empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix back button behaviour in bubbles.

Browse source 
Fixes #12563
This commit is contained in:
elena 2022-10-29 21:58:01 +01:00 • committed by Cody Henthorne
parent 6999d1fbf1
commit f119496da4
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
View file

@ -454,6 +454,7 @@ public class ConversationParentFragment extends Fragment
private VoiceNotePlayerView voiceNotePlayerView;
private Material3OnScrollHelper material3OnScrollHelper;
private InlineQueryResultsController inlineQueryResultsController;
private OnBackPressedCallback backPressedCallback;
private LiveRecipient recipient;
private long threadId;
@ -556,12 +557,13 @@ public class ConversationParentFragment extends Fragment
disposables.add(viewModel.getStoryViewState().subscribe(titleView::setStoryRingFromState));
requireActivity().getOnBackPressedDispatcher().addCallback(getViewLifecycleOwner(), new OnBackPressedCallback(true) {
backPressedCallback = new OnBackPressedCallback(true) {
@Override
public void handleOnBackPressed() {
onBackPressed();
}
});
};
requireActivity().getOnBackPressedDispatcher().addCallback(getViewLifecycleOwner(), backPressedCallback);
if (isSearchRequested && savedInstanceState == null) {
onCreateOptionsMenu(toolbar.getMenu(), requireActivity().getMenuInflater());
@ -579,6 +581,7 @@ public class ConversationParentFragment extends Fragment
WindowUtil.setLightStatusBarFromTheme(requireActivity());
EventBus.getDefault().register(this);
backPressedCallback.setEnabled(true);
viewModel.checkIfMmsIsEnabled();
initializeIdentityRecords();
composeText.setMessageSendType(sendButton.getSelectedSendType());
@ -1160,6 +1163,9 @@ public class ConversationParentFragment extends Fragment
if (searchViewItem != null) {
searchViewItem.collapseActionView();
}
} else if (isInBubble()) {
backPressedCallback.setEnabled(false);
requireActivity().onBackPressed();
} else {
requireActivity().finish();
}