AaronFiore/electrum
1
0
Fork 0
Code Activity

distinguish invalid otp from server failure when sending tx

Browse Source
This commit is contained in:
SomberNight
2018-06-08 13:42:41 +02:00
committed by ThomasV
parent 27012e7394
commit 4fea9edd11
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/trustedcoin/kivy.py
View File

@@ -32,7 +32,7 @@ from kivy.clock import Clock
from electrum.i18n import _ from electrum.i18n import _
from electrum.plugins import hook from electrum.plugins import hook
from .trustedcoin import TrustedCoinPlugin, server, KIVY_DISCLAIMER from .trustedcoin import TrustedCoinPlugin, server, KIVY_DISCLAIMER, TrustedCoinException
@@ -62,10 +62,15 @@ class Plugin(TrustedCoinPlugin):
def on_otp(self, wallet, tx, otp, on_success, on_failure): def on_otp(self, wallet, tx, otp, on_success, on_failure):
try: try:
wallet.on_otp(tx, otp) wallet.on_otp(tx, otp)
except: except TrustedCoinException as e:
Clock.schedule_once(lambda dt: on_failure(_("Invalid OTP"))) if e.status_code == 400: # invalid OTP
return Clock.schedule_once(lambda dt: on_failure(_('Invalid one-time password.')))
on_success(tx) else:
Clock.schedule_once(lambda dt, bound_e=e: on_failure(_('Error') + ':' + str(bound_e)))
except Exception as e:
Clock.schedule_once(lambda dt, bound_e=e: on_failure(_('Error') + ':' + str(bound_e)))
else:
on_success(tx)
def accept_terms_of_use(self, wizard): def accept_terms_of_use(self, wizard):
tos = server.get_terms_of_service() tos = server.get_terms_of_service()