Merge pull request #6817 from element-hq/feature/bma/automaticRetry

[Link new device] Rotate QrCode instead of showing an error

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/linknewdevice/LinkMobileHandler.kt

@@ -18,6 +18,7 @@ sealed interface LinkMobileStep {
     data object Uninitialized : LinkMobileStep
     data object Starting : LinkMobileStep
     data class QrReady(val data: String) : LinkMobileStep
+    data object QrRotating : LinkMobileStep
     data class WaitingForAuth(val verificationUri: String) : LinkMobileStep
     data class QrScanned(val checkCodeSender: CheckCodeSender) : LinkMobileStep
     data class Error(val errorType: ErrorType) : LinkMobileStep

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustLinkMobileHandler.kt

@@ -51,6 +51,15 @@ class RustLinkMobileHandler(
             )
             // We emit Done in case the progress listener was deallocated before generate() sent the Done
             _linkMobileStep.emit(LinkMobileStep.Done)
+        } catch (e: HumanQrGrantLoginException.NotFound) {
+            Timber.tag(tag.value).w(e, "Error during QR login grant")
+            // Catch timeout here?
+            if (_linkMobileStep.value is LinkMobileStep.QrReady) {
+                Timber.tag(tag.value).d("Emit QrRotating due to HumanQrGrantLoginException.NotFound")
+                _linkMobileStep.emit(LinkMobileStep.QrRotating)
+            } else {
+                _linkMobileStep.emit(LinkMobileStep.Error(e.map()))
+            }
         } catch (e: HumanQrGrantLoginException) {
             Timber.tag(tag.value).w(e, "Error during QR login grant")
             _linkMobileStep.emit(LinkMobileStep.Error(e.map()))

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustLinkMobileHandlerTest.kt

@@ -118,6 +118,35 @@ class RustLinkMobileHandlerTest {
         }
     }
 
+    @Test
+    fun `when start throws HumanQrGrantLoginException_NotFound when in state QrReady, the handler emits QrRotating step`() = runTest {
+        val completable = CompletableDeferred<Unit>()
+        val handler = FakeFfiGrantLoginWithQrCodeHandler(
+            generateResult = {
+                completable.await()
+                throw HumanQrGrantLoginException.NotFound("Timeout")
+            }
+        )
+        val sut = createRustLinkMobileHandler(
+            handler,
+        )
+        sut.linkMobileStep.test {
+            val initialItem = awaitItem()
+            assertThat(initialItem).isEqualTo(LinkMobileStep.Uninitialized)
+            backgroundScope.launch {
+                sut.start()
+            }
+            runCurrent()
+            handler.emitGenerateProgress(GrantGeneratedQrLoginProgress.QrReady(FakeFfiQrCodeData(toBytesResult = { QR_CODE_DATA_RECIPROCATE })))
+            val readyState = awaitItem()
+            assertThat(readyState).isInstanceOf(LinkMobileStep.QrReady::class.java)
+            // generate returns, error is emitted
+            completable.complete(Unit)
+            val qrRotatingState = awaitItem()
+            assertThat(qrRotatingState).isEqualTo(LinkMobileStep.QrRotating)
+        }
+    }
+
     private fun TestScope.createRustLinkMobileHandler(
         handler: FakeFfiGrantLoginWithQrCodeHandler = FakeFfiGrantLoginWithQrCodeHandler(),
     ) = RustLinkMobileHandler(

libraries/qrcode/src/main/kotlin/io/element/android/libraries/qrcode/QrCodeImage.kt

@@ -57,8 +57,8 @@ private fun BitMatrix.toBitmap(
 @Composable
 fun QrCodeImage(
     data: String,
-    forceMaxBrightness: Boolean = true,
     modifier: Modifier = Modifier,
+    forceMaxBrightness: Boolean = true,
 ) {
     if (forceMaxBrightness) {
         ForceMaxBrightness()