refactor(InAppUpdate): Use StoresLocalSettings and clean useless code

Author: FabianDevel

Core

@@ -27,7 +27,6 @@ import com.infomaniak.lib.core.utils.SentryLog
 import com.infomaniak.lib.core.utils.SharedValues
 import com.infomaniak.lib.core.utils.sharedValue
 import com.infomaniak.lib.core.utils.transaction
-import com.infomaniak.lib.stores.StoreUtils.APP_UPDATE_TAG
 import com.infomaniak.mail.MatomoMail.ACTION_ARCHIVE_NAME
 import com.infomaniak.mail.MatomoMail.ACTION_DELETE_NAME
 import com.infomaniak.mail.MatomoMail.ACTION_FAVORITE_NAME
@@ -49,8 +48,6 @@ class LocalSettings private constructor(context: Context) : SharedValues {
     var askEmailAcknowledgement by sharedValue("askEmailAcknowledgmentKey", false)
     var hasAlreadyEnabledNotifications by sharedValue("hasAlreadyEnabledNotificationsKey", false)
     var isAppLocked by sharedValue("isAppLockedKey", false)
-    var isUserWantingUpdates by sharedValue("isUserWantingUpdatesKey", true)
-    var hasAppUpdateDownloaded by sharedValue("hasAppUpdateDownloaded", false)
     var aiEngine by sharedValue("aiEngineKey", AiEngine.FALCON)
     var threadDensity by sharedValue("threadDensityKey", ThreadDensity.LARGE)
     var theme by sharedValue("themeKey", if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) Theme.LIGHT else Theme.SYSTEM)
