remove AutofillFeatureExceptionStore

Author: aitorvs

autofill/autofill-impl/src/main/java/com/duckduckgo/autofill/impl/RealAutofill.kt

@@ -18,7 +18,7 @@ package com.duckduckgo.autofill.impl
 
 import com.duckduckgo.app.browser.UriString.Companion.sameOrSubdomain
 import com.duckduckgo.autofill.api.Autofill
-import com.duckduckgo.autofill.store.feature.AutofillFeatureRepository
+import com.duckduckgo.autofill.impl.feature.plugin.AutofillFeatureRepository
 import com.duckduckgo.di.scopes.AppScope
 import com.duckduckgo.privacy.config.api.UnprotectedTemporary
 import com.squareup.anvil.annotations.ContributesBinding

autofill/autofill-impl/src/main/java/com/duckduckgo/autofill/impl/di/AutofillModule.kt

@@ -19,8 +19,6 @@ package com.duckduckgo.autofill.impl.di
 import android.content.Context
 import androidx.room.Room
 import com.duckduckgo.anvil.annotations.ContributesPluginPoint
-import com.duckduckgo.app.di.AppCoroutineScope
-import com.duckduckgo.app.di.IsMainProcess
 import com.duckduckgo.autofill.api.AutofillFeature
 import com.duckduckgo.autofill.api.AutofillFragmentResultsPlugin
 import com.duckduckgo.autofill.api.InternalTestUserChecker
@@ -39,20 +37,16 @@ import com.duckduckgo.autofill.store.RealInternalTestUserStore
 import com.duckduckgo.autofill.store.RealLastUpdatedTimeProvider
 import com.duckduckgo.autofill.store.engagement.AutofillEngagementDatabase
 import com.duckduckgo.autofill.store.feature.AutofillDefaultStateDecider
-import com.duckduckgo.autofill.store.feature.AutofillFeatureRepository
 import com.duckduckgo.autofill.store.feature.RealAutofillDefaultStateDecider
-import com.duckduckgo.autofill.store.feature.RealAutofillFeatureRepository
 import com.duckduckgo.autofill.store.targets.DomainTargetAppDao
 import com.duckduckgo.autofill.store.targets.DomainTargetAppsDatabase
 import com.duckduckgo.browser.api.UserBrowserProperties
-import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.di.scopes.ActivityScope
 import com.duckduckgo.di.scopes.AppScope
 import com.squareup.anvil.annotations.ContributesTo
 import dagger.Module
 import dagger.Provides
 import dagger.SingleInstanceIn
-import kotlinx.coroutines.CoroutineScope
 
 @Module
 @ContributesTo(AppScope::class)
@@ -99,17 +93,6 @@ class AutofillModule {
             .build()
     }
 
-    @SingleInstanceIn(AppScope::class)
-    @Provides
-    fun provideAutofillRepository(
-        database: AutofillDatabase,
-        @AppCoroutineScope appCoroutineScope: CoroutineScope,
-        dispatcherProvider: DispatcherProvider,
-        @IsMainProcess isMainProcess: Boolean,
-    ): AutofillFeatureRepository {
-        return RealAutofillFeatureRepository(database, appCoroutineScope, dispatcherProvider, isMainProcess)
-    }
-
     @Provides
     @SingleInstanceIn(AppScope::class)
     fun providesCredentialsSyncDao(

autofill/autofill-impl/src/main/java/com/duckduckgo/autofill/impl/feature/plugin/AutofillFeatureExceptionStore.kt

@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2025 DuckDuckGo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.duckduckgo.autofill.impl.feature.plugin
+
+import com.duckduckgo.app.di.AppCoroutineScope
+import com.duckduckgo.app.di.IsMainProcess
+import com.duckduckgo.autofill.api.AutofillFeature
+import com.duckduckgo.common.utils.DispatcherProvider
+import com.duckduckgo.di.scopes.AppScope
+import com.duckduckgo.feature.toggles.api.FeatureExceptions.FeatureException
+import com.duckduckgo.privacy.config.api.PrivacyConfigCallbackPlugin
+import com.squareup.anvil.annotations.ContributesBinding
+import com.squareup.anvil.annotations.ContributesMultibinding
+import dagger.SingleInstanceIn
+import java.util.concurrent.CopyOnWriteArrayList
+import javax.inject.Inject
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+
+interface AutofillFeatureRepository {
+    val exceptions: CopyOnWriteArrayList<FeatureException>
+}
+
+@ContributesMultibinding(
+    scope = AppScope::class,
+    boundType = PrivacyConfigCallbackPlugin::class,
+)
+@ContributesBinding(
+    scope = AppScope::class,
+    boundType = AutofillFeatureRepository::class,
+)
+@SingleInstanceIn(AppScope::class)
+class RealAutofillFeatureRepository @Inject constructor(
+    private val feature: AutofillFeature,
+    @AppCoroutineScope private val coroutineScope: CoroutineScope,
+    private val dispatcherProvider: DispatcherProvider,
+    @IsMainProcess private val isMainProcess: Boolean,
+) : AutofillFeatureRepository, PrivacyConfigCallbackPlugin {
+
+    override val exceptions = CopyOnWriteArrayList<FeatureException>()
+
+    init {
+        loadToMemory()
+    }
+
+    override fun onPrivacyConfigDownloaded() {
+        loadToMemory()
+    }
+
+    private fun loadToMemory() {
+        coroutineScope.launch(dispatcherProvider.io()) {
+            if (isMainProcess) {
+                exceptions.clear()
+                exceptions.addAll(feature.self().getExceptions())
+            }
+        }
+    }
+}

autofill/autofill-impl/src/main/java/com/duckduckgo/autofill/impl/feature/plugin/AutofillFeatureRepository.kt

@@ -24,7 +24,6 @@ import com.duckduckgo.di.scopes.AppScope
     scope = AppScope::class,
     boundType = AutofillFeature::class,
     featureName = "autofill",
-    exceptionsStore = AutofillFeatureExceptionStore::class,
 )
 @Suppress("unused")
 private interface UnusedAutofillRemoteFeatureCodegenTrigger

