From 297db53aa3038e4486a8fc199425a77476c9cb06 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Tue, 7 May 2019 19:45:08 +0800
Subject: Reverse the change of unescaping HTML because it also remove all the
 HTML tags. Fixed subreddit name and post time overlapping. Fixed menu item
 text not shown in MainActivity.

---
 .../ml/docilealligator/infinityforreddit/ParseComment.java     |  3 +--
 .../java/ml/docilealligator/infinityforreddit/ParsePost.java   | 10 +++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'app/src/main/java/ml')

diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/ParseComment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/ParseComment.java
index c2808e97..78bc2581 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/ParseComment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/ParseComment.java
@@ -1,7 +1,6 @@
 package ml.docilealligator.infinityforreddit;
 
 import android.os.AsyncTask;
-import android.text.Html;
 import android.util.Log;
 
 import org.json.JSONArray;
@@ -117,7 +116,7 @@ class ParseComment {
                     boolean isSubmitter = data.getBoolean(JSONUtils.IS_SUBMITTER_KEY);
                     String commentContent = "";
                     if(!data.isNull(JSONUtils.BODY_HTML_KEY)) {
-                        commentContent = Html.fromHtml(data.getString(JSONUtils.BODY_HTML_KEY).trim()).toString();
+                        commentContent = data.getString(JSONUtils.BODY_HTML_KEY).trim();
                     }
                     String permalink = data.getString(JSONUtils.PERMALINK_KEY);
                     int score = data.getInt(JSONUtils.SCORE_KEY);
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/ParsePost.java b/app/src/main/java/ml/docilealligator/infinityforreddit/ParsePost.java
index 6cb68323..280d36a7 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/ParsePost.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/ParsePost.java
@@ -1,7 +1,6 @@
 package ml.docilealligator.infinityforreddit;
 
 import android.os.AsyncTask;
-import android.text.Html;
 import android.util.Log;
 
 import org.json.JSONArray;
@@ -63,6 +62,7 @@ class ParsePost {
                 for(int i = 0; i < allData.length(); i++) {
                     String kind = allData.getJSONObject(i).getString(JSONUtils.KIND_KEY);
                     if(!kind.equals("t3")) {
+                        //It's a comment
                         continue;
                     }
                     JSONObject data = allData.getJSONObject(i).getJSONObject(JSONUtils.DATA_KEY);
@@ -149,7 +149,7 @@ class ParsePost {
                 if(data.isNull(JSONUtils.SELFTEXT_HTML_KEY)) {
                     post.setSelfText("");
                 } else {
-                    post.setSelfText(Html.fromHtml(data.getString(JSONUtils.SELFTEXT_HTML_KEY).trim()).toString());
+                    post.setSelfText(data.getString(JSONUtils.SELFTEXT_HTML_KEY).trim());
                 }
                 bestPostData.add(post);
             } else {
@@ -162,7 +162,7 @@ class ParsePost {
                 if(data.isNull(JSONUtils.SELFTEXT_HTML_KEY)) {
                     linkPost.setSelfText("");
                 } else {
-                    linkPost.setSelfText(Html.fromHtml(data.getString(JSONUtils.SELFTEXT_HTML_KEY).trim()).toString());
+                    linkPost.setSelfText(data.getString(JSONUtils.SELFTEXT_HTML_KEY).trim());
                 }
                 bestPostData.add(linkPost);
             }
@@ -253,7 +253,7 @@ class ParsePost {
                             if(data.isNull(JSONUtils.SELFTEXT_HTML_KEY)) {
                                 textWithImagePost.setSelfText("");
                             } else {
-                                textWithImagePost.setSelfText(Html.fromHtml(data.getString(JSONUtils.SELFTEXT_HTML_KEY).trim()).toString());
+                                textWithImagePost.setSelfText(data.getString(JSONUtils.SELFTEXT_HTML_KEY).trim());
                             }
                             bestPostData.add(textWithImagePost);
                         } else {
@@ -266,7 +266,7 @@ class ParsePost {
                             if(data.isNull(JSONUtils.SELFTEXT_HTML_KEY)) {
                                 linkPost.setSelfText("");
                             } else {
-                                linkPost.setSelfText(Html.fromHtml(data.getString(JSONUtils.SELFTEXT_HTML_KEY).trim()).toString());
+                                linkPost.setSelfText(data.getString(JSONUtils.SELFTEXT_HTML_KEY).trim());
                             }
 
                             linkPost.setPreviewWidth(previewWidth);
-- 
cgit v1.2.3