Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Andro…

…id into develop
wordpress-mobile · Mar 10, 2016 · 018afc3 · 018afc3
2 parents d9c3df6 + b319ace
commit 018afc3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/WordPressUtils/src/main/java/org/wordpress/android/util/AppLog.java b/WordPressUtils/src/main/java/org/wordpress/android/util/AppLog.java
@@ -16,7 +16,8 @@
 public class AppLog {
     // T for Tag
     public enum T {READER, EDITOR, MEDIA, NUX, API, STATS, UTILS, NOTIFS, DB, POSTS, COMMENTS, THEMES, TESTS, PROFILING,
-        SIMPERIUM, SUGGESTION, MAIN, SETTINGS}
+        SIMPERIUM, SUGGESTION, MAIN, SETTINGS, PLANS}
+
     public static final String TAG = "WordPress";
     public static final int HEADER_LINE_COUNT = 2;
 

diff --git a/WordPressUtils/src/main/java/org/wordpress/android/util/JSONUtils.java b/WordPressUtils/src/main/java/org/wordpress/android/util/JSONUtils.java
@@ -210,6 +210,8 @@ public static boolean getBool(JSONObject json, String name) {
             return false;
         if (value.equalsIgnoreCase("false"))
             return false;
+        if (value.equalsIgnoreCase("no"))
+            return false;
         return true;
     }