Merge pull request #7338 from element-hq/feature/bma/linkNewDeviceTimeout

[Link new device] Add timeout

features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/LinkNewDesktopHandler.kt

@@ -12,10 +12,12 @@ import dev.zacsweers.metro.SingleIn
 import io.element.android.libraries.core.log.logger.LoggerTag
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.matrix.api.linknewdevice.ErrorType
 import io.element.android.libraries.matrix.api.linknewdevice.LinkDesktopHandler
 import io.element.android.libraries.matrix.api.linknewdevice.LinkDesktopStep
 import io.element.android.libraries.matrix.api.logs.LoggerTags
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -23,6 +25,7 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import timber.log.Timber
+import kotlin.time.Duration.Companion.minutes
 
 private val loggerTag = LoggerTag("LinkNewDesktopHandler", LoggerTags.linkNewDevice)
 
@@ -40,25 +43,34 @@ class LinkNewDesktopHandler(
         get() = linkDesktopStepFlow.asStateFlow()
 
     private var currentJob: Job? = null
+    private var timerJob: Job? = null
     private var handler: LinkDesktopHandler? = null
 
-    fun createNewHandler() {
+    private fun resetJobs() {
         currentJob?.cancel()
         currentJob = null
+        timerJob?.cancel()
+        timerJob = null
+    }
+
+    fun createNewHandler() {
+        resetJobs()
         handler = matrixClient.createLinkDesktopHandler().getOrNull()
+        timerJob = sessionScope.launch {
+            delay(2.minutes)
+            linkDesktopStepFlow.emit(LinkDesktopStep.Error(ErrorType.Expired("Scanning QrCode took too long.")))
+        }
     }
 
     fun reset() {
-        currentJob?.cancel()
+        resetJobs()
-        currentJob = null
         sessionScope.launch {
             linkDesktopStepFlow.emit(LinkDesktopStep.Uninitialized)
         }
     }
 
     fun onScannedCode(data: ByteArray) {
-        currentJob?.cancel()
+        resetJobs()
-        currentJob = null
         val currentHandler = handler
         if (currentHandler == null) {
             Timber.tag(loggerTag.value).e("onScannedCode: Handler is not initialized. Call createNewHandler() first.")

features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/qrcode/ShowQrCodeNode.kt

@@ -20,6 +20,13 @@ import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.inputs
 import io.element.android.libraries.di.SessionScope
 
+/**
+ * Max number of QrCode rotation.
+ * When QrCode is rotated this number of time, a TimeOut error is emitted.
+ * Set to 0 to disable QrCode rotation.
+ */
+private const val MAX_QR_CODE_ROTATION = 0
+
 @ContributesNode(SessionScope::class)
 @AssistedInject
 class ShowQrCodeNode(
@@ -39,6 +46,7 @@ class ShowQrCodeNode(
     private val callback: Callback = callback()
     private val showQrCodePresenter: ShowQrCodePresenter = showQrCodePresenterFactory.create(
         initialData = inputs.data,
+        maxQrCodeRotation = MAX_QR_CODE_ROTATION,
     )
 
     @Composable

features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/qrcode/ShowQrCodePresenter.kt

@@ -26,24 +26,29 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import timber.log.Timber
+import kotlin.time.Duration.Companion.seconds
 
 private val tag = LoggerTag("ShowQrCodePresenter", LoggerTags.linkNewDevice)
 
 @AssistedInject
 class ShowQrCodePresenter(
     @Assisted private val initialData: String,
+    @Assisted private val maxQrCodeRotation: Int,
     private val linkNewMobileHandler: LinkNewMobileHandler,
 ) : Presenter<ShowQrCodeState> {
     @AssistedFactory
     interface Factory {
-        fun create(initialData: String): ShowQrCodePresenter
+        fun create(
+            initialData: String,
+            maxQrCodeRotation: Int,
+        ): ShowQrCodePresenter
     }
 
     private var loadingJob: Job? = null
 
     @Composable
     override fun present(): ShowQrCodeState {
-        var qrCodeRotationCounter by remember { mutableIntStateOf(MAX_QR_CODE_ROTATION) }
+        var qrCodeRotationCounter by remember { mutableIntStateOf(maxQrCodeRotation) }
         val state by produceState(
             initialValue = ShowQrCodeState(
                 data = AsyncData.Success(initialData),
@@ -63,7 +68,7 @@ class ShowQrCodePresenter(
                             linkNewMobileHandler.rotateQrCode()
                             // Ensure that outdated data is not rendered too long while rotating QR code
                             loadingJob = launch {
-                                delay(1000)
+                                delay(1.seconds)
                                 value = ShowQrCodeState(
                                     data = AsyncData.Loading(),
                                 )
@@ -80,8 +85,4 @@ class ShowQrCodePresenter(
 
         return state
     }
-
-    companion object {
-        const val MAX_QR_CODE_ROTATION = 10
-    }
 }

features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/qrcode/ShowQrCodePresenterTest.kt

@@ -91,10 +91,36 @@ class ShowQrCodePresenterTest {
         }
     }
 
+    @Test
+    fun `present - when handler emits QrRotating, the presenter does not emit anything when rotation is disabled`() = runTest {
+        val linkMobileHandler = FakeLinkMobileHandler(
+            startResult = {},
+        )
+        val matrixClient = FakeMatrixClient(
+            sessionCoroutineScope = backgroundScope,
+            createLinkMobileHandlerResult = { Result.success(linkMobileHandler) },
+        )
+        val linkNewMobileHandler = LinkNewMobileHandler(matrixClient)
+        linkNewMobileHandler.createAndStartNewHandler()
+        createPresenter(
+            linkNewMobileHandler = linkNewMobileHandler,
+            maxQrCodeRotation = 0,
+        ).test {
+            awaitItem()
+            linkMobileHandler.emitStep(
+                LinkMobileStep.QrRotating
+            )
+            runCurrent()
+            expectNoEvents()
+        }
+    }
+
     private fun createPresenter(
         linkNewMobileHandler: LinkNewMobileHandler = LinkNewMobileHandler(FakeMatrixClient()),
+        maxQrCodeRotation: Int = 10,
     ) = ShowQrCodePresenter(
         initialData = "DATA",
+        maxQrCodeRotation = maxQrCodeRotation,
         linkNewMobileHandler = linkNewMobileHandler,
     )
 }

features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/biometric/BiometricAuthenticator.kt

@@ -59,7 +59,7 @@ class DefaultBiometricAuthentication(
     private var cryptoObject: CryptoObject? = null
 
     override suspend fun setup() {
-        if (cryptoObject != null) return
+        Timber.d("Setup biometric authentication")
         try {
             val secretKey = ensureKey()
             val cipher = encryptionDecryptionService.createEncryptionCipher(secretKey)
@@ -126,6 +126,9 @@ private class AuthenticationCallback(
         if (this == null) return false
         return runCatchingExceptions {
             doFinal("biometric_challenge".toByteArray())
-        }.isSuccess
+        }.onFailure {
+            Timber.e(it, "Failed to validate cipher")
+        }
+            .isSuccess
     }
 }