mirrors/Fedilab
1
0
Fork 1
mirror of https://codeberg.org/tom79/Fedilab.git synced 2025-07-13 23:20:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix embedded quotes not displayed

Browse source
This commit is contained in:
Thomas 2025-06-05 11:56:54 +02:00
parent e051bec7a0
commit 8a9b0d897f
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -170,7 +170,8 @@ public class SpannableHelper {
if (status != null && status.mentions != null) {
mentions.addAll(status.mentions);
}
if(!convertMarkdown) {
boolean markdownSupport = sharedpreferences.getBoolean(context.getString(R.string.SET_MARKDOWN_SUPPORT), false);
if(!markdownSupport) {
text = text.replaceAll("((<\\s?p\\s?>|<\\s?br\\s?/?>)&gt;(((?!(<\\s?br\\s?/?>|<\\s?/s?p\\s?>)).)*))", "$2<blockquote>$3</blockquote>");
}
text = text.trim().replaceAll("\\s{3}", "&nbsp;&nbsp;&nbsp;");
@ -185,7 +186,7 @@ public class SpannableHelper {
initialContent = new SpannableString(text);
}
boolean markdownSupport = sharedpreferences.getBoolean(context.getString(R.string.SET_MARKDOWN_SUPPORT), false);
//Get all links
SpannableStringBuilder content;
if (markdownSupport && convertMarkdown) {
@ -373,9 +374,9 @@ public class SpannableHelper {
} else {
makeLinks(context, status, content, url, start, end, sameContent);
}
replaceQuoteSpans(context, content);
emails(context, content, status);
}
replaceQuoteSpans(context, content);
emails(context, content, status);
Pattern imgPattern = Pattern.compile("<img [^>]*src=\"([^\"]+)\"[^>]*>");
Matcher matcherImg = imgPattern.matcher(text);