mirrors/Fedilab
1
0
Fork 1
mirror of https://codeberg.org/tom79/Fedilab.git synced 2024-12-23 01:00:04 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix an issue

Browse source
This commit is contained in:
Thomas 2022-07-02 14:53:54 +02:00
parent bbbc8e00cc
commit 13575706de
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/app/fedilab/android/helper/SpannableHelper.java
View file

@ -94,7 +94,6 @@ public class SpannableHelper {
private static Spannable convert(@NonNull Context context, @NonNull Status status, String text) { private static Spannable convert(@NonNull Context context, @NonNull Status status, String text) {
return convert(context, status, text, true); return convert(context, status, text, true);
} }
/** /**
* Convert HTML content to text. Also, it handles click on link and transform emoji * Convert HTML content to text. Also, it handles click on link and transform emoji
* This needs to be run asynchronously * This needs to be run asynchronously
@ -124,7 +123,7 @@ public class SpannableHelper {
text = text.replaceAll(Pattern.quote(matcherALink.group()), Matcher.quoteReplacement(url)); text = text.replaceAll(Pattern.quote(matcherALink.group()), Matcher.quoteReplacement(url));
} }
} }
if (convertHtml) { if(convertHtml) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
initialContent = new SpannableString(Html.fromHtml(text, Html.FROM_HTML_MODE_LEGACY)); initialContent = new SpannableString(Html.fromHtml(text, Html.FROM_HTML_MODE_LEGACY));
else else
@ -1144,7 +1143,14 @@ public class SpannableHelper {
if (text == null) { if (text == null) {
return 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); SpannableStringBuilder content = new SpannableStringBuilder(initialContent);
URLSpan[] urls = content.getSpans(0, (content.length() - 1), URLSpan.class); URLSpan[] urls = content.getSpans(0, (content.length() - 1), URLSpan.class);
for (URLSpan span : urls) for (URLSpan span : urls)