mirror of
https://github.com/SimpleMobileTools/Simple-Calendar.git
synced 2025-06-05 21:59:17 +02:00
make reminder "overrides" field optional at google events
This commit is contained in:
@@ -190,14 +190,16 @@ class FetchGoogleEventsTask(val context: Context, val googleSyncListener: Google
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun getReminders(json: JsonObject): List<Int> {
|
private fun getReminders(json: JsonObject?): List<Int> {
|
||||||
val array = json.getAsJsonArray(OVERRIDES)
|
|
||||||
val token = object : TypeToken<List<GoogleEventReminder>>() {}.type
|
|
||||||
val reminders = Gson().fromJson<ArrayList<GoogleEventReminder>>(array, token) ?: ArrayList<GoogleEventReminder>(2)
|
|
||||||
val reminderMinutes = ArrayList<Int>()
|
val reminderMinutes = ArrayList<Int>()
|
||||||
for ((method, minutes) in reminders) {
|
if (json?.has(OVERRIDES) == true) {
|
||||||
if (method == POPUP) {
|
val array = json.getAsJsonArray(OVERRIDES)
|
||||||
reminderMinutes.add(minutes)
|
val token = object : TypeToken<List<GoogleEventReminder>>() {}.type
|
||||||
|
val reminders = Gson().fromJson<ArrayList<GoogleEventReminder>>(array, token) ?: ArrayList<GoogleEventReminder>(2)
|
||||||
|
for ((method, minutes) in reminders) {
|
||||||
|
if (method == POPUP) {
|
||||||
|
reminderMinutes.add(minutes)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return reminderMinutes
|
return reminderMinutes
|
||||||
|
Reference in New Issue
Block a user