LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-09-01 17:55:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

wizard: ask for password earlier during restore

Browse source
This commit is contained in:
ThomasV 2014-07-06 01:49:22 +02:00
parent 37127e563b
commit cd4c8335b0
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
gui/qt/installwizard.py
View file

@ -493,6 +493,10 @@ class InstallWizard(QDialog):
return return
text1, text2 = r text1, text2 = r
wallet = Wallet_2of2(self.storage) wallet = Wallet_2of2(self.storage)
if Wallet.is_seed(text1) or Wallet.is_seed(text2):
password = self.password_dialog()
else:
password = None
if Wallet.is_seed(text1): if Wallet.is_seed(text1):
wallet.add_seed(text1, password) wallet.add_seed(text1, password)
@ -500,8 +504,8 @@ class InstallWizard(QDialog):
wallet.add_cold_seed(text2, password) wallet.add_cold_seed(text2, password)
else: else:
wallet.add_master_public_key("cold/", text2) wallet.add_master_public_key("cold/", text2)
else:
elif Wallet.is_xpub(text1): assert Wallet.is_xpub(text1)
if Wallet.is_seed(text2): if Wallet.is_seed(text2):
wallet.add_seed(text2, password) wallet.add_seed(text2, password)
wallet.add_master_public_key("cold/", text1) wallet.add_master_public_key("cold/", text1)
@ -509,11 +513,7 @@ class InstallWizard(QDialog):
wallet.add_master_public_key("m/", text1) wallet.add_master_public_key("m/", text1)
wallet.add_master_public_key("cold/", text2) wallet.add_master_public_key("cold/", text2)
if wallet.is_watching_only(): wallet.create_accounts(password)
wallet.create_accounts(None)
else:
password = self.password_dialog()
wallet.create_accounts(password)
elif t in ['2of3']: elif t in ['2of3']:
@ -521,8 +521,11 @@ class InstallWizard(QDialog):
if not r: if not r:
return return
text1, text2, text3 = r text1, text2, text3 = r
password = self.password_dialog()
wallet = Wallet_2of3(self.storage) wallet = Wallet_2of3(self.storage)
if Wallet.is_seed(text1) or Wallet.is_seed(text2) or Wallet.is_seed(text3):
password = self.password_dialog()
else:
password = None
if Wallet.is_seed(text1): if Wallet.is_seed(text1):
wallet.add_seed(text1, password) wallet.add_seed(text1, password)