AaronFiore/electrum
1
0
Fork 0
Code Activity

raise an exception on trezor decrypt

Browse Source
This commit is contained in:
ThomasV
2014-09-03 10:45:41 +02:00
parent 65a155401b
commit 449feddaaf
2 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gui/qt/main_window.py
View File

@@ -2000,9 +2000,9 @@ class ElectrumWindow(QMainWindow):
try:
decrypted = self.wallet.decrypt_message(str(pubkey_e.text()), str(encrypted_e.toPlainText()), password)
message_e.setText(decrypted)
except Exception as e:
except BaseException as e:
traceback.print_exc(file=sys.stdout)
self.show_message(str(e))
self.show_warning(str(e))
def do_encrypt(self, message_e, pubkey_e, encrypted_e):
@@ -2011,10 +2011,9 @@ class ElectrumWindow(QMainWindow):
try:
encrypted = bitcoin.encrypt_message(message, str(pubkey_e.text()))
encrypted_e.setText(encrypted)
except Exception as e:
except BaseException as e:
traceback.print_exc(file=sys.stdout)
self.show_message(str(e))
self.show_warning(str(e))
def encrypt_message(self, address = ''):
@@ -2065,6 +2064,9 @@ class ElectrumWindow(QMainWindow):
def show_message(self, msg):
QMessageBox.information(self, _('Message'), msg, _('OK'))
def show_warning(self, msg):
QMessageBox.warning(self, _('Warning'), msg, _('OK'))
def password_dialog(self, msg=None):
d = QDialog(self)
d.setModal(1)