fenix
/
Simple-Calendar
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1877 from Chris-GW/fix_manual_flag_caldav_syncing 

Set the "Manual" flag in the caldav sync, only if it is triggered by the user and he is notified via toasts
This commit is contained in:
Tibor Kaputa 2022-11-11 19:33:26 +01:00 committed by GitHub
parent 7210a43dbd b17d4766d8
commit 93c13cc470
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt
View File

@ -134,7 +134,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
} }
swipe_refresh_layout.setOnRefreshListener { swipe_refresh_layout.setOnRefreshListener {
refreshCalDAVCalendars(false) refreshCalDAVCalendars(true)
} }
checkIsViewIntent() checkIsViewIntent()

5
app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Context.kt
View File

@ -603,7 +603,10 @@ fun Context.refreshCalDAVCalendars(ids: String, showToasts: Boolean) {
Bundle().apply { Bundle().apply {
putBoolean(ContentResolver.SYNC_EXTRAS_EXPEDITED, true) putBoolean(ContentResolver.SYNC_EXTRAS_EXPEDITED, true)
putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true) if (showToasts) {
// Assume this is a manual synchronisation when we showToasts to the user (swipe_refresh, MainMenu->refresh_caldav_calendars, ...)
putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true)
}
accounts.forEach { accounts.forEach {
ContentResolver.requestSync(it, uri.authority, this) ContentResolver.requestSync(it, uri.authority, this)
} }