refactor(StoresLocalSettings): Replace SharedPrefs by DataStores

Infomaniak · Feb 12, 2024 · cca36bc · cca36bc
1 parent dba8442
commit cca36bc
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/Core b/Core
diff --git a/app/src/main/java/com/infomaniak/mail/di/ApplicationModule.kt b/app/src/main/java/com/infomaniak/mail/di/ApplicationModule.kt
@@ -22,7 +22,7 @@ import android.content.Context
 import androidx.core.app.NotificationManagerCompat
 import androidx.work.WorkManager
 import com.infomaniak.lib.stores.AppUpdateScheduler
-import com.infomaniak.lib.stores.StoresLocalSettings
+import com.infomaniak.lib.stores.StoresSettingsRepository
 import com.infomaniak.mail.MainApplication
 import com.infomaniak.mail.data.LocalSettings
 import dagger.Module
@@ -66,7 +66,7 @@ object ApplicationModule {
 
     @Provides
     @Singleton
-    fun providesStoresLocalSettings(appContext: Context): StoresLocalSettings = StoresLocalSettings.getInstance(appContext)
+    fun providesStoresSettingsRepository(appContext: Context): StoresSettingsRepository = StoresSettingsRepository(appContext)
 
     @Provides
     @Singleton

diff --git a/...c/main/java/com/infomaniak/mail/ui/bottomSheetDialogs/UpdateAvailableBottomSheetDialog.kt b/...c/main/java/com/infomaniak/mail/ui/bottomSheetDialogs/UpdateAvailableBottomSheetDialog.kt
@@ -19,23 +19,21 @@ package com.infomaniak.mail.ui.bottomSheetDialogs
 
 import android.os.Bundle
 import android.view.View
+import androidx.fragment.app.activityViewModels
 import com.infomaniak.lib.core.utils.context
 import com.infomaniak.lib.core.utils.getAppName
 import com.infomaniak.lib.core.utils.goToPlayStore
-import com.infomaniak.lib.stores.StoresLocalSettings
+import com.infomaniak.lib.stores.StoresSettingsRepository
+import com.infomaniak.lib.stores.StoresViewModel
 import com.infomaniak.mail.MatomoMail.DISCOVER_LATER
 import com.infomaniak.mail.MatomoMail.DISCOVER_NOW
 import com.infomaniak.mail.MatomoMail.trackAppUpdateEvent
 import com.infomaniak.mail.R
-import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
 import com.infomaniak.lib.core.R as RCore
 
-@AndroidEntryPoint
 class UpdateAvailableBottomSheetDialog : InformationBottomSheetDialog() {
 
-    @Inject
-    lateinit var storesLocalSettings: StoresLocalSettings
+    private val storesViewModel: StoresViewModel by activityViewModels()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?): Unit = with(binding) {
         super.onViewCreated(view, savedInstanceState)
@@ -48,15 +46,15 @@ class UpdateAvailableBottomSheetDialog : InformationBottomSheetDialog() {
             trackAppUpdateEvent(DISCOVER_NOW)
             setText(RCore.string.buttonUpdate)
             setOnClickListener {
-                storesLocalSettings.isUserWantingUpdates = true
+                storesViewModel.set(StoresSettingsRepository.IS_USER_WANTING_UPDATES_KEY, true)
                 requireContext().goToPlayStore()
                 dismiss()
             }
         }
 
         secondaryActionButton.setOnClickListener {
             trackAppUpdateEvent(DISCOVER_LATER)
-            storesLocalSettings.isUserWantingUpdates = false
+            storesViewModel.set(StoresSettingsRepository.IS_USER_WANTING_UPDATES_KEY, false)
             dismiss()
         }
     }

diff --git a/app/src/main/java/com/infomaniak/mail/utils/LogoutUser.kt b/app/src/main/java/com/infomaniak/mail/utils/LogoutUser.kt
@@ -23,7 +23,7 @@ import androidx.work.WorkManager
 import com.infomaniak.lib.core.models.user.User
 import com.infomaniak.lib.core.networking.HttpClient
 import com.infomaniak.lib.core.utils.SentryLog
-import com.infomaniak.lib.stores.StoresLocalSettings
+import com.infomaniak.lib.stores.StoresSettingsRepository
 import com.infomaniak.mail.data.LocalSettings
 import com.infomaniak.mail.data.cache.RealmDatabase
 import com.infomaniak.mail.data.cache.appSettings.AppSettingsController
@@ -42,7 +42,7 @@ class LogoutUser @Inject constructor(
     private val localSettings: LocalSettings,
     private val mailboxController: MailboxController,
     private val playServicesUtils: PlayServicesUtils,
-    private val storesLocalSettings: StoresLocalSettings,
+    private val storesSettingsRepository: StoresSettingsRepository,
     @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ) {
 
@@ -79,10 +79,10 @@ class LogoutUser @Inject constructor(
         )
     }
 
-    private fun resetSettings() {
+    private suspend fun resetSettings() {
         AppSettingsController.removeAppSettings()
         localSettings.removeSettings()
-        storesLocalSettings.removeSettings()
+        storesSettingsRepository.clear()
         with(WorkManager.getInstance(appContext)) {
             cancelAllWork()
             pruneWork()
+2 −0		Stores/build.gradle
+6 −7		Stores/src/main/java/com/infomaniak/lib/stores/BaseInAppUpdateManager.kt
+0 −57		Stores/src/main/java/com/infomaniak/lib/stores/StoresLocalSettings.kt
+70 −0		Stores/src/main/java/com/infomaniak/lib/stores/StoresSettingsRepository.kt
+39 −9		Stores/src/main/java/com/infomaniak/lib/stores/StoresViewModel.kt
+14 −11		Stores/src/standard/java/com/infomaniak/lib/stores/AppUpdateScheduler.kt
+10 −13		Stores/src/standard/java/com/infomaniak/lib/stores/updatemanagers/InAppUpdateManager.kt
+10 −4		Stores/src/standard/java/com/infomaniak/lib/stores/updatemanagers/WorkerUpdateManager.kt