fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-02-20 05:30:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix #719, properly handle reminders at importing birthdays/anniversaries

Browse Source
This commit is contained in:
tibbi 2019-03-21 23:33:01 +01:00
parent 1115dc951b
commit c508c1f647
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/SetRemindersDialog.kt
View File

@ -4,6 +4,7 @@ import android.app.Activity
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import com.simplemobiletools.calendar.pro.R import com.simplemobiletools.calendar.pro.R
import com.simplemobiletools.calendar.pro.extensions.config import com.simplemobiletools.calendar.pro.extensions.config
import com.simplemobiletools.calendar.pro.helpers.REMINDER_OFF
import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.extensions.*
import kotlinx.android.synthetic.main.dialog_set_reminders.view.* import kotlinx.android.synthetic.main.dialog_set_reminders.view.*
@ -56,8 +57,13 @@ class SetRemindersDialog(val activity: Activity, val callback: (reminders: Array
} }
private fun dialogConfirmed() { private fun dialogConfirmed() {
val reminders = arrayListOf(mReminder1Minutes, mReminder2Minutes, mReminder3Minutes) val tempReminders = arrayListOf(mReminder1Minutes, mReminder2Minutes, mReminder3Minutes).filter { it != REMINDER_OFF }.sorted()
reminders.sort() val reminders = arrayListOf(
tempReminders.getOrNull(0) ?: REMINDER_OFF,
tempReminders.getOrNull(1) ?: REMINDER_OFF,
tempReminders.getOrNull(2) ?: REMINDER_OFF
)
callback(reminders) callback(reminders)
} }
} }