From a95fed8c1402cb0a88b01ea33e2922a1499fef1e Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 25 Jul 2017 18:24:26 +0200 Subject: [PATCH] couple updates at sending events to google --- .../calendar/helpers/GoogleSyncHandler.kt | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) 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 51e14f885..85d3e0e07 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/GoogleSyncHandler.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/GoogleSyncHandler.kt @@ -30,13 +30,21 @@ class GoogleSyncHandler { start = EventDateTime().setDate(com.google.api.client.util.DateTime(true, event.startTS * 1000L, null)) end = EventDateTime().setDate(com.google.api.client.util.DateTime(true, (event.endTS + DAY) * 1000L, null)) } else { - start = EventDateTime().setDateTime(com.google.api.client.util.DateTime(event.startTS * 1000L)) - end = EventDateTime().setDateTime(com.google.api.client.util.DateTime(event.endTS * 1000L)) + start = EventDateTime().setDateTime(com.google.api.client.util.DateTime(event.startTS * 1000L)).setTimeZone(TimeZone.getDefault().id) + end = EventDateTime().setDateTime(com.google.api.client.util.DateTime(event.endTS * 1000L)).setTimeZone(TimeZone.getDefault().id) } status = CONFIRMED.toLowerCase() - recurrence = listOf(Parser().getShortRepeatInterval(event)) - reminders = getEventReminders(event) + Parser().getShortRepeatInterval(event).let { + if (it.isNotEmpty()) { + recurrence = listOf(it) + } + } + + if (event.getReminders().isNotEmpty()) { + reminders = getEventReminders(event).setUseDefault(false) + } + context.getGoogleSyncService().events().insert(PRIMARY, this).execute() } } catch (ignored: Exception) {