Apply a better try catch logic

wikimedia · Nov 18, 2023 · 5a152ff · 5a152ff
1 parent 3fda90e
commit 5a152ff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/app/src/main/java/org/wikipedia/richtext/TextViewHtml.kt b/app/src/main/java/org/wikipedia/richtext/TextViewHtml.kt
@@ -1,7 +1,8 @@
 package org.wikipedia.richtext
 
 import android.widget.TextView
+import org.wikipedia.util.StringUtil
 
 fun TextView.setHtml(source: String?) {
-    this.text = CustomHtmlParser.fromHtml(source, this).trim()
+    this.text = StringUtil.fromHtml(source).trim()
 }
diff --git a/app/src/main/java/org/wikipedia/util/StringUtil.kt b/app/src/main/java/org/wikipedia/util/StringUtil.kt
@@ -12,6 +12,7 @@ import android.text.style.StyleSpan
 import android.widget.EditText
 import android.widget.TextView
 import androidx.annotation.IntRange
+import androidx.core.text.HtmlCompat
 import androidx.core.text.buildSpannedString
 import androidx.core.text.set
 import okio.ByteString.Companion.encodeUtf8
@@ -109,7 +110,11 @@ object StringUtil {
     }
 
     fun fromHtml(source: String?): Spanned {
-        return CustomHtmlParser.fromHtml(source)
+        return try {
+            CustomHtmlParser.fromHtml(source)
+        } catch (e: Exception) {
+            HtmlCompat.fromHtml(source.orEmpty(), HtmlCompat.FROM_HTML_MODE_LEGACY)
+        }
     }
 
     fun highlightEditText(editText: EditText, parentText: String, highlightText: String) {