citizenaspirant/PyBitmessage
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

If user trashes message before POW completed then closes Bitmessage, don't restart the send when client starts again

Browse Source
This commit is contained in:
Jonathan Warren 2013-04-10 16:23:43 -04:00
parent e02816b5ea
commit b8fb551830
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bitmessagemain.py
View File

@ -2146,7 +2146,7 @@ class singleWorker(QThread):
#Now let us see if there are any proofs of work for msg messages that we have yet to complete.. #Now let us see if there are any proofs of work for msg messages that we have yet to complete..
sqlLock.acquire() sqlLock.acquire()
t = ('doingpow',) t = ('doingpow',)
sqlSubmitQueue.put('SELECT toripe FROM sent WHERE status=?') sqlSubmitQueue.put('''SELECT toripe FROM sent WHERE status=? and folder='sent' ''')
sqlSubmitQueue.put(t) sqlSubmitQueue.put(t)
queryreturn = sqlReturnQueue.get() queryreturn = sqlReturnQueue.get()
sqlLock.release() sqlLock.release()
@ -2283,7 +2283,7 @@ class singleWorker(QThread):
def sendBroadcast(self): def sendBroadcast(self):
sqlLock.acquire() sqlLock.acquire()
t = ('broadcastpending',) t = ('broadcastpending',)
sqlSubmitQueue.put('SELECT fromaddress, subject, message, ackdata FROM sent WHERE status=?') sqlSubmitQueue.put('''SELECT fromaddress, subject, message, ackdata FROM sent WHERE status=? and folder='sent' ''')
sqlSubmitQueue.put(t) sqlSubmitQueue.put(t)
queryreturn = sqlReturnQueue.get() queryreturn = sqlReturnQueue.get()
sqlLock.release() sqlLock.release()
@ -2358,13 +2358,13 @@ class singleWorker(QThread):
def sendMsg(self,toRipe): def sendMsg(self,toRipe):
sqlLock.acquire() sqlLock.acquire()
t = ('doingpow','findingpubkey',toRipe) t = ('doingpow','findingpubkey',toRipe)
sqlSubmitQueue.put('UPDATE sent SET status=? WHERE status=? AND toripe=?') sqlSubmitQueue.put('''UPDATE sent SET status=? WHERE status=? AND toripe=? and folder='sent' ''')
sqlSubmitQueue.put(t) sqlSubmitQueue.put(t)
queryreturn = sqlReturnQueue.get() queryreturn = sqlReturnQueue.get()
sqlSubmitQueue.put('commit') sqlSubmitQueue.put('commit')
t = ('doingpow',toRipe) t = ('doingpow',toRipe)
sqlSubmitQueue.put('SELECT toaddress, fromaddress, subject, message, ackdata FROM sent WHERE status=? AND toripe=?') sqlSubmitQueue.put('''SELECT toaddress, fromaddress, subject, message, ackdata FROM sent WHERE status=? AND toripe=? and folder='sent' ''')
sqlSubmitQueue.put(t) sqlSubmitQueue.put(t)
queryreturn = sqlReturnQueue.get() queryreturn = sqlReturnQueue.get()
sqlLock.release() sqlLock.release()