Match email addresses before web urls

irccloud · Dec 12, 2019 · f62140b · f62140b
1 parent a6b4ccb
commit f62140b
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 33 deletions.
diff --git a/build.gradle b/build.gradle
@@ -68,7 +68,7 @@ android {
     testBuildType "mockdata"
 
     defaultConfig {
-        versionCode 266
+        versionCode 267
         versionName "4.20"
         minSdkVersion 17
         targetSdkVersion 29

diff --git a/src/com/irccloud/android/ColorFormatter.java b/src/com/irccloud/android/ColorFormatter.java
@@ -2407,6 +2407,38 @@ public boolean acceptMatch(CharSequence s, int start, int end) {
                 }
             };
 
+            Linkify.addLinks(output, Patterns.EMAIL_ADDRESS, "mailto:", noOverlapFilter, null);
+            Linkify.addLinks(output, Pattern.compile("ircs?://[^<>\",\\s]+"), null, noOverlapFilter, new TransformFilter() {
+                public final String transformUrl(final Matcher match, String url) {
+                    char last = url.charAt(url.length() - 1);
+                    if (isPunctuation(last)) {
+                        url = url.substring(0, url.length() - 1);
+                        last = url.charAt(url.length() - 1);
+                    }
+
+                    if (quotes.containsKey(String.valueOf(last))) {
+                        char open = quotes.get(String.valueOf(last)).charAt(0);
+                        int countOpen = 0, countClose = 0;
+                        for (int i = 0; i < url.length(); i++) {
+                            char c = url.charAt(i);
+                            if (c == open)
+                                countOpen++;
+                            else if (c == last)
+                                countClose++;
+                        }
+                        if (countOpen != countClose) {
+                            url = url.substring(0, url.length() - 1);
+                        }
+                    }
+
+                    return url.replace("#", "%23");
+                }
+            });
+            Linkify.addLinks(output, Pattern.compile("spotify:([a-zA-Z0-9:]+)"), null, noOverlapFilter, new TransformFilter() {
+                public final String transformUrl(final Matcher match, String url) {
+                    return "https://open.spotify.com/" + url.substring(8).replace(":", "/");
+                }
+            });
             Linkify.addLinks(output, WEB_URL, null, new MatchFilter() {
                 public final boolean acceptMatch(CharSequence s, int start, int end) {
                     if (start >= 6 && s.subSequence(start - 6, end).toString().toLowerCase().startsWith("irc://"))
@@ -2504,38 +2536,6 @@ else if (lower.startsWith("https://"))
                     return url;
                 }
             });
-            Linkify.addLinks(output, Patterns.EMAIL_ADDRESS, "mailto:", noOverlapFilter, null);
-            Linkify.addLinks(output, Pattern.compile("ircs?://[^<>\",\\s]+"), null, noOverlapFilter, new TransformFilter() {
-                public final String transformUrl(final Matcher match, String url) {
-                    char last = url.charAt(url.length() - 1);
-                    if (isPunctuation(last)) {
-                        url = url.substring(0, url.length() - 1);
-                        last = url.charAt(url.length() - 1);
-                    }
-
-                    if (quotes.containsKey(String.valueOf(last))) {
-                        char open = quotes.get(String.valueOf(last)).charAt(0);
-                        int countOpen = 0, countClose = 0;
-                        for (int i = 0; i < url.length(); i++) {
-                            char c = url.charAt(i);
-                            if (c == open)
-                                countOpen++;
-                            else if (c == last)
-                                countClose++;
-                        }
-                        if (countOpen != countClose) {
-                            url = url.substring(0, url.length() - 1);
-                        }
-                    }
-
-                    return url.replace("#", "%23");
-                }
-            });
-            Linkify.addLinks(output, Pattern.compile("spotify:([a-zA-Z0-9:]+)"), null, noOverlapFilter, new TransformFilter() {
-                public final String transformUrl(final Matcher match, String url) {
-                    return "https://open.spotify.com/" + url.substring(8).replace(":", "/");
-                }
-            });
             if (server != null) {
                 Linkify.addLinks(output, Pattern.compile(pattern), null, new MatchFilter() {
                     public final boolean acceptMatch(CharSequence s, int start, int end) {