src/bitmessageqt/__init__.py

@@ -2165,6 +2165,26 @@ class MyForm(QtGui.QMainWindow):
             if float(self.settingsDialogInstance.ui.lineEditMaxAcceptableSmallMessageDifficulty.text()) >= 1 or float(self.settingsDialogInstance.ui.lineEditMaxAcceptableSmallMessageDifficulty.text()) == 0:
                 shared.config.set('bitmessagesettings', 'maxacceptablepayloadlengthextrabytes', str(int(float(
                     self.settingsDialogInstance.ui.lineEditMaxAcceptableSmallMessageDifficulty.text()) * shared.networkDefaultPayloadLengthExtraBytes)))
+            #start:UI setting to stop trying to send messages after X days/months
+            # I'm open to changing this UI to something else if someone has a better idea.
+            if ((self.settingsDialogInstance.ui.lineEditDays.text()=='') and (self.settingsDialogInstance.ui.lineEditMonths.text()=='')):#We need to handle this special case. Bitmessage has its default behavior. The input is blank/blank
+                shared.config.set('bitmessagesettings', 'stopresendingafterxdays', '')
+                shared.config.set('bitmessagesettings', 'stopresendingafterxmonths', '')
+                shared.maximumLengthOfTimeToBotherResendingMessages = float('inf')
+            elif (float(self.settingsDialogInstance.ui.lineEditDays.text()) >=0 and float(self.settingsDialogInstance.ui.lineEditMonths.text()) >=0):
+                shared.maximumLengthOfTimeToBotherResendingMessages = (float(str(self.settingsDialogInstance.ui.lineEditDays.text())) * 24 * 60 * 60) + (float(str(self.settingsDialogInstance.ui.lineEditMonths.text())) * (60 * 60 * 24 *365)/12)
+                if shared.maximumLengthOfTimeToBotherResendingMessages < 432000: # If the time period is less than 5 hours, we give zero values to all fields. No message will be sent again.
+                    QMessageBox.about(self, _translate("MainWindow", "Will not resend ever"), _translate(
+                        "MainWindow", "Note that the time limit you entered is less than the amount of time Bitmessage waits for the first resend attempt therefore your messages will never be resent."))
+                    shared.config.set('bitmessagesettings', 'stopresendingafterxdays', '0')
+                    shared.config.set('bitmessagesettings', 'stopresendingafterxmonths', '0')
+                    shared.maximumLengthOfTimeToBotherResendingMessages = 0
+                else:
+                    shared.config.set('bitmessagesettings', 'stopresendingafterxdays', str(float(
+                    self.settingsDialogInstance.ui.lineEditDays.text())))
+                    shared.config.set('bitmessagesettings', 'stopresendingafterxmonths', str(float(
+                    self.settingsDialogInstance.ui.lineEditMonths.text())))
+            #end
 
             # if str(self.settingsDialogInstance.ui.comboBoxMaxCores.currentText()) == 'All':
             #    shared.config.set('bitmessagesettings', 'maxcores', '99999')
@@ -3233,6 +3253,13 @@ class settingsDialog(QtGui.QDialog):
         QtCore.QObject.connect(self.ui.pushButtonNamecoinTest, QtCore.SIGNAL(
             "clicked()"), self.click_pushButtonNamecoinTest)
 
