Skip to content

Commit 22303d2

Browse files
Remove observerDraftsActionsCompletedWorks() in ThreadList since its already done in MainActivity
1 parent 69a2876 commit 22303d2

File tree

1 file changed

+4
-24
lines changed

1 file changed

+4
-24
lines changed

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

+4-24
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,8 @@ import com.infomaniak.mail.utils.RealmChangesBinding.Companion.bindResultsChange
7575
import com.infomaniak.mail.utils.UiUtils.formatUnreadCount
7676
import com.infomaniak.mail.utils.Utils.isPermanentDeleteFolder
7777
import com.infomaniak.mail.utils.Utils.runCatchingRealm
78-
import com.infomaniak.mail.utils.WorkerUtils
7978
import com.infomaniak.mail.utils.extensions.*
80-
import com.infomaniak.mail.workers.DraftsActionsWorker
8179
import dagger.hilt.android.AndroidEntryPoint
82-
import io.realm.kotlin.ext.isValid
8380
import io.sentry.Sentry
8481
import io.sentry.SentryLevel
8582
import java.util.Date
@@ -107,9 +104,6 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
107104
@Inject
108105
lateinit var localSettings: LocalSettings
109106

110-
@Inject
111-
lateinit var draftsActionsWorkerScheduler: DraftsActionsWorker.Scheduler
112-
113107
@Inject
114108
lateinit var notificationManagerCompat: NotificationManagerCompat
115109

@@ -163,7 +157,6 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
163157
observeCurrentFolder()
164158
observeCurrentFolderLive()
165159
observeUpdatedAtTriggers()
166-
observerDraftsActionsCompletedWorks()
167160
observeFlushFolderTrigger()
168161
observeUpdateInstall()
169162
}.getOrDefault(Unit)
@@ -239,10 +232,10 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
239232
private fun refreshThreadsIfNotificationsAreDisabled() = with(mainViewModel) {
240233

241234
if (canRefreshThreads) {
242-
val areGoogleServicesDisabled = !playServicesUtils.areGooglePlayServicesAvailable()
243-
val areAppNotifsDisabled = !notificationManagerCompat.areNotificationsEnabled()
244-
val areMailboxNotifsDisabled = currentMailbox.value?.notificationsIsDisabled(notificationManagerCompat) == true
245-
val shouldRefreshThreads = areGoogleServicesDisabled || areAppNotifsDisabled || areMailboxNotifsDisabled
235+
val areGoogleServicesDisabled = !playServicesUtils.areGooglePlayServicesAvailable()
236+
val areAppNotifsDisabled = !notificationManagerCompat.areNotificationsEnabled()
237+
val areMailboxNotifsDisabled = currentMailbox.value?.notificationsIsDisabled(notificationManagerCompat) == true
238+
val shouldRefreshThreads = areGoogleServicesDisabled || areAppNotifsDisabled || areMailboxNotifsDisabled
246239

247240
if (shouldRefreshThreads) forceRefreshThreads()
248241
}
@@ -617,19 +610,6 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
617610
threadListViewModel.updatedAtTrigger.observe(viewLifecycleOwner) { updateUpdatedAt() }
618611
}
619612

620-
private fun observerDraftsActionsCompletedWorks() {
621-
622-
fun observeDraftsActions() {
623-
draftsActionsWorkerScheduler.getCompletedWorkInfoLiveData().observe(viewLifecycleOwner) {
624-
mainViewModel.currentFolder.value?.let { folder ->
625-
if (folder.isValid() && folder.role == FolderRole.DRAFT) mainViewModel.forceRefreshThreads()
626-
}
627-
}
628-
}
629-
630-
WorkerUtils.flushWorkersBefore(requireContext(), viewLifecycleOwner, ::observeDraftsActions)
631-
}
632-
633613
private fun observeFlushFolderTrigger() {
634614
mainViewModel.flushFolderTrigger.observe(viewLifecycleOwner) { descriptionDialog.resetLoadingAndDismiss() }
635615
}

0 commit comments

Comments
 (0)