diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/org/thoughtcrime/securesms/ConversationItem.java index 34d120da8..5960c737a 100644 --- a/src/org/thoughtcrime/securesms/ConversationItem.java +++ b/src/org/thoughtcrime/securesms/ConversationItem.java @@ -424,20 +424,16 @@ public class ConversationItem extends LinearLayout if (documentViewStub.resolved()) documentViewStub.get().setVisibility(View.GONE); Slide slide; - boolean isPreview; if (messageRecord.getType()==DcMsg.DC_MSG_VIDEO) { slide = new VideoSlide(context, messageRecord); - isPreview = true; } else { slide = new DocumentSlide(context, messageRecord); - isPreview = false; } mediaThumbnailStub.get().setImageResource(glideRequests, slide, showControls, - isPreview, messageRecord.getWidth(100), messageRecord.getHeight(100)); mediaThumbnailStub.get().setThumbnailClickListener(new ThumbnailClickListener()); diff --git a/src/org/thoughtcrime/securesms/MediaGalleryAdapter.java b/src/org/thoughtcrime/securesms/MediaGalleryAdapter.java index 7a7811cbe..87b0333f6 100644 --- a/src/org/thoughtcrime/securesms/MediaGalleryAdapter.java +++ b/src/org/thoughtcrime/securesms/MediaGalleryAdapter.java @@ -111,7 +111,7 @@ class MediaGalleryAdapter extends StickyHeaderGridAdapter { Slide slide = MediaUtil.getSlideForMsg(context, mediaRecord); if (slide != null) { - thumbnailView.setImageResource(glideRequests, slide, false, false); + thumbnailView.setImageResource(glideRequests, slide, false); } thumbnailView.setOnClickListener(view -> itemClickListener.onMediaClicked(mediaRecord)); diff --git a/src/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java b/src/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java index 9cedc26bd..ce8bb247b 100644 --- a/src/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java +++ b/src/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java @@ -165,17 +165,17 @@ public class ConversationItemThumbnail extends FrameLayout { @UiThread public void setImageResource(@NonNull GlideRequests glideRequests, @NonNull Slide slide, - boolean showControls, boolean isPreview) + boolean showControls) { - refreshSlideAttachmentState(thumbnail.setImageResource(glideRequests, slide, showControls, isPreview), slide); + refreshSlideAttachmentState(thumbnail.setImageResource(glideRequests, slide, showControls), slide); } @UiThread public void setImageResource(@NonNull GlideRequests glideRequests, @NonNull Slide slide, - boolean showControls, boolean isPreview, int naturalWidth, + boolean showControls, int naturalWidth, int naturalHeight) { - refreshSlideAttachmentState(thumbnail.setImageResource(glideRequests, slide, showControls, isPreview, naturalWidth, naturalHeight), slide); + refreshSlideAttachmentState(thumbnail.setImageResource(glideRequests, slide, showControls, naturalWidth, naturalHeight), slide); } diff --git a/src/org/thoughtcrime/securesms/components/ThreadPhotoRailView.java b/src/org/thoughtcrime/securesms/components/ThreadPhotoRailView.java index a69f77bb4..56e384f63 100644 --- a/src/org/thoughtcrime/securesms/components/ThreadPhotoRailView.java +++ b/src/org/thoughtcrime/securesms/components/ThreadPhotoRailView.java @@ -92,7 +92,7 @@ public class ThreadPhotoRailView extends FrameLayout { Slide slide = MediaUtil.getSlideForAttachment(getContext(), mediaRecord.getAttachment()); if (slide != null) { - imageView.setImageResource(glideRequests, slide, false, false); + imageView.setImageResource(glideRequests, slide, false); } imageView.setOnClickListener(v -> { diff --git a/src/org/thoughtcrime/securesms/components/ThumbnailView.java b/src/org/thoughtcrime/securesms/components/ThumbnailView.java index 163e33f07..0983b7f90 100644 --- a/src/org/thoughtcrime/securesms/components/ThumbnailView.java +++ b/src/org/thoughtcrime/securesms/components/ThumbnailView.java @@ -212,18 +212,17 @@ public class ThumbnailView extends FrameLayout { @UiThread public ListenableFuture setImageResource(@NonNull GlideRequests glideRequests, @NonNull Slide slide, - boolean showControls, boolean isPreview) + boolean showControls) { - return setImageResource(glideRequests, slide, showControls, isPreview, 0, 0); + return setImageResource(glideRequests, slide, showControls, 0, 0); } @UiThread public ListenableFuture setImageResource(@NonNull GlideRequests glideRequests, @NonNull Slide slide, - boolean showControls, boolean isPreview, int naturalWidth, + boolean showControls, int naturalWidth, int naturalHeight) { - if (slide.getThumbnailUri() != null && slide.hasPlayOverlay() && - (slide.getTransferState() == AttachmentDatabase.TRANSFER_PROGRESS_DONE || isPreview)) + if (slide.getThumbnailUri() != null && slide.hasPlayOverlay()) { this.playOverlay.setVisibility(View.VISIBLE); } else { diff --git a/src/org/thoughtcrime/securesms/mms/AttachmentManager.java b/src/org/thoughtcrime/securesms/mms/AttachmentManager.java index ce163a8f4..676e034a6 100644 --- a/src/org/thoughtcrime/securesms/mms/AttachmentManager.java +++ b/src/org/thoughtcrime/securesms/mms/AttachmentManager.java @@ -281,7 +281,7 @@ public class AttachmentManager { result.set(true); } else { Attachment attachment = slide.asAttachment(); - result.deferTo(thumbnail.setImageResource(glideRequests, slide, false, true, attachment.getWidth(), attachment.getHeight())); + result.deferTo(thumbnail.setImageResource(glideRequests, slide, false, attachment.getWidth(), attachment.getHeight())); removableMediaView.display(thumbnail, mediaType == MediaType.IMAGE); }