Commit 9d6a2057 authored by Thomas's avatar Thomas
Browse files

Add tags in any when pinned / Fix quotes with tags breaking lines

parent 785257cc

app/src/main/java/app/fedilab/android/activities/HashTagActivity.java

+2 −0
Original line number Diff line number Diff line
@@ -221,6 +221,8 @@ public class HashTagActivity extends BaseActivity { 
                        tagTimeline.name = stripTag.trim();

                        tagTimeline.isNSFW = false;

                        tagTimeline.isART = false;

                        tagTimeline.any = new ArrayList<>();

                        tagTimeline.any.add(stripTag.trim());

                        pinnedTimeline.tagTimeline = tagTimeline;

                        pinned.pinnedTimelines.add(pinnedTimeline);

                        if (update) {

app/src/main/java/app/fedilab/android/helper/SpannableHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ public class SpannableHelper { 
        if (status != null && status.mentions != null) {

            mentions.addAll(status.mentions);

        }

        text = text.replaceAll("((<\\s?p\\s?>|<\\s?br\\s?/?>)&gt;(((?!([<])).)*))", "$2<blockquote>$3</blockquote>");

        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;