fix toots showing too much whitespace (#1761)

* fix toots showing too much whitespace

* use isWhitespace extension function

app/src/main/java/com/keylesspalace/tusky/db/Converters.kt

@@ -29,6 +29,7 @@ import com.keylesspalace.tusky.entity.Emoji
 import com.keylesspalace.tusky.entity.Poll
 import com.keylesspalace.tusky.entity.Status
 import com.keylesspalace.tusky.json.SpannedTypeAdapter
+import com.keylesspalace.tusky.util.trimTrailingWhitespace
 import java.net.URLDecoder
 import java.net.URLEncoder
 import java.util.*
@@ -137,7 +138,7 @@ class Converters {
         if(spannedString == null) {
             return null
         }
-        return spannedString.parseAsHtml()
+        return spannedString.parseAsHtml().trimTrailingWhitespace()
     }
 
     @TypeConverter

app/src/main/java/com/keylesspalace/tusky/json/SpannedTypeAdapter.java

@@ -1,59 +0,0 @@
-/* Copyright 2017 Andrew Dawson
- *
- * This file is a part of Tusky.
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with Tusky; if not,
- * see <http://www.gnu.org/licenses>. */
-
-package com.keylesspalace.tusky.json;
-
-import android.text.Spanned;
-import android.text.SpannedString;
-
-import androidx.core.text.HtmlCompat;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParseException;
-import com.google.gson.JsonPrimitive;
-import com.google.gson.JsonSerializationContext;
-import com.google.gson.JsonSerializer;
-
-import java.lang.reflect.Type;
-
-public class SpannedTypeAdapter implements JsonDeserializer<Spanned>, JsonSerializer<Spanned> {
-    @Override
-    public Spanned deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
-            throws JsonParseException {
-        String string = json.getAsString();
-        if (string != null) {
-            /* Html.fromHtml returns trailing whitespace if the html ends in a </p> tag, which
-             * all status contents do, so it should be trimmed. */
-            return (Spanned)trimTrailingWhitespace(HtmlCompat.fromHtml(string, HtmlCompat.FROM_HTML_MODE_LEGACY));
-        } else {
-            return new SpannedString("");
-        }
-    }
-
-    @Override
-    public JsonElement serialize(Spanned src, Type typeOfSrc, JsonSerializationContext context) {
-        return new JsonPrimitive(HtmlCompat.toHtml(src, HtmlCompat.TO_HTML_PARAGRAPH_LINES_INDIVIDUAL));
-    }
-
-    private static CharSequence trimTrailingWhitespace(CharSequence s) {
-        int i = s.length();
-        do {
-            i--;
-        } while (i >= 0 && Character.isWhitespace(s.charAt(i)));
-        return s.subSequence(0, i + 1);
-    }
-}

app/src/main/java/com/keylesspalace/tusky/json/SpannedTypeAdapter.kt

@@ -0,0 +1,37 @@
+/* Copyright 2020 Tusky Contributors
+ *
+ * This file is a part of Tusky.
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Tusky; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+package com.keylesspalace.tusky.json
+
+import android.text.Spanned
+import android.text.SpannedString
+import androidx.core.text.HtmlCompat
+import androidx.core.text.parseAsHtml
+import com.google.gson.*
+import com.keylesspalace.tusky.util.trimTrailingWhitespace
+import java.lang.reflect.Type
+
+class SpannedTypeAdapter : JsonDeserializer<Spanned>, JsonSerializer<Spanned?> {
+    @Throws(JsonParseException::class)
+    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): Spanned {
+        /* Html.fromHtml returns trailing whitespace if the html ends in a </p> tag, which
+         * all status contents do, so it should be trimmed. */
+        return json.asString?.parseAsHtml()?.trimTrailingWhitespace() ?: SpannedString("")
+    }
+
+    override fun serialize(src: Spanned?, typeOfSrc: Type, context: JsonSerializationContext): JsonElement {
+        return JsonPrimitive(HtmlCompat.toHtml(src!!, HtmlCompat.TO_HTML_PARAGRAPH_LINES_INDIVIDUAL))
+    }
+}

app/src/main/java/com/keylesspalace/tusky/repository/TimelineRepository.kt

@@ -1,5 +1,6 @@
 package com.keylesspalace.tusky.repository
 
+import android.text.Spanned
 import android.text.SpannedString
 import androidx.core.text.parseAsHtml
 import androidx.core.text.toHtml
@@ -13,6 +14,7 @@ import com.keylesspalace.tusky.repository.TimelineRequestMode.NETWORK
 import com.keylesspalace.tusky.util.Either
 import com.keylesspalace.tusky.util.dec
 import com.keylesspalace.tusky.util.inc
+import com.keylesspalace.tusky.util.trimTrailingWhitespace
 import io.reactivex.Single
 import io.reactivex.schedulers.Schedulers
 import java.io.IOException
@@ -214,7 +216,7 @@ class TimelineRepositoryImpl(
                     inReplyToId = status.inReplyToId,
                     inReplyToAccountId = status.inReplyToAccountId,
                     reblog = null,
-                    content = status.content?.parseAsHtml() ?: SpannedString(""),
+                    content = status.content?.parseAsHtml()?.trimTrailingWhitespace() ?: SpannedString(""),
                     createdAt = Date(status.createdAt),
                     emojis = emojis,
                     reblogsCount = status.reblogsCount,
@@ -269,7 +271,7 @@ class TimelineRepositoryImpl(
                     inReplyToId = status.inReplyToId,
                     inReplyToAccountId = status.inReplyToAccountId,
                     reblog = null,
-                    content = status.content?.parseAsHtml() ?: SpannedString(""),
+                    content = status.content?.parseAsHtml()?.trimTrailingWhitespace() ?: SpannedString(""),
                     createdAt = Date(status.createdAt),
                     emojis = emojis,
                     reblogsCount = status.reblogsCount,

app/src/main/java/com/keylesspalace/tusky/util/StringUtils.kt

@@ -2,7 +2,8 @@
 
 package com.keylesspalace.tusky.util
 
-import java.util.Random
+import android.text.Spanned
+import java.util.*
 
 
 private const val POSSIBLE_CHARS = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
@@ -71,3 +72,11 @@ fun String.isLessThan(other: String): Boolean {
         else -> this < other
     }
 }
+
+fun Spanned.trimTrailingWhitespace(): Spanned {
+    var i = length
+    do {
+        i--
+    } while (i >= 0 && get(i).isWhitespace())
+    return subSequence(0, i + 1) as Spanned
+}