request caldav calendar sync on startup

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

@@ -1,7 +1,5 @@
 package com.simplemobiletools.calendar.activities
 
-import android.accounts.Account
-import android.content.ContentResolver
 import android.content.Intent
 import android.content.pm.ActivityInfo
 import android.database.ContentObserver
@@ -9,7 +7,6 @@ import android.database.Cursor
 import android.net.Uri
 import android.os.Bundle
 import android.os.Handler
-import android.provider.CalendarContract
 import android.provider.ContactsContract
 import android.support.v4.view.ViewPager
 import android.util.SparseIntArray
@@ -53,14 +50,8 @@ class MainActivity : SimpleActivity(), NavigationListener {
     private val PREFILLED_YEARS = 31
     private val PREFILLED_WEEKS = 61
 
+    private var showCalDAVRefreshToast = false
     private var mIsMonthSelected = false
-    private var mStoredUseEnglish = false
-    private var mStoredTextColor = 0
-    private var mStoredBackgroundColor = 0
-    private var mStoredPrimaryColor = 0
-    private var mStoredDayCode = ""
-    private var mStoredIsSundayFirst = false
-    private var mStoredUse24HourFormat = false
     private var mShouldFilterBeVisible = false
     private var mCalDAVSyncHandler = Handler()
 
@@ -68,6 +59,14 @@ class MainActivity : SimpleActivity(), NavigationListener {
     private var mDefaultMonthlyPage = 0
     private var mDefaultYearlyPage = 0
 
+    private var mStoredTextColor = 0
+    private var mStoredBackgroundColor = 0
+    private var mStoredPrimaryColor = 0
+    private var mStoredDayCode = ""
+    private var mStoredIsSundayFirst = false
+    private var mStoredUse24HourFormat = false
+    private var mStoredUseEnglish = false
+
     companion object {
         var mWeekScrollY = 0
         var eventTypeColors = SparseIntArray()
@@ -106,7 +105,10 @@ class MainActivity : SimpleActivity(), NavigationListener {
             config.caldavSync = false
         }
 
-        recheckCalDAVCalendars {}
+        if (config.caldavSync) {
+            refreshCalDAVCalendars(false)
+        }
+
         checkOpenIntents()
     }
 
@@ -166,7 +168,7 @@ class MainActivity : SimpleActivity(), NavigationListener {
             R.id.change_view -> showViewDialog()
             R.id.go_to_today -> goToToday()
             R.id.filter -> showFilterDialog()
-            R.id.refresh_caldav_calendars -> refreshCalDAVCalendars()
+            R.id.refresh_caldav_calendars -> refreshCalDAVCalendars(true)
             R.id.add_holidays -> addHolidays()
             R.id.add_birthdays -> tryAddBirthdays()
             R.id.add_anniversaries -> tryAddAnniversaries()
@@ -244,10 +246,10 @@ class MainActivity : SimpleActivity(), NavigationListener {
         }
     }
 
-    private fun shouldGoToTodayBeVisible() = when {
+    private fun shouldGoToTodayBeVisible() = when (config.storedView) {
-        config.storedView == WEEKLY_VIEW -> week_view_view_pager.currentItem != mDefaultWeeklyPage
+        WEEKLY_VIEW -> week_view_view_pager.currentItem != mDefaultWeeklyPage
-        config.storedView == MONTHLY_VIEW -> main_view_pager.currentItem != mDefaultMonthlyPage
+        MONTHLY_VIEW -> main_view_pager.currentItem != mDefaultMonthlyPage
-        config.storedView == YEARLY_VIEW -> main_view_pager.currentItem != mDefaultYearlyPage
+        YEARLY_VIEW -> main_view_pager.currentItem != mDefaultYearlyPage
         else -> false
     }
 
@@ -257,24 +259,13 @@ class MainActivity : SimpleActivity(), NavigationListener {
         }
     }
 
-    private fun refreshCalDAVCalendars() {
+    private fun refreshCalDAVCalendars(showRefreshToast: Boolean) {
+        showCalDAVRefreshToast = showRefreshToast
+        if (showRefreshToast) {
             toast(R.string.refreshing)
-        val uri = CalendarContract.Calendars.CONTENT_URI
-        contentResolver.registerContentObserver(uri, false, calDAVSyncObserver)
-
-        val accounts = HashSet<Account>()
-        val calendars = CalDAVHandler(applicationContext).getCalDAVCalendars(this, config.caldavSyncedCalendarIDs)
-        calendars.forEach {
-            accounts.add(Account(it.accountName, it.accountType))
         }
 
-        Bundle().apply {
+        syncCalDAVCalendars(this, calDAVSyncObserver)
-            putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true)
-            putBoolean(ContentResolver.SYNC_EXTRAS_EXPEDITED, true)
-            accounts.forEach {
-                ContentResolver.requestSync(it, uri.authority, this)
-            }
-        }
         scheduleCalDAVSync(true)
     }
 
@@ -286,8 +277,10 @@ class MainActivity : SimpleActivity(), NavigationListener {
                 mCalDAVSyncHandler.postDelayed({
                     recheckCalDAVCalendars {
                         refreshViewPager()
+                        if (showCalDAVRefreshToast) {
                             toast(R.string.refreshing_complete)
                         }
+                    }
                 }, CALDAV_SYNC_DELAY)
             }
         }

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

@@ -1,13 +1,18 @@
 package com.simplemobiletools.calendar.extensions
 
+import android.accounts.Account
 import android.annotation.SuppressLint
 import android.app.*
 import android.appwidget.AppWidgetManager
 import android.content.ComponentName
+import android.content.ContentResolver
 import android.content.Context
 import android.content.Intent
 import android.content.res.Resources
+import android.database.ContentObserver
 import android.net.Uri
+import android.os.Bundle
+import android.provider.CalendarContract
 import android.support.v4.app.NotificationCompat
 import android.view.Gravity
 import android.view.View
@@ -16,6 +21,7 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import com.simplemobiletools.calendar.R
 import com.simplemobiletools.calendar.activities.EventActivity
+import com.simplemobiletools.calendar.activities.SimpleActivity
 import com.simplemobiletools.calendar.helpers.*
 import com.simplemobiletools.calendar.helpers.Formatter
 import com.simplemobiletools.calendar.models.DayMonthly
@@ -268,6 +274,28 @@ fun Context.scheduleCalDAVSync(activate: Boolean) {
     }
 }
 
+fun Context.syncCalDAVCalendars(activity: SimpleActivity?, calDAVSyncObserver: ContentObserver) {
+    Thread {
+        val uri = CalendarContract.Calendars.CONTENT_URI
+        contentResolver.unregisterContentObserver(calDAVSyncObserver)
+        contentResolver.registerContentObserver(uri, false, calDAVSyncObserver)
+
+        val accounts = HashSet<Account>()
+        val calendars = CalDAVHandler(applicationContext).getCalDAVCalendars(activity, config.caldavSyncedCalendarIDs)
+        calendars.forEach {
+            accounts.add(Account(it.accountName, it.accountType))
+        }
+
+        Bundle().apply {
+            putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true)
+            putBoolean(ContentResolver.SYNC_EXTRAS_EXPEDITED, true)
+            accounts.forEach {
+                ContentResolver.requestSync(it, uri.authority, this)
+            }
+        }
+    }.start()
+}
+
 fun Context.addDayNumber(rawTextColor: Int, day: DayMonthly, linearLayout: LinearLayout, dayLabelHeight: Int, callback: (Int) -> Unit) {
     var textColor = rawTextColor
     if (!day.isThisMonth)