From e91a102868be891b6339aeb33c1262ece4823e78 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Thu, 12 Apr 2018 13:49:37 -0500
Subject: [PATCH] Hide delete icon for new caldav collections

---
 .../org/tasks/caldav/CaldavCalendarSettingsActivity.java    | 6 ++++--
 app/src/main/res/menu/menu_caldav_calendar_settings.xml     | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.java b/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.java
index 000984d3c..eadba65c0 100644
--- a/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.java
+++ b/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.java
@@ -131,7 +131,9 @@ public class CaldavCalendarSettingsActivity extends ThemedInjectingAppCompatActi
             save();
           }
         });
-    toolbar.inflateMenu(R.menu.menu_caldav_calendar_settings);
+    if (caldavCalendar != null) {
+      toolbar.inflateMenu(R.menu.menu_caldav_calendar_settings);
+    }
     toolbar.setOnMenuItemClickListener(this);
     MenuColorizer.colorToolbar(this, toolbar);
 
@@ -340,7 +342,7 @@ public class CaldavCalendarSettingsActivity extends ThemedInjectingAppCompatActi
   @Override
   public boolean onMenuItemClick(MenuItem item) {
     switch (item.getItemId()) {
-      case R.id.remove:
+      case R.id.delete:
         deleteCollection();
         break;
     }
diff --git a/app/src/main/res/menu/menu_caldav_calendar_settings.xml b/app/src/main/res/menu/menu_caldav_calendar_settings.xml
index 2f39c8125..9b4e99154 100644
--- a/app/src/main/res/menu/menu_caldav_calendar_settings.xml
+++ b/app/src/main/res/menu/menu_caldav_calendar_settings.xml
@@ -3,9 +3,9 @@
   xmlns:app="http://schemas.android.com/apk/res-auto">
 
   <item
-    android:id="@+id/remove"
+    android:id="@+id/delete"
     android:icon="@drawable/ic_delete_24dp"
-    android:title="@string/remove"
+    android:title="@string/delete"
     app:showAsAction="ifRoom"/>
 
 </menu>
\ No newline at end of file