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

- Fix issue #961 - Quotes broken with Markdowns

Browse source
This commit is contained in:
Thomas 2025-02-22 10:43:37 +01:00
parent 1a0131e05a
commit 661b7fb2b0
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/app/fedilab/android/mastodon/client/entities/app/MarkdownConverter.java
View file

@ -23,7 +23,7 @@ public class MarkdownConverter {
public List<MarkdownItem> markdownItems;
public MarkdownItem getByPosition(int position) {
if (markdownItems != null && markdownItems.size() > 0 && position < markdownItems.size()) {
if (markdownItems != null && !markdownItems.isEmpty() && position < markdownItems.size()) {
for (MarkdownItem markdownItem : markdownItems) {
if (markdownItem.position == position) {
return markdownItem;

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

@ -148,7 +148,9 @@ public class SpannableHelper {
if (status != null && status.mentions != null) {
mentions.addAll(status.mentions);
}
text = text.replaceAll("((<\\s?p\\s?>|<\\s?br\\s?/?>)&gt;(((?!(<\\s?br\\s?/?>|<\\s?/s?p\\s?>)).)*))", "$2<blockquote>$3</blockquote>");
if(!convertMarkdown) {
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;");
text = text.trim().replaceAll("\\s{2}", "&nbsp;&nbsp;");
SpannableString initialContent;
@ -181,7 +183,7 @@ public class SpannableHelper {
markdownItem.urlSpan = spans[0];
}
if (markdownItem.code.trim().length() > 0) {
if (!markdownItem.code.trim().isEmpty()) {
markdownConverter.markdownItems.add(markdownItem);
position++;
}