autofill/autofill-impl/src/main/java/com/duckduckgo/autofill/impl/feature/plugin/UnusedAutofillRemoteFeatureCodegenTrigger.kt

@@ -17,7 +17,7 @@
 package com.duckduckgo.autofill.impl
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.duckduckgo.autofill.store.feature.AutofillFeatureRepository
+import com.duckduckgo.autofill.impl.feature.plugin.AutofillFeatureRepository
 import com.duckduckgo.feature.toggles.api.FeatureExceptions.FeatureException
 import com.duckduckgo.privacy.config.api.UnprotectedTemporary
 import java.util.concurrent.CopyOnWriteArrayList

autofill/autofill-impl/src/test/java/com/duckduckgo/autofill/impl/RealAutofillTest.kt

@@ -0,0 +1,55 @@
+package com.duckduckgo.autofill.impl.feature.plugin
+
+import com.duckduckgo.autofill.api.AutofillFeature
+import com.duckduckgo.common.test.CoroutineTestRule
+import com.duckduckgo.feature.toggles.api.FakeFeatureToggleFactory
+import com.duckduckgo.feature.toggles.api.FeatureExceptions.FeatureException
+import com.duckduckgo.feature.toggles.api.Toggle
+import kotlinx.coroutines.test.runTest
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+
+class RealAutofillFeatureRepositoryTest {
+    @get:Rule
+    var coroutineRule = CoroutineTestRule()
+
+    private val feature = FakeFeatureToggleFactory.create(AutofillFeature::class.java)
+
+    @Before
+    fun setup() {
+        feature.self().setRawStoredState(Toggle.State(exceptions = exceptions))
+    }
+
+    @Test
+    fun whenRepositoryIsCreatedThenExceptionsLoadIntoMemory() = runTest {
+        val repository = RealAutofillFeatureRepository(
+            feature,
+            coroutineRule.testScope,
+            coroutineRule.testDispatcherProvider,
+            true,
+        )
+
+        assertEquals(exceptions, repository.exceptions)
+    }
+
+    @Test
+    fun whenRemoteConfigUpdateThenExceptionsUpdated() = runTest {
+        val repository = RealAutofillFeatureRepository(
+            feature,
+            coroutineRule.testScope,
+            coroutineRule.testDispatcherProvider,
+            true,
+        )
+
+        assertEquals(exceptions, repository.exceptions)
+        feature.self().setRawStoredState(Toggle.State(exceptions = emptyList()))
+        repository.onPrivacyConfigDownloaded()
+        assertEquals(emptyList<FeatureException>(), repository.exceptions)
+    }
+
+    companion object {
+        val exceptions = listOf(FeatureException("example.com", "reason"))
+    }
+}

autofill/autofill-impl/src/test/java/com/duckduckgo/autofill/impl/feature/plugin/RealAutofillFeatureRepositoryTest.kt

@@ -23,14 +23,12 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 @Database(
     exportSchema = true,
-    version = 2,
+    version = 3,
     entities = [
-        AutofillExceptionEntity::class,
         CredentialsSyncMetadataEntity::class,
     ],
 )
 abstract class AutofillDatabase : RoomDatabase() {
-    abstract fun autofillDao(): AutofillDao
     abstract fun credentialsSyncDao(): CredentialsSyncMetadataDao
 }
 
@@ -46,4 +44,10 @@ val MIGRATION_1_2 = object : Migration(1, 2) {
     }
 }
 
-val ALL_MIGRATIONS = arrayOf(MIGRATION_1_2)
+val MIGRATION_2_3 = object : Migration(2, 3) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("DROP TABLE `autofill_exceptions`")
+    }
+}
+
+val ALL_MIGRATIONS = arrayOf(MIGRATION_1_2, MIGRATION_2_3)