summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas <tschneider.ac@gmail.com>2022-07-02 14:53:54 +0200
committerThomas <tschneider.ac@gmail.com>2022-07-02 14:53:54 +0200
commit13575706de25a4bd269e2c1ed37a86c96235e47e (patch)
tree33db6dbff25087312c7c2cc68614d317617857e9
parentbbbc8e00cc6f39d9ca671bed568c1a3c5188cdda (diff)
Fix an issue
-rw-r--r--app/src/main/java/app/fedilab/android/helper/SpannableHelper.java12
1 files changed, 9 insertions, 3 deletions
diff --git a/app/src/main/java/app/fedilab/android/helper/SpannableHelper.java b/app/src/main/java/app/fedilab/android/helper/SpannableHelper.java
index eb403a682..d0e9afda4 100644
--- a/app/src/main/java/app/fedilab/android/helper/SpannableHelper.java
+++ b/app/src/main/java/app/fedilab/android/helper/SpannableHelper.java
@@ -94,7 +94,6 @@ public class SpannableHelper {
private static Spannable convert(@NonNull Context context, @NonNull Status status, String text) {
return convert(context, status, text, true);
}
-
/**
* Convert HTML content to text. Also, it handles click on link and transform emoji
* This needs to be run asynchronously
@@ -124,7 +123,7 @@ public class SpannableHelper {
text = text.replaceAll(Pattern.quote(matcherALink.group()), Matcher.quoteReplacement(url));
}
}
- if (convertHtml) {
+ if(convertHtml) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
initialContent = new SpannableString(Html.fromHtml(text, Html.FROM_HTML_MODE_LEGACY));
else
@@ -1144,7 +1143,14 @@ public class SpannableHelper {
if (text == null) {
return null;
}
- initialContent = new SpannableString(text);
+ if (!limitedToDisplayName) {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
+ initialContent = new SpannableString(Html.fromHtml(text, Html.FROM_HTML_MODE_LEGACY));
+ else
+ initialContent = new SpannableString(Html.fromHtml(text));
+ } else {
+ initialContent = new SpannableString(text);
+ }
SpannableStringBuilder content = new SpannableStringBuilder(initialContent);
URLSpan[] urls = content.getSpans(0, (content.length() - 1), URLSpan.class);
for (URLSpan span : urls)