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

digitalbitbox: (trivial) user handler instead of handler.win

Browse source
This commit is contained in:
SomberNight 2020-04-01 18:35:41 +02:00
parent 7f1c7955dc
commit 276631fab7
No known key found for this signature in database
GPG key ID: B33B5F232C6271E9
1 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
electrum/plugins/digitalbitbox/digitalbitbox.py
View file

@ -234,10 +234,9 @@ class DigitalBitbox_Client(HardwareClientBase):
(_("Load a wallet from the micro SD card (the current seed is overwritten)")),
(_("Erase the Digital Bitbox"))
]
try:
reply = self.handler.win.query_choice(msg, choices)
except Exception:
return # Back button pushed
reply = self.handler.query_choice(msg, choices)
if reply is None:
return # user cancelled
if reply == 2:
self.dbb_erase()
elif reply == 1:
@ -256,10 +255,9 @@ class DigitalBitbox_Client(HardwareClientBase):
(_("Generate a new random wallet")),
(_("Load a wallet from the micro SD card"))
]
try:
reply = self.handler.win.query_choice(msg, choices)
except Exception:
return # Back button pushed
reply = self.handler.query_choice(msg, choices)
if reply is None:
return # user cancelled
if reply == 0:
self.dbb_generate_wallet()
else:
@ -297,10 +295,9 @@ class DigitalBitbox_Client(HardwareClientBase):
_('Do not pair'),
_('Import pairing from the Digital Bitbox desktop app'),
]
try:
reply = self.handler.win.query_choice(_('Mobile pairing options'), choices)
except Exception:
return # Back button pushed
reply = self.handler.query_choice(_('Mobile pairing options'), choices)
if reply is None:
return # user cancelled
if reply == 0:
if self.plugin.is_mobile_paired():
@ -338,10 +335,9 @@ class DigitalBitbox_Client(HardwareClientBase):
backups = self.hid_send_encrypt(b'{"backup":"list"}')
if 'error' in backups:
raise UserFacingException(backups['error']['message'])
try:
f = self.handler.win.query_choice(_("Choose a backup file:"), backups['backup'])
except Exception:
return False # Back button pushed
f = self.handler.query_choice(_("Choose a backup file:"), backups['backup'])
if f is None:
return False # user cancelled
key = self.backup_password_dialog()
if key is None:
raise Exception('Canceled by user')