From 8683ba2612559225743c1ba4efd2dfee012345b8 Mon Sep 17 00:00:00 2001
From: stom79 <tschneider.ac@gmail.com>
Date: Sat, 26 Jan 2019 19:18:53 +0100
Subject: [PATCH] Html support

---
 .../java/fr/gouv/etalab/mastodon/client/Entities/Status.java  | 4 ++--
 app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java  | 4 ++--
 app/src/main/res/layout/drawer_status.xml                     | 2 --
 app/src/main/res/layout/drawer_status_focused.xml             | 2 --
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java
index 5ea217813..0537c7717 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java
@@ -861,10 +861,10 @@ public class Status implements Parcelable{
         }
         SpannableString spannableStringT;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
-            spannableStringT = new SpannableString(Html.fromHtml(spannableString.toString().replaceAll("^<p>","").replaceAll("<p>","<br/><br/>").replaceAll("</p>",""), Html.FROM_HTML_MODE_LEGACY));
+            spannableStringT = new SpannableString(Html.fromHtml(spannableString.toString(), Html.FROM_HTML_SEPARATOR_LINE_BREAK_PARAGRAPH));
         else
             //noinspection deprecation
-            spannableStringT = new SpannableString(Html.fromHtml(spannableString.toString().replaceAll("^<p>","").replaceAll("<p>","<br/><br/>").replaceAll("</p>","")));
+            spannableStringT = new SpannableString(Html.fromHtml(spannableString.toString()));
 
         URLSpan[] spans = spannableStringT.getSpans(0, spannableStringT.length(), URLSpan.class);
         for (URLSpan span : spans) {
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
index 572dcdb5e..334037b8e 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
@@ -1891,10 +1891,10 @@ public class Helper {
             accountsMentionUnknown.add(account);
         }
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
-            spannableString = new SpannableString(Html.fromHtml(spannableStringT.toString().replaceAll("^<p>","").replaceAll("<p>","<br/><br/>").replaceAll("</p>",""), Html.FROM_HTML_MODE_LEGACY));
+            spannableString = new SpannableString(Html.fromHtml(spannableStringT.toString(), Html.TO_HTML_PARAGRAPH_LINES_INDIVIDUAL));
         else
             //noinspection deprecation
-            spannableString = new SpannableString(Html.fromHtml(spannableStringT.toString().replaceAll("^<p>","").replaceAll("<p>","<br/><br/>").replaceAll("</p>","")));
+            spannableString = new SpannableString(Html.fromHtml(spannableStringT.toString()));
 
         URLSpan[] urls = spannableString.getSpans(0, spannableString.length(), URLSpan.class);
         for(URLSpan span : urls)
diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml
index 9714845bb..1c8af5631 100644
--- a/app/src/main/res/layout/drawer_status.xml
+++ b/app/src/main/res/layout/drawer_status.xml
@@ -265,11 +265,9 @@
                 <fr.gouv.etalab.mastodon.helper.CustomTextView
                     android:id="@+id/status_content"
                     android:textIsSelectable="true"
-                    android:layout_marginBottom="10dp"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
                 <Button
-                    android:layout_marginTop="-10dp"
                     android:paddingTop="2dp"
                     android:paddingBottom="2dp"
                     android:id="@+id/status_show_more_content"
diff --git a/app/src/main/res/layout/drawer_status_focused.xml b/app/src/main/res/layout/drawer_status_focused.xml
index 535ef1ca0..cfc74fa76 100644
--- a/app/src/main/res/layout/drawer_status_focused.xml
+++ b/app/src/main/res/layout/drawer_status_focused.xml
@@ -158,7 +158,6 @@
         <fr.gouv.etalab.mastodon.helper.CustomTextView
             android:id="@+id/status_content"
             android:textIsSelectable="true"
-            android:layout_marginBottom="10dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
         <Button
@@ -169,7 +168,6 @@
             android:drawableStart="@drawable/ic_more_toot_content"
             android:gravity="center_vertical"
             android:drawablePadding="5dp"
-            android:layout_marginTop="-10dp"
             android:paddingTop="2dp"
             android:paddingBottom="2dp"
             android:maxLines="1"