merge: merge newest upstream/master

2023-01-02 19:42:42 +01:00
parent 42fcd6df51 91995155e9
commit 4fe87a9888
15 changed files with 114 additions and 66 deletions
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/text/LinkSpan.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/text/LinkSpan.java
@@ -32,7 +32,7 @@ public class LinkSpan extends CharacterStyle {
 	public void updateDrawState(TextPaint tp) {
 		tp.setColor(color=tp.linkColor);
 	}
-	
+
 	public void onClick(Context context){
 		switch(getType()){
 			case URL -> UiUtils.openURL(context, accountID, link);
@@ -45,7 +45,6 @@ public class LinkSpan extends CharacterStyle {
 		UiUtils.copyText(view, getType() == Type.URL ? link : text);
 	}

-
 	public String getLink(){
 		return link;
 	}