From 398653ee640d07a049a1a9abb3bdbb36d290ed2a Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 17 Feb 2018 23:48:45 +0100
Subject: [PATCH] move the refresh_caldav_calendars menu visibility check in
 onPrepareOptionsMenu

---
 .../calendar/activities/MainActivity.kt            | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt
index 17b580ef2..ef647a68d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt
@@ -123,10 +123,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
         }
 
         dbHelper.getEventTypes {
-            eventTypeColors.clear()
-            it.map { eventTypeColors.put(it.id, it.color) }
-            mShouldFilterBeVisible = eventTypeColors.size() > 1 || config.displayEventTypes.isEmpty()
-            invalidateOptionsMenu()
+            mShouldFilterBeVisible = it.size > 1 || config.displayEventTypes.isEmpty()
         }
 
         if (config.storedView == WEEKLY_VIEW) {
@@ -162,13 +159,20 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
             goToTodayButton = findItem(R.id.go_to_today)
             findItem(R.id.filter).isVisible = mShouldFilterBeVisible
             findItem(R.id.go_to_today).isVisible = shouldGoToTodayBeVisible && config.storedView != EVENTS_LIST_VIEW
-            findItem(R.id.refresh_caldav_calendars).isVisible = config.caldavSync
         }
 
         setupSearch(menu)
         return true
     }
 
+    override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
+        menu!!.apply {
+            findItem(R.id.refresh_caldav_calendars).isVisible = config.caldavSync
+        }
+
+        return true
+    }
+
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.change_view -> showViewDialog()