From 2bff2d3a305b5a7cfb79555668ab9bafd72bbfc1 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Wed, 15 Feb 2023 12:03:33 -0400 Subject: [PATCH] Disable shared element transitions from bubble. --- .../securesms/conversation/ConversationFragment.java | 6 ++++++ .../securesms/conversation/ConversationParentFragment.java | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java index a05ebac07..2ea3e2010 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java @@ -1490,6 +1490,7 @@ public class ConversationFragment extends LoggingFragment implements Multiselect void onRegisterVoiceNoteCallbacks(@NonNull Observer onPlaybackStartObserver); void onUnregisterVoiceNoteCallbacks(@NonNull Observer onPlaybackStartObserver); void onInviteToSignal(); + boolean isInBubble(); } private class ConversationScrollListener extends OnScrollListener { @@ -2109,6 +2110,11 @@ public class ConversationFragment extends LoggingFragment implements Multiselect @Override public void goToMediaPreview(ConversationItem parent, View sharedElement, MediaIntentFactory.MediaPreviewArgs args) { + if (listener.isInBubble()) { + requireActivity().startActivity(MediaIntentFactory.create(requireActivity(), args)); + return; + } + if (args.isVideoGif()) { int adapterPosition = list.getChildAdapterPosition(parent); GiphyMp4ProjectionPlayerHolder holder = giphyMp4ProjectionRecycler.getCurrentHolder(adapterPosition); diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java index 1b7ae9a63..1aec957fe 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java @@ -2267,7 +2267,8 @@ public class ConversationParentFragment extends Fragment callback.onInitializeToolbar(toolbar); } - protected boolean isInBubble() { + @Override + public boolean isInBubble() { return callback.isInBubble(); }