android: fixes
This commit is contained in:
parent
491aab4afc
commit
13fbf9904e
|
@ -44,10 +44,12 @@ def modal_input(title, msg, value = None, etype=None):
|
||||||
droid.dialogShow()
|
droid.dialogShow()
|
||||||
response = droid.dialogGetResponse()
|
response = droid.dialogGetResponse()
|
||||||
result = response.result
|
result = response.result
|
||||||
|
droid.dialogDismiss()
|
||||||
|
|
||||||
if result is None:
|
if result is None:
|
||||||
print "modal input: result is none"
|
print "modal input: result is none"
|
||||||
return False
|
return modal_input(title, msg, value, etype)
|
||||||
droid.dialogDismiss()
|
|
||||||
if result.get('which') == 'positive':
|
if result.get('which') == 'positive':
|
||||||
return result.get('value')
|
return result.get('value')
|
||||||
|
|
||||||
|
@ -58,10 +60,12 @@ def modal_question(q, msg, pos_text = 'OK', neg_text = 'Cancel'):
|
||||||
droid.dialogShow()
|
droid.dialogShow()
|
||||||
response = droid.dialogGetResponse()
|
response = droid.dialogGetResponse()
|
||||||
result = response.result
|
result = response.result
|
||||||
|
droid.dialogDismiss()
|
||||||
|
|
||||||
if result is None:
|
if result is None:
|
||||||
print "modal question: result is none"
|
print "modal question: result is none"
|
||||||
return False
|
return modal_question(q,msg, pos_text, neg_text)
|
||||||
droid.dialogDismiss()
|
|
||||||
return result.get('which') == 'positive'
|
return result.get('which') == 'positive'
|
||||||
|
|
||||||
def edit_label(addr):
|
def edit_label(addr):
|
||||||
|
@ -756,12 +760,12 @@ def settings_loop():
|
||||||
|
|
||||||
|
|
||||||
def set_listview():
|
def set_listview():
|
||||||
server, port, p = network.default_server.split(':')
|
host, port, p = network.default_server.split(':')
|
||||||
fee = str( Decimal( wallet.fee)/100000000 )
|
fee = str( Decimal( wallet.fee)/100000000 )
|
||||||
is_encrypted = 'yes' if wallet.use_encryption else 'no'
|
is_encrypted = 'yes' if wallet.use_encryption else 'no'
|
||||||
protocol = protocol_name(p)
|
protocol = protocol_name(p)
|
||||||
droid.fullShow(settings_layout)
|
droid.fullShow(settings_layout)
|
||||||
droid.fullSetList("myListView",['Server: ' + server, 'Protocol: '+ protocol, 'Port: '+port, 'Transaction fee: '+fee, 'Password: '+is_encrypted, 'Seed'])
|
droid.fullSetList("myListView",['Server: ' + host, 'Protocol: '+ protocol, 'Port: '+port, 'Transaction fee: '+fee, 'Password: '+is_encrypted, 'Seed'])
|
||||||
|
|
||||||
set_listview()
|
set_listview()
|
||||||
|
|
||||||
|
@ -918,7 +922,7 @@ class ElectrumGui:
|
||||||
if not self.restore_wallet():
|
if not self.restore_wallet():
|
||||||
exit()
|
exit()
|
||||||
|
|
||||||
self.password_dialog(wallet)
|
self.password_dialog()
|
||||||
|
|
||||||
else:
|
else:
|
||||||
wallet = Wallet(storage)
|
wallet = Wallet(storage)
|
||||||
|
|
Loading…
Reference in New Issue