wbrawner/Simple-Calendar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

implement the manual caldav calendar refreshing

Browse source
This commit is contained in:
tibbi 2017-08-20 21:55:34 +02:00
parent d766aaed70
commit 3505567083
22 changed files with 74 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt
View file

@ -1,11 +1,15 @@
package com.simplemobiletools.calendar.activities
import android.Manifest
import android.content.ContentResolver
import android.content.Intent
import android.content.pm.ActivityInfo
import android.content.pm.PackageManager
import android.database.ContentObserver
import android.net.Uri
import android.os.Bundle
import android.os.Handler
import android.provider.CalendarContract
import android.support.v4.app.ActivityCompat
import android.support.v4.view.ViewPager
import android.util.SparseIntArray
@ -45,6 +49,7 @@ import java.util.*
import kotlin.collections.ArrayList
class MainActivity : SimpleActivity(), NavigationListener {
private val CALDAV_SYNC_DELAY = 2000L
private val PREFILLED_MONTHS = 97
private val PREFILLED_YEARS = 31
private val PREFILLED_WEEKS = 61
@ -59,6 +64,7 @@ class MainActivity : SimpleActivity(), NavigationListener {
private var mStoredIsSundayFirst = false
private var mStoredUse24HourFormat = false
private var mShouldFilterBeVisible = false
private var mCalDAVSyncHandler = Handler()
private var mDefaultWeeklyPage = 0
private var mDefaultMonthlyPage = 0
@ -88,7 +94,7 @@ class MainActivity : SimpleActivity(), NavigationListener {
config.caldavSync = false
}
recheckCalDAVCalendars()
recheckCalDAVCalendars {}
}
override fun onResume() {
@ -126,6 +132,12 @@ class MainActivity : SimpleActivity(), NavigationListener {
mStoredUse24HourFormat = config.use24hourFormat
}
override fun onStop() {
super.onStop()
mCalDAVSyncHandler.removeCallbacksAndMessages(null)
contentResolver.unregisterContentObserver(calDAVSyncObserver)
}
override fun onCreateOptionsMenu(menu: Menu): Boolean {
menuInflater.inflate(R.menu.menu_main, menu)
menu.findItem(R.id.filter).isVisible = mShouldFilterBeVisible
@ -214,7 +226,25 @@ class MainActivity : SimpleActivity(), NavigationListener {
}
private fun refreshCalDAVAccounts() {
toast(R.string.refreshing)
val uri = CalendarContract.Calendars.CONTENT_URI
contentResolver.registerContentObserver(uri, false, calDAVSyncObserver)
ContentResolver.requestSync(null, uri.authority, Bundle())
}
private val calDAVSyncObserver = object : ContentObserver(Handler()) {
override fun onChange(selfChange: Boolean) {
super.onChange(selfChange)
if (!selfChange) {
mCalDAVSyncHandler.removeCallbacksAndMessages(null)
mCalDAVSyncHandler.postDelayed({
recheckCalDAVCalendars {
refreshViewPager()
toast(R.string.refreshing_complete)
}
}, CALDAV_SYNC_DELAY)
}
}
}
private fun addHolidays() {

5
app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt
View file

@ -143,15 +143,14 @@ class SettingsActivity : SimpleActivity() {
Thread({
if (newCalendarIds.isNotEmpty()) {
val eventTypeNames = dbHelper.fetchEventTypes().map { it.title.toLowerCase() } as ArrayList<String>
val calendars = CalDAVEventsHandler(applicationContext).getCalDAVCalendars(config.caldavSyncedCalendarIDs)
calendars.forEach {
getSyncedCalDAVCalendars().forEach {
if (!eventTypeNames.contains(it.displayName.toLowerCase())) {
val eventType = EventType(0, it.displayName, it.color, it.id)
eventTypeNames.add(it.displayName.toLowerCase())
dbHelper.insertEventType(eventType)
}
}
CalDAVEventsHandler(applicationContext).refreshCalendars()
CalDAVEventsHandler(applicationContext).refreshCalendars {}
}
oldCalendarIds.filter { !newCalendarIds.contains(it) }.forEach {

6
app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt
View file

@ -235,9 +235,11 @@ fun Context.getNewEventTimestampFromCode(dayCode: String) = Formatter.getLocalDa
fun Context.getCurrentOffset() = SimpleDateFormat("Z", Locale.getDefault()).format(Date())
fun Context.recheckCalDAVCalendars() {
fun Context.getSyncedCalDAVCalendars() = CalDAVEventsHandler(this).getCalDAVCalendars(config.caldavSyncedCalendarIDs)
fun Context.recheckCalDAVCalendars(callback: () -> Unit) {
if (config.caldavSync) {
CalDAVEventsHandler(this).refreshCalendars()
CalDAVEventsHandler(this).refreshCalendars(callback)
}
}

3
app/src/main/kotlin/com/simplemobiletools/calendar/helpers/CalDAVEventsHandler.kt
View file

@ -18,12 +18,13 @@ import com.simplemobiletools.commons.extensions.getStringValue
import java.util.*
class CalDAVEventsHandler(val context: Context) {
fun refreshCalendars() {
fun refreshCalendars(callback: () -> Unit) {
getCalDAVCalendars(context.config.caldavSyncedCalendarIDs).forEach {
val eventTypeId = context.dbHelper.getEventTypeIdWithTitle(it.displayName)
CalDAVEventsHandler(context).fetchCalDAVCalendarEvents(it.id, eventTypeId)
}
context.scheduleCalDAVSync(true)
callback()
}
fun getCalDAVCalendars(ids: String = ""): List<CalDAVCalendar> {

2
app/src/main/kotlin/com/simplemobiletools/calendar/receivers/BootCompletedReceiver.kt
View file

@ -13,7 +13,7 @@ class BootCompletedReceiver : BroadcastReceiver() {
context.apply {
scheduleAllEvents()
notifyRunningEvents()
recheckCalDAVCalendars()
recheckCalDAVCalendars {}
}
}
}

2
app/src/main/kotlin/com/simplemobiletools/calendar/receivers/CalDAVSyncReceiver.kt
View file

@ -7,6 +7,6 @@ import com.simplemobiletools.calendar.extensions.recheckCalDAVCalendars
class CalDAVSyncReceiver : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) {
context.recheckCalDAVCalendars()
context.recheckCalDAVCalendars {}
}
}

2
app/src/main/res/values-de/strings.xml
View file

@ -197,6 +197,8 @@
<string name="manage_synced_calendars">Manage synced calendars</string>
<string name="store_locally_only">Store locally only</string>
<string name="refresh_caldav_accounts">Refresh CalDAV accounts</string>
<string name="refreshing">Refreshing…</string>
<string name="refreshing_complete">Refreshing complete</string>
<plurals name="by_minutes">
<item quantity="one">%1$d minute</item>

2
app/src/main/res/values-es/strings.xml
View file

@ -197,6 +197,8 @@
<string name="manage_synced_calendars">Manage synced calendars</string>
<string name="store_locally_only">Store locally only</string>
<string name="refresh_caldav_accounts">Refresh CalDAV accounts</string>
<string name="refreshing">Refreshing…</string>
<string name="refreshing_complete">Refreshing complete</string>
<plurals name="by_minutes">
<item quantity="one">%1$d minute</item>

2
app/src/main/res/values-fr/strings.xml
View file

@ -197,6 +197,8 @@
<string name="manage_synced_calendars">Manage synced calendars</string>
<string name="store_locally_only">Store locally only</string>
<string name="refresh_caldav_accounts">Refresh CalDAV accounts</string>
<string name="refreshing">Refreshing…</string>
<string name="refreshing_complete">Refreshing complete</string>
<plurals name="by_minutes">
<item quantity="one">%1$d minute</item>

2
app/src/main/res/values-hi-rIN/strings.xml
View file

@ -197,6 +197,8 @@
<string name="manage_synced_calendars">Manage synced calendars</string>
<string name="store_locally_only">Store locally only</string>
<string name="refresh_caldav_accounts">Refresh CalDAV accounts</string>
<string name="refreshing">Refreshing…</string>
<string name="refreshing_complete">Refreshing complete</string>
<plurals name="by_minutes">
<item quantity="one">%1$d minute</item>

2
app/src/main/res/values-hu/strings.xml
View file

@ -197,6 +197,8 @@
<string name="manage_synced_calendars">Manage synced calendars</string>
<string name="store_locally_only">Store locally only</string>
<string name="refresh_caldav_accounts">Refresh CalDAV accounts</string>
<string name="refreshing">Refreshing…</string>
<string name="refreshing_complete">Refreshing complete</string>
<plurals name="by_minutes">
<item quantity="one">%1$d minute</item>

2
app/src/main/res/values-it/strings.xml
View file

@ -197,6 +197,8 @@
<string name="manage_synced_calendars">Manage synced calendars</string>
<string name="store_locally_only">Store locally only</string>
<string name="refresh_caldav_accounts">Refresh CalDAV accounts</string>
<string name="refreshing">Refreshing…</string>
<string name="refreshing_complete">Refreshing complete</string>
<plurals name="by_minutes">
<item quantity="one">%1$d minute</item>

2
app/src/main/res/values-iw/strings.xml
View file

@ -197,6 +197,8 @@
<string name="manage_synced_calendars">Manage synced calendars</string>
<string name="store_locally_only">Store locally only</string>
<string name="refresh_caldav_accounts">Refresh CalDAV accounts</string>
<string name="refreshing">Refreshing…</string>
<string name="refreshing_complete">Refreshing complete</string>
<plurals name="by_minutes">
<item quantity="one">%1$d minute</item>

2
app/src/main/res/values-ja/strings.xml
View file

@ -197,6 +197,8 @@
<string name="manage_synced_calendars">Manage synced calendars</string>
<string name="store_locally_only">Store locally only</string>
<string name="refresh_caldav_accounts">Refresh CalDAV accounts</string>
<string name="refreshing">Refreshing…</string>
<string name="refreshing_complete">Refreshing complete</string>
<plurals name="by_minutes">
<item quantity="one">%1$d minute</item>

2
app/src/main/res/values-pl/strings.xml
View file

@ -202,6 +202,8 @@
<string name="manage_synced_calendars">Manage synced calendars</string>
<string name="store_locally_only">Store locally only</string>
<string name="refresh_caldav_accounts">Refresh CalDAV accounts</string>
<string name="refreshing">Refreshing…</string>
<string name="refreshing_complete">Refreshing complete</string>
<plurals name="by_minutes">
<item quantity="one">%1$d minutę</item>

2
app/src/main/res/values-pt-rBR/strings.xml
View file

@ -197,6 +197,8 @@
<string name="manage_synced_calendars">Manage synced calendars</string>
<string name="store_locally_only">Store locally only</string>
<string name="refresh_caldav_accounts">Refresh CalDAV accounts</string>
<string name="refreshing">Refreshing…</string>
<string name="refreshing_complete">Refreshing complete</string>
<plurals name="by_minutes">
<item quantity="one">%1$d minute</item>

2
app/src/main/res/values-pt/strings.xml
View file

@ -197,6 +197,8 @@
<string name="manage_synced_calendars">Gerir calendários sincronizados</string>
<string name="store_locally_only">Store locally only</string>
<string name="refresh_caldav_accounts">Refresh CalDAV accounts</string>
<string name="refreshing">Refreshing…</string>
<string name="refreshing_complete">Refreshing complete</string>
<plurals name="by_minutes">
<item quantity="one">%1$d minuto</item>

2
app/src/main/res/values-ru/strings.xml
View file

@ -211,6 +211,8 @@
<string name="manage_synced_calendars">Manage synced calendars</string>
<string name="store_locally_only">Store locally only</string>
<string name="refresh_caldav_accounts">Refresh CalDAV accounts</string>
<string name="refreshing">Refreshing…</string>
<string name="refreshing_complete">Refreshing complete</string>
<plurals name="by_minutes">
<item quantity="one">%1$d минута</item>

4
app/src/main/res/values-sk/strings.xml
View file

@ -203,7 +203,9 @@
<string name="select_caldav_calendars">Zvoľte kalendáre pre synchronizáciu</string>
<string name="manage_synced_calendars">Spravovať synchronizované kalendáre</string>
<string name="store_locally_only">Uložiť iba lokálne</string>
<string name="refresh_caldav_accounts">Obnoviť CalDAV účty Refresh CalDAV accounts</string>
<string name="refresh_caldav_accounts">Obnoviť CalDAV účty</string>
<string name="refreshing">Obnovuje sa…</string>
<string name="refreshing_complete">Obnovovanie ukončené</string>
<plurals name="by_minutes">
<item quantity="one">%1$d minútu</item>

2
app/src/main/res/values-sv/strings.xml
View file

@ -197,6 +197,8 @@
<string name="manage_synced_calendars">Manage synced calendars</string>
<string name="store_locally_only">Store locally only</string>
<string name="refresh_caldav_accounts">Refresh CalDAV accounts</string>
<string name="refreshing">Refreshing…</string>
<string name="refreshing_complete">Refreshing complete</string>
<plurals name="by_minutes">
<item quantity="one">%1$d minut</item>

2
app/src/main/res/values-tr/strings.xml
View file

@ -197,6 +197,8 @@
<string name="manage_synced_calendars">Manage synced calendars</string>
<string name="store_locally_only">Store locally only</string>
<string name="refresh_caldav_accounts">Refresh CalDAV accounts</string>
<string name="refreshing">Refreshing…</string>
<string name="refreshing_complete">Refreshing complete</string>
<plurals name="by_minutes">
<item quantity="one">%1$d minute</item>

2
app/src/main/res/values/strings.xml
View file

@ -197,6 +197,8 @@
<string name="manage_synced_calendars">Manage synced calendars</string>
<string name="store_locally_only">Store locally only</string>
<string name="refresh_caldav_accounts">Refresh CalDAV accounts</string>
<string name="refreshing">Refreshing…</string>
<string name="refreshing_complete">Refreshing complete</string>
<plurals name="by_minutes">
<item quantity="one">%1$d minute</item>