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

Enable Media Preview to respond to media changes.

Browse Source
This commit is contained in:
Cody Henthorne
2020-07-09 12:19:58 -04:00
committed by Greyson Parrelli
parent 1fe38f5ed1
commit 3c069fb588
8 changed files with 139 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewFragment.java
View File

@@ -10,7 +10,13 @@ import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import org.thoughtcrime.securesms.attachments.Attachment;
import org.thoughtcrime.securesms.attachments.AttachmentId;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.mms.PartUriParser;
import org.thoughtcrime.securesms.util.MediaUtil;
import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
import java.util.Objects;
public abstract class MediaPreviewFragment extends Fragment {
@@ -19,7 +25,8 @@ public abstract class MediaPreviewFragment extends Fragment {
static final String DATA_CONTENT_TYPE = "DATA_CONTENT_TYPE";
static final String AUTO_PLAY = "AUTO_PLAY";
protected Events events;
private AttachmentId attachmentId;
protected Events events;
public static MediaPreviewFragment newInstance(@NonNull Attachment attachment, boolean autoPlay) {
return newInstance(attachment.getDataUri(), attachment.getContentType(), attachment.getSize(), autoPlay);
@@ -60,6 +67,12 @@ public abstract class MediaPreviewFragment extends Fragment {
events = (Events) context;
}
@Override
public void onResume() {
super.onResume();
checkMediaStillAvailable();
}
public void cleanUp() {
}
@@ -70,8 +83,18 @@ public abstract class MediaPreviewFragment extends Fragment {
return null;
}
public interface Events {
public void checkMediaStillAvailable() {
if (attachmentId == null) {
attachmentId = new PartUriParser(Objects.requireNonNull(requireArguments().getParcelable(DATA_URI))).getPartId();
}
SimpleTask.run(getViewLifecycleOwner().getLifecycle(),
() -> DatabaseFactory.getAttachmentDatabase(requireContext()).hasAttachment(attachmentId),
hasAttachment -> { if (!hasAttachment) events.mediaNotAvailable(); });
}
public interface Events {
boolean singleTapOnMedia();
void mediaNotAvailable();
}
}