Merge pull request #1714 from Infomaniak/clean-code

Simplify error-prone usage of `canRefreshThreads`

Author: LunarX

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

@@ -241,8 +241,8 @@ class MainActivity : BaseActivity() {
 
     private fun observeDraftWorkerResults() {
         WorkerUtils.flushWorkersBefore(context = this, lifecycleOwner = this) {
-            val treatedWorkInfoUuids = mutableSetOf<UUID>()
 
+            val treatedWorkInfoUuids = mutableSetOf<UUID>()
             draftsActionsWorkerScheduler.getCompletedWorkInfoLiveData().observe(this) {
                 it.forEach { workInfo ->
                     if (!treatedWorkInfoUuids.add(workInfo.id)) return@forEach
@@ -255,7 +255,6 @@ class MainActivity : BaseActivity() {
             }
 
             val treatedFailedWorkInfoUuids = mutableSetOf<UUID>()
-
             draftsActionsWorkerScheduler.getFailedWorkInfoLiveData().observe(this) {
                 it.forEach { workInfo ->
                     if (!treatedFailedWorkInfoUuids.add(workInfo.id)) return@forEach

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

@@ -26,7 +26,6 @@ import com.infomaniak.lib.core.utils.SentryLog
 import com.infomaniak.lib.core.utils.SingleLiveEvent
 import com.infomaniak.mail.MatomoMail.trackMultiSelectionEvent
 import com.infomaniak.mail.R
-import com.infomaniak.mail.data.LocalSettings
 import com.infomaniak.mail.data.api.ApiRepository
 import com.infomaniak.mail.data.cache.RealmDatabase
 import com.infomaniak.mail.data.cache.mailboxContent.FolderController
@@ -80,7 +79,6 @@ class MainViewModel @Inject constructor(
     avatarMergedContactData: AvatarMergedContactData,
     private val addressBookController: AddressBookController,
     private val folderController: FolderController,
-    private val localSettings: LocalSettings,
     private val mailboxContentRealm: RealmDatabase.MailboxContent,
     private val mailboxController: MailboxController,
     private val mergedContactController: MergedContactController,

app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt

@@ -102,7 +102,7 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
 
     private val showLoadingTimer: CountDownTimer by lazy { Utils.createRefreshTimer(onTimerFinish = ::showRefreshLayout) }
 
-    private var canRefreshThreads = false
+    private var isFirstTimeRefreshingThreads = true
 
     @Inject
     lateinit var localSettings: LocalSettings
@@ -234,16 +234,20 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
         super.onResume()
         refreshThreadsIfNotificationsAreDisabled()
         updateSwipeActionsAccordingToSettings()
-        canRefreshThreads = true
     }
 
     private fun refreshThreadsIfNotificationsAreDisabled() = with(mainViewModel) {
-        val areGoogleServicesDisabled = !playServicesUtils.areGooglePlayServicesAvailable()
-        val areAppNotifsDisabled = !notificationManagerCompat.areNotificationsEnabled()
-        val areMailboxNotifsDisabled = currentMailbox.value?.notificationsIsDisabled(notificationManagerCompat) == true
-        val shouldRefreshThreads = areGoogleServicesDisabled || areAppNotifsDisabled || areMailboxNotifsDisabled
 
-        if (shouldRefreshThreads && canRefreshThreads) forceRefreshThreads()
+        if (!isFirstTimeRefreshingThreads) {
+            val areGoogleServicesDisabled = !playServicesUtils.areGooglePlayServicesAvailable()
+            val areAppNotifsDisabled = !notificationManagerCompat.areNotificationsEnabled()
+            val areMailboxNotifsDisabled = currentMailbox.value?.notificationsIsDisabled(notificationManagerCompat) == true
+            val shouldRefreshThreads = areGoogleServicesDisabled || areAppNotifsDisabled || areMailboxNotifsDisabled
+
+            if (shouldRefreshThreads) forceRefreshThreads()
+        }
+
+        isFirstTimeRefreshingThreads = false
     }
 
     private fun updateSwipeActionsAccordingToSettings() = with(binding.threadsList) {