From ab4a5da28a5e685191beeaab7190182983db5d56 Mon Sep 17 00:00:00 2001 From: Jonathan Warren Date: Wed, 15 May 2013 18:03:33 -0400 Subject: [PATCH 1/2] Bugfix: Must use toAddress instead of addressInKeysFile if toLabel is blank when receiving message --- src/addresses.py | 2 +- src/bitmessagemain.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/addresses.py b/src/addresses.py index a6a571f6..00a2df83 100644 --- a/src/addresses.py +++ b/src/addresses.py @@ -276,7 +276,7 @@ if __name__ == "__main__": print 'Ripe digest that we will encode in the address:', ripe.digest().encode('hex') returnedAddress = encodeAddress(addressVersionNumber,streamNumber,ripe.digest()) print 'Encoded address:', returnedAddress - status,addressVersionNumber,streamNumber,data = decodeAddress(returnedAddress) + status,addressVersionNumber,streamNumber,data = decodeAddress("oriDZJ7VAEjphwQmt7fACFqZJVwds26vW") print '\nAfter decoding address:' print 'Status:', status print 'addressVersionNumber', addressVersionNumber diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py index d0ef7222..b51c73fc 100755 --- a/src/bitmessagemain.py +++ b/src/bitmessagemain.py @@ -1072,7 +1072,7 @@ class receiveDataThread(threading.Thread): toLabel = shared.config.get(toAddress, 'label') if toLabel == '': - toLabel = addressInKeysFile + toLabel = toAddress if messageEncodingType == 2: bodyPositionIndex = string.find(message,'\nBody:') From 5cf30c1533462f89014f959a681f743708d4c6f7 Mon Sep 17 00:00:00 2001 From: Jonathan Warren Date: Wed, 15 May 2013 18:03:54 -0400 Subject: [PATCH 2/2] Bugfix: Must use toAddress instead of addressInKeysFile if toLabel is blank when receiving message --- src/addresses.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/addresses.py b/src/addresses.py index 00a2df83..a6a571f6 100644 --- a/src/addresses.py +++ b/src/addresses.py @@ -276,7 +276,7 @@ if __name__ == "__main__": print 'Ripe digest that we will encode in the address:', ripe.digest().encode('hex') returnedAddress = encodeAddress(addressVersionNumber,streamNumber,ripe.digest()) print 'Encoded address:', returnedAddress - status,addressVersionNumber,streamNumber,data = decodeAddress("oriDZJ7VAEjphwQmt7fACFqZJVwds26vW") + status,addressVersionNumber,streamNumber,data = decodeAddress(returnedAddress) print '\nAfter decoding address:' print 'Status:', status print 'addressVersionNumber', addressVersionNumber