handle queued google Update operations

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

@@ -473,7 +473,7 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
                     toast(R.string.event_added)
                 }
 
-                GoogleSyncHandler().insertToGoogle(this, mEvent)
+                GoogleSyncHandler().tryInsertToGoogle(this, mEvent)
                 finish()
             }
         } else {
@@ -502,7 +502,7 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
     }
 
     private fun eventUpdated() {
-        GoogleSyncHandler().updateGoogleEvent(this, mEvent)
+        GoogleSyncHandler().tryUpdateGoogleEvent(this, mEvent)
         toast(R.string.event_updated)
         finish()
     }

app/src/main/kotlin/com/simplemobiletools/calendar/asynctasks/FetchGoogleEventsTask.kt

@@ -36,14 +36,17 @@ class FetchGoogleEventsTask(val context: Context, val googleSyncListener: Google
                 OPERATION_INSERT -> {
                     val event = dbHelper.getEventWithId(it.eventId)
                     if (event != null)
-                        GoogleSyncHandler().createRemoteGoogleEvent(context, event)
+                        GoogleSyncHandler().insertToGoogle(context, event)
                     context.googleSyncQueue.clearOperationsOf(it.eventId)
                 }
                 OPERATION_UPDATE -> {
-
+                    val event = dbHelper.getEventWithId(it.eventId)
+                    if (event != null)
+                        GoogleSyncHandler().updateGoogleEvent(context, event)
+                    context.googleSyncQueue.clearOperationsOf(it.eventId)
                 }
                 OPERATION_DELETE -> {
-                    context.deleteFromGoogleSync(it.importId)
+                    GoogleSyncHandler().deleteFromGoogle(context, it.importId)
                     context.googleSyncQueue.clearOperationsOf(it.eventId)
                 }
             }

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

@@ -259,13 +259,6 @@ fun Context.scheduleGoogleSync(activate: Boolean) {
     }
 }
 
-fun Context.deleteFromGoogleSync(importId: String) {
-    try {
-        getGoogleSyncService().events().delete(PRIMARY, importId).execute()
-    } catch (ignored: Exception) {
-    }
-}
-
 fun Context.getNewEventTimestampFromCode(dayCode: String) = Formatter.getLocalDateTimeFromCode(dayCode).withTime(13, 0, 0, 0).seconds()
 
 fun Context.getCurrentOffset() = SimpleDateFormat("Z", Locale.getDefault()).format(Date())

app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt

@@ -347,13 +347,7 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
         deleteChildEvents(args, deleteFromGoogle)
         if (deleteFromGoogle) {
             events.forEach {
-                Thread({
+                GoogleSyncHandler().tryDeleteFromGoogle(context, it)
-                    if (context.isOnline()) {
-                        context.deleteFromGoogleSync(it.importId)
-                    } else {
-                        context.googleSyncQueue.addOperation(it.id, OPERATION_DELETE, it.importId)
-                    }
-                }).start()
             }
         }
     }

app/src/main/kotlin/com/simplemobiletools/calendar/helpers/GoogleSyncHandler.kt

