rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Revert "Retry scanning if not a QR code""

Browse Source 
This reverts commit 9429a4f22a.
This commit is contained in:
Hugh Nimmo-Smith 2022-10-13 22:32:02 +01:00
parent 6399032312
commit 958ee2d356
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginInstructionsFragment.kt
View File

@ -83,6 +83,7 @@ class QrCodeLoginInstructionsFragment : VectorBaseFragment<FragmentQrCodeLoginIn
if (activityResult.resultCode == Activity.RESULT_OK) { if (activityResult.resultCode == Activity.RESULT_OK) {
val scannedQrCode = QrCodeScannerActivity.getResultText(activityResult.data) val scannedQrCode = QrCodeScannerActivity.getResultText(activityResult.data)
val wasQrCode = QrCodeScannerActivity.getResultIsQrCode(activityResult.data) val wasQrCode = QrCodeScannerActivity.getResultIsQrCode(activityResult.data)
Timber.d("Scanned QR code: $scannedQrCode $wasQrCode")
if (wasQrCode && !scannedQrCode.isNullOrBlank()) { if (wasQrCode && !scannedQrCode.isNullOrBlank()) {
onQrCodeScanned(scannedQrCode) onQrCodeScanned(scannedQrCode)
@ -98,5 +99,6 @@ class QrCodeLoginInstructionsFragment : VectorBaseFragment<FragmentQrCodeLoginIn
private fun onQrCodeScannerFailed() { private fun onQrCodeScannerFailed() {
Timber.d("QrCodeLoginInstructionsFragment.onQrCodeScannerFailed") Timber.d("QrCodeLoginInstructionsFragment.onQrCodeScannerFailed")
QrCodeScannerActivity.startForResult(requireActivity(), scanActivityResultLauncher)
} }
} }