@@ -71,12 +68,6 @@ class LocalSettings private constructor(context: Context) : SharedValues {
 
     fun removeSettings() = sharedPreferences.transaction { clear() }
 
-    fun resetUpdateSettings() {
-        SentryLog.d(APP_UPDATE_TAG, "Reset update settings")
-        isUserWantingUpdates = false // This avoid the user being instantly reprompted to download update
-        hasAppUpdateDownloaded = false
-    }
-
     fun getSwipeAction(@StringRes nameRes: Int): SwipeAction = when (nameRes) {
         R.string.settingsSwipeRight -> swipeRight
         R.string.settingsSwipeLeft -> swipeLeft

app/src/main/java/com/infomaniak/mail/data/LocalSettings.kt

@@ -21,6 +21,7 @@ import android.app.Application
 import android.content.Context
 import androidx.core.app.NotificationManagerCompat
 import androidx.work.WorkManager
+import com.infomaniak.lib.stores.StoresLocalSettings
 import com.infomaniak.mail.MainApplication
 import com.infomaniak.mail.data.LocalSettings
 import dagger.Module
@@ -61,4 +62,8 @@ object ApplicationModule {
     @Provides
     @Singleton
     fun providesLocalSettings(appContext: Context): LocalSettings = LocalSettings.getInstance(appContext)
+
+    @Provides
+    @Singleton
+    fun providesStoresLocalSettings(appContext: Context): StoresLocalSettings = StoresLocalSettings.getInstance(appContext)
 }

app/src/main/java/com/infomaniak/mail/di/ApplicationModule.kt

@@ -26,7 +26,6 @@ import android.view.ViewGroup
 import android.webkit.WebView
 import androidx.activity.addCallback
 import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
-import androidx.activity.result.contract.ActivityResultContracts.StartIntentSenderForResult
 import androidx.activity.viewModels
 import androidx.annotation.FloatRange
 import androidx.core.view.isVisible
@@ -48,13 +47,10 @@ import com.infomaniak.lib.stores.InAppUpdateManager
 import com.infomaniak.lib.stores.StoreUtils
 import com.infomaniak.lib.stores.StoreUtils.launchInAppReview
 import com.infomaniak.mail.BuildConfig
-import com.infomaniak.mail.MatomoMail.DISCOVER_LATER
-import com.infomaniak.mail.MatomoMail.DISCOVER_NOW
 import com.infomaniak.mail.MatomoMail.trackAppReviewEvent
 import com.infomaniak.mail.MatomoMail.trackDestination
 import com.infomaniak.mail.MatomoMail.trackEasterEggEvent
 import com.infomaniak.mail.MatomoMail.trackEvent
-import com.infomaniak.mail.MatomoMail.trackInAppUpdateEvent
 import com.infomaniak.mail.MatomoMail.trackMenuDrawerEvent
 import com.infomaniak.mail.R
 import com.infomaniak.mail.data.LocalSettings
@@ -123,12 +119,6 @@ class MainActivity : BaseActivity() {
         }
     }
 
-    private val inAppUpdateResultLauncher = registerForActivityResult(StartIntentSenderForResult()) { result ->
-        val isUserWantingUpdates = result.resultCode == RESULT_OK
-        localSettings.isUserWantingUpdates = isUserWantingUpdates
-        trackInAppUpdateEvent(if (isUserWantingUpdates) DISCOVER_NOW else DISCOVER_LATER)
-    }
-
     private val currentFragment
         get() = supportFragmentManager
             .findFragmentById(R.id.mainHostFragment)

app/src/main/java/com/infomaniak/mail/ui/MainActivity.kt

@@ -22,11 +22,11 @@ import android.view.View
 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.mail.MatomoMail.DISCOVER_LATER
 import com.infomaniak.mail.MatomoMail.DISCOVER_NOW
 import com.infomaniak.mail.MatomoMail.trackAppUpdateEvent
 import com.infomaniak.mail.R
-import com.infomaniak.mail.data.LocalSettings
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 import com.infomaniak.lib.core.R as RCore
@@ -35,7 +35,7 @@ import com.infomaniak.lib.core.R as RCore
 class UpdateAvailableBottomSheetDialog : InformationBottomSheetDialog() {
 
     @Inject
-    lateinit var localSettings: LocalSettings
+    lateinit var storesLocalSettings: StoresLocalSettings
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?): Unit = with(binding) {
         super.onViewCreated(view, savedInstanceState)
@@ -48,15 +48,15 @@ class UpdateAvailableBottomSheetDialog : InformationBottomSheetDialog() {
             trackAppUpdateEvent(DISCOVER_NOW)
             setText(RCore.string.buttonUpdate)
             setOnClickListener {
-                localSettings.isUserWantingUpdates = true
+                storesLocalSettings.isUserWantingUpdates = true
                 requireContext().goToPlayStore()
                 dismiss()
             }
         }
 
         secondaryActionButton.setOnClickListener {
             trackAppUpdateEvent(DISCOVER_LATER)
-            localSettings.isUserWantingUpdates = false
+            storesLocalSettings.isUserWantingUpdates = false
             dismiss()
         }
     }

app/src/main/java/com/infomaniak/mail/ui/bottomSheetDialogs/UpdateAvailableBottomSheetDialog.kt

@@ -23,6 +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.mail.data.LocalSettings
 import com.infomaniak.mail.data.cache.RealmDatabase
 import com.infomaniak.mail.data.cache.appSettings.AppSettingsController
@@ -41,6 +42,7 @@ class LogoutUser @Inject constructor(
     private val localSettings: LocalSettings,
     private val mailboxController: MailboxController,
     private val playServicesUtils: PlayServicesUtils,
+    private val storesLocalSettings: StoresLocalSettings,
     @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ) {
 
@@ -80,6 +82,7 @@ class LogoutUser @Inject constructor(
     private fun resetSettings() {
         AppSettingsController.removeAppSettings()
         localSettings.removeSettings()
+        storesLocalSettings.removeSettings()
         with(WorkManager.getInstance(appContext)) {
             cancelAllWork()
             pruneWork()

app/src/main/java/com/infomaniak/mail/utils/LogoutUser.kt

@@ -25,7 +25,7 @@ import androidx.work.WorkInfo.State
 import com.google.common.util.concurrent.ListenableFuture
 import com.infomaniak.lib.core.utils.SentryLog
 import com.infomaniak.lib.stores.StoreUtils
-import com.infomaniak.mail.data.LocalSettings
+import com.infomaniak.lib.stores.StoresLocalSettings
 import com.infomaniak.mail.di.IoDispatcher
 import com.infomaniak.mail.utils.PlayServicesUtils
 import dagger.assisted.Assisted
@@ -41,20 +41,20 @@ import javax.inject.Singleton
 class AppUpdateWorker @AssistedInject constructor(
     @Assisted appContext: Context,
     @Assisted params: WorkerParameters,
-    private val localSettings: LocalSettings,
+    private val storesLocalSettings: StoresLocalSettings,
 ) : ListenableWorker(appContext, params) {
 
     override fun startWork(): ListenableFuture<Result> {
         SentryLog.i(TAG, "Work started")
 
         return CallbackToFutureAdapter.getFuture { completer ->
 
-            localSettings.hasAppUpdateDownloaded = false
+            storesLocalSettings.hasAppUpdateDownloaded = false
             StoreUtils.installDownloadedUpdate(
                 onSuccess = { completer.setResult(Result.success()) },
                 onFailure = { exception ->
                     Sentry.captureException(exception)
-                    localSettings.resetUpdateSettings()
+                    storesLocalSettings.resetUpdateSettings()
                     completer.setResult(Result.failure())
                 },
             )
@@ -70,12 +70,12 @@ class AppUpdateWorker @AssistedInject constructor(
     class Scheduler @Inject constructor(
         private val playServicesUtils: PlayServicesUtils,
         private val workManager: WorkManager,
-        private val localSettings: LocalSettings,
+        private val storesLocalSettings: StoresLocalSettings,
         @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
     ) {
 
         suspend fun scheduleWorkIfNeeded() = withContext(ioDispatcher) {
-            if (playServicesUtils.areGooglePlayServicesAvailable() && localSettings.hasAppUpdateDownloaded) {
+            if (playServicesUtils.areGooglePlayServicesAvailable() && storesLocalSettings.hasAppUpdateDownloaded) {
                 SentryLog.d(TAG, "Work scheduled")
 
                 val workRequest = OneTimeWorkRequestBuilder<AppUpdateWorker>()