Skip to content

Commit d3fce7a

Browse files
Simplify error-prone usage of canRefreshThreads
1 parent c592226 commit d3fce7a

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

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

+10-6
Original file line numberDiff line numberDiff line change
@@ -234,16 +234,20 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
234234
super.onResume()
235235
refreshThreadsIfNotificationsAreDisabled()
236236
updateSwipeActionsAccordingToSettings()
237-
canRefreshThreads = true
238237
}
239238

240239
private fun refreshThreadsIfNotificationsAreDisabled() = with(mainViewModel) {
241-
val areGoogleServicesDisabled = !playServicesUtils.areGooglePlayServicesAvailable()
242-
val areAppNotifsDisabled = !notificationManagerCompat.areNotificationsEnabled()
243-
val areMailboxNotifsDisabled = currentMailbox.value?.notificationsIsDisabled(notificationManagerCompat) == true
244-
val shouldRefreshThreads = areGoogleServicesDisabled || areAppNotifsDisabled || areMailboxNotifsDisabled
245240

246-
if (shouldRefreshThreads && canRefreshThreads) forceRefreshThreads()
241+
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
246+
247+
if (shouldRefreshThreads) forceRefreshThreads()
248+
}
249+
250+
canRefreshThreads = true
247251
}
248252

249253
private fun updateSwipeActionsAccordingToSettings() = with(binding.threadsList) {

0 commit comments

Comments
 (0)