From 4a6baae97abf8bfeea910ea0e9acfca23a3344b7 Mon Sep 17 00:00:00 2001
From: Grishka <git@grishka.me>
Date: Sat, 26 Nov 2022 19:29:05 +0300
Subject: [PATCH] Make URLs clickable in instance rules

closes #389
---
 .../android/fragments/ComposeFragment.java    | 20 +-----------
 .../onboarding/InstanceRulesFragment.java     |  6 +++-
 .../joinmastodon/android/model/Instance.java  |  2 ++
 .../android/ui/text/HtmlParser.java           | 32 +++++++++++++++++++
 .../android/ui/utils/UiUtils.java             |  3 +-
 .../main/res/layout/item_report_choice.xml    |  2 +-
 6 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
index 58748aba9..a41d851b9 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -27,7 +27,6 @@ import android.text.Layout;
 import android.text.Spanned;
 import android.text.TextUtils;
 import android.text.TextWatcher;
-import android.text.format.DateUtils;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -51,7 +50,6 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.twitter.twittertext.Regex;
 import com.twitter.twittertext.TwitterTextEmojiRegex;
 
 import org.joinmastodon.android.E;
@@ -101,7 +99,6 @@ import org.parceler.Parcels;
 import java.io.InterruptedIOException;
 import java.net.SocketException;
 import java.net.UnknownHostException;
-import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.List;
@@ -132,21 +129,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private static final Pattern AUTO_COMPLETE_PATTERN=Pattern.compile("(?<!\\w)(?:@([a-zA-Z0-9_]+)(@[a-zA-Z0-9_.-]+)?|#([^\\s.]+)|:([a-zA-Z0-9_]+))");
 	private static final Pattern HIGHLIGHT_PATTERN=Pattern.compile("(?<!\\w)(?:@([a-zA-Z0-9_]+)(@[a-zA-Z0-9_.-]+)?|#([^\\s.]+))");
 
-	private static final String VALID_URL_PATTERN_STRING =
-					"(" +                                                            //  $1 total match
-						"(" + Regex.URL_VALID_PRECEDING_CHARS + ")" +                        //  $2 Preceding character
-						"(" +                                                          //  $3 URL
-						"(https?://)" +                                             //  $4 Protocol (optional)
-						"(" + Regex.URL_VALID_DOMAIN + ")" +                               //  $5 Domain(s)
-						"(?::(" + Regex.URL_VALID_PORT_NUMBER + "))?" +                    //  $6 Port number (optional)
-						"(/" +
-						Regex.URL_VALID_PATH + "*+" +
-						")?" +                                                       //  $7 URL Path and anchor
-						"(\\?" + Regex.URL_VALID_URL_QUERY_CHARS + "*" +                   //  $8 Query String
-						Regex.URL_VALID_URL_QUERY_ENDING_CHARS + ")?" +
-						")" +
-					")";
-	private static final Pattern URL_PATTERN=Pattern.compile(VALID_URL_PATTERN_STRING, Pattern.CASE_INSENSITIVE);
 	@SuppressLint("NewApi") // this class actually exists on 6.0
 	private final BreakIterator breakIterator=BreakIterator.getCharacterInstance();
 
@@ -612,7 +594,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 
 		String countableText=TwitterTextEmojiRegex.VALID_EMOJI_PATTERN.matcher(
 				MENTION_PATTERN.matcher(
-						URL_PATTERN.matcher(text).replaceAll("$2xxxxxxxxxxxxxxxxxxxxxxx")
+						HtmlParser.URL_PATTERN.matcher(text).replaceAll("$2xxxxxxxxxxxxxxxxxxxxxxx")
 				).replaceAll("$1@$3")
 		).replaceAll("x");
 		charCount=0;
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceRulesFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceRulesFragment.java
index edf124502..f0df80b49 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceRulesFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceRulesFragment.java
@@ -14,6 +14,7 @@ import android.widget.TextView;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.ui.DividerItemDecoration;
+import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.parceler.Parcels;
 
