From 31a93b4fefc260811375843740ea037a804726a7 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Fri, 23 Mar 2018 16:47:36 -0500
Subject: [PATCH] Fix default caldav theme and password indicator

---
 .../main/java/org/tasks/caldav/CalDAVSettingsActivity.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/tasks/caldav/CalDAVSettingsActivity.java b/app/src/main/java/org/tasks/caldav/CalDAVSettingsActivity.java
index cf8861f7f..5f7f17746 100644
--- a/app/src/main/java/org/tasks/caldav/CalDAVSettingsActivity.java
+++ b/app/src/main/java/org/tasks/caldav/CalDAVSettingsActivity.java
@@ -109,7 +109,7 @@ public class CalDAVSettingsActivity extends ThemedInjectingAppCompatActivity
 
         if (savedInstanceState == null) {
             if (caldavAccount == null) {
-                selectedTheme = themeColor.getIndex();
+                selectedTheme = -1;
             } else {
                 selectedTheme = caldavAccount.getColor();
                 url.setText(caldavAccount.getUrl());
@@ -168,7 +168,7 @@ public class CalDAVSettingsActivity extends ThemedInjectingAppCompatActivity
                 password.setText("");
             }
         } else {
-            if (localAccount != null && isEmpty(password.getText())) {
+            if (localAccount != null &&  isEmpty(password.getText()) && !isEmpty(localAccount.getPassword())) {
                 password.setText(PASSWORD_MASK);
             }
         }