tdigitalbitbox: (trivial) user handler instead of handler.win - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 276631fab7920d3781614d3fabce2f463bac672d
DIR parent 7f1c7955dc401c31d1c519bfcb3e92b714afc334
HTML Author: SomberNight <somber.night@protonmail.com>
Date: Wed, 1 Apr 2020 18:35:41 +0200
digitalbitbox: (trivial) user handler instead of handler.win
Diffstat:
M electrum/plugins/digitalbitbox/dig… | 28 ++++++++++++----------------
1 file changed, 12 insertions(+), 16 deletions(-)
---
DIR diff --git a/electrum/plugins/digitalbitbox/digitalbitbox.py b/electrum/plugins/digitalbitbox/digitalbitbox.py
t@@ -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:
t@@ -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:
t@@ -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():
t@@ -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')