Merge pull request #5388 from element-hq/feature/bma/fixIssueOnFtueNotificationScreen

Change in clear cache behavior
2025-09-22 12:15:17 +02:00
parent 99f956bdc3 f683728f35
commit 8dee4d0137
15 changed files with 1 additions and 114 deletions
--- a/features/ftue/api/src/main/kotlin/io/element/android/features/ftue/api/state/FtueService.kt
+++ b/features/ftue/api/src/main/kotlin/io/element/android/features/ftue/api/state/FtueService.kt
@@ -15,9 +15,6 @@ import kotlinx.coroutines.flow.StateFlow
 interface FtueService {
    /** The current state of the FTUE. */
    val state: StateFlow<FtueState>
-
-    /** Reset the FTUE state. */
-    suspend fun reset()
 }

 /** The state of the FTUE. */
--- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/state/DefaultFtueService.kt
+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/state/DefaultFtueService.kt
@@ -58,13 +58,6 @@ class DefaultFtueService(
            }
        }

-    override suspend fun reset() {
-        analyticsService.reset()
-        if (sdkVersionProvider.isAtLeast(Build.VERSION_CODES.TIRAMISU)) {
-            permissionStateProvider.resetPermission(Manifest.permission.POST_NOTIFICATIONS)
-        }
-    }
-
    init {
        combine(
            sessionVerificationService.sessionVerifiedStatus.onEach { sessionVerifiedStatus ->
--- a/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/DefaultFtueServiceTest.kt
+++ b/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/DefaultFtueServiceTest.kt
@@ -27,8 +27,6 @@ import io.element.android.services.analytics.api.AnalyticsService
 import io.element.android.services.analytics.noop.NoopAnalyticsService
 import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.services.toolbox.test.sdk.FakeBuildVersionSdkIntProvider
-import io.element.android.tests.testutils.lambda.lambdaRecorder
-import io.element.android.tests.testutils.lambda.value
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
@@ -191,47 +189,6 @@ class DefaultFtueServiceTest {
            assertThat(awaitItem()).isEqualTo(InternalFtueState.Complete)
        }
    }
-
-    @Test
-    fun `reset do the expected actions S`() = runTest {
-        val resetAnalyticsLambda = lambdaRecorder<Unit> { }
-        val analyticsService = FakeAnalyticsService(
-            resetLambda = resetAnalyticsLambda
-        )
-        val resetPermissionLambda = lambdaRecorder<String, Unit> { }
-        val permissionStateProvider = FakePermissionStateProvider(
-            resetPermissionLambda = resetPermissionLambda
-        )
-        val service = createDefaultFtueService(
-            sdkIntVersion = Build.VERSION_CODES.S,
-            permissionStateProvider = permissionStateProvider,
-            analyticsService = analyticsService,
-        )
-        service.reset()
-        resetAnalyticsLambda.assertions().isCalledOnce()
-        resetPermissionLambda.assertions().isNeverCalled()
-    }
-
-    @Test
-    fun `reset do the expected actions TIRAMISU`() = runTest {
-        val resetLambda = lambdaRecorder<Unit> { }
-        val analyticsService = FakeAnalyticsService(
-            resetLambda = resetLambda
-        )
-        val resetPermissionLambda = lambdaRecorder<String, Unit> { }
-        val permissionStateProvider = FakePermissionStateProvider(
-            resetPermissionLambda = resetPermissionLambda
-        )
-        val service = createDefaultFtueService(
-            sdkIntVersion = Build.VERSION_CODES.TIRAMISU,
-            permissionStateProvider = permissionStateProvider,
-            analyticsService = analyticsService,
-        )
-        service.reset()
-        resetLambda.assertions().isCalledOnce()
-        resetPermissionLambda.assertions().isCalledOnce()
-            .with(value("android.permission.POST_NOTIFICATIONS"))
-    }
 }

 internal fun TestScope.createDefaultFtueService(
--- a/features/ftue/test/src/main/kotlin/io/element/android/features/ftue/test/FakeFtueService.kt
+++ b/features/ftue/test/src/main/kotlin/io/element/android/features/ftue/test/FakeFtueService.kt
@@ -9,18 +9,11 @@ package io.element.android.features.ftue.test

 import io.element.android.features.ftue.api.state.FtueService
 import io.element.android.features.ftue.api.state.FtueState
-import io.element.android.tests.testutils.lambda.lambdaError
 import kotlinx.coroutines.flow.MutableStateFlow

-class FakeFtueService(
-    private val resetLambda: () -> Unit = { lambdaError() },
-) : FtueService {
+class FakeFtueService : FtueService {
    override val state: MutableStateFlow<FtueState> = MutableStateFlow(FtueState.Unknown)

-    override suspend fun reset() {
-        resetLambda()
-    }
-
    suspend fun emitState(newState: FtueState) {
        state.emit(newState)
    }
--- a/features/preferences/impl/build.gradle.kts
+++ b/features/preferences/impl/build.gradle.kts
@@ -72,7 +72,6 @@ dependencies {
    implementation(projects.features.rageshake.api)
    implementation(projects.features.lockscreen.api)
    implementation(projects.features.analytics.api)
-    implementation(projects.features.ftue.api)
    implementation(projects.features.licenses.api)
    implementation(projects.features.logout.api)
    implementation(projects.features.deactivation.api)
@@ -101,7 +100,6 @@ dependencies {
    testImplementation(projects.libraries.preferences.test)
    testImplementation(projects.libraries.push.test)
    testImplementation(projects.libraries.pushstore.test)
-    testImplementation(projects.features.ftue.test)
    testImplementation(projects.features.invite.test)
    testImplementation(projects.features.rageshake.test)
    testImplementation(projects.features.logout.test)
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/ClearCacheUseCase.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/ClearCacheUseCase.kt
@@ -12,7 +12,6 @@ import coil3.SingletonImageLoader
 import dev.zacsweers.metro.ContributesBinding
 import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.Provider
-import io.element.android.features.ftue.api.state.FtueService
 import io.element.android.features.invite.api.SeenInvitesStore
 import io.element.android.features.preferences.impl.DefaultCacheService
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
@@ -36,7 +35,6 @@ class DefaultClearCacheUseCase(
    private val coroutineDispatchers: CoroutineDispatchers,
    private val defaultCacheService: DefaultCacheService,
    private val okHttpClient: Provider<OkHttpClient>,
-    private val ftueService: FtueService,
    private val pushService: PushService,
    private val seenInvitesStore: SeenInvitesStore,
    private val activeRoomsHolder: ActiveRoomsHolder,
@@ -56,7 +54,6 @@ class DefaultClearCacheUseCase(
        // Clear app cache
        context.cacheDir.deleteRecursively()
        // Clear some settings
-        ftueService.reset()
        seenInvitesStore.clear()
        // Ensure any error will be displayed again
        pushService.setIgnoreRegistrationError(matrixClient.sessionId, false)
--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/tasks/DefaultClearCacheUseCaseTest.kt
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/tasks/DefaultClearCacheUseCaseTest.kt
@@ -10,7 +10,6 @@ package io.element.android.features.preferences.impl.tasks
 import androidx.test.platform.app.InstrumentationRegistry
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
-import io.element.android.features.ftue.test.FakeFtueService
 import io.element.android.features.invite.test.InMemorySeenInvitesStore
 import io.element.android.features.preferences.impl.DefaultCacheService
 import io.element.android.libraries.matrix.api.core.SessionId
@@ -41,10 +40,6 @@ class DefaultClearCacheUseCaseTest {
            clearCacheLambda = clearCacheLambda,
        )
        val defaultCacheService = DefaultCacheService()
-        val resetFtueLambda = lambdaRecorder<Unit> { }
-        val ftueService = FakeFtueService(
-            resetLambda = resetFtueLambda,
-        )
        val setIgnoreRegistrationErrorLambda = lambdaRecorder<SessionId, Boolean, Unit> { _, _ -> }
        val resetBatteryOptimizationStateResult = lambdaRecorder<Unit> { }
        val pushService = FakePushService(
@@ -59,7 +54,6 @@ class DefaultClearCacheUseCaseTest {
            coroutineDispatchers = testCoroutineDispatchers(),
            defaultCacheService = defaultCacheService,
            okHttpClient = { OkHttpClient.Builder().build() },
-            ftueService = ftueService,
            pushService = pushService,
            seenInvitesStore = seenInvitesStore,
            activeRoomsHolder = activeRoomsHolder,
@@ -67,7 +61,6 @@ class DefaultClearCacheUseCaseTest {
        defaultCacheService.clearedCacheEventFlow.test {
            sut.invoke()
            clearCacheLambda.assertions().isCalledOnce()
-            resetFtueLambda.assertions().isCalledOnce()
            setIgnoreRegistrationErrorLambda.assertions().isCalledOnce()
                .with(value(matrixClient.sessionId), value(false))
            resetBatteryOptimizationStateResult.assertions().isCalledOnce()
--- a/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionStateProvider.kt
+++ b/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionStateProvider.kt
@@ -16,6 +16,4 @@ interface PermissionStateProvider {

    suspend fun setPermissionAsked(permission: String, value: Boolean)
    fun isPermissionAsked(permission: String): Flow<Boolean>
-
-    suspend fun resetPermission(permission: String)
 }
--- a/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/DefaultPermissionStateProvider.kt
+++ b/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/DefaultPermissionStateProvider.kt
@@ -40,6 +40,4 @@ class DefaultPermissionStateProvider(
    override suspend fun setPermissionAsked(permission: String, value: Boolean) = permissionsStore.setPermissionAsked(permission, value)

    override fun isPermissionAsked(permission: String): Flow<Boolean> = permissionsStore.isPermissionAsked(permission)
-
-    override suspend fun resetPermission(permission: String) = permissionsStore.resetPermission(permission)
 }
--- a/libraries/permissions/test/src/main/kotlin/io/element/android/libraries/permissions/test/FakePermissionStateProvider.kt
+++ b/libraries/permissions/test/src/main/kotlin/io/element/android/libraries/permissions/test/FakePermissionStateProvider.kt
@@ -15,7 +15,6 @@ class FakePermissionStateProvider(
    private var permissionGranted: Boolean = true,
    permissionDenied: Boolean = false,
    permissionAsked: Boolean = false,
-    private val resetPermissionLambda: (String) -> Unit = {},
 ) : PermissionStateProvider {
    private val permissionDeniedFlow = MutableStateFlow(permissionDenied)
    private val permissionAskedFlow = MutableStateFlow(permissionAsked)
@@ -37,10 +36,4 @@ class FakePermissionStateProvider(
    }

    override fun isPermissionAsked(permission: String): Flow<Boolean> = permissionAskedFlow
-
-    override suspend fun resetPermission(permission: String) {
-        setPermissionAsked(permission, false)
-        setPermissionDenied(permission, false)
-        resetPermissionLambda(permission)
-    }
 }
--- a/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsService.kt
+++ b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsService.kt
@@ -47,9 +47,4 @@ interface AnalyticsService : AnalyticsTracker, ErrorTracker {
     * Update analyticsId from the AccountData.
     */
    suspend fun setAnalyticsId(analyticsId: String)
-
-    /**
-     * Reset the analytics service (will ask for user consent again).
-     */
-    suspend fun reset()
 }
--- a/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/DefaultAnalyticsService.kt
+++ b/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/DefaultAnalyticsService.kt
@@ -70,10 +70,6 @@ class DefaultAnalyticsService(
        analyticsStore.setDidAskUserConsent()
    }

-    override suspend fun reset() {
-        analyticsStore.setDidAskUserConsent(false)
-    }
-
    override suspend fun setAnalyticsId(analyticsId: String) {
        Timber.tag(analyticsTag.value).d("setAnalyticsId($analyticsId)")
        analyticsStore.setAnalyticsId(analyticsId)
--- a/services/analytics/impl/src/test/kotlin/io/element/android/services/analytics/impl/DefaultAnalyticsServiceTest.kt
+++ b/services/analytics/impl/src/test/kotlin/io/element/android/services/analytics/impl/DefaultAnalyticsServiceTest.kt
@@ -180,20 +180,6 @@ class DefaultAnalyticsServiceTest {
        resetLambda.assertions().isCalledOnce()
    }

-    @Test
-    fun `when reset is invoked, the user consent is reset`() = runTest {
-        val store = FakeAnalyticsStore(
-            defaultDidAskUserConsent = true,
-        )
-        val sut = createDefaultAnalyticsService(
-            coroutineScope = backgroundScope,
-            analyticsStore = store,
-        )
-        assertThat(store.didAskUserConsentFlow.first()).isTrue()
-        sut.reset()
-        assertThat(store.didAskUserConsentFlow.first()).isFalse()
-    }
-
    @Test
    fun `when a session is added, nothing happen`() = runTest {
        val sut = createDefaultAnalyticsService(
--- a/services/analytics/noop/src/main/kotlin/io/element/android/services/analytics/noop/NoopAnalyticsService.kt
+++ b/services/analytics/noop/src/main/kotlin/io/element/android/services/analytics/noop/NoopAnalyticsService.kt
@@ -31,7 +31,6 @@ class NoopAnalyticsService : AnalyticsService {
    override suspend fun setDidAskUserConsent() = Unit
    override val analyticsIdFlow: Flow<String> = flowOf("")
    override suspend fun setAnalyticsId(analyticsId: String) = Unit
-    override suspend fun reset() = Unit
    override fun capture(event: VectorAnalyticsEvent) = Unit
    override fun screen(screen: VectorAnalyticsScreen) = Unit
    override fun updateUserProperties(userProperties: UserProperties) = Unit
--- a/services/analytics/test/src/main/kotlin/io/element/android/services/analytics/test/FakeAnalyticsService.kt
+++ b/services/analytics/test/src/main/kotlin/io/element/android/services/analytics/test/FakeAnalyticsService.kt
@@ -20,7 +20,6 @@ import kotlinx.coroutines.flow.asStateFlow
 class FakeAnalyticsService(
    isEnabled: Boolean = false,
    didAskUserConsent: Boolean = false,
-    private val resetLambda: () -> Unit = {},
 ) : AnalyticsService {
    private val isEnabledFlow = MutableStateFlow(isEnabled)
    override val didAskUserConsentFlow = MutableStateFlow(didAskUserConsent)
@@ -65,9 +64,4 @@ class FakeAnalyticsService(
    override fun updateSuperProperties(updatedProperties: SuperProperties) {
        // No op
    }
-
-    override suspend fun reset() {
-        didAskUserConsentFlow.value = false
-        resetLambda()
-    }
 }