Commit 3f9e2210 authored by Thomas's avatar Thomas
Browse files

Fix mentions

parent 865cf068

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

+2 −2
Original line number Diff line number Diff line
@@ -315,8 +315,8 @@ public class Helper { 


    public static final Pattern hashtagPattern = Pattern.compile("(#[\\w_A-zÀ-ÿ]+)");

    public static final Pattern groupPattern = Pattern.compile("(![\\w_]+)");

    public static final Pattern mentionPattern = Pattern.compile("^(@[\\w_]+)|\\s+(@[\\w_]+)");

    public static final Pattern mentionLongPattern = Pattern.compile("(@[\\w_-]+@[a-zA-Z0-9][a-zA-Z0-9.-]{1,61}[a-zA-Z0-9](?:\\.[a-zA-Z]{2,})+)");

    public static final Pattern mentionPattern = Pattern.compile("(@[\\w_.-]+)");

    public static final Pattern mentionLongPattern = Pattern.compile("(@[\\w_.-]+@[a-zA-Z0-9][a-zA-Z0-9.-]{1,61}[a-zA-Z0-9](?:\\.[a-zA-Z]{2,})+)");



    public static final Pattern twitterPattern = Pattern.compile("((@[\\w]+)@twitter\\.com)");

    public static final Pattern youtubePattern = Pattern.compile("(www\\.|m\\.)?(youtube\\.com|youtu\\.be|youtube-nocookie\\.com)/(((?!([\"'<])).)*)");

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

+7 −0
Original line number Diff line number Diff line
@@ -675,6 +675,13 @@ public class SpannableHelper { 
            int matchEnd = matcher.end();

            String email = content.toString().substring(matchStart, matchEnd);

            if (matchStart >= 0 && matchEnd <= content.toString().length() && matchEnd >= matchStart) {

                ClickableSpan[] clickableSpans = content.getSpans(matchStart, matchEnd, ClickableSpan.class);

                if (clickableSpans != null) {

                    for (ClickableSpan clickableSpan : clickableSpans) {

                        content.removeSpan(clickableSpan);

                    }

                }

                content.removeSpan(clickableSpans);

                content.setSpan(new ClickableSpan() {

                    @Override

                    public void onClick(@NonNull View textView) {