Skip to content

Commit 0cf8b3c

Browse files
committed
qeqrscanner: check requestCode on activity result
1 parent adde6ad commit 0cf8b3c

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

electrum/gui/qml/qeqrscanner.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020

2121
class QEQRScanner(QObject):
22+
REQUEST_CODE_SIMPLE_SCANNER_ACTIVITY = 30368 # random 16 bit int
23+
2224
_logger = get_logger(__name__)
2325

2426
foundText = pyqtSignal(str)
@@ -54,9 +56,12 @@ def open(self):
5456
intent.putExtra(jIntent.EXTRA_TEXT, jString(self._hint))
5557

5658
activity.bind(on_activity_result=self.on_qr_activity_result)
57-
jpythonActivity.startActivityForResult(intent, 0)
59+
jpythonActivity.startActivityForResult(intent, self.REQUEST_CODE_SIMPLE_SCANNER_ACTIVITY)
5860

5961
def on_qr_activity_result(self, requestCode, resultCode, intent):
62+
if requestCode != self.REQUEST_CODE_SIMPLE_SCANNER_ACTIVITY:
63+
self._logger.warning(f"got activity result with invalid {requestCode=}")
64+
return
6065
try:
6166
if resultCode == -1: # RESULT_OK:
6267
if (contents := intent.getStringExtra(jString("text"))) is not None:

0 commit comments

Comments
 (0)