owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #406

Browse Source 
fix(ThreadFragment): pass correct account to ComposeView
This commit is contained in:
LucasGGamerM
2024-05-18 13:24:18 -03:00
committed by GitHub
parent 892ce130ca 1ccf9bf4b7
commit 1d405d9e48
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
View File

@@ -418,7 +418,7 @@ public class ThreadFragment extends StatusListFragment implements ProvidesAssist
UiUtils.loadCustomEmojiInTextView(replyButtonText); UiUtils.loadCustomEmojiInTextView(replyButtonText);
replyButtonAva.setOutlineProvider(OutlineProviders.OVAL); replyButtonAva.setOutlineProvider(OutlineProviders.OVAL);
replyButtonAva.setClipToOutline(true); replyButtonAva.setClipToOutline(true);
replyButton.setOnClickListener(v->openReply()); replyButton.setOnClickListener(v->openReply(mainStatus, accountID));
replyButton.setOnLongClickListener(this::onReplyLongClick); replyButton.setOnLongClickListener(this::onReplyLongClick);
Account self=AccountSessionManager.get(accountID).self; Account self=AccountSessionManager.get(accountID).self;
if(!TextUtils.isEmpty(self.avatar)){ if(!TextUtils.isEmpty(self.avatar)){
@@ -570,11 +570,11 @@ public class ThreadFragment extends StatusListFragment implements ProvidesAssist
super.onApplyWindowInsets(UiUtils.applyBottomInsetToFixedView(replyContainer, insets)); super.onApplyWindowInsets(UiUtils.applyBottomInsetToFixedView(replyContainer, insets));
} }
private void openReply(){ private void openReply(Status status, String accountID){
maybeShowPreReplySheet(mainStatus, ()->{ maybeShowPreReplySheet(status, ()->{
Bundle args=new Bundle(); Bundle args=new Bundle();
args.putString("account", accountID); args.putString("account", accountID);
args.putParcelable("replyTo", Parcels.wrap(mainStatus)); args.putParcelable("replyTo", Parcels.wrap(status));
args.putBoolean("fromThreadFragment", true); args.putBoolean("fromThreadFragment", true);
Nav.go(getActivity(), ComposeFragment.class, args); Nav.go(getActivity(), ComposeFragment.class, args);
}); });
@@ -583,9 +583,10 @@ public class ThreadFragment extends StatusListFragment implements ProvidesAssist
if(mainStatus.preview) return false; if(mainStatus.preview) return false;
if (AccountSessionManager.getInstance().getLoggedInAccounts().size() < 2) 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.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; if (status == null) return;
openReply(); openReply(status, pickedAccountID);
}); });
}, null); }, null);
return true; return true;