From 9876690ae4cfc5d651cfcb7ee0b8219d1dc43ef9 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 28 Aug 2017 16:31:29 +0200 Subject: [PATCH] add a check at EventActivity to not initialize things too early --- .../calendar/activities/EventActivity.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 907937171..f3e652497 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt @@ -33,6 +33,7 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener { private var mEventTypeId = DBHelper.REGULAR_EVENT_TYPE_ID private var mDialogTheme = 0 private var mEventOccurrenceTS = 0 + private var wasActivityInitialized = false lateinit var mEventStartDateTime: DateTime lateinit var mEventEndDateTime: DateTime @@ -98,6 +99,7 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener { updateTextColors(event_scrollview) updateIconColors() + wasActivityInitialized = true } private fun setupEditEvent() { @@ -442,8 +444,10 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener { override fun onCreateOptionsMenu(menu: Menu): Boolean { menuInflater.inflate(R.menu.menu_event, menu) - menu.findItem(R.id.delete).isVisible = mDialogTheme != 0 && mEvent.id != 0 - menu.findItem(R.id.share).isVisible = mDialogTheme != 0 && mEvent.id != 0 + if (wasActivityInitialized) { + menu.findItem(R.id.delete).isVisible = mDialogTheme != 0 && mEvent.id != 0 + menu.findItem(R.id.share).isVisible = mDialogTheme != 0 && mEvent.id != 0 + } return true }