Bitmessage/PyBitmessage-2024-11-30
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

OS X Build script and 'add subscription from address book' option #225

Merged
Atheros1 merged 14 commits from master into master 2013-06-19 19:16:58 +02:00
Conversation 0 Commits 14 Files Changed 7 +3 -2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5b6a3d419e - Show all commits

5
src/shared.py
View File

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