Bug 963036 - Store default and disabled flags as JSON booleans (r=margaret)

mobile/android/base/home/HomeConfig.java

@@ -102,9 +102,6 @@ public final class HomeConfig {
         private static final String JSON_KEY_DEFAULT = "default";
         private static final String JSON_KEY_DISABLED = "disabled";
 
-        private static final int IS_DEFAULT = 1;
-        private static final int IS_DISABLED = 1;
-
         public enum Flags {
             DEFAULT_PANEL,
             DISABLED_PANEL
@@ -138,13 +135,11 @@ public final class HomeConfig {
 
             mFlags = EnumSet.noneOf(Flags.class);
 
-            final boolean isDefault = (json.optInt(JSON_KEY_DEFAULT, -1) == IS_DEFAULT);
-            if (isDefault) {
+            if (json.optBoolean(JSON_KEY_DEFAULT, false)) {
                 mFlags.add(Flags.DEFAULT_PANEL);
             }
 
-            final boolean isDisabled = (json.optInt(JSON_KEY_DISABLED, -1) == IS_DISABLED);
-            if (isDisabled) {
+            if (json.optBoolean(JSON_KEY_DISABLED, false)) {
                 mFlags.add(Flags.DISABLED_PANEL);
             }
 
@@ -300,11 +295,11 @@ public final class HomeConfig {
             }
 
             if (mFlags.contains(Flags.DEFAULT_PANEL)) {
-                json.put(JSON_KEY_DEFAULT, IS_DEFAULT);
+                json.put(JSON_KEY_DEFAULT, true);
             }
 
             if (mFlags.contains(Flags.DISABLED_PANEL)) {
-                json.put(JSON_KEY_DISABLED, IS_DISABLED);
+                json.put(JSON_KEY_DISABLED, true);
             }
 
             return json;