electrum

commit 8c365fd6811016977f365d0b6bfcd2efb712528c
parent 1028c9282bda885eeb1eb1e86d0f39cac55b8e1f
Author: ThomasV <thomasv@electrum.org>
Date:   Thu, 25 Feb 2016 16:55:38 +0100

kivy: show error message with qr scanner

Diffstat:
M
gui/kivy/main_window.py
 | 
6
++++++

1 file changed, 6 insertions(+), 0 deletions(-)
diff --git a/gui/kivy/main_window.py b/gui/kivy/main_window.py
@@ -317,6 +317,12 @@ class ElectrumWindow(App):
                     contents = intent.getStringExtra("SCAN_RESULT")
                     if intent.getStringExtra("SCAN_RESULT_FORMAT") == 'QR_CODE':
                         on_complete(contents)
+                    else:
+                        self.show_error("wrong format " + intent.getStringExtra("SCAN_RESULT_FORMAT"))
+                else:
+                    self.show_error("wrong resultCode %d" % resultCode)
+            else:
+                self.show_error("wrong requestCode %d" % requestCode)
         activity.bind(on_activity_result=on_qr_result)
         try:
             PythonActivity.mActivity.startActivityForResult(intent, 0)