Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-20 08:39:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ensure we do not stage shared element transition view when opening media from a bubble.

Browse Source
This commit is contained in:
Alex Hart
2023-03-17 14:07:33 -03:00
committed by Greyson Parrelli
parent bf611f3a56
commit 5c688289a5
6 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
View File

@@ -2116,7 +2116,7 @@ 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));
requireActivity().startActivity(MediaIntentFactory.create(requireActivity(), args.skipSharedElementTransition(true)));
return;
}

3
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
View File

@@ -2393,7 +2393,8 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
mediaThumbnailStub.require().getCorners().getTopRight(),
mediaThumbnailStub.require().getCorners().getBottomRight(),
mediaThumbnailStub.require().getCorners().getBottomLeft()
));
),
false);
MediaPreviewCache.INSTANCE.setDrawable(((ThumbnailView) v).getImageDrawable());
eventListener.goToMediaPreview(ConversationItem.this, v, args);
} else if (slide.getUri() != null) {