From 496d4188c7e859762182e05bb3cc877d50d15bab Mon Sep 17 00:00:00 2001 From: Tobias Preuss Date: Mon, 13 Jul 2020 19:52:22 +0200 Subject: [PATCH] Replace deprecated Html#fromHtml with HtmlCompat#fromHtml. Resolves #1435. --- .../java/org/briarproject/briar/android/util/UiUtils.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java b/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java index 50dbd91ca..c22a012ca 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java @@ -9,7 +9,6 @@ import android.content.Intent; import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.PowerManager; -import android.text.Html; import android.text.Spannable; import android.text.SpannableString; import android.text.SpannableStringBuilder; @@ -51,6 +50,7 @@ import androidx.annotation.UiThread; import androidx.appcompat.app.AlertDialog; import androidx.core.content.ContextCompat; import androidx.core.hardware.fingerprint.FingerprintManagerCompat; +import androidx.core.text.HtmlCompat; import androidx.fragment.app.FragmentManager; import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.LiveData; @@ -186,9 +186,7 @@ public class UiUtils { } public static Spanned getSpanned(@Nullable String s) { - // TODO move to HtmlCompat #1435 - // https://commonsware.com/blog/2018/05/29/at-last-htmlcompat.html - return Html.fromHtml(s); + return HtmlCompat.fromHtml(s, HtmlCompat.FROM_HTML_MODE_LEGACY); } public static void makeLinksClickable(TextView v,