tkivy: revert to using zxing - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 1f1dbaf523ee02eb3960f5ba2182a4bb8b9390ff
DIR parent 5dfde10d30ce230e077755719d899f1e8322a2de
HTML Author: ThomasV <thomasv@electrum.org>
Date: Thu, 17 Mar 2016 08:16:15 +0100
kivy: revert to using zxing
Diffstat:
M gui/kivy/main_window.py | 13 +------------
M gui/kivy/uix/dialogs/create_restor… | 2 +-
2 files changed, 2 insertions(+), 13 deletions(-)
---
DIR diff --git a/gui/kivy/main_window.py b/gui/kivy/main_window.py
t@@ -241,7 +241,7 @@ class ElectrumWindow(App):
self.show_error("invoice error:" + pr.error)
self.send_screen.do_clear()
- def on_qr(self, d, data):
+ def on_qr(self, data):
from electrum.bitcoin import base_decode, is_address
if is_address(data):
self.set_URI(data)
t@@ -310,17 +310,6 @@ class ElectrumWindow(App):
popup.open()
def scan_qr(self, on_complete):
- self.scan_qr_android(on_complete)
-
- def scan_qr_android(self, on_complete):
- dlg = Cache.get('electrum_widgets', 'QrScannerDialog')
- if not dlg:
- dlg = Factory.QrScannerDialog()
- Cache.append('electrum_widgets', 'QrScannerDialog', dlg)
- dlg.bind(on_complete=on_complete)
- dlg.open()
-
- def scan_qr_zxing(self, on_complete):
if platform != 'android':
return
from jnius import autoclass
DIR diff --git a/gui/kivy/uix/dialogs/create_restore.py b/gui/kivy/uix/dialogs/create_restore.py
t@@ -562,7 +562,7 @@ class RestoreXpubDialog(WizardDialog):
self.ids.next.disabled = not bool(self._test(self.get_text()))
def scan_xpub(self):
- def on_complete(d, text):
+ def on_complete(text):
self.ids.text_input_seed.text = text
self.app.scan_qr(on_complete)