AaronFiore/electrum
1
0
Fork 0
Code Activity

qt: fix scanning multi (privkeys, addresses) from QR.

Browse Source
This commit is contained in:
Sander van Grieken
2024-09-17 11:48:54 +02:00
parent e638a832e4
commit 4dc64e4cf9
1 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
electrum/gui/qt/util.py
View File

@@ -685,14 +685,21 @@ class GenericInputHandler:
return return
if not data: if not data:
data = '' data = ''
if allow_multi: try:
new_text = self.text() + data + '\n' # TODO: unused? if allow_multi:
else: text = self.text()
new_text = data if data in text:
try: return
if text and not text.endswith('\n'):
text += '\n'
text += data
text += '\n'
setText(text)
else:
new_text = data
setText(new_text) setText(new_text)
except Exception as e: except Exception as e:
show_error(_('Invalid payment identifier in QR') + ':\n' + repr(e)) show_error(_('Invalid payment identifier in QR') + ':\n' + repr(e))
from .qrreader import scan_qrcode from .qrreader import scan_qrcode
if parent is None: if parent is None:
@@ -730,14 +737,21 @@ class GenericInputHandler:
show_error(_("No QR code was found on the screen.")) show_error(_("No QR code was found on the screen."))
return return
data = scanned_qr[0].data data = scanned_qr[0].data
if allow_multi: try:
new_text = self.text() + data + '\n' # TODO: unused? if allow_multi:
else: text = self.text()
new_text = data if data in text:
try: return
if text and not text.endswith('\n'):
text += '\n'
text += data
text += '\n'
setText(text)
else:
new_text = data
setText(new_text) setText(new_text)
except Exception as e: except Exception as e:
show_error(_('Invalid payment identifier in QR') + ':\n' + repr(e)) show_error(_('Invalid payment identifier in QR') + ':\n' + repr(e))
def input_file( def input_file(
self, self,