This commit is contained in:
nimda 2013-06-13 22:03:03 -04:00
parent 98aacd16ff
commit 5b6a3d419e
1 changed files with 3 additions and 2 deletions

View File

@ -51,7 +51,7 @@ def lookupAppdataFolder():
return dataFolder
def isAddressInMyAddressBook(address):
t = (address,)
t = (addBMIfNotPresent(address,)
sqlLock.acquire()
sqlSubmitQueue.put('''select address from addressbook where address=?''')
sqlSubmitQueue.put(t)
@ -68,6 +68,7 @@ def isAddressInMySubscriptionsList(address):
queryreturn = sqlReturnQueue.get()
sqlLock.release()
return queryreturn != []
def isAddressInMyAddressBookSubscriptionsListOrWhitelist(address):
if isAddressInMyAddressBook(address):
return True
@ -219,4 +220,4 @@ def fixPotentiallyInvalidUTF8Data(text):
return text
except:
output = 'Part of the message is corrupt. The message cannot be displayed the normal way.\n\n' + repr(text)
return output
return output