diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt index 92970187e..0d95e84d0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt @@ -10,6 +10,7 @@ import android.view.Menu import android.view.MenuItem import android.view.WindowManager import com.google.api.services.calendar.model.EventDateTime +import com.google.api.services.calendar.model.EventReminder import com.simplemobiletools.calendar.R import com.simplemobiletools.calendar.dialogs.* import com.simplemobiletools.calendar.extensions.* @@ -512,6 +513,7 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener { end = EventDateTime().setDateTime(com.google.api.client.util.DateTime(mEvent.endTS * 1000L)) status = CONFIRMED.toLowerCase() recurrence = listOf(Parser().getShortRepeatInterval(mEvent)) + reminders = getEventReminders() getGoogleSyncService().events().insert(PRIMARY, this).execute() } } catch (ignored: Exception) { @@ -519,6 +521,15 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener { } } + private fun getEventReminders(): com.google.api.services.calendar.model.Event.Reminders { + val reminders = ArrayList() + mEvent.getReminders().forEach { + val reminder = EventReminder().setMinutes(it).setMethod(POPUP) + reminders.add(reminder) + } + return com.google.api.services.calendar.model.Event.Reminders().setOverrides(reminders) + } + private fun updateStartTexts() { updateStartDateText() updateStartTimeText() 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 da72e7aea..91b550bad 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/asynctasks/FetchGoogleEventsTask.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/asynctasks/FetchGoogleEventsTask.kt @@ -23,7 +23,6 @@ import java.util.* class FetchGoogleEventsTask(val activity: Activity, val googleSyncListener: GoogleSyncListener? = null) : AsyncTask() { private val ITEMS = "items" private val OVERRIDES = "overrides" - private val POPUP = "popup" private val NEXT_PAGE_TOKEN = "nextPageToken" private var lastError: Exception? = null diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt index a25754eb6..278a397fb 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt @@ -123,3 +123,4 @@ val SOURCE_IMPORTED_ICS = 2 // Google Sync val PRIMARY = "primary" +val POPUP = "popup"