Remove broadcastRefreshList

3 months ago · c9721790ce
parent 6f16a29fd7
commit c9721790ce
14 changed files with 21 additions and 28 deletions
--- a/app/src/main/java/com/todoroo/astrid/activity/MainActivityViewModel.kt
+++ b/app/src/main/java/com/todoroo/astrid/activity/MainActivityViewModel.kt
@ -91,8 +91,7 @@ class MainActivityViewModel @Inject constructor(
    private val refreshReceiver = object : BroadcastReceiver() {
        override fun onReceive(context: Context?, intent: Intent?) {
            when (intent?.action) {
-                LocalBroadcastManager.REFRESH,
-                LocalBroadcastManager.REFRESH_LIST -> _updateFilters.update { currentTimeMillis() }
+                LocalBroadcastManager.REFRESH -> _updateFilters.update { currentTimeMillis() }
            }
        }
    }
@ -216,12 +215,12 @@ class MainActivityViewModel @Inject constructor(
        when (subheader.subheaderType) {
            NavigationDrawerSubheader.SubheaderType.PREFERENCE -> {
                tasksPreferences.set(booleanPreferencesKey(subheader.id), collapsed)
-                localBroadcastManager.broadcastRefreshList()
+                localBroadcastManager.broadcastRefresh()
            }
            NavigationDrawerSubheader.SubheaderType.CALDAV,
            NavigationDrawerSubheader.SubheaderType.TASKS -> {
                caldavDao.setCollapsed(subheader.id, collapsed)
-                localBroadcastManager.broadcastRefreshList()
+                localBroadcastManager.broadcastRefresh()
            }
        }
    }
--- a/app/src/main/java/com/todoroo/astrid/adapter/SubheaderClickHandler.kt
+++ b/app/src/main/java/com/todoroo/astrid/adapter/SubheaderClickHandler.kt
@ -40,7 +40,7 @@ class SubheaderClickHandler @Inject constructor(
                CALDAV,
                TASKS -> caldavDao.setCollapsed(subheader.id, collapsed)
            }
-            localBroadcastManager.broadcastRefreshList()
+            localBroadcastManager.broadcastRefresh()
        }
    }

--- a/app/src/main/java/com/todoroo/astrid/alarms/AlarmService.kt
+++ b/app/src/main/java/com/todoroo/astrid/alarms/AlarmService.kt
@ -54,7 +54,7 @@ class AlarmService @Inject constructor(
            changed = true
        }
        if (changed) {
-            localBroadcastManager.broadcastRefreshList()
+            localBroadcastManager.broadcastRefresh()
        }
        return changed
    }
--- a/app/src/main/java/com/todoroo/astrid/gtasks/GtasksListService.kt
+++ b/app/src/main/java/com/todoroo/astrid/gtasks/GtasksListService.kt
@ -55,6 +55,6 @@ class GtasksListService @Inject constructor(
        for (listId in previousLists) {
            taskDeleter.delete(caldavDao.getCalendarById(listId)!!)
        }
-        localBroadcastManager.broadcastRefreshList()
+        localBroadcastManager.broadcastRefresh()
    }
 }
--- a/app/src/main/java/com/todoroo/astrid/service/TaskDeleter.kt
+++ b/app/src/main/java/com/todoroo/astrid/service/TaskDeleter.kt
@ -72,7 +72,7 @@ class TaskDeleter @Inject constructor(
            caldavCalendar = list,
            cleanup = { cleanup(it) }
        )
-        localBroadcastManager.broadcastRefreshList()
+        localBroadcastManager.broadcastRefresh()
    }

    suspend fun delete(account: CaldavAccount) {
@ -81,7 +81,7 @@ class TaskDeleter @Inject constructor(
            caldavAccount = account,
            cleanup = { cleanup(it) }
        )
-        localBroadcastManager.broadcastRefreshList()
+        localBroadcastManager.broadcastRefresh()
    }

    private suspend fun cleanup(tasks: List<Long>) {
--- a/app/src/main/java/org/tasks/LocalBroadcastManager.kt
+++ b/app/src/main/java/org/tasks/LocalBroadcastManager.kt
@ -23,7 +23,6 @@ class LocalBroadcastManager @Inject constructor(
    fun registerRefreshListReceiver(broadcastReceiver: BroadcastReceiver?) {
        val intentFilter = IntentFilter()
        intentFilter.addAction(REFRESH)
-        intentFilter.addAction(REFRESH_LIST)
        localBroadcastManager.registerReceiver(broadcastReceiver!!, intentFilter)
    }

@ -47,10 +46,6 @@ class LocalBroadcastManager @Inject constructor(
        appWidgetManager.updateWidgets()
    }

-    fun broadcastRefreshList() {
-        localBroadcastManager.sendBroadcast(Intent(REFRESH_LIST))
-    }
-
    fun broadcastPreferenceRefresh() {
        localBroadcastManager.sendBroadcast(Intent(REFRESH_PREFERENCES))
    }
@ -80,7 +75,6 @@ class LocalBroadcastManager @Inject constructor(

    companion object {
        const val REFRESH = "${BuildConfig.APPLICATION_ID}.REFRESH"
-        const val REFRESH_LIST = "${BuildConfig.APPLICATION_ID}.REFRESH_LIST"
        private const val TASK_COMPLETED = "${BuildConfig.APPLICATION_ID}.REPEAT"
        private const val REFRESH_PURCHASES = "${BuildConfig.APPLICATION_ID}.REFRESH_PURCHASES"
        private const val REFRESH_PREFERENCES = "${BuildConfig.APPLICATION_ID}.REFRESH_PREFERENCES"
--- a/app/src/main/java/org/tasks/activities/NavigationDrawerCustomization.kt
+++ b/app/src/main/java/org/tasks/activities/NavigationDrawerCustomization.kt
@ -140,7 +140,7 @@ class NavigationDrawerCustomization : ThemedInjectingAppCompatActivity(), Toolba
    private inner class RefreshReceiver : BroadcastReceiver() {
        override fun onReceive(context: Context, intent: Intent?) {
            val action = intent?.action
-            if (LocalBroadcastManager.REFRESH == action || LocalBroadcastManager.REFRESH_LIST == action) {
+            if (LocalBroadcastManager.REFRESH == action) {
                updateFilters()
            }
        }
--- a/app/src/main/java/org/tasks/activities/PlaceSettingsActivity.kt
+++ b/app/src/main/java/org/tasks/activities/PlaceSettingsActivity.kt
@ -190,7 +190,7 @@ class PlaceSettingsActivity : BaseListSettingsActivity(),
        locationDao.deleteGeofencesByPlace(place.uid!!)
        locationDao.delete(place)
        setResult(Activity.RESULT_OK, Intent(TaskListFragment.ACTION_DELETED))
-        localBroadcastManager.broadcastRefreshList()
+        localBroadcastManager.broadcastRefresh()
        finish()
    }

--- a/app/src/main/java/org/tasks/caldav/CaldavSynchronizer.kt
+++ b/app/src/main/java/org/tasks/caldav/CaldavSynchronizer.kt
@ -188,7 +188,7 @@ class CaldavSynchronizer @Inject constructor(
                    icon = icon ?: calendar.icon,
                )
                caldavDao.update(calendar)
-                localBroadcastManager.broadcastRefreshList()
+                localBroadcastManager.broadcastRefresh()
            }
            resource
                .principals(account, calendar)
@ -220,7 +220,7 @@ class CaldavSynchronizer @Inject constructor(
        }
        account.error = message
        caldavDao.update(account)
-        localBroadcastManager.broadcastRefreshList()
+        localBroadcastManager.broadcastRefresh()
        if (!isNullOrEmpty(message)) {
            Timber.e(message)
        }
--- a/app/src/main/java/org/tasks/dialogs/FilterPickerViewModel.kt
+++ b/app/src/main/java/org/tasks/dialogs/FilterPickerViewModel.kt
@ -86,7 +86,7 @@ class FilterPickerViewModel @Inject constructor(

            else -> throw IllegalStateException()
        }
-        localBroadcastManager.broadcastRefreshList()
+        localBroadcastManager.broadcastRefresh()
    }

    fun getIcon(filter: Filter): String? = filter.getIcon(inventory)
--- a/app/src/main/java/org/tasks/etebase/EtebaseSynchronizer.kt
+++ b/app/src/main/java/org/tasks/etebase/EtebaseSynchronizer.kt
@ -98,7 +98,7 @@ class EtebaseSynchronizer @Inject constructor(
                calendar.name = meta.name
                calendar.color = color
                caldavDao.update(calendar)
-                localBroadcastManager.broadcastRefreshList()
+                localBroadcastManager.broadcastRefresh()
            }
            fetchChanges(account, client, calendar, collection)
            pushLocalChanges(account, client, calendar, collection)
@ -112,7 +112,7 @@ class EtebaseSynchronizer @Inject constructor(
    private suspend fun setError(account: CaldavAccount, message: String?) {
        account.error = message
        caldavDao.update(account)
-        localBroadcastManager.broadcastRefreshList()
+        localBroadcastManager.broadcastRefresh()
        if (!isNullOrEmpty(message)) {
            Timber.e(message)
        }
--- a/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.kt
+++ b/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.kt
@ -94,7 +94,7 @@ class GoogleTaskSynchronizer @Inject constructor(
            firebase.reportException(e)
        } finally {
            caldavDao.update(account)
-            localBroadcastManager.broadcastRefreshList()
+            localBroadcastManager.broadcastRefresh()
            Timber.d("%s: end sync", account)
        }
    }
--- a/app/src/main/java/org/tasks/opentasks/OpenTasksSynchronizer.kt
+++ b/app/src/main/java/org/tasks/opentasks/OpenTasksSynchronizer.kt
@ -111,7 +111,7 @@ class OpenTasksSynchronizer @Inject constructor(
        if (local.id == NO_ID) {
            caldavDao.insert(local)
            Timber.d("Created calendar: $local")
-            localBroadcastManager.broadcastRefreshList()
+            localBroadcastManager.broadcastRefresh()
        } else if (
            local.name != remote.name ||
            local.color != remote.color ||
@ -122,7 +122,7 @@ class OpenTasksSynchronizer @Inject constructor(
            local.access = remote.access
            caldavDao.update(local)
            Timber.d("Updated calendar: $local")
-            localBroadcastManager.broadcastRefreshList()
+            localBroadcastManager.broadcastRefresh()
        }
        return local
    }
@ -202,7 +202,7 @@ class OpenTasksSynchronizer @Inject constructor(
    private suspend fun setError(account: CaldavAccount, message: String?) {
        account.error = message
        caldavDao.update(account)
-        localBroadcastManager.broadcastRefreshList()
+        localBroadcastManager.broadcastRefresh()
        if (!message.isNullOrBlank()) {
            Timber.e(message)
        }
--- a/app/src/main/java/org/tasks/sync/microsoft/MicrosoftSynchronizer.kt
+++ b/app/src/main/java/org/tasks/sync/microsoft/MicrosoftSynchronizer.kt
@ -130,7 +130,7 @@ class MicrosoftSynchronizer @Inject constructor(
            } else if (local.name != remoteName || local.access != access) {
                remote.applyTo(local)
                caldavDao.update(local)
-                localBroadcastManager.broadcastRefreshList()
+                localBroadcastManager.broadcastRefresh()
            }
            if (local.ctag?.isNotBlank() == true) {
                deltaSync(account, local, remote, microsoft)
@ -488,7 +488,7 @@ class MicrosoftSynchronizer @Inject constructor(
    private suspend fun setError(account: CaldavAccount, message: String?) {
        account.error = message
        caldavDao.update(account)
-        localBroadcastManager.broadcastRefreshList()
+        localBroadcastManager.broadcastRefresh()
        if (!isNullOrEmpty(message)) {
            Timber.e(message)
        }