Merge pull request #1621 from Infomaniak/Add-logs-to-inAppUpdate

Try to fix update bug + add lots of logs for debug
Infomaniak · Jan 4, 2024 · 5fe7242 · 5fe7242
2 parents 41015d1 + 3784046
commit 5fe7242
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/Core b/Core
diff --git a/app/src/main/java/com/infomaniak/mail/data/LocalSettings.kt b/app/src/main/java/com/infomaniak/mail/data/LocalSettings.kt
@@ -27,6 +27,7 @@ import com.infomaniak.lib.core.utils.SentryLog
 import com.infomaniak.lib.core.utils.SharedValue.sharedValue
 import com.infomaniak.lib.core.utils.SharedValue.sharedValueNullable
 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
@@ -71,6 +72,7 @@ class LocalSettings private constructor(context: Context) {
     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
     }

diff --git a/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
@@ -25,6 +25,7 @@ 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,11 +1024,16 @@ class MainViewModel @Inject constructor(
     }
 
     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
     }

diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
@@ -50,6 +50,7 @@ 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.mail.MatomoMail.trackEvent
 import com.infomaniak.mail.MatomoMail.trackMenuDrawerEvent
 import com.infomaniak.mail.MatomoMail.trackMultiSelectionEvent
@@ -566,13 +567,15 @@ class ThreadListFragment : Fragment(), SwipeRefreshLayout.OnRefreshListener {
 
     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")
                 trackEvent("inAppUpdate", "installUpdate")
                 mainViewModel.canInstallUpdate.value = false
+                localSettings.hasAppUpdateDownloaded = false
 
                 StoreUtils.installDownloadedUpdate(
-                    onSuccess = { localSettings.hasAppUpdateDownloaded = false },
                     onFailure = {
                         Sentry.captureException(it)
                         localSettings.resetUpdateSettings()
+2 −0		Stores/src/fdroid/java/com.infomaniak.lib.stores/StoreUtils.kt
+8 −8		Stores/src/standard/java/com.infomaniak.lib.stores/StoreUtils.kt