tfix android: from_seed - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 9aa812026a62d22a230746c87a75284afc8d6af0
DIR parent 75cf142be0d30960dc63ea999da15daa42a73741
HTML Author: ThomasV <thomasv@gitorious>
Date: Fri, 3 Apr 2015 11:49:44 +0200
fix android: from_seed
Diffstat:
M gui/android.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
DIR diff --git a/gui/android.py b/gui/android.py
t@@ -924,22 +924,22 @@ class ElectrumGui:
wallet = Wallet(storage)
seed = wallet.make_seed()
modal_dialog('Your seed is:', seed)
+ wallet.add_seed(seed, password)
+ wallet.create_master_keys(password)
+ wallet.create_main_account(password)
elif action == 'restore':
seed = self.seed_dialog()
if not seed:
exit()
if not Wallet.is_seed(seed):
exit()
- wallet = Wallet.from_seed(seed, storage)
+ wallet = Wallet.from_seed(seed, password, storage)
else:
exit()
msg = "Creating wallet" if action == 'create' else "Restoring wallet"
droid.dialogCreateSpinnerProgress("Electrum", msg)
droid.dialogShow()
- wallet.add_seed(seed, password)
- wallet.create_master_keys(password)
- wallet.create_main_account(password)
wallet.start_threads(network)
if action == 'restore':
wallet.restore(lambda x: None)