Refactor theme preference values into constants

Also explicitly set a theme via preference updating to the default.

4 files changed, 14 insertions, 4 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
index a45cac832..6051c4d4e 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
@@ -104,6 +104,11 @@ public final class Constants {
         public static final String PROXY_PORT = "proxyPort";
         public static final String PROXY_TYPE = "proxyType";
         public static final String THEME = "theme";
+
+        public static final class Theme {
+            public static final String LIGHT = "light";
+            public static final String DARK = "dark";
+        }
     }
 
     /**
@@ -117,7 +122,7 @@ public final class Constants {
 
     public static final class Defaults {
         public static final String KEY_SERVERS = "hkps://hkps.pool.sks-keyservers.net, hkps://pgp.mit.edu";
-        public static final int PREF_VERSION = 4;
+        public static final int PREF_VERSION = 5;
     }
 
     public static final class key {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java
index e7c5f51ab..b88ed97bc 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java
@@ -136,7 +136,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
         }
 
         int themeId = R.style.LightTheme;
-        if ("dark".equals(newTheme)) {
+        if (Constants.Pref.Theme.DARK.equals(newTheme)) {
             themeId = R.style.DarkTheme;
         }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseActivity.java
index 00aa4802c..676fb2b3e 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseActivity.java
@@ -30,6 +30,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.util.Preferences;
 
@@ -76,7 +77,7 @@ public abstract class BaseActivity extends AppCompatActivity {
         }
 
         int themeId = R.style.LightTheme;
-        if ("dark".equals(newTheme)) {
+        if (Constants.Pref.Theme.DARK.equals(newTheme)) {
             themeId = R.style.DarkTheme;
         }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java
index c7b02f696..0b5189a63 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java
@@ -221,7 +221,7 @@ public class Preferences {
     }
 
     public String getTheme() {
-        return mSharedPreferences.getString(Pref.THEME, "light");
+        return mSharedPreferences.getString(Pref.THEME, Pref.Theme.LIGHT);
     }
 
     public void setTheme(String value) {
@@ -390,6 +390,10 @@ public class Preferences {
                 }
                 // fall through
                 case 4: {
+                    // fall through
+                }
+                case 5: {
+                    setTheme(Constants.Pref.Theme.LIGHT);
                 }
             }