Fix default caldav theme and password indicator

6 years ago · 31a93b4fef
parent 3ad9062381
commit 31a93b4fef
1 changed files with 2 additions and 2 deletions
--- 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);
            }
        }