@@ -13,11 +13,11 @@ import com.simplemobiletools.commons.extensions.toast
 import java.util.*
 
 class GoogleSyncHandler {
-    fun insertToGoogle(activity: SimpleActivity, event: Event) {
+    fun tryInsertToGoogle(activity: SimpleActivity, event: Event) {
         if (activity.isGoogleSyncActive()) {
             if (activity.isOnline()) {
                 Thread({
-                    val errorMsg = createRemoteGoogleEvent(activity, event)
+                    val errorMsg = insertToGoogle(activity, event)
                     if (errorMsg.isNotEmpty()) {
                         val msg = String.format(activity.getString(R.string.google_sync_error_insert), errorMsg)
                         activity.toast(msg, Toast.LENGTH_LONG)
@@ -29,7 +29,7 @@ class GoogleSyncHandler {
         }
     }
 
-    fun createRemoteGoogleEvent(context: Context, event: Event): String {
+    fun insertToGoogle(context: Context, event: Event): String {
         val googleEvent = mergeMyEventToGoogleEvent(com.google.api.services.calendar.model.Event(), event)
         try {
             context.getGoogleSyncService().events().insert(PRIMARY, googleEvent).execute()
@@ -39,13 +39,48 @@ class GoogleSyncHandler {
         return ""
     }
 
-    private fun getEventReminders(event: Event): com.google.api.services.calendar.model.Event.Reminders {
+    fun tryUpdateGoogleEvent(activity: SimpleActivity, event: Event) {
-        val reminders = ArrayList<EventReminder>()
+        if (activity.isGoogleSyncActive()) {
-        event.getReminders().forEach {
+            if (activity.isOnline()) {
-            val reminder = EventReminder().setMinutes(it).setMethod(POPUP)
+                Thread({
-            reminders.add(reminder)
+                    val errorMsg = updateGoogleEvent(activity.applicationContext, event)
+                    if (errorMsg.isNotEmpty()) {
+                        val msg = String.format(activity.getString(R.string.google_sync_error_update), errorMsg)
+                        activity.toast(msg, Toast.LENGTH_LONG)
+                    }
+                }).start()
+            } else {
+                activity.googleSyncQueue.addOperation(event.id, OPERATION_UPDATE, event.importId)
+            }
+        }
+    }
+
+    fun updateGoogleEvent(context: Context, event: Event): String {
+        try {
+            val googleEvent = context.getGoogleSyncService().events().get(PRIMARY, event.importId).execute()
+            val newGoogleEvent = mergeMyEventToGoogleEvent(googleEvent, event)
+            context.getGoogleSyncService().events().update(PRIMARY, newGoogleEvent.id, newGoogleEvent).execute()
+        } catch (e: GoogleJsonResponseException) {
+            return e.getGoogleMessageError()
+        }
+        return ""
+    }
+
+    fun tryDeleteFromGoogle(context: Context, event: Event) {
+        Thread({
+            if (context.isOnline()) {
+                deleteFromGoogle(context, event.importId)
+            } else {
+                context.googleSyncQueue.addOperation(event.id, OPERATION_DELETE, event.importId)
+            }
+        }).start()
+    }
+
+    fun deleteFromGoogle(context: Context, importId: String) {
+        try {
+            context.getGoogleSyncService().events().delete(PRIMARY, importId).execute()
+        } catch (ignored: Exception) {
         }
-        return com.google.api.services.calendar.model.Event.Reminders().setOverrides(reminders)
     }
 
     private fun mergeMyEventToGoogleEvent(googleEvent: com.google.api.services.calendar.model.Event, event: Event): com.google.api.services.calendar.model.Event {
@@ -80,22 +115,12 @@ class GoogleSyncHandler {
         return googleEvent
     }
 
-    fun updateGoogleEvent(activity: SimpleActivity, event: Event) {
+    private fun getEventReminders(event: Event): com.google.api.services.calendar.model.Event.Reminders {
-        if (activity.isGoogleSyncActive()) {
+        val reminders = ArrayList<EventReminder>()
-            if (activity.isOnline()) {
+        event.getReminders().forEach {
-                Thread({
+            val reminder = EventReminder().setMinutes(it).setMethod(POPUP)
-                    try {
+            reminders.add(reminder)
-                        val googleEvent = activity.getGoogleSyncService().events().get(PRIMARY, event.importId).execute()
-                        val newGoogleEvent = mergeMyEventToGoogleEvent(googleEvent, event)
-                        activity.getGoogleSyncService().events().update(PRIMARY, newGoogleEvent.id, newGoogleEvent).execute()
-                    } catch (e: GoogleJsonResponseException) {
-                        val msg = String.format(activity.getString(R.string.google_sync_error_update), e.getGoogleMessageError())
-                        activity.toast(msg, Toast.LENGTH_LONG)
-                    }
-                }).start()
-            } else {
-                activity.googleSyncQueue.addOperation(event.id, OPERATION_UPDATE, event.importId)
-            }
         }
+        return com.google.api.services.calendar.model.Event.Reminders().setOverrides(reminders)
     }
 }