From 1ccf9bf4b75fc1100d183c56031e38e1981e6ce0 Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Tue, 14 May 2024 18:50:01 +0200
Subject: [PATCH] fix(ThreadFragment): pass correct account to ComposeView

Fixes an issue, where the wrong account could be passed to the
ComposeView, when longpressing the replyBar and choosing an account.
---
 .../android/fragments/ThreadFragment.java           | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
index f06c65331c..e5b5cc9e31 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
@@ -418,7 +418,7 @@ public void onViewCreated(View view, Bundle savedInstanceState){
 		UiUtils.loadCustomEmojiInTextView(replyButtonText);
 		replyButtonAva.setOutlineProvider(OutlineProviders.OVAL);
 		replyButtonAva.setClipToOutline(true);
-		replyButton.setOnClickListener(v->openReply());
+		replyButton.setOnClickListener(v->openReply(mainStatus, accountID));
 		replyButton.setOnLongClickListener(this::onReplyLongClick);
 		Account self=AccountSessionManager.get(accountID).self;
 		if(!TextUtils.isEmpty(self.avatar)){
@@ -570,11 +570,11 @@ public void onApplyWindowInsets(WindowInsets insets){
 		super.onApplyWindowInsets(UiUtils.applyBottomInsetToFixedView(replyContainer, insets));
 	}
 
-	private void openReply(){
-		maybeShowPreReplySheet(mainStatus, ()->{
+	private void openReply(Status status, String accountID){
+		maybeShowPreReplySheet(status, ()->{
 			Bundle args=new Bundle();
 			args.putString("account", accountID);
-			args.putParcelable("replyTo", Parcels.wrap(mainStatus));
+			args.putParcelable("replyTo", Parcels.wrap(status));
 			args.putBoolean("fromThreadFragment", true);
 			Nav.go(getActivity(), ComposeFragment.class, args);
 		});
@@ -583,9 +583,10 @@ private boolean onReplyLongClick(View v) {
 		if(mainStatus.preview) return false;
 		if (AccountSessionManager.getInstance().getLoggedInAccounts().size() < 2) return false;
 		UiUtils.pickAccount(v.getContext(), accountID, R.string.sk_reply_as, R.drawable.ic_fluent_arrow_reply_28_regular, session -> {
-			UiUtils.lookupStatus(v.getContext(), mainStatus, accountID, session.getID(), status -> {
+			String pickedAccountID = session.getID();
+				UiUtils.lookupStatus(v.getContext(), mainStatus, pickedAccountID, accountID, status -> {
 				if (status == null) return;
-				openReply();
+				openReply(status, pickedAccountID);
 			});
 		}, null);
 		return true;