Bug 1944956 - Part 2: Switch to the new repository r=android-reviewers,gmalekpour,twhite

This patch swaps repository implementations, and adds an extra store action for the initial sotre update.

Differential Revision: https://phabricator.services.mozilla.com/D236295

Author: mavduevskiy

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/store/PrivacyPreferencesMiddleware.kt

@@ -10,10 +10,10 @@ import mozilla.components.lib.state.MiddlewareContext
 /**
  * [Middleware] that reacts to various [PrivacyPreferencesAction]s and updates any corresponding preferences.
  *
- * @param privacyPreferencesRepository [PrivacyPreferencesRepository] used to access the privacy preferences.
+ * @param repository [PrivacyPreferencesRepository] used to access the privacy preferences.
  */
 class PrivacyPreferencesMiddleware(
-    private val privacyPreferencesRepository: PrivacyPreferencesRepository,
+    private val repository: SimplePrivacyPreferencesRepository,
 ) : Middleware<PrivacyPreferencesState, PrivacyPreferencesAction> {
 
     override fun invoke(
@@ -24,27 +24,22 @@ class PrivacyPreferencesMiddleware(
         next(action)
 
         when (action) {
-            is PrivacyPreferencesAction.Init -> privacyPreferencesRepository.init()
-
             is PrivacyPreferencesAction.CrashReportingPreferenceUpdatedTo -> {
-                privacyPreferencesRepository.updatePrivacyPreference(
-                    PrivacyPreferencesRepository.PrivacyPreferenceUpdate(
-                        preferenceType = PrivacyPreferencesRepository.PrivacyPreference.CrashReporting,
-                        value = action.enabled,
-                    ),
+                repository.setPreference(
+                    type = PreferenceType.CrashReporting,
+                    enabled = action.enabled,
                 )
             }
 
             is PrivacyPreferencesAction.UsageDataPreferenceUpdatedTo -> {
-                privacyPreferencesRepository.updatePrivacyPreference(
-                    PrivacyPreferencesRepository.PrivacyPreferenceUpdate(
-                        preferenceType = PrivacyPreferencesRepository.PrivacyPreference.UsageData,
-                        value = action.enabled,
-                    ),
+                repository.setPreference(
+                    type = PreferenceType.UsageData,
+                    enabled = action.enabled,
                 )
             }
 
             // no-ops
+            is PrivacyPreferencesAction.Init,
             is PrivacyPreferencesAction.CrashReportingLearnMore,
             is PrivacyPreferencesAction.UsageDataUserLearnMore,
             -> {}

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/store/SimplePrivacyPreferencesRepository.kt

@@ -17,15 +17,15 @@ interface SimplePrivacyPreferencesRepository {
      * @param type The type of preference to retrieve.
      * @return Returns `true` if the preference is enabled.
      */
-    fun getPrivacyPreference(type: PreferenceType): Boolean
+    fun getPreference(type: PreferenceType): Boolean
 
     /**
      * Updates a specific preference.
      *
      * @param type The type of preference to modify.
      * @param enabled The new state of the preference.
      */
-    fun setPrivacyPreference(type: PreferenceType, enabled: Boolean)
+    fun setPreference(type: PreferenceType, enabled: Boolean)
 }
 
 /**
@@ -44,14 +44,14 @@ class DefaultSimplePrivacyPreferencesRepository(
     private val settings: Settings,
 ) : SimplePrivacyPreferencesRepository {
 
-    override fun getPrivacyPreference(type: PreferenceType): Boolean {
+    override fun getPreference(type: PreferenceType): Boolean {
         return when (type) {
             PreferenceType.CrashReporting -> settings.crashReportAlwaysSend
             PreferenceType.UsageData -> settings.isTelemetryEnabled
         }
     }
 
-    override fun setPrivacyPreference(
+    override fun setPreference(
         type: PreferenceType,
         enabled: Boolean,
     ) {

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/ManagePrivacyPreferencesDialogFragment.kt

@@ -11,9 +11,10 @@ import android.view.ViewGroup
 import androidx.compose.ui.platform.ComposeView
 import androidx.fragment.app.DialogFragment
 import org.mozilla.fenix.components.lazyStore
-import org.mozilla.fenix.ext.requireComponents
+import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.onboarding.ManagePrivacyPreferencesDialog
-import org.mozilla.fenix.onboarding.store.DefaultPrivacyPreferencesRepository
+import org.mozilla.fenix.onboarding.store.DefaultSimplePrivacyPreferencesRepository
+import org.mozilla.fenix.onboarding.store.PreferenceType
 import org.mozilla.fenix.onboarding.store.PrivacyPreferencesAction
 import org.mozilla.fenix.onboarding.store.PrivacyPreferencesMiddleware
 import org.mozilla.fenix.onboarding.store.PrivacyPreferencesState
@@ -29,18 +30,16 @@ import org.mozilla.fenix.theme.FirefoxTheme
 class ManagePrivacyPreferencesDialogFragment : DialogFragment() {
 
     private val store by lazyStore {
+        val repository = DefaultSimplePrivacyPreferencesRepository(
+            settings = requireContext().settings(),
+        )
         PrivacyPreferencesStore(
             initialState = PrivacyPreferencesState(
-                crashReportingEnabled = requireComponents.settings.crashReportAlwaysSend,
-                usageDataEnabled = requireComponents.settings.isTelemetryEnabled,
+                crashReportingEnabled = repository.getPreference(PreferenceType.CrashReporting),
+                usageDataEnabled = repository.getPreference(PreferenceType.UsageData),
             ),
             middlewares = listOf(
-                PrivacyPreferencesMiddleware(
-                    privacyPreferencesRepository = DefaultPrivacyPreferencesRepository(
-                        context = requireContext(),
-                        lifecycleOwner = viewLifecycleOwner,
-                    ),
-                ),
+                PrivacyPreferencesMiddleware(repository),
                 PrivacyPreferencesTelemetryMiddleware(),
             ),
         )