refactor(InAppUpdate): Use new Manager

Author: FabianDevel

Core

@@ -0,0 +1,52 @@
+/*
+ * Infomaniak Mail - Android
+ * Copyright (C) 2024 Infomaniak Network SA
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.infomaniak.mail.di
+
+import androidx.fragment.app.FragmentActivity
+import com.infomaniak.lib.stores.InAppUpdateManager
+import com.infomaniak.mail.BuildConfig
+import com.infomaniak.mail.MatomoMail.DISCOVER_LATER
+import com.infomaniak.mail.MatomoMail.DISCOVER_NOW
+import com.infomaniak.mail.MatomoMail.trackInAppUpdateEvent
+import com.infomaniak.mail.ui.main.SnackbarManager
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ActivityComponent
+import dagger.hilt.android.scopes.ActivityScoped
+import io.sentry.Sentry
+import com.infomaniak.lib.core.R as RCore
+
+@Module
+@InstallIn(ActivityComponent::class)
+object ActivityModule {
+
+    @ActivityScoped
+    @Provides
+    fun provideInAppUpdateManager(activity: FragmentActivity, snackbarManager: SnackbarManager) = InAppUpdateManager(
+        activity = activity,
+        appId = BuildConfig.APPLICATION_ID,
+        versionCode = BuildConfig.VERSION_CODE,
+        onUserChoice = { isWantingUpdate -> activity.trackInAppUpdateEvent(if (isWantingUpdate) DISCOVER_NOW else DISCOVER_LATER) },
+        onInstallStart = { activity.trackInAppUpdateEvent("installUpdate") },
+        onInstallFailure = {
+            Sentry.captureException(it)
+            snackbarManager.setValue(activity.getString(RCore.string.errorUpdateInstall))
+        },
+    )
+}

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

@@ -40,16 +40,13 @@ import androidx.navigation.fragment.NavHostFragment
 import androidx.work.Data
 import com.infomaniak.lib.core.MatomoCore.TrackerAction
 import com.infomaniak.lib.core.networking.LiveDataNetworkStatus
-import com.infomaniak.lib.core.utils.SentryLog
+import com.infomaniak.lib.core.utils.*
 import com.infomaniak.lib.core.utils.Utils
 import com.infomaniak.lib.core.utils.Utils.toEnumOrThrow
 import com.infomaniak.lib.core.utils.UtilsUi.openUrl
-import com.infomaniak.lib.core.utils.hasPermissions
-import com.infomaniak.lib.core.utils.year
-import com.infomaniak.lib.stores.StoreUtils.checkUpdateIsAvailable
-import com.infomaniak.lib.stores.StoreUtils.initAppUpdateManager
+import com.infomaniak.lib.stores.InAppUpdateManager
+import com.infomaniak.lib.stores.StoreUtils
 import com.infomaniak.lib.stores.StoreUtils.launchInAppReview
-import com.infomaniak.lib.stores.StoreUtils.unregisterAppUpdateListener
 import com.infomaniak.mail.BuildConfig
 import com.infomaniak.mail.MatomoMail.DISCOVER_LATER
 import com.infomaniak.mail.MatomoMail.DISCOVER_NOW
@@ -156,6 +153,9 @@ class MainActivity : BaseActivity() {
     @Inject
     lateinit var snackbarManager: SnackbarManager
 
+    @Inject
+    lateinit var inAppUpdateManager: InAppUpdateManager
+
     private val drawerListener = object : DrawerLayout.DrawerListener {
 
         var hasDragged = false
@@ -347,14 +347,12 @@ class MainActivity : BaseActivity() {
             appReviewLaunches--
         }
 
-        showUpdateAvailable()
         showSyncDiscovery()
     }
 
     override fun onResume() {
         super.onResume()
         playServicesUtils.checkPlayServices(this)
-        mainViewModel.checkAppUpdateStatus()
         if (binding.drawerLayout.isOpen) colorSystemBarsWithMenuDrawer(UiUtils.FULLY_SLID)
     }
 
@@ -387,7 +385,6 @@ class MainActivity : BaseActivity() {
 
     override fun onStop() {
         descriptionDialog.resetLoadingAndDismiss()
-        unregisterAppUpdateListener()
         super.onStop()
     }
 
@@ -466,28 +463,17 @@ class MainActivity : BaseActivity() {
         }
     }
 
-    private fun initAppUpdateManager() {
-        initAppUpdateManager(
-            context = this,
-            onUpdateDownloaded = { mainViewModel.toggleAppUpdateStatus(isUpdateDownloaded = true) },
-            onUpdateInstalled = {
-                Sentry.captureMessage("InstallStateUpdateListener called ’state == INSTALLED’", SentryLevel.DEBUG)
-                mainViewModel.toggleAppUpdateStatus(isUpdateDownloaded = false)
-            },
-        )
-    }
+    private fun initAppUpdateManager() = with(inAppUpdateManager) {
+        onFDroidResult = { updateIsAvailable ->
+            if (updateIsAvailable) navController.navigate(R.id.updateAvailableBottomSheetDialog)
+        }
 
-    private fun showUpdateAvailable() = with(localSettings) {
-        if (isUserWantingUpdates || (appLaunches != 0 && appLaunches % 10 == 0)) {
-            checkUpdateIsAvailable(
-                appId = BuildConfig.APPLICATION_ID,
-                versionCode = BuildConfig.VERSION_CODE,
-                inAppResultLauncher = inAppUpdateResultLauncher,
-                onFDroidResult = { updateIsAvailable ->
-                    if (updateIsAvailable) navController.navigate(R.id.updateAvailableBottomSheetDialog)
-                },
-            )
+        onInAppUpdateUiChange = { isUpdateDownloaded ->
+            SentryLog.d(StoreUtils.APP_UPDATE_TAG, "Must display update button : $isUpdateDownloaded")
+            mainViewModel.canInstallUpdate.value = isUpdateDownloaded
         }
+
+        lifecycle.addObserver(observer = this)
     }
 
     private fun showSyncDiscovery() = with(localSettings) {

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

@@ -24,8 +24,6 @@ import com.infomaniak.lib.core.utils.ApiErrorCode.Companion.translateError
 import com.infomaniak.lib.core.utils.DownloadManagerUtils
 import com.infomaniak.lib.core.utils.SentryLog
 import com.infomaniak.lib.core.utils.SingleLiveEvent
-import com.infomaniak.lib.stores.StoreUtils
-import com.infomaniak.lib.stores.StoreUtils.APP_UPDATE_TAG
 import com.infomaniak.mail.MatomoMail.trackMultiSelectionEvent
 import com.infomaniak.mail.R
 import com.infomaniak.mail.data.LocalSettings
@@ -1023,21 +1021,6 @@ class MainViewModel @Inject constructor(
         snackbarManager.postValue(context.getString(snackbarTitleRes))
     }
 
-    fun checkAppUpdateStatus() {
-        SentryLog.d(
-            tag = APP_UPDATE_TAG,
-            msg = "Setting canInstallUpdate value to ${localSettings.hasAppUpdateDownloaded} in checkAppUpdateStatus",
-        )
-        canInstallUpdate.value = localSettings.hasAppUpdateDownloaded
-        StoreUtils.checkStalledUpdate()
-    }
-
-    fun toggleAppUpdateStatus(isUpdateDownloaded: Boolean) {
-        SentryLog.d(APP_UPDATE_TAG, "Setting canInstallUpdate value to $isUpdateDownloaded in toggleAppUpdateStatus")
-        canInstallUpdate.value = isUpdateDownloaded
-        localSettings.hasAppUpdateDownloaded = isUpdateDownloaded
-    }
-
     companion object {
         private val TAG: String = MainViewModel::class.java.simpleName
         private val DEFAULT_SELECTED_FOLDER = FolderRole.INBOX

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

@@ -47,10 +47,8 @@ import com.ernestoyaquello.dragdropswiperecyclerview.listener.OnListScrollListen
 import com.infomaniak.lib.core.MatomoCore.TrackerAction
 import com.infomaniak.lib.core.utils.*
 import com.infomaniak.lib.core.utils.Utils
-import com.infomaniak.lib.stores.StoreUtils
-import com.infomaniak.lib.stores.StoreUtils.APP_UPDATE_TAG
+import com.infomaniak.lib.stores.InAppUpdateManager
 import com.infomaniak.mail.MatomoMail.trackEvent
-import com.infomaniak.mail.MatomoMail.trackInAppUpdateEvent
 import com.infomaniak.mail.MatomoMail.trackMenuDrawerEvent
 import com.infomaniak.mail.MatomoMail.trackMultiSelectionEvent
 import com.infomaniak.mail.MatomoMail.trackNewMessageEvent
@@ -101,6 +99,10 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
     private var lastUpdatedDate: Date? = null
     private var previousCustomFolderId: String? = null
 
+    private val showLoadingTimer: CountDownTimer by lazy { Utils.createRefreshTimer(onTimerFinish = ::showRefreshLayout) }
+
+    private var canRefreshThreads = false
+
     @Inject
     lateinit var localSettings: LocalSettings
 
@@ -113,16 +115,15 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
     @Inject
     lateinit var playServicesUtils: PlayServicesUtils
 
-    private val showLoadingTimer: CountDownTimer by lazy { Utils.createRefreshTimer(onTimerFinish = ::showRefreshLayout) }
-
-    private var canRefreshThreads = false
-
     @Inject
     lateinit var descriptionDialog: DescriptionAlertDialog
 
     @Inject
     lateinit var snackbarManager: SnackbarManager
 
+    @Inject
+    lateinit var inAppUpdateManager: InAppUpdateManager
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         return FragmentThreadListBinding.inflate(inflater, container, false).also { _binding = it }.root
     }
@@ -623,23 +624,8 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
 
     private fun observeUpdateInstall() = with(binding) {
         mainViewModel.canInstallUpdate.observe(viewLifecycleOwner) { isUpdateDownloaded ->
-            SentryLog.d(APP_UPDATE_TAG, "Must display update button : $isUpdateDownloaded")
             installUpdateGroup.isVisible = isUpdateDownloaded
-            installUpdate.setOnClickListener {
-                SentryLog.d(APP_UPDATE_TAG, "Install downloaded Update from button")
-                context.trackInAppUpdateEvent("installUpdate")
-                mainViewModel.canInstallUpdate.value = false
-                localSettings.hasAppUpdateDownloaded = false
-
-                StoreUtils.installDownloadedUpdate(
-                    onFailure = {
-                        Sentry.captureException(it)
-                        localSettings.resetUpdateSettings()
-
-                        snackbarManager.setValue(getString(RCore.string.errorUpdateInstall))
-                    },
-                )
-            }
+            installUpdate.setOnClickListener { inAppUpdateManager.installDownloadedUpdate() }
         }
     }