First Commit

libraries/indicator/impl/build.gradle.kts

@@ -0,0 +1,34 @@
+import extension.setupDependencyInjection
+import extension.testCommonDependencies
+
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2024 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+plugins {
+    id("io.element.android-compose-library")
+}
+
+setupDependencyInjection()
+
+android {
+    namespace = "io.element.android.libraries.indicator.impl"
+}
+
+dependencies {
+    implementation(projects.libraries.di)
+    implementation(projects.libraries.featureflag.api)
+    implementation(projects.libraries.matrix.api)
+
+    implementation(libs.coroutines.core)
+
+    api(projects.libraries.indicator.api)
+
+    testCommonDependencies(libs)
+    testImplementation(projects.libraries.featureflag.test)
+    testImplementation(projects.libraries.matrix.test)
+}

libraries/indicator/impl/src/main/kotlin/io/element/android/libraries/indicator/impl/DefaultIndicatorService.kt

@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.indicator.impl
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.State
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.indicator.api.IndicatorService
+import io.element.android.libraries.matrix.api.encryption.BackupState
+import io.element.android.libraries.matrix.api.encryption.EncryptionService
+import io.element.android.libraries.matrix.api.encryption.RecoveryState
+import io.element.android.libraries.matrix.api.verification.SessionVerificationService
+
+@ContributesBinding(SessionScope::class)
+class DefaultIndicatorService(
+    private val sessionVerificationService: SessionVerificationService,
+    private val encryptionService: EncryptionService,
+) : IndicatorService {
+    @Composable
+    override fun showRoomListTopBarIndicator(): State<Boolean> {
+        val canVerifySession by sessionVerificationService.needsSessionVerification.collectAsState(initial = false)
+        val settingChatBackupIndicator = showSettingChatBackupIndicator()
+
+        return remember {
+            derivedStateOf {
+                canVerifySession || settingChatBackupIndicator.value
+            }
+        }
+    }
+
+    @Composable
+    override fun showSettingChatBackupIndicator(): State<Boolean> {
+        val backupState by encryptionService.backupStateStateFlow.collectAsState()
+        val recoveryState by encryptionService.recoveryStateStateFlow.collectAsState()
+
+        return remember {
+            derivedStateOf {
+                val showForBackup = backupState in listOf(
+                    BackupState.UNKNOWN,
+                )
+                val showForRecovery = recoveryState in listOf(
+                    RecoveryState.DISABLED,
+                    RecoveryState.INCOMPLETE,
+                )
+                showForBackup || showForRecovery
+            }
+        }
+    }
+}

libraries/indicator/impl/src/test/kotlin/io/element/android/libraries/indicator/impl/DefaultIndicatorServiceTest.kt

@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.indicator.impl
+
+import app.cash.molecule.RecompositionMode
+import app.cash.molecule.moleculeFlow
+import app.cash.turbine.test
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.api.encryption.BackupState
+import io.element.android.libraries.matrix.api.encryption.RecoveryState
+import io.element.android.libraries.matrix.test.encryption.FakeEncryptionService
+import io.element.android.libraries.matrix.test.verification.FakeSessionVerificationService
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class DefaultIndicatorServiceTest {
+    @Test
+    fun `test - showRoomListTopBarIndicator`() = runTest {
+        val encryptionService = FakeEncryptionService()
+        val sessionVerificationService = FakeSessionVerificationService()
+        val sut = DefaultIndicatorService(
+            sessionVerificationService = sessionVerificationService,
+            encryptionService = encryptionService,
+        )
+        moleculeFlow(RecompositionMode.Immediate) {
+            sut.showRoomListTopBarIndicator().value
+        }.test {
+            assertThat(awaitItem()).isTrue()
+            sessionVerificationService.emitNeedsSessionVerification(false)
+            encryptionService.emitBackupState(BackupState.ENABLED)
+            encryptionService.emitRecoveryState(RecoveryState.ENABLED)
+            assertThat(awaitItem()).isFalse()
+            sessionVerificationService.emitNeedsSessionVerification(true)
+            assertThat(awaitItem()).isTrue()
+        }
+    }
+
+    @Test
+    fun `test - showSettingChatBackupIndicator is true when BackupState is UNKNOWN`() = runTest {
+        val encryptionService = FakeEncryptionService()
+        val sessionVerificationService = FakeSessionVerificationService()
+        val sut = DefaultIndicatorService(
+            sessionVerificationService = sessionVerificationService,
+            encryptionService = encryptionService,
+        )
+        moleculeFlow(RecompositionMode.Immediate) {
+            sut.showSettingChatBackupIndicator().value
+        }.test {
+            assertThat(awaitItem()).isTrue()
+            encryptionService.emitBackupState(BackupState.ENABLED)
+            encryptionService.emitRecoveryState(RecoveryState.ENABLED)
+            assertThat(awaitItem()).isFalse()
+            encryptionService.emitBackupState(BackupState.UNKNOWN)
+            assertThat(awaitItem()).isTrue()
+        }
+    }
+
+    @Test
+    fun `test - showSettingChatBackupIndicator is true when recoveryState is DISABLED`() = runTest {
+        val encryptionService = FakeEncryptionService()
+        val sessionVerificationService = FakeSessionVerificationService()
+        val sut = DefaultIndicatorService(
+            sessionVerificationService = sessionVerificationService,
+            encryptionService = encryptionService,
+        )
+        moleculeFlow(RecompositionMode.Immediate) {
+            sut.showSettingChatBackupIndicator().value
+        }.test {
+            assertThat(awaitItem()).isTrue()
+            encryptionService.emitBackupState(BackupState.ENABLED)
+            encryptionService.emitRecoveryState(RecoveryState.ENABLED)
+            assertThat(awaitItem()).isFalse()
+            encryptionService.emitRecoveryState(RecoveryState.DISABLED)
+            assertThat(awaitItem()).isTrue()
+        }
+    }
+
+    @Test
+    fun `test - showSettingChatBackupIndicator is true when recoveryState is INCOMPLETE`() = runTest {
+        val encryptionService = FakeEncryptionService()
+        val sessionVerificationService = FakeSessionVerificationService()
+        val sut = DefaultIndicatorService(
+            sessionVerificationService = sessionVerificationService,
+            encryptionService = encryptionService,
+        )
+        moleculeFlow(RecompositionMode.Immediate) {
+            sut.showSettingChatBackupIndicator().value
+        }.test {
+            assertThat(awaitItem()).isTrue()
+            encryptionService.emitBackupState(BackupState.ENABLED)
+            encryptionService.emitRecoveryState(RecoveryState.ENABLED)
+            assertThat(awaitItem()).isFalse()
+            encryptionService.emitRecoveryState(RecoveryState.INCOMPLETE)
+            assertThat(awaitItem()).isTrue()
+        }
+    }
+}