@ -643,9 +639,9 @@ class receiveDataThread(QThread):
ripe=hashlib.new('ripemd160')
ripe.update(sha.digest())
#We have reached the end of the public key. Let's store it in case we want to reply to this person.
#Let's store the public key in case we want to reply to this person.
#We don't have the correct nonce in order to send out a pubkey message so we'll just fill it with 1's. We won't be able to send this pubkey to others (without doing the proof of work ourselves, which this program is programmed to not do.)
t=(ripe.digest(),False,'\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF'+data[20+messageVersionLength:endOfThePublicKeyPosition],int(time.time())+2419200)#after one month we may remove this pub key from our database.
t=(ripe.digest(),False,'\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF'+data[20+messageVersionLength:endOfThePublicKeyPosition],int(time.time())+2419200)#after one month we may remove this pub key from our database. (2419200 = a month)
sqlLock.acquire()
sqlSubmitQueue.put('''INSERT INTO pubkeys VALUES (?,?,?,?)''')
sqlSubmitQueue.put(t)
@ -654,7 +650,7 @@ class receiveDataThread(QThread):
blockMessage=False#Gets set to True if the user shouldn't see the message according to black or white lists.
newItem=QtGui.QTableWidgetItem('Waiting on their public key. Will request it again soon.')
newItem=myTableWidgetItem('Waiting on their public key. Will request it again soon.')
elifstatus=='sentmessage':
newItem=QtGui.QTableWidgetItem('Message sent. Waiting on acknowledgement. Sent at '+strftime(config.get('bitmessagesettings','timeformat'),localtime(lastactiontime)))
newItem=myTableWidgetItem('Message sent. Waiting on acknowledgement. Sent at '+strftime(config.get('bitmessagesettings','timeformat'),localtime(lastactiontime)))
elifstatus=='doingpow':
newItem=QtGui.QTableWidgetItem('Need to do work to send message. Work is queued.')
newItem=myTableWidgetItem('Need to do work to send message. Work is queued.')
elifstatus=='ackreceived':
newItem=QtGui.QTableWidgetItem('Acknowledgement of the message received '+strftime(config.get('bitmessagesettings','timeformat'),localtime(int(lastactiontime))))
newItem=myTableWidgetItem('Acknowledgement of the message received '+strftime(config.get('bitmessagesettings','timeformat'),localtime(int(lastactiontime))))
elifstatus=='broadcastpending':
newItem=QtGui.QTableWidgetItem('Doing the work necessary to send broadcast...')
newItem=myTableWidgetItem('Doing the work necessary to send broadcast...')
elifstatus=='broadcastsent':
newItem=QtGui.QTableWidgetItem('Broadcast on '+strftime(config.get('bitmessagesettings','timeformat'),localtime(int(lastactiontime))))
newItem=myTableWidgetItem('Broadcast on '+strftime(config.get('bitmessagesettings','timeformat'),localtime(int(lastactiontime))))
#In order for the time columns on the Inbox and Sent tabs to be sorted correctly (rather than alphabetically), we need to overload the < operator and use this class instead of QTableWidgetItem.