From 16f907c91f0d48170f65fd0f291627e26f88f547 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Wed, 15 Mar 2023 19:23:20 +0100
Subject: [PATCH] show thread reply line

---
 .../android/ui/displayitems/StatusDisplayItem.java  | 13 ++++++++++---
 mastodon/src/main/res/values/strings_sk.xml         |  1 +
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
index 92f1fd05f..62caa539a 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
@@ -135,13 +135,20 @@ public abstract class StatusDisplayItem{
 		}
 
 		ReblogOrReplyLineStatusDisplayItem replyLine = null;
-		if(statusForContent.inReplyToAccountId!=null){
+		boolean threadReply = statusForContent.inReplyToAccountId != null &&
+				statusForContent.inReplyToAccountId.equals(status.account.id);
+
+		if(statusForContent.inReplyToAccountId!=null && !(threadReply && fragment instanceof ThreadFragment)){
 			Account account = knownAccounts.get(statusForContent.inReplyToAccountId);
-			View.OnClickListener handleClick = account == null ? null : i -> {
+			View.OnClickListener handleClick = account == null || threadReply ? null : i -> {
 				args.putParcelable("profileAccount", Parcels.wrap(account));
 				Nav.go(fragment.getActivity(), ProfileFragment.class, args);
 			};
-			String text = account != null ? fragment.getString(R.string.in_reply_to, account.displayName) : fragment.getString(R.string.sk_in_reply);
+
+			String text = threadReply ?
+					fragment.getString(R.string.sk_show_thread) : account != null ?
+					fragment.getString(R.string.in_reply_to, account.displayName) : fragment.getString(R.string.sk_in_reply);
+
 			replyLine = new ReblogOrReplyLineStatusDisplayItem(
 					parentID, fragment, text, account == null ? List.of() : account.emojis,
 					R.drawable.ic_fluent_arrow_reply_20_filled, null, handleClick
diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index 020abb079..4406ecca2 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -264,4 +264,5 @@
     <string name="sk_settings_hide_fab">Auto-hide Compose button</string>
     <string name="sk_in_reply">In reply</string>
     <string name="sk_reply_line_below_avatar">“In reply to” line below avatar</string>
+    <string name="sk_show_thread">Show thread</string>
 </resources>
\ No newline at end of file