+        #Message Resend tab
+        self.ui.lineEditDays.setText(str(
+            shared.config.get('bitmessagesettings', 'stopresendingafterxdays')))
+        self.ui.lineEditMonths.setText(str(
+            shared.config.get('bitmessagesettings', 'stopresendingafterxmonths')))
+        
+        
         #'System' tab removed for now.
         """try:
             maxCores = shared.config.getint('bitmessagesettings', 'maxcores')

src/bitmessageqt/settings.py

@@ -319,7 +319,48 @@ class Ui_settingsDialog(object):
         self.gridLayout_8.addLayout(self.horizontalLayout, 1, 0, 1, 3)
         self.tabWidgetSettings.addTab(self.tabNamecoin, _fromUtf8(""))
         self.gridLayout.addWidget(self.tabWidgetSettings, 0, 0, 1, 1)
-
+        #start:UI setting to stop trying to send messages after X hours/days/months
+        self.tabResendingMessagesAdjustment=QtGui.QWidget()
+        self.tabResendingMessagesAdjustment.setObjectName(_fromUtf8("tabResendingMessagesAdjustment"))
+        self.gridLayout_9 = QtGui.QGridLayout(self.tabResendingMessagesAdjustment)
+        self.gridLayout_9.setObjectName(_fromUtf8("gridLayout_9"))
+        self.label_19 = QtGui.QLabel(self.tabResendingMessagesAdjustment)
+        self.label_19.setWordWrap(True)
+        self.label_19.setObjectName(_fromUtf8("label_19"))
+        self.gridLayout_9.addWidget(self.label_19, 0, 0, 1, 0)
+        spacerItem13 = QtGui.QSpacerItem(102, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.gridLayout_9.addItem(spacerItem13, 1, 0, 1, 1)
+        self.horizontalLayout = QtGui.QHBoxLayout()
+        self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout"))
+        self.label_20 = QtGui.QLabel(self.tabResendingMessagesAdjustment)
+        self.label_20.setLayoutDirection(QtCore.Qt.LeftToRight)
+        self.label_20.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_20.setObjectName(_fromUtf8("label_20"))
+        self.gridLayout_9.addWidget(self.label_20, 2, 0, 1, 1)
+        self.lineEditHours = QtGui.QLineEdit(self.tabResendingMessagesAdjustment)
+        self.lineEditHours.setMaximumSize(QtCore.QSize(33, 16777))
+        self.lineEditHours.setObjectName(_fromUtf8("lineEditHours"))
+        self.gridLayout_9.addWidget(self.lineEditHours, 2, 1, 1, 1)
+        self.label_22 = QtGui.QLabel(self.tabResendingMessagesAdjustment)
+        self.label_22.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_22.setObjectName(_fromUtf8("label_22"))
+        self.gridLayout_9.addWidget(self.label_22, 2, 2, 1, 1)
+        self.lineEditDays = QtGui.QLineEdit(self.tabResendingMessagesAdjustment)
+        self.lineEditDays.setMaximumSize(QtCore.QSize(33, 16777))
+        self.lineEditDays.setObjectName(_fromUtf8("lineEditDays"))
+        self.gridLayout_9.addWidget(self.lineEditDays, 2, 3, 1, 1)
+        self.label_23 = QtGui.QLabel(self.tabResendingMessagesAdjustment)
+        self.label_23.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_23.setObjectName(_fromUtf8("label_23"))
+        self.gridLayout_9.addWidget(self.label_23, 2, 4, 1, 1)
+        self.lineEditMonths = QtGui.QLineEdit(self.tabResendingMessagesAdjustment)
+        self.lineEditMonths.setMaximumSize(QtCore.QSize(33, 16777))
+        self.lineEditMonths.setObjectName(_fromUtf8("lineEditMonths"))
+        self.gridLayout_9.addWidget(self.lineEditMonths, 2, 5, 1, 1)
+        spacerItem15 = QtGui.QSpacerItem(20, 147, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        self.gridLayout_9.addItem(spacerItem15, 3, 1, 1, 1)
+        self.tabWidgetSettings.addTab(self.tabResendingMessagesAdjustment, _fromUtf8(""))
+        #end
         self.retranslateUi(settingsDialog)
         self.tabWidgetSettings.setCurrentIndex(0)
         QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("accepted()")), settingsDialog.accept)
@@ -383,6 +424,13 @@ class Ui_settingsDialog(object):
         self.tabWidgetSettings.setTabText(self.tabWidgetSettings.indexOf(self.tab), _translate("settingsDialog", "Demanded difficulty", None))
         self.label_15.setText(_translate("settingsDialog", "Here you may set the maximum amount of work you are willing to do to send a message to another person. Setting these values to 0 means that any value is acceptable.", None))
         self.label_13.setText(_translate("settingsDialog", "Maximum acceptable total difficulty:", None))
+        #start:UI setting to stop trying to send messages after X hours/days/months
+        self.tabWidgetSettings.setTabText(self.tabWidgetSettings.indexOf(self.tabResendingMessagesAdjustment), _translate("settingsDialog", "Adjusting time period to stop sending messages", None))
+        self.label_19.setText(_translate("settingsDialog", "<html><head/><body><p>If you send a message to someone and he is offline for more than two and a half days, Bitmessage will send the message again after an additional two and a half days. This will be continued with exponential backoff forever. Μessages will continue to be sent after 5, 10, 20 days etc. until the receiver gets them.</p><p> Leaving all the input fields blank means the default behavior which will continue the resending with exponential backoff.</p><p> Setting these values to 0/0/0 or less than 5 days mean that the client will not resend any messages.</p><p> Here you can adjust Bitmessage to stop trying to send messages after X hours/days/months.</p></body></html>", None))
+        self.label_20.setText(_translate("settingsDialog", "Time in hours/days/months:", None))
+        self.label_22.setText(_translate("settingsDialog", "/", None))
+        self.label_23.setText(_translate("settingsDialog", "/", None))
+        #end
         self.label_14.setText(_translate("settingsDialog", "Maximum acceptable small message difficulty:", None))
         self.tabWidgetSettings.setTabText(self.tabWidgetSettings.indexOf(self.tab_2), _translate("settingsDialog", "Max acceptable difficulty", None))
         self.label_16.setText(_translate("settingsDialog", "<html><head/><body><p>Bitmessage can utilize a different Bitcoin-based program called Namecoin to make addresses human-friendly. For example, instead of having to tell your friend your long Bitmessage address, you can simply tell him to send a message to <span style=\" font-style:italic;\">test. </span></p><p>(Getting your own Bitmessage address into Namecoin is still rather difficult).</p><p>Bitmessage can use either namecoind directly or a running nmcontrol instance.</p></body></html>", None))

src/class_singleCleaner.py

@@ -10,16 +10,16 @@ from debug import logger
 
 '''The singleCleaner class is a timer-driven thread that cleans data structures to free memory, resends messages when a remote node doesn't respond, and sends pong messages to keep connections alive if the network isn't busy.
 It cleans these data structures in memory:
-    inventory (moves data to the on-disk sql database)
+inventory (moves data to the on-disk sql database)
-    inventorySets (clears then reloads data out of sql database)
+inventorySets (clears then reloads data out of sql database)
 
 It cleans these tables on the disk:
-    inventory (clears data more than 2 days and 12 hours old)
+inventory (clears data more than 2 days and 12 hours old)
-    pubkeys (clears pubkeys older than 4 weeks old which we have not used personally)
+pubkeys (clears pubkeys older than 4 weeks old which we have not used personally)
 
 It resends messages when there has been no response:
-    resends getpubkey messages in 4 days (then 8 days, then 16 days, etc...)
+resends getpubkey messages in 5 days (then 10 days, then 20 days, etc...)
-    resends msg messages in 4 days (then 8 days, then 16 days, etc...)
+resends msg messages in 5 days (then 10 days, then 20 days, etc...)
 
 '''
 
@@ -31,6 +31,11 @@ class singleCleaner(threading.Thread):
 
     def run(self):
         timeWeLastClearedInventoryAndPubkeysTables = 0
+        try:
+            shared.maximumLengthOfTimeToBotherResendingMessages = (float(shared.config.get('bitmessagesettings', 'stopresendingafterxdays')) * 24 * 60 * 60) + (float(shared.config.get('bitmessagesettings', 'stopresendingafterxmonths')) * (60 * 60 * 24 *365)/12)
+        except:
+            shared.maximumLengthOfTimeToBotherResendingMessages = float('inf')
+            print 'problem calculating maximumLengthOfTimeToBotherResendingMessages '
 
         while True:
             shared.UISignalQueue.put((
@@ -52,7 +57,7 @@ class singleCleaner(threading.Thread):
                             del shared.inventory[hash]
             shared.UISignalQueue.put(('updateStatusBar', ''))
             shared.broadcastToSendDataQueues((
-                0, 'pong', 'no data'))  # commands the sendData threads to send out a pong message if they haven't sent anything else in the last five minutes. The socket timeout-time is 10 minutes.
+                0, 'pong', 'no data')) # commands the sendData threads to send out a pong message if they haven't sent anything else in the last five minutes. The socket timeout-time is 10 minutes.
             # If we are running as a daemon then we are going to fill up the UI
             # queue which will never be handled by a UI. We should clear it to
             # save memory.
@@ -65,7 +70,7 @@ class singleCleaner(threading.Thread):
                 # inventory (clears pubkeys after 28 days and everything else
                 # after 2 days and 12 hours)
                 sqlExecute(
-                    '''DELETE FROM inventory WHERE (receivedtime<? AND objecttype<>'pubkey') OR (receivedtime<?  AND objecttype='pubkey') ''',
+                    '''DELETE FROM inventory WHERE (receivedtime<? AND objecttype<>'pubkey') OR (receivedtime<? AND objecttype='pubkey') ''',
                     int(time.time()) - shared.lengthOfTimeToLeaveObjectsInInventory,
                     int(time.time()) - shared.lengthOfTimeToHoldOnToAllPubkeys)
 
@@ -75,7 +80,8 @@ class singleCleaner(threading.Thread):
                     int(time.time()) - shared.lengthOfTimeToHoldOnToAllPubkeys)
 
                 queryreturn = sqlQuery(
-                    '''select toaddress, toripe, fromaddress, subject, message, ackdata, lastactiontime, status, pubkeyretrynumber, msgretrynumber FROM sent WHERE ((status='awaitingpubkey' OR status='msgsent') AND folder='sent') ''')  # If the message's folder='trash' then we'll ignore it.
+                    '''select toaddress, toripe, fromaddress, subject, message, ackdata, lastactiontime, status, pubkeyretrynumber, msgretrynumber FROM sent WHERE ((status='awaitingpubkey' OR status='msgsent') AND folder='sent' AND lastactiontime>?) ''',
+                    int(time.time()) - shared.maximumLengthOfTimeToBotherResendingMessages) # If the message's folder='trash' then we'll ignore it.
                 for row in queryreturn:
                     if len(row) < 5:
                         with shared.printLock:
@@ -86,35 +92,11 @@ class singleCleaner(threading.Thread):
                         break
                     toaddress, toripe, fromaddress, subject, message, ackdata, lastactiontime, status, pubkeyretrynumber, msgretrynumber = row
                     if status == 'awaitingpubkey':
-                        if int(time.time()) - lastactiontime > (shared.maximumAgeOfAnObjectThatIAmWillingToAccept * (2 ** (pubkeyretrynumber))):
+                        if (int(time.time()) - lastactiontime) > (shared.maximumAgeOfAnObjectThatIAmWillingToAccept * (2 ** (pubkeyretrynumber))):
-                            print 'It has been a long time and we haven\'t heard a response to our getpubkey request. Sending again.'
+                            resendPubkey(pubkeyretrynumber,toripe)
-                            try:
+                    else: # status == msgsent
-                                del shared.neededPubkeys[
+                        if (int(time.time()) - lastactiontime) > (shared.maximumAgeOfAnObjectThatIAmWillingToAccept * (2 ** (msgretrynumber))):
-                                    toripe]  # We need to take this entry out of the shared.neededPubkeys structure because the shared.workerQueue checks to see whether the entry is already present and will not do the POW and send the message because it assumes that it has already done it recently.
+                            resendMsg(msgretrynumber,ackdata)    
-                            except:
-                                pass
-
-                            shared.UISignalQueue.put((
-                                'updateStatusBar', 'Doing work necessary to again attempt to request a public key...'))
-                            t = ()
-                            sqlExecute(
-                                '''UPDATE sent SET lastactiontime=?, pubkeyretrynumber=?, status='msgqueued' WHERE toripe=?''',
-                                int(time.time()),
-                                pubkeyretrynumber + 1,
-                                toripe)
-                            shared.workerQueue.put(('sendmessage', ''))
-                    else:  # status == msgsent
-                        if int(time.time()) - lastactiontime > (shared.maximumAgeOfAnObjectThatIAmWillingToAccept * (2 ** (msgretrynumber))):
-                            print 'It has been a long time and we haven\'t heard an acknowledgement to our msg. Sending again.'
-                            sqlExecute(
-                                '''UPDATE sent SET lastactiontime=?, msgretrynumber=?, status=? WHERE ackdata=?''',
-                                int(time.time()),
-                                msgretrynumber + 1,
-                                'msgqueued',
-                                ackdata)
-                            shared.workerQueue.put(('sendmessage', ''))
-                            shared.UISignalQueue.put((
-                                'updateStatusBar', 'Doing work necessary to again attempt to deliver a message...'))
                 
                 # Let's also clear and reload shared.inventorySets to keep it from
                 # taking up an unnecessary amount of memory.
@@ -145,3 +127,34 @@ class singleCleaner(threading.Thread):
                 shared.knownNodesLock.release()
                 shared.needToWriteKnownNodesToDisk = False
             time.sleep(300)
+
+
+def resendPubkey(pubkeyretrynumber,toripe):
+    print 'It has been a long time and we haven\'t heard a response to our getpubkey request. Sending again.'
+    try:
+        del shared.neededPubkeys[
+            toripe] # We need to take this entry out of the shared.neededPubkeys structure because the shared.workerQueue checks to see whether the entry is already present and will not do the POW and send the message because it assumes that it has already done it recently.
+    except:
+        pass
+    
+    shared.UISignalQueue.put((
+         'updateStatusBar', 'Doing work necessary to again attempt to request a public key...'))
+    t = ()
+    sqlExecute(
+        '''UPDATE sent SET lastactiontime=?, pubkeyretrynumber=?, status='msgqueued' WHERE toripe=?''',
+        int(time.time()),
+        pubkeyretrynumber + 1,
+        toripe)
+    shared.workerQueue.put(('sendmessage', ''))
+
+def resendMsg(msgretrynumber,ackdata):
+    print 'It has been a long time and we haven\'t heard an acknowledgement to our msg. Sending again.'
+    sqlExecute(
+    '''UPDATE sent SET lastactiontime=?, msgretrynumber=?, status=? WHERE ackdata=?''',
+    int(time.time()),
+    msgretrynumber + 1,
+    'msgqueued',
+    ackdata)
+    shared.workerQueue.put(('sendmessage', ''))
+    shared.UISignalQueue.put((
+    'updateStatusBar', 'Doing work necessary to again attempt to deliver a message...'))

src/class_sqlThread.py

@@ -279,6 +279,17 @@ class sqlThread(threading.Thread):
             with open(shared.appdata + 'keys.dat', 'wb') as configfile:
                 shared.config.write(configfile)
 
+        #Adjusting time period to stop sending messages
+        if shared.config.getint('bitmessagesettings', 'settingsversion') == 7:
+            shared.config.set(
+                'bitmessagesettings', 'stopresendingafterxdays', '')
+            shared.config.set(
+                'bitmessagesettings', 'stopresendingafterxmonths', '')
+            #shared.config.set(
+            shared.config.set('bitmessagesettings', 'settingsversion', '8') 
+            with open(shared.appdata + 'keys.dat', 'wb') as configfile:
+                shared.config.write(configfile)
+
         # Are you hoping to add a new option to the keys.dat file of existing
         # Bitmessage users? Add it right above this line!
         

src/class_sqlThread.py.orig

@@ -0,0 +1,436 @@
+import threading
+import shared
+import sqlite3
+import time
+import shutil  # used for moving the messages.dat file
+import sys
+import os
+from debug import logger
+from namecoin import ensureNamecoinOptions
+import tr#anslate
+
+# This thread exists because SQLITE3 is so un-threadsafe that we must
+# submit queries to it and it puts results back in a different queue. They
+# won't let us just use locks.
+
+
+class sqlThread(threading.Thread):
+
+    def __init__(self):
+        threading.Thread.__init__(self)
+
+    def run(self):        
+        self.conn = sqlite3.connect(shared.appdata + 'messages.dat')
+        self.conn.text_factory = str
+        self.cur = self.conn.cursor()
+        try:
+            self.cur.execute(
+                '''CREATE TABLE inbox (msgid blob, toaddress text, fromaddress text, subject text, received text, message text, folder text, encodingtype int, read bool, UNIQUE(msgid) ON CONFLICT REPLACE)''' )
+            self.cur.execute(
+                '''CREATE TABLE sent (msgid blob, toaddress text, toripe blob, fromaddress text, subject text, message text, ackdata blob, lastactiontime integer, status text, pubkeyretrynumber integer, msgretrynumber integer, folder text, encodingtype int)''' )
+            self.cur.execute(
+                '''CREATE TABLE subscriptions (label text, address text, enabled bool)''' )
+            self.cur.execute(
+                '''CREATE TABLE addressbook (label text, address text)''' )
+            self.cur.execute(
+                '''CREATE TABLE blacklist (label text, address text, enabled bool)''' )
+            self.cur.execute(
+                '''CREATE TABLE whitelist (label text, address text, enabled bool)''' )
+            # Explanation of what is in the pubkeys table:
+            #   The hash is the RIPEMD160 hash that is encoded in the Bitmessage address.
+            #   transmitdata is literally the data that was included in the Bitmessage pubkey message when it arrived, except for the 24 byte protocol header- ie, it starts with the POW nonce.
+            #   time is the time that the pubkey was broadcast on the network same as with every other type of Bitmessage object.
+            # usedpersonally is set to "yes" if we have used the key
+            # personally. This keeps us from deleting it because we may want to
+            # reply to a message in the future. This field is not a bool
+            # because we may need more flexability in the future and it doesn't
+            # take up much more space anyway.
+            self.cur.execute(
+                '''CREATE TABLE pubkeys (hash blob, addressversion int, transmitdata blob, time int, usedpersonally text, UNIQUE(hash, addressversion) ON CONFLICT REPLACE)''' )
+            self.cur.execute(
+                '''CREATE TABLE inventory (hash blob, objecttype text, streamnumber int, payload blob, receivedtime integer, tag blob, UNIQUE(hash) ON CONFLICT REPLACE)''' )
+            self.cur.execute(
+                '''CREATE TABLE knownnodes (timelastseen int, stream int, services blob, host blob, port blob, UNIQUE(host, stream, port) ON CONFLICT REPLACE)''' )
+                             # This table isn't used in the program yet but I
+                             # have a feeling that we'll need it.
+            self.cur.execute(
+                '''INSERT INTO subscriptions VALUES('Bitmessage new releases/announcements','BM-GtovgYdgs7qXPkoYaRgrLFuFKz1SFpsw',1)''')
+            self.cur.execute(
+                '''CREATE TABLE settings (key blob, value blob, UNIQUE(key) ON CONFLICT REPLACE)''' )
+            self.cur.execute( '''INSERT INTO settings VALUES('version','5')''')
+            self.cur.execute( '''INSERT INTO settings VALUES('lastvacuumtime',?)''', (
+                int(time.time()),))
+            self.conn.commit()
+            logger.info('Created messages database file')
+        except Exception as err:
+            if str(err) == 'table inbox already exists':
+                logger.debug('Database file already exists.')
+
+            else:
+                sys.stderr.write(
+                    'ERROR trying to create database file (message.dat). Error message: %s\n' % str(err))
+                os._exit(0)
+
+        if shared.config.getint('bitmessagesettings', 'settingsversion') == 1:
+            shared.config.set('bitmessagesettings', 'settingsversion', '2')
+                      # If the settings version is equal to 2 or 3 then the
+                      # sqlThread will modify the pubkeys table and change
+                      # the settings version to 4.
+            shared.config.set('bitmessagesettings', 'socksproxytype', 'none')
+            shared.config.set('bitmessagesettings', 'sockshostname', 'localhost')
+            shared.config.set('bitmessagesettings', 'socksport', '9050')
+            shared.config.set('bitmessagesettings', 'socksauthentication', 'false')
+            shared.config.set('bitmessagesettings', 'socksusername', '')
+            shared.config.set('bitmessagesettings', 'sockspassword', '')
+            shared.config.set('bitmessagesettings', 'sockslisten', 'false')
+            shared.config.set('bitmessagesettings', 'keysencrypted', 'false')
+            shared.config.set('bitmessagesettings', 'messagesencrypted', 'false')
+            with open(shared.appdata + 'keys.dat', 'wb') as configfile:
+                shared.config.write(configfile)
+
+        # People running earlier versions of PyBitmessage do not have the
+        # usedpersonally field in their pubkeys table. Let's add it.
+        if shared.config.getint('bitmessagesettings', 'settingsversion') == 2:
+            item = '''ALTER TABLE pubkeys ADD usedpersonally text DEFAULT 'no' '''
+            parameters = ''
+            self.cur.execute(item, parameters)
+            self.conn.commit()
+
+            shared.config.set('bitmessagesettings', 'settingsversion', '3')
+            with open(shared.appdata + 'keys.dat', 'wb') as configfile:
+                shared.config.write(configfile)
+
+        # People running earlier versions of PyBitmessage do not have the
+        # encodingtype field in their inbox and sent tables or the read field
+        # in the inbox table. Let's add them.
+        if shared.config.getint('bitmessagesettings', 'settingsversion') == 3:
+            item = '''ALTER TABLE inbox ADD encodingtype int DEFAULT '2' '''
+            parameters = ''
+            self.cur.execute(item, parameters)
+
+            item = '''ALTER TABLE inbox ADD read bool DEFAULT '1' '''
+            parameters = ''
+            self.cur.execute(item, parameters)
+
+            item = '''ALTER TABLE sent ADD encodingtype int DEFAULT '2' '''
+            parameters = ''
+            self.cur.execute(item, parameters)
+            self.conn.commit()
+
+            shared.config.set('bitmessagesettings', 'settingsversion', '4')
+            with open(shared.appdata + 'keys.dat', 'wb') as configfile:
+                shared.config.write(configfile)
+
+        if shared.config.getint('bitmessagesettings', 'settingsversion') == 4:
+            shared.config.set('bitmessagesettings', 'defaultnoncetrialsperbyte', str(
+                shared.networkDefaultProofOfWorkNonceTrialsPerByte))
+            shared.config.set('bitmessagesettings', 'defaultpayloadlengthextrabytes', str(
+                shared.networkDefaultPayloadLengthExtraBytes))
+            shared.config.set('bitmessagesettings', 'settingsversion', '5')
+
+        if shared.config.getint('bitmessagesettings', 'settingsversion') == 5:
+            shared.config.set(
+                'bitmessagesettings', 'maxacceptablenoncetrialsperbyte', '0')
+            shared.config.set(
+                'bitmessagesettings', 'maxacceptablepayloadlengthextrabytes', '0')
+            shared.config.set('bitmessagesettings', 'settingsversion', '6')
+            with open(shared.appdata + 'keys.dat', 'wb') as configfile:
+                shared.config.write(configfile)
+
+        # From now on, let us keep a 'version' embedded in the messages.dat
+        # file so that when we make changes to the database, the database
+        # version we are on can stay embedded in the messages.dat file. Let us
+        # check to see if the settings table exists yet.
+        item = '''SELECT name FROM sqlite_master WHERE type='table' AND name='settings';'''
+        parameters = ''
+        self.cur.execute(item, parameters)
+        if self.cur.fetchall() == []:
+            # The settings table doesn't exist. We need to make it.
+            logger.debug('In messages.dat database, creating new \'settings\' table.')
+            self.cur.execute(
+                '''CREATE TABLE settings (key text, value blob, UNIQUE(key) ON CONFLICT REPLACE)''' )
+            self.cur.execute( '''INSERT INTO settings VALUES('version','1')''')
+            self.cur.execute( '''INSERT INTO settings VALUES('lastvacuumtime',?)''', (
+                int(time.time()),))
+            logger.debug('In messages.dat database, removing an obsolete field from the pubkeys table.')
+            self.cur.execute(
+                '''CREATE TEMPORARY TABLE pubkeys_backup(hash blob, transmitdata blob, time int, usedpersonally text, UNIQUE(hash) ON CONFLICT REPLACE);''')
+            self.cur.execute(
+                '''INSERT INTO pubkeys_backup SELECT hash, transmitdata, time, usedpersonally FROM pubkeys;''')
+            self.cur.execute( '''DROP TABLE pubkeys''')
+            self.cur.execute(
+                '''CREATE TABLE pubkeys (hash blob, transmitdata blob, time int, usedpersonally text, UNIQUE(hash) ON CONFLICT REPLACE)''' )
+            self.cur.execute(
+                '''INSERT INTO pubkeys SELECT hash, transmitdata, time, usedpersonally FROM pubkeys_backup;''')
+            self.cur.execute( '''DROP TABLE pubkeys_backup;''')
+            logger.debug('Deleting all pubkeys from inventory. They will be redownloaded and then saved with the correct times.')
+            self.cur.execute(
+                '''delete from inventory where objecttype = 'pubkey';''')
+            logger.debug('replacing Bitmessage announcements mailing list with a new one.')
+            self.cur.execute(
+                '''delete from subscriptions where address='BM-BbkPSZbzPwpVcYZpU4yHwf9ZPEapN5Zx' ''')
+            self.cur.execute(
+                '''INSERT INTO subscriptions VALUES('Bitmessage new releases/announcements','BM-GtovgYdgs7qXPkoYaRgrLFuFKz1SFpsw',1)''')
+            logger.debug('Commiting.')
+            self.conn.commit()
+            logger.debug('Vacuuming message.dat. You might notice that the file size gets much smaller.')
+            self.cur.execute( ''' VACUUM ''')
+
+        # After code refactoring, the possible status values for sent messages
+        # have changed.
+        self.cur.execute(
+            '''update sent set status='doingmsgpow' where status='doingpow'  ''')
+        self.cur.execute(
+            '''update sent set status='msgsent' where status='sentmessage'  ''')
+        self.cur.execute(
+            '''update sent set status='doingpubkeypow' where status='findingpubkey'  ''')
+        self.cur.execute(
+            '''update sent set status='broadcastqueued' where status='broadcastpending'  ''')
+        self.conn.commit()
+        
+        if not shared.config.has_option('bitmessagesettings', 'sockslisten'):
+            shared.config.set('bitmessagesettings', 'sockslisten', 'false')
+            
+        ensureNamecoinOptions()
+            
+        """# Add a new column to the inventory table to store the first 20 bytes of encrypted messages to support Android app
+        item = '''SELECT value FROM settings WHERE key='version';'''
+        parameters = ''
+        self.cur.execute(item, parameters)
+        if int(self.cur.fetchall()[0][0]) == 1:
+            print 'upgrading database'
+            item = '''ALTER TABLE inventory ADD first20bytesofencryptedmessage blob DEFAULT '' '''
+            parameters = ''
+            self.cur.execute(item, parameters)
+            item = '''update settings set value=? WHERE key='version';'''
+            parameters = (2,)
+            self.cur.execute(item, parameters)"""
+
+        # Let's get rid of the first20bytesofencryptedmessage field in the inventory table.
+        item = '''SELECT value FROM settings WHERE key='version';'''
+        parameters = ''
+        self.cur.execute(item, parameters)
+        if int(self.cur.fetchall()[0][0]) == 2:
+            logger.debug('In messages.dat database, removing an obsolete field from the inventory table.')
+            self.cur.execute(
+                '''CREATE TEMPORARY TABLE inventory_backup(hash blob, objecttype text, streamnumber int, payload blob, receivedtime integer, UNIQUE(hash) ON CONFLICT REPLACE);''')
+            self.cur.execute(
+                '''INSERT INTO inventory_backup SELECT hash, objecttype, streamnumber, payload, receivedtime FROM inventory;''')
+            self.cur.execute( '''DROP TABLE inventory''')
+            self.cur.execute(
+                '''CREATE TABLE inventory (hash blob, objecttype text, streamnumber int, payload blob, receivedtime integer, UNIQUE(hash) ON CONFLICT REPLACE)''' )
+            self.cur.execute(
+                '''INSERT INTO inventory SELECT hash, objecttype, streamnumber, payload, receivedtime FROM inventory_backup;''')
+            self.cur.execute( '''DROP TABLE inventory_backup;''')
+            item = '''update settings set value=? WHERE key='version';'''
+            parameters = (3,)
+            self.cur.execute(item, parameters)
+
+        # Add a new column to the inventory table to store tags.
+        item = '''SELECT value FROM settings WHERE key='version';'''
+        parameters = ''
+        self.cur.execute(item, parameters)
+        currentVersion = int(self.cur.fetchall()[0][0])
+        if currentVersion == 1 or currentVersion == 3:
+            logger.debug('In messages.dat database, adding tag field to the inventory table.')
+            item = '''ALTER TABLE inventory ADD tag blob DEFAULT '' '''
+            parameters = ''
+            self.cur.execute(item, parameters)
+            item = '''update settings set value=? WHERE key='version';'''
+            parameters = (4,)
+            self.cur.execute(item, parameters)
+
+        if not shared.config.has_option('bitmessagesettings', 'userlocale'):
+            shared.config.set('bitmessagesettings', 'userlocale', 'system')
+        if not shared.config.has_option('bitmessagesettings', 'sendoutgoingconnections'):
+            shared.config.set('bitmessagesettings', 'sendoutgoingconnections', 'True')
+
+        # Raise the default required difficulty from 1 to 2
+        if shared.config.getint('bitmessagesettings', 'settingsversion') == 6:
+            if int(shared.config.get('bitmessagesettings','defaultnoncetrialsperbyte')) == shared.networkDefaultProofOfWorkNonceTrialsPerByte:
+                shared.config.set('bitmessagesettings','defaultnoncetrialsperbyte', str(shared.networkDefaultProofOfWorkNonceTrialsPerByte * 2))
+            shared.config.set('bitmessagesettings', 'settingsversion', '7')
+            with open(shared.appdata + 'keys.dat', 'wb') as configfile:
+                shared.config.write(configfile)
+<<<<<<< HEAD
+
+        # Add a new column to the pubkeys table to store the address version.
+        # We're going to trash all of our pubkeys and let them be redownloaded.
+        item = '''SELECT value FROM settings WHERE key='version';'''
+        parameters = ''
+        self.cur.execute(item, parameters)
+        currentVersion = int(self.cur.fetchall()[0][0])
+        if currentVersion == 4:
+            self.cur.execute( '''DROP TABLE pubkeys''')
+            self.cur.execute(
+                '''CREATE TABLE pubkeys (hash blob, addressversion int, transmitdata blob, time int, usedpersonally text, UNIQUE(hash, addressversion) ON CONFLICT REPLACE)''' )
+            self.cur.execute(
+                '''delete from inventory where objecttype = 'pubkey';''')
+            item = '''update settings set value=? WHERE key='version';'''
+            parameters = (5,)
+            self.cur.execute(item, parameters)
+
+=======
+                
+>>>>>>> c16d9787d289b1f6ae05358e55ad46cd4b8d2a30
+        # Are you hoping to add a new option to the keys.dat file of existing
+        # Bitmessage users? Add it right above this line!
+        
+        #my new implementation starts here, the most of these comment will be deleted, they are just for documentation
+        if shared.config.getint('bitmessagesettings', 'settingsversion') == 7:#this is the version that all we have,if you see your keys.dat file this is your version.AQWA
+            shared.config.set(#in order to not have to change your keys.dat file I update it with the new lines. I add to your keys.dat three new default fields.AQWA
+                'bitmessagesettings', 'hours', '')# hours, days, months have no value.This means that bitmessage works as before. It re-sends mails every 4,8,16 days..forever.AQWA
+            shared.config.set(
+                'bitmessagesettings', 'days', '')
+            shared.config.set(
+                'bitmessagesettings', 'months', '')
+            shared.config.set(
+                'bitmessagesettings', 'timeperiod', '-1')#time period has default value -1. This is used for checking in class_singleCleaner. If you leave default the time period or after you change it(f.i 1/0/0), again you set it with its default value(-/-/-) this variable will be -1.AQWA
+            shared.config.set('bitmessagesettings', 'settingsversion', '8') #We update the version.If I leave it 7 every time that Bitmessage starts your setting will be lost.The default values(-/-/-) will be loaded all the time ;).That was juicy.AQWA
+            with open(shared.appdata + 'keys.dat', 'wb') as configfile:
+                shared.config.write(configfile)
+        #my new implementation in this file stops here
+        
+        try:
+            testpayload = '\x00\x00'
+            t = ('1234', 1, testpayload, '12345678', 'no')
+            self.cur.execute( '''INSERT INTO pubkeys VALUES(?,?,?,?,?)''', t)
+            self.conn.commit()
+            self.cur.execute(
+                '''SELECT transmitdata FROM pubkeys WHERE hash='1234' ''')
+            queryreturn = self.cur.fetchall()
+            for row in queryreturn:
+                transmitdata, = row
+            self.cur.execute('''DELETE FROM pubkeys WHERE hash='1234' ''')
+            self.conn.commit()
+            if transmitdata == '':
+                logger.fatal('Problem: The version of SQLite you have cannot store Null values. Please download and install the latest revision of your version of Python (for example, the latest Python 2.7 revision) and try again.\n')
+                logger.fatal('PyBitmessage will now exit very abruptly. You may now see threading errors related to this abrupt exit but the problem you need to solve is related to SQLite.\n\n')
+                os._exit(0)
+        except Exception as err:
+            if str(err) == 'database or disk is full':
+                logger.fatal('(While null value test) Alert: Your disk or data storage volume is full. sqlThread will now exit.')
+                shared.UISignalQueue.put(('alert', (tr.translateText("MainWindow", "Disk full"), tr.translateText("MainWindow", 'Alert: Your disk or data storage volume is full. Bitmessage will now exit.'), True)))
+                if shared.daemon:
+                    os._exit(0)
+                else:
+                    return
+            else:
+                logger.error(err)
+
+        # Let us check to see the last time we vaccumed the messages.dat file.
+        # If it has been more than a month let's do it now.
+        item = '''SELECT value FROM settings WHERE key='lastvacuumtime';'''
+        parameters = ''
+        self.cur.execute(item, parameters)
+        queryreturn = self.cur.fetchall()
+        for row in queryreturn:
+            value, = row
+            if int(value) < int(time.time()) - 2592000:
+                logger.info('It has been a long time since the messages.dat file has been vacuumed. Vacuuming now...')
+                try:
+                    self.cur.execute( ''' VACUUM ''')
+                except Exception as err:
+                    if str(err) == 'database or disk is full':
+                        logger.fatal('(While VACUUM) Alert: Your disk or data storage volume is full. sqlThread will now exit.')
+                        shared.UISignalQueue.put(('alert', (tr.translateText("MainWindow", "Disk full"), tr.translateText("MainWindow", 'Alert: Your disk or data storage volume is full. Bitmessage will now exit.'), True)))
+                        if shared.daemon:
+                            os._exit(0)
+                        else:
+                            return
+                item = '''update settings set value=? WHERE key='lastvacuumtime';'''
+                parameters = (int(time.time()),)
+                self.cur.execute(item, parameters)
+
+        while True:
+            item = shared.sqlSubmitQueue.get()
+            if item == 'commit':
+                try:
+                    self.conn.commit()
+                except Exception as err:
+                    if str(err) == 'database or disk is full':
+                        logger.fatal('(While committing) Alert: Your disk or data storage volume is full. sqlThread will now exit.')
+                        shared.UISignalQueue.put(('alert', (tr.translateText("MainWindow", "Disk full"), tr.translateText("MainWindow", 'Alert: Your disk or data storage volume is full. Bitmessage will now exit.'), True)))
+                        if shared.daemon:
+                            os._exit(0)
+                        else:
+                            return
+            elif item == 'exit':
+                self.conn.close()
+                logger.info('sqlThread exiting gracefully.')
+
+                return
+            elif item == 'movemessagstoprog':
+                logger.debug('the sqlThread is moving the messages.dat file to the local program directory.')
+
+                try:
+                    self.conn.commit()
+                except Exception as err:
+                    if str(err) == 'database or disk is full':
+                        logger.fatal('(while movemessagstoprog) Alert: Your disk or data storage volume is full. sqlThread will now exit.')
+                        shared.UISignalQueue.put(('alert', (tr.translateText("MainWindow", "Disk full"), tr.translateText("MainWindow", 'Alert: Your disk or data storage volume is full. Bitmessage will now exit.'), True)))
+                        if shared.daemon:
+                            os._exit(0)
+                        else:
+                            return
+                self.conn.close()
+                shutil.move(
+                    shared.lookupAppdataFolder() + 'messages.dat', 'messages.dat')
+                self.conn = sqlite3.connect('messages.dat')
+                self.conn.text_factory = str
+                self.cur = self.conn.cursor()
+            elif item == 'movemessagstoappdata':
+                logger.debug('the sqlThread is moving the messages.dat file to the Appdata folder.')
+
+                try:
+                    self.conn.commit()
+                except Exception as err:
+                    if str(err) == 'database or disk is full':
+                        logger.fatal('(while movemessagstoappdata) Alert: Your disk or data storage volume is full. sqlThread will now exit.')
+                        shared.UISignalQueue.put(('alert', (tr.translateText("MainWindow", "Disk full"), tr.translateText("MainWindow", 'Alert: Your disk or data storage volume is full. Bitmessage will now exit.'), True)))
+                        if shared.daemon:
+                            os._exit(0)
+                        else:
+                            return
+                self.conn.close()
+                shutil.move(
+                    'messages.dat', shared.lookupAppdataFolder() + 'messages.dat')
+                self.conn = sqlite3.connect(shared.appdata + 'messages.dat')
+                self.conn.text_factory = str
+                self.cur = self.conn.cursor()
+            elif item == 'deleteandvacuume':
+                self.cur.execute('''delete from inbox where folder='trash' ''')
+                self.cur.execute('''delete from sent where folder='trash' ''')
+                self.conn.commit()
+                try:
+                    self.cur.execute( ''' VACUUM ''')
+                except Exception as err:
+                    if str(err) == 'database or disk is full':
+                        logger.fatal('(while deleteandvacuume) Alert: Your disk or data storage volume is full. sqlThread will now exit.')
+                        shared.UISignalQueue.put(('alert', (tr.translateText("MainWindow", "Disk full"), tr.translateText("MainWindow", 'Alert: Your disk or data storage volume is full. Bitmessage will now exit.'), True)))
+                        if shared.daemon:
+                            os._exit(0)
+                        else:
+                            return
+            else:
+                parameters = shared.sqlSubmitQueue.get()
+                # print 'item', item
+                # print 'parameters', parameters
+                try:
+                    self.cur.execute(item, parameters)
+                except Exception as err:
+                    if str(err) == 'database or disk is full':
+                        logger.fatal('(while cur.execute) Alert: Your disk or data storage volume is full. sqlThread will now exit.')
+                        shared.UISignalQueue.put(('alert', (tr.translateText("MainWindow", "Disk full"), tr.translateText("MainWindow", 'Alert: Your disk or data storage volume is full. Bitmessage will now exit.'), True)))
+                        if shared.daemon:
+                            os._exit(0)
+                        else:
+                            return
+                    else:
+                        logger.fatal('Major error occurred when trying to execute a SQL statement within the sqlThread. Please tell Atheros about this error message or post it in the forum! Error occurred while trying to execute statement: "%s"  Here are the parameters; you might want to censor this data with asterisks (***) as it can contain private information: %s. Here is the actual error message thrown by the sqlThread: %s', str(item), str(repr(parameters)),  str(err))
+                        logger.fatal('This program shall now abruptly exit!')
+
+                    os._exit(0)
+
+                shared.sqlReturnQueue.put(self.cur.fetchall())
+                # shared.sqlSubmitQueue.task_done()

src/helper_bootstrap.py

@@ -25,7 +25,7 @@ def knownNodes():
                 shared.knownNodes[stream][peer] = time
     except:
         shared.knownNodes = defaultKnownNodes.createDefaultKnownNodes(shared.appdata)
-    if shared.config.getint('bitmessagesettings', 'settingsversion') > 7:
+    if shared.config.getint('bitmessagesettings', 'settingsversion') > 8:
         print 'Bitmessage cannot read future versions of the keys file (keys.dat). Run the newer version of Bitmessage.'
         raise SystemExit
 

src/helper_startup.py

@@ -44,7 +44,7 @@ def loadConfig():
         # This appears to be the first time running the program; there is
         # no config file (or it cannot be accessed). Create config file.
         shared.config.add_section('bitmessagesettings')
-        shared.config.set('bitmessagesettings', 'settingsversion', '7')
+        shared.config.set('bitmessagesettings', 'settingsversion', '8')
         shared.config.set('bitmessagesettings', 'port', '8444')
         shared.config.set(
             'bitmessagesettings', 'timeformat', '%%a, %%d %%b %%Y  %%I:%%M %%p')
@@ -88,6 +88,15 @@ def loadConfig():
         shared.config.set('bitmessagesettings', 'userlocale', 'system')
         shared.config.set('bitmessagesettings', 'useidenticons', 'True')
         shared.config.set('bitmessagesettings', 'identiconsuffix', ''.join(random.choice("123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz") for x in range(12))) # a twelve character pseudo-password to salt the identicons
+        
+         #start:UI setting to stop trying to send messages after X days/months
+        shared.config.set(
+            'bitmessagesettings', 'stopresendingafterxdays', '')
+        shared.config.set(
+            'bitmessagesettings', 'stopresendingafterxmonths', '')
+        #shared.config.set(
+        #    'bitmessagesettings', 'timeperiod', '-1')
+        #end
 
         # Are you hoping to add a new option to the keys.dat file? You're in
         # the right place for adding it to users who install the software for

src/shared.py

@@ -1,7 +1,7 @@
 softwareVersion = '0.4.1'
 verbose = 1
 maximumAgeOfAnObjectThatIAmWillingToAccept = 216000  # Equals two days and 12 hours.
-lengthOfTimeToLeaveObjectsInInventory = 237600  # Equals two days and 18 hours. This should be longer than maximumAgeOfAnObjectThatIAmWillingToAccept so that we don't process messages twice.
+lengthOfTimeToLeaveObjectsInInventory = 237600 # Equals two days and 18 hours. This should be longer than maximumAgeOfAnObjectThatIAmWillingToAccept so that we don't process messages twice.
 lengthOfTimeToHoldOnToAllPubkeys = 2419200  # Equals 4 weeks. You could make this longer if you want but making it shorter would not be advisable because there is a very small possibility that it could keep you from obtaining a needed pubkey for a period of time.
 maximumAgeOfObjectsThatIAdvertiseToOthers = 216000  # Equals two days and 12 hours
 maximumAgeOfNodesThatIAdvertiseToOthers = 10800  # Equals three hours
@@ -71,6 +71,7 @@ numberOfInventoryLookupsPerformed = 0
 daemon = False
 inventorySets = {} # key = streamNumer, value = a set which holds the inventory object hashes that we are aware of. This is used whenever we receive an inv message from a peer to check to see what items are new to us. We don't delete things out of it; instead, the singleCleaner thread clears and refills it every couple hours.
 needToWriteKnownNodesToDisk = False # If True, the singleCleaner will write it to disk eventually.
+maximumLengthOfTimeToBotherResendingMessages = 0
 
 #If changed, these values will cause particularly unexpected behavior: You won't be able to either send or receive messages because the proof of work you do (or demand) won't match that done or demanded by others. Don't change them!
 networkDefaultProofOfWorkNonceTrialsPerByte = 320 #The amount of work that should be performed (and demanded) per byte of the payload. Double this number to double the work.