From 35e96fecdba1c4e44e470baa185939686c7ebf4d Mon Sep 17 00:00:00 2001
From: Nicholas <nicholas@signal.org>
Date: Mon, 1 May 2023 12:01:53 -0400
Subject: [PATCH] Launch the MediaPreviewV2Activity in its own stack from
 Bubbles.

---
 .../securesms/conversation/ConversationFragment.java  | 11 ++++++++++-
 1 file changed, 10 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 2d24be0805..614d9cc5e6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
@@ -2044,7 +2044,16 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
       sharedElement.setTransitionName(MediaPreviewV2Activity.SHARED_ELEMENT_TRANSITION_NAME);
       requireActivity().setExitSharedElementCallback(new MaterialContainerTransformSharedElementCallback());
       ActivityOptions options = ActivityOptions.makeSceneTransitionAnimation(requireActivity(), sharedElement, MediaPreviewV2Activity.SHARED_ELEMENT_TRANSITION_NAME);
-      requireActivity().startActivity(MediaIntentFactory.create(requireActivity(), args), options.toBundle());
+
+      final Intent mediaPreviewIntent = MediaIntentFactory.create(requireActivity(), args);
+
+      if (listener.isInBubble()) {
+        mediaPreviewIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP |
+                                    Intent.FLAG_ACTIVITY_NEW_TASK |
+                                    Intent.FLAG_ACTIVITY_SINGLE_TOP);
+      }
+
+      requireActivity().startActivity(mediaPreviewIntent, options.toBundle());
     }
 
     @Override