From cc428983e8af8cb3ac9131782d788e71e947f6af Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Fri, 28 Jul 2017 19:04:37 +0200
Subject: [PATCH] handle adding queued events in google

---
 .../asynctasks/FetchGoogleEventsTask.kt       |  5 +++-
 .../calendar/helpers/GoogleSyncHandler.kt     | 24 +++++++++----------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/asynctasks/FetchGoogleEventsTask.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/asynctasks/FetchGoogleEventsTask.kt
index 9f2ae57f9..0140a0528 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/asynctasks/FetchGoogleEventsTask.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/asynctasks/FetchGoogleEventsTask.kt
@@ -34,7 +34,10 @@ class FetchGoogleEventsTask(val context: Context, val googleSyncListener: Google
         queuedOperations.forEach {
             when (it.operation) {
                 OPERATION_INSERT -> {
-
+                    val event = dbHelper.getEventWithId(it.eventId)
+                    if (event != null)
+                        GoogleSyncHandler().createRemoteGoogleEvent(context, event)
+                    context.googleSyncQueue.clearOperationsOf(it.eventId)
                 }
                 OPERATION_UPDATE -> {
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/GoogleSyncHandler.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/GoogleSyncHandler.kt
index ce39ff878..921664d5c 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/GoogleSyncHandler.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/GoogleSyncHandler.kt
@@ -1,5 +1,6 @@
 package com.simplemobiletools.calendar.helpers
 
+import android.content.Context
 import android.widget.Toast
 import com.google.api.client.googleapis.json.GoogleJsonResponseException
 import com.google.api.services.calendar.model.EventDateTime
@@ -16,7 +17,11 @@ class GoogleSyncHandler {
         if (activity.isGoogleSyncActive()) {
             if (activity.isOnline()) {
                 Thread({
-                    createRemoteGoogleEvent(activity, event)
+                    val errorMsg = createRemoteGoogleEvent(activity, event)
+                    if (errorMsg.isNotEmpty()) {
+                        val msg = String.format(activity.getString(R.string.google_sync_error_insert), errorMsg)
+                        activity.toast(msg, Toast.LENGTH_LONG)
+                    }
                 }).start()
             } else {
                 activity.googleSyncQueue.addOperation(event.id, OPERATION_INSERT, event.importId)
@@ -24,19 +29,14 @@ class GoogleSyncHandler {
         }
     }
 
-    private fun createRemoteGoogleEvent(activity: SimpleActivity, event: Event) {
+    fun createRemoteGoogleEvent(context: Context, event: Event): String {
+        val googleEvent = mergeMyEventToGoogleEvent(com.google.api.services.calendar.model.Event(), event)
         try {
-            val googleEvent = mergeMyEventToGoogleEvent(com.google.api.services.calendar.model.Event(), event)
-            try {
-                activity.getGoogleSyncService().events().insert(PRIMARY, googleEvent).execute()
-            } catch (e: GoogleJsonResponseException) {
-                val msg = String.format(activity.getString(R.string.google_sync_error_insert), e.getGoogleMessageError())
-                activity.toast(msg, Toast.LENGTH_LONG)
-            }
-
-        } catch (ignored: Exception) {
-
+            context.getGoogleSyncService().events().insert(PRIMARY, googleEvent).execute()
+        } catch (e: GoogleJsonResponseException) {
+            return e.getGoogleMessageError()
         }
+        return ""
     }
 
     private fun getEventReminders(event: Event): com.google.api.services.calendar.model.Event.Reminders {