AaronFiore/electrum
1
0
Fork 0
Code Activity

qeqrscanner: check requestCode on activity result

Browse Source
This commit is contained in:
f321x
2025-12-03 12:49:27 +01:00
parent 5dd3dda238
commit 6450187902
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
electrum/gui/qml/qeqrscanner.py
View File

@@ -19,6 +19,8 @@ if 'ANDROID_DATA' in os.environ:
class QEQRScanner(QObject): class QEQRScanner(QObject):
REQUEST_CODE_SIMPLE_SCANNER_ACTIVITY = 30368 # random 16 bit int
_logger = get_logger(__name__) _logger = get_logger(__name__)
foundText = pyqtSignal(str) foundText = pyqtSignal(str)
@@ -54,9 +56,12 @@ class QEQRScanner(QObject):
intent.putExtra(jIntent.EXTRA_TEXT, jString(self._hint)) intent.putExtra(jIntent.EXTRA_TEXT, jString(self._hint))
activity.bind(on_activity_result=self.on_qr_activity_result) activity.bind(on_activity_result=self.on_qr_activity_result)
jpythonActivity.startActivityForResult(intent, 0) jpythonActivity.startActivityForResult(intent, self.REQUEST_CODE_SIMPLE_SCANNER_ACTIVITY)
def on_qr_activity_result(self, requestCode, resultCode, intent): def on_qr_activity_result(self, requestCode, resultCode, intent):
if requestCode != self.REQUEST_CODE_SIMPLE_SCANNER_ACTIVITY:
self._logger.warning(f"got activity result with invalid {requestCode=}")
return
try: try:
if resultCode == -1: # RESULT_OK: if resultCode == -1: # RESULT_OK:
if (contents := intent.getStringExtra(jString("text"))) is not None: if (contents := intent.getStringExtra(jString("text"))) is not None: