Remove broadcastRefreshList

pull/3881/head
Alex Baker 3 months ago
parent 6f16a29fd7
commit c9721790ce

@ -91,8 +91,7 @@ class MainActivityViewModel @Inject constructor(
private val refreshReceiver = object : BroadcastReceiver() { private val refreshReceiver = object : BroadcastReceiver() {
override fun onReceive(context: Context?, intent: Intent?) { override fun onReceive(context: Context?, intent: Intent?) {
when (intent?.action) { when (intent?.action) {
LocalBroadcastManager.REFRESH, LocalBroadcastManager.REFRESH -> _updateFilters.update { currentTimeMillis() }
LocalBroadcastManager.REFRESH_LIST -> _updateFilters.update { currentTimeMillis() }
} }
} }
} }
@ -216,12 +215,12 @@ class MainActivityViewModel @Inject constructor(
when (subheader.subheaderType) { when (subheader.subheaderType) {
NavigationDrawerSubheader.SubheaderType.PREFERENCE -> { NavigationDrawerSubheader.SubheaderType.PREFERENCE -> {
tasksPreferences.set(booleanPreferencesKey(subheader.id), collapsed) tasksPreferences.set(booleanPreferencesKey(subheader.id), collapsed)
localBroadcastManager.broadcastRefreshList() localBroadcastManager.broadcastRefresh()
} }
NavigationDrawerSubheader.SubheaderType.CALDAV, NavigationDrawerSubheader.SubheaderType.CALDAV,
NavigationDrawerSubheader.SubheaderType.TASKS -> { NavigationDrawerSubheader.SubheaderType.TASKS -> {
caldavDao.setCollapsed(subheader.id, collapsed) caldavDao.setCollapsed(subheader.id, collapsed)
localBroadcastManager.broadcastRefreshList() localBroadcastManager.broadcastRefresh()
} }
} }
} }

@ -40,7 +40,7 @@ class SubheaderClickHandler @Inject constructor(
CALDAV, CALDAV,
TASKS -> caldavDao.setCollapsed(subheader.id, collapsed) TASKS -> caldavDao.setCollapsed(subheader.id, collapsed)
} }
localBroadcastManager.broadcastRefreshList() localBroadcastManager.broadcastRefresh()
} }
} }

@ -54,7 +54,7 @@ class AlarmService @Inject constructor(
changed = true changed = true
} }
if (changed) { if (changed) {
localBroadcastManager.broadcastRefreshList() localBroadcastManager.broadcastRefresh()
} }
return changed return changed
} }

@ -55,6 +55,6 @@ class GtasksListService @Inject constructor(
for (listId in previousLists) { for (listId in previousLists) {
taskDeleter.delete(caldavDao.getCalendarById(listId)!!) taskDeleter.delete(caldavDao.getCalendarById(listId)!!)
} }
localBroadcastManager.broadcastRefreshList() localBroadcastManager.broadcastRefresh()
} }
} }

@ -72,7 +72,7 @@ class TaskDeleter @Inject constructor(
caldavCalendar = list, caldavCalendar = list,
cleanup = { cleanup(it) } cleanup = { cleanup(it) }
) )
localBroadcastManager.broadcastRefreshList() localBroadcastManager.broadcastRefresh()
} }
suspend fun delete(account: CaldavAccount) { suspend fun delete(account: CaldavAccount) {
@ -81,7 +81,7 @@ class TaskDeleter @Inject constructor(
caldavAccount = account, caldavAccount = account,
cleanup = { cleanup(it) } cleanup = { cleanup(it) }
) )
localBroadcastManager.broadcastRefreshList() localBroadcastManager.broadcastRefresh()
} }
private suspend fun cleanup(tasks: List<Long>) { private suspend fun cleanup(tasks: List<Long>) {

@ -23,7 +23,6 @@ class LocalBroadcastManager @Inject constructor(
fun registerRefreshListReceiver(broadcastReceiver: BroadcastReceiver?) { fun registerRefreshListReceiver(broadcastReceiver: BroadcastReceiver?) {
val intentFilter = IntentFilter() val intentFilter = IntentFilter()
intentFilter.addAction(REFRESH) intentFilter.addAction(REFRESH)
intentFilter.addAction(REFRESH_LIST)
localBroadcastManager.registerReceiver(broadcastReceiver!!, intentFilter) localBroadcastManager.registerReceiver(broadcastReceiver!!, intentFilter)
} }
@ -47,10 +46,6 @@ class LocalBroadcastManager @Inject constructor(
appWidgetManager.updateWidgets() appWidgetManager.updateWidgets()
} }
fun broadcastRefreshList() {
localBroadcastManager.sendBroadcast(Intent(REFRESH_LIST))
}
fun broadcastPreferenceRefresh() { fun broadcastPreferenceRefresh() {
localBroadcastManager.sendBroadcast(Intent(REFRESH_PREFERENCES)) localBroadcastManager.sendBroadcast(Intent(REFRESH_PREFERENCES))
} }
@ -80,7 +75,6 @@ class LocalBroadcastManager @Inject constructor(
companion object { companion object {
const val REFRESH = "${BuildConfig.APPLICATION_ID}.REFRESH" 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 TASK_COMPLETED = "${BuildConfig.APPLICATION_ID}.REPEAT"
private const val REFRESH_PURCHASES = "${BuildConfig.APPLICATION_ID}.REFRESH_PURCHASES" private const val REFRESH_PURCHASES = "${BuildConfig.APPLICATION_ID}.REFRESH_PURCHASES"
private const val REFRESH_PREFERENCES = "${BuildConfig.APPLICATION_ID}.REFRESH_PREFERENCES" private const val REFRESH_PREFERENCES = "${BuildConfig.APPLICATION_ID}.REFRESH_PREFERENCES"

@ -140,7 +140,7 @@ class NavigationDrawerCustomization : ThemedInjectingAppCompatActivity(), Toolba
private inner class RefreshReceiver : BroadcastReceiver() { private inner class RefreshReceiver : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent?) { override fun onReceive(context: Context, intent: Intent?) {
val action = intent?.action val action = intent?.action
if (LocalBroadcastManager.REFRESH == action || LocalBroadcastManager.REFRESH_LIST == action) { if (LocalBroadcastManager.REFRESH == action) {
updateFilters() updateFilters()
} }
} }

@ -190,7 +190,7 @@ class PlaceSettingsActivity : BaseListSettingsActivity(),
locationDao.deleteGeofencesByPlace(place.uid!!) locationDao.deleteGeofencesByPlace(place.uid!!)
locationDao.delete(place) locationDao.delete(place)
setResult(Activity.RESULT_OK, Intent(TaskListFragment.ACTION_DELETED)) setResult(Activity.RESULT_OK, Intent(TaskListFragment.ACTION_DELETED))
localBroadcastManager.broadcastRefreshList() localBroadcastManager.broadcastRefresh()
finish() finish()
} }

@ -188,7 +188,7 @@ class CaldavSynchronizer @Inject constructor(
icon = icon ?: calendar.icon, icon = icon ?: calendar.icon,
) )
caldavDao.update(calendar) caldavDao.update(calendar)
localBroadcastManager.broadcastRefreshList() localBroadcastManager.broadcastRefresh()
} }
resource resource
.principals(account, calendar) .principals(account, calendar)
@ -220,7 +220,7 @@ class CaldavSynchronizer @Inject constructor(
} }
account.error = message account.error = message
caldavDao.update(account) caldavDao.update(account)
localBroadcastManager.broadcastRefreshList() localBroadcastManager.broadcastRefresh()
if (!isNullOrEmpty(message)) { if (!isNullOrEmpty(message)) {
Timber.e(message) Timber.e(message)
} }

@ -86,7 +86,7 @@ class FilterPickerViewModel @Inject constructor(
else -> throw IllegalStateException() else -> throw IllegalStateException()
} }
localBroadcastManager.broadcastRefreshList() localBroadcastManager.broadcastRefresh()
} }
fun getIcon(filter: Filter): String? = filter.getIcon(inventory) fun getIcon(filter: Filter): String? = filter.getIcon(inventory)

@ -98,7 +98,7 @@ class EtebaseSynchronizer @Inject constructor(
calendar.name = meta.name calendar.name = meta.name
calendar.color = color calendar.color = color
caldavDao.update(calendar) caldavDao.update(calendar)
localBroadcastManager.broadcastRefreshList() localBroadcastManager.broadcastRefresh()
} }
fetchChanges(account, client, calendar, collection) fetchChanges(account, client, calendar, collection)
pushLocalChanges(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?) { private suspend fun setError(account: CaldavAccount, message: String?) {
account.error = message account.error = message
caldavDao.update(account) caldavDao.update(account)
localBroadcastManager.broadcastRefreshList() localBroadcastManager.broadcastRefresh()
if (!isNullOrEmpty(message)) { if (!isNullOrEmpty(message)) {
Timber.e(message) Timber.e(message)
} }

@ -94,7 +94,7 @@ class GoogleTaskSynchronizer @Inject constructor(
firebase.reportException(e) firebase.reportException(e)
} finally { } finally {
caldavDao.update(account) caldavDao.update(account)
localBroadcastManager.broadcastRefreshList() localBroadcastManager.broadcastRefresh()
Timber.d("%s: end sync", account) Timber.d("%s: end sync", account)
} }
} }

@ -111,7 +111,7 @@ class OpenTasksSynchronizer @Inject constructor(
if (local.id == NO_ID) { if (local.id == NO_ID) {
caldavDao.insert(local) caldavDao.insert(local)
Timber.d("Created calendar: $local") Timber.d("Created calendar: $local")
localBroadcastManager.broadcastRefreshList() localBroadcastManager.broadcastRefresh()
} else if ( } else if (
local.name != remote.name || local.name != remote.name ||
local.color != remote.color || local.color != remote.color ||
@ -122,7 +122,7 @@ class OpenTasksSynchronizer @Inject constructor(
local.access = remote.access local.access = remote.access
caldavDao.update(local) caldavDao.update(local)
Timber.d("Updated calendar: $local") Timber.d("Updated calendar: $local")
localBroadcastManager.broadcastRefreshList() localBroadcastManager.broadcastRefresh()
} }
return local return local
} }
@ -202,7 +202,7 @@ class OpenTasksSynchronizer @Inject constructor(
private suspend fun setError(account: CaldavAccount, message: String?) { private suspend fun setError(account: CaldavAccount, message: String?) {
account.error = message account.error = message
caldavDao.update(account) caldavDao.update(account)
localBroadcastManager.broadcastRefreshList() localBroadcastManager.broadcastRefresh()
if (!message.isNullOrBlank()) { if (!message.isNullOrBlank()) {
Timber.e(message) Timber.e(message)
} }

@ -130,7 +130,7 @@ class MicrosoftSynchronizer @Inject constructor(
} else if (local.name != remoteName || local.access != access) { } else if (local.name != remoteName || local.access != access) {
remote.applyTo(local) remote.applyTo(local)
caldavDao.update(local) caldavDao.update(local)
localBroadcastManager.broadcastRefreshList() localBroadcastManager.broadcastRefresh()
} }
if (local.ctag?.isNotBlank() == true) { if (local.ctag?.isNotBlank() == true) {
deltaSync(account, local, remote, microsoft) deltaSync(account, local, remote, microsoft)
@ -488,7 +488,7 @@ class MicrosoftSynchronizer @Inject constructor(
private suspend fun setError(account: CaldavAccount, message: String?) { private suspend fun setError(account: CaldavAccount, message: String?) {
account.error = message account.error = message
caldavDao.update(account) caldavDao.update(account)
localBroadcastManager.broadcastRefreshList() localBroadcastManager.broadcastRefresh()
if (!isNullOrEmpty(message)) { if (!isNullOrEmpty(message)) {
Timber.e(message) Timber.e(message)
} }

Loading…
Cancel
Save