- Fixed html entity encoding in theme name.

- Fixed list refresh bug when installing theme.
micwallace · Jun 20, 2016 · 143a744 · 143a744
1 parent 37ae5cf
commit 143a744
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/reddinator/src/main/java/au/com/wallaceit/reddinator/activity/ThemesActivity.java b/reddinator/src/main/java/au/com/wallaceit/reddinator/activity/ThemesActivity.java
@@ -99,10 +99,15 @@ public void onClick(DialogInterface dialog, int which) {
         }
     }
 
+    @Override
+    protected void onResume() {
+        super.onResume();
+        refreshList();
+    }
+
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data){
         if (resultCode==RESULT_CODE_THEME_UPDATED) {
-            refreshList();
             themesEdited = true;
             setResult(RESULT_CODE_THEME_UPDATED);
         }

diff --git a/reddinator/src/main/java/au/com/wallaceit/reddinator/core/ThemeManager.java b/reddinator/src/main/java/au/com/wallaceit/reddinator/core/ThemeManager.java
@@ -23,6 +23,7 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.graphics.Color;
+import android.text.Html;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -165,6 +166,9 @@ private boolean validateThemeJson(JSONObject theme){
             if (!theme.has("name") || "".equals(theme.get("name")))
                 return false;
 
+            // decode Html entities in name
+            theme.put("name", Html.fromHtml(theme.getString("name")));
+
             JSONObject impValues = theme.getJSONObject("values");
             JSONObject defaults = defaultValues.getTheme().getJSONObject("values");