fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-03-09 16:00:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

adding some null checks at device rotation

Browse Source
This commit is contained in:
tibbi 2018-12-03 10:44:38 +01:00
parent 0b57e4fd85
commit 83d3f3a724
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt
View File

@ -178,23 +178,34 @@ class EventActivity : SimpleActivity() {
override fun onSaveInstanceState(outState: Bundle) { override fun onSaveInstanceState(outState: Bundle) {
super.onSaveInstanceState(outState) super.onSaveInstanceState(outState)
outState.putLong(START_TS, mEventStartDateTime.seconds()) if (!wasActivityInitialized) {
outState.putLong(END_TS, mEventEndDateTime.seconds()) return
}
outState.putInt(REMINDER_1_MINUTES, mReminder1Minutes) outState.apply {
outState.putInt(REMINDER_2_MINUTES, mReminder2Minutes) putLong(START_TS, mEventStartDateTime.seconds())
outState.putInt(REMINDER_3_MINUTES, mReminder3Minutes) putLong(END_TS, mEventEndDateTime.seconds())
outState.putInt(REPEAT_INTERVAL, mRepeatInterval) putInt(REMINDER_1_MINUTES, mReminder1Minutes)
outState.putInt(REPEAT_RULE, mRepeatRule) putInt(REMINDER_2_MINUTES, mReminder2Minutes)
outState.putLong(REPEAT_LIMIT, mRepeatLimit) putInt(REMINDER_3_MINUTES, mReminder3Minutes)
outState.putLong(EVENT_TYPE_ID, mEventTypeId) putInt(REPEAT_INTERVAL, mRepeatInterval)
outState.putInt(EVENT_CALENDAR_ID, mEventCalendarId) putInt(REPEAT_RULE, mRepeatRule)
putLong(REPEAT_LIMIT, mRepeatLimit)
putLong(EVENT_TYPE_ID, mEventTypeId)
putInt(EVENT_CALENDAR_ID, mEventCalendarId)
}
} }
override fun onRestoreInstanceState(savedInstanceState: Bundle) { override fun onRestoreInstanceState(savedInstanceState: Bundle) {
super.onRestoreInstanceState(savedInstanceState) super.onRestoreInstanceState(savedInstanceState)
if (!savedInstanceState.containsKey(START_TS)) {
finish()
return
}
savedInstanceState.apply { savedInstanceState.apply {
mEventStartDateTime = Formatter.getDateTimeFromTS(getLong(START_TS)) mEventStartDateTime = Formatter.getDateTimeFromTS(getLong(START_TS))
mEventEndDateTime = Formatter.getDateTimeFromTS(getLong(END_TS)) mEventEndDateTime = Formatter.getDateTimeFromTS(getLong(END_TS))