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

V0.6 #852

Merged
Atheros1 merged 399 commits from v0.6 into master 2016-05-03 01:58:38 +02:00
Conversation 0 Commits 399 Files Changed 133 +12 -11
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit aa97b53114 - Show all commits

23
src/class_addressGenerator.py
View File

@ -142,7 +142,8 @@ class addressGenerator(threading.Thread, StoppableThread):
# The API and the join and create Chan functionality # The API and the join and create Chan functionality
# both need information back from the address generator. # both need information back from the address generator.
shared.apiAddressGeneratorReturnQueue.put(address) if shared.safeConfigGetBoolean('bitmessagesettings', 'apienabled'):
shared.apiAddressGeneratorReturnQueue.put(address)
shared.UISignalQueue.put(( shared.UISignalQueue.put((
'updateStatusBar', tr.translateText("MainWindow", "Done generating address. Doing work necessary to broadcast it..."))) 'updateStatusBar', tr.translateText("MainWindow", "Done generating address. Doing work necessary to broadcast it...")))
@ -161,10 +162,8 @@ class addressGenerator(threading.Thread, StoppableThread):
sys.stderr.write( sys.stderr.write(
'WARNING: You are creating deterministic address(es) using a blank passphrase. Bitmessage will do it but it is rather stupid.') 'WARNING: You are creating deterministic address(es) using a blank passphrase. Bitmessage will do it but it is rather stupid.')
if command == 'createDeterministicAddresses': if command == 'createDeterministicAddresses':
statusbar = 'Generating ' + str(
numberOfAddressesToMake) + ' new addresses.'
shared.UISignalQueue.put(( shared.UISignalQueue.put((
'updateStatusBar', statusbar)) 'updateStatusBar', tr.translateText("MainWindow","Generating %1 new addresses.").arg(str(numberOfAddressesToMake))))
signingKeyNonce = 0 signingKeyNonce = 0
encryptionKeyNonce = 1 encryptionKeyNonce = 1
listOfNewAddressesToSendOutThroughTheAPI = [ listOfNewAddressesToSendOutThroughTheAPI = [
@ -210,7 +209,8 @@ class addressGenerator(threading.Thread, StoppableThread):
# If we are joining an existing chan, let us check to make sure it matches the provided Bitmessage address # If we are joining an existing chan, let us check to make sure it matches the provided Bitmessage address
if command == 'joinChan': if command == 'joinChan':
if address != chanAddress: if address != chanAddress:
shared.apiAddressGeneratorReturnQueue.put('chan name does not match address') if shared.safeConfigGetBoolean('bitmessagesettings', 'apienabled'):
shared.apiAddressGeneratorReturnQueue.put('chan name does not match address')
saveAddressToDisk = False saveAddressToDisk = False
if command == 'getDeterministicAddress': if command == 'getDeterministicAddress':
saveAddressToDisk = False saveAddressToDisk = False
@ -281,12 +281,13 @@ class addressGenerator(threading.Thread, StoppableThread):
# Done generating addresses. # Done generating addresses.
if command == 'createDeterministicAddresses' or command == 'joinChan' or command == 'createChan': if shared.safeConfigGetBoolean('bitmessagesettings', 'apienabled'):
shared.apiAddressGeneratorReturnQueue.put( if command == 'createDeterministicAddresses' or command == 'joinChan' or command == 'createChan':
listOfNewAddressesToSendOutThroughTheAPI) shared.apiAddressGeneratorReturnQueue.put(
elif command == 'getDeterministicAddress': listOfNewAddressesToSendOutThroughTheAPI)
shared.apiAddressGeneratorReturnQueue.put(address) elif command == 'getDeterministicAddress':
shared.apiAddressGeneratorReturnQueue.put(address)
else: else:
raise Exception( raise Exception(
"Error in the addressGenerator thread. Thread was given a command it could not understand: " + command) "Error in the addressGenerator thread. Thread was given a command it could not understand: " + command)
shared.apiAddressGeneratorQueue.task_done() shared.addressGeneratorQueue.task_done()