AaronFiore/electrum
1
0
Fork 0
Code Activity

more robust android app

Browse Source
This commit is contained in:
thomasv
2012-11-28 17:47:25 +01:00
parent d5b47fa93e
commit b0398e0774
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/gui_android.py
View File

@@ -39,19 +39,27 @@ def modal_input(title, msg, value = None, etype=None):
droid.dialogSetPositiveButtonText('OK') droid.dialogSetPositiveButtonText('OK')
droid.dialogSetNegativeButtonText('Cancel') droid.dialogSetNegativeButtonText('Cancel')
droid.dialogShow() droid.dialogShow()
response = droid.dialogGetResponse().result response = droid.dialogGetResponse()
result = response.result
if result is None:
print "modal input: result is none"
return False
droid.dialogDismiss() droid.dialogDismiss()
if response.get('which') == 'positive': if result.get('which') == 'positive':
return response.get('value') return result.get('value')
def modal_question(q, msg, pos_text = 'OK', neg_text = 'Cancel'): def modal_question(q, msg, pos_text = 'OK', neg_text = 'Cancel'):
droid.dialogCreateAlert(q, msg) droid.dialogCreateAlert(q, msg)
droid.dialogSetPositiveButtonText(pos_text) droid.dialogSetPositiveButtonText(pos_text)
droid.dialogSetNegativeButtonText(neg_text) droid.dialogSetNegativeButtonText(neg_text)
droid.dialogShow() droid.dialogShow()
response = droid.dialogGetResponse().result response = droid.dialogGetResponse()
result = response.result
if result is None:
print "modal question: result is none"
return False
droid.dialogDismiss() droid.dialogDismiss()
return response.get('which') == 'positive' return result.get('which') == 'positive'
def edit_label(addr): def edit_label(addr):
v = modal_input('Edit label',None,wallet.labels.get(addr)) v = modal_input('Edit label',None,wallet.labels.get(addr))
@@ -471,7 +479,7 @@ def make_new_contact():
data = r['extras']['SCAN_RESULT'] data = r['extras']['SCAN_RESULT']
if data: if data:
if re.match('^bitcoin:', data): if re.match('^bitcoin:', data):
address, _, _, _, _, _, _ = wallet.parse_url(data, None, None) address, _, _, _, _, _, _ = wallet.parse_url(data, None, lambda x: modal_question('Question',x))
elif wallet.is_valid(data): elif wallet.is_valid(data):
address = data address = data
else: else:
@@ -563,7 +571,9 @@ def payto_loop():
out = None out = None
while out is None: while out is None:
event = droid.eventWait().result event = droid.eventWait().result
if not event: continue
print "got event in payto loop", event print "got event in payto loop", event
if event == 'OK': continue
if not event.get("name"): continue if not event.get("name"): continue
if event["name"] == "click": if event["name"] == "click":
@@ -601,7 +611,7 @@ def payto_loop():
data = r['extras']['SCAN_RESULT'] data = r['extras']['SCAN_RESULT']
if data: if data:
if re.match('^bitcoin:', data): if re.match('^bitcoin:', data):
payto, amount, label, _, _, _, _ = wallet.parse_url(data, None, None) payto, amount, label, _, _, _, _ = wallet.parse_url(data, None, lambda x: modal_question('Question', x))
droid.fullSetProperty("recipient", "text",payto) droid.fullSetProperty("recipient", "text",payto)
droid.fullSetProperty("amount", "text", amount) droid.fullSetProperty("amount", "text", amount)
droid.fullSetProperty("label", "text", label) droid.fullSetProperty("label", "text", label)