@@ -131,7 +132,10 @@ public class InstanceRulesFragment extends AppKitFragment{
 
 		@Override
 		public void onBind(Instance.Rule item){
-			title.setText(item.text);
+			if(item.parsedText==null){
+				item.parsedText=HtmlParser.parseLinks(item.text);
+			}
+			title.setText(item.parsedText);
 		}
 	}
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/Instance.java b/mastodon/src/main/java/org/joinmastodon/android/model/Instance.java
index 56a96d330..a9a0aeab7 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/model/Instance.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/Instance.java
@@ -134,6 +134,8 @@ public class Instance extends BaseModel{
 	public static class Rule{
 		public String id;
 		public String text;
+
+		public transient CharSequence parsedText;
 	}
 
 	@Parcel
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java b/mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
index a27ced1da..fdd976983 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
@@ -2,8 +2,11 @@ package org.joinmastodon.android.ui.text;
 
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
+import android.text.TextUtils;
 import android.widget.TextView;
 
+import com.twitter.twittertext.Regex;
+
 import org.joinmastodon.android.model.Emoji;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.Mention;
@@ -28,6 +31,21 @@ import androidx.annotation.NonNull;
 
 public class HtmlParser{
 	private static final String TAG="HtmlParser";
+	private static final String VALID_URL_PATTERN_STRING =
+					"(" +                                                            //  $1 total match
+						"(" + Regex.URL_VALID_PRECEDING_CHARS + ")" +                        //  $2 Preceding character
+						"(" +                                                          //  $3 URL
+						"(https?://)" +                                             //  $4 Protocol (optional)
+						"(" + Regex.URL_VALID_DOMAIN + ")" +                               //  $5 Domain(s)
+						"(?::(" + Regex.URL_VALID_PORT_NUMBER + "))?" +                    //  $6 Port number (optional)
+						"(/" +
+						Regex.URL_VALID_PATH + "*+" +
+						")?" +                                                       //  $7 URL Path and anchor
+						"(\\?" + Regex.URL_VALID_URL_QUERY_CHARS + "*" +                   //  $8 Query String
+						Regex.URL_VALID_URL_QUERY_ENDING_CHARS + ")?" +
+						")" +
+					")";
+	public static final Pattern URL_PATTERN=Pattern.compile(VALID_URL_PATTERN_STRING, Pattern.CASE_INSENSITIVE);
 	private static Pattern EMOJI_CODE_PATTERN=Pattern.compile(":([\\w]+):");
 
 	private HtmlParser(){}
@@ -172,4 +190,18 @@ public class HtmlParser{
 	public static String strip(String html){
 		return Jsoup.clean(html, Safelist.none());
 	}
+
+	public static CharSequence parseLinks(String text){
+		Matcher matcher=URL_PATTERN.matcher(text);
+		if(!matcher.find()) // Return the original string if there are no URLs
+			return text;
+		SpannableStringBuilder ssb=new SpannableStringBuilder(text);
+		do{
+			String url=matcher.group(3);
+			if(TextUtils.isEmpty(matcher.group(4)))
+				url="http://"+url;
+			ssb.setSpan(new LinkSpan(url, null, LinkSpan.Type.URL, null), matcher.start(3), matcher.end(3), 0);
+		}while(matcher.find()); // Find more URLs
+		return ssb;
+	}
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
index 84436cca2..47f750845 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
@@ -550,8 +550,7 @@ public class UiUtils{
 
 	public static void openURL(Context context, String accountID, String url){
 		Uri uri=Uri.parse(url);
-		String accountDomain=AccountSessionManager.getInstance().getAccount(accountID).domain;
-		if("https".equals(uri.getScheme()) && accountDomain.equalsIgnoreCase(uri.getAuthority())){
+		if(accountID!=null && "https".equals(uri.getScheme()) && AccountSessionManager.getInstance().getAccount(accountID).domain.equalsIgnoreCase(uri.getAuthority())){
 			List<String> path=uri.getPathSegments();
 			// Match URLs like https://mastodon.social/@Gargron/108132679274083591
 			if(path.size()==2 && path.get(0).matches("^@[a-zA-Z0-9_]+$") && path.get(1).matches("^[0-9]+$")){
diff --git a/mastodon/src/main/res/layout/item_report_choice.xml b/mastodon/src/main/res/layout/item_report_choice.xml
index 27ecd7588..6a748bca2 100644
--- a/mastodon/src/main/res/layout/item_report_choice.xml
+++ b/mastodon/src/main/res/layout/item_report_choice.xml
@@ -14,7 +14,7 @@
 		android:tint="?android:textColorSecondary"
 		android:src="@drawable/ic_round_checkbox"/>
 
-	<TextView
+	<org.joinmastodon.android.ui.views.LinkedTextView
 		android:id="@+id/title"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"