From b42dd5289b21e582d8727d44a561aebfa2cf7377 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Wed, 30 Aug 2023 12:44:23 -0400 Subject: [PATCH] Remove unnecessary context args in slide creation. --- .../components/ThreadPhotoRailView.java | 2 +- .../conversation/VoiceNoteDraftView.kt | 2 +- .../conversation/v2/ConversationFragment.kt | 4 +- .../conversation/v2/ConversationRepository.kt | 6 +-- .../securesms/database/MessageTable.kt | 6 +-- .../database/model/MediaMmsMessageRecord.java | 2 +- .../mediaoverview/MediaGalleryAllAdapter.java | 4 +- .../securesms/mms/AudioSlide.java | 40 +++++++++---------- .../securesms/mms/DocumentSlide.java | 2 +- .../thoughtcrime/securesms/mms/MmsSlide.java | 2 +- .../thoughtcrime/securesms/mms/SlideDeck.java | 10 ++--- .../thoughtcrime/securesms/mms/TextSlide.java | 2 +- .../securesms/mms/VideoSlide.java | 2 +- .../securesms/mms/ViewOnceSlide.java | 2 +- .../securesms/util/MediaUtil.java | 14 +++---- 15 files changed, 49 insertions(+), 51 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ThreadPhotoRailView.java b/app/src/main/java/org/thoughtcrime/securesms/components/ThreadPhotoRailView.java index d27a5f1f7d..8c1058d9cc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/ThreadPhotoRailView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/ThreadPhotoRailView.java @@ -91,7 +91,7 @@ public class ThreadPhotoRailView extends FrameLayout { public void onBindItemViewHolder(ThreadPhotoViewHolder viewHolder, @NonNull Cursor cursor) { ThumbnailView imageView = viewHolder.imageView; MediaTable.MediaRecord mediaRecord = MediaTable.MediaRecord.from(cursor); - Slide slide = MediaUtil.getSlideForAttachment(getContext(), mediaRecord.getAttachment()); + Slide slide = MediaUtil.getSlideForAttachment(mediaRecord.getAttachment()); if (slide != null) { imageView.setImageResource(glideRequests, slide, false, false); diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/VoiceNoteDraftView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/VoiceNoteDraftView.kt index efea3a923e..1115c948f8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/VoiceNoteDraftView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/VoiceNoteDraftView.kt @@ -51,7 +51,7 @@ class VoiceNoteDraftView @JvmOverloads constructor( fun setDraft(draft: DraftTable.Draft) { audioView.setAudio( - AudioSlide.createFromVoiceNoteDraft(context, draft), + AudioSlide.createFromVoiceNoteDraft(draft), AudioViewCallbacksAdapter(), true, false diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt index 9bd4b0d6db..e481152429 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt @@ -1789,7 +1789,7 @@ class ConversationFragment : if (slideDeck == null) { val voiceNote: DraftTable.Draft? = draftViewModel.voiceNoteDraft if (voiceNote != null) { - sendMessageWithoutComposeInput(slide = AudioSlide.createFromVoiceNoteDraft(requireContext(), voiceNote), clearCompose = true) + sendMessageWithoutComposeInput(slide = AudioSlide.createFromVoiceNoteDraft(voiceNote), clearCompose = true) return } } @@ -4060,7 +4060,7 @@ class ConversationFragment : } override fun sendVoiceNote(draft: VoiceNoteDraft) { - val audioSlide = AudioSlide(requireContext(), draft.uri, draft.size, MediaUtil.AUDIO_AAC, true) + val audioSlide = AudioSlide(draft.uri, draft.size, MediaUtil.AUDIO_AAC, true) sendMessageWithoutComposeInput( slide = audioSlide, diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationRepository.kt index a17b0dbc3a..09446e68c9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationRepository.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationRepository.kt @@ -508,7 +508,7 @@ class ConversationRepository( val slideDeck = SlideDeck() if (contact.avatarAttachment != null) { - slideDeck.addSlide(MediaUtil.getSlideForAttachment(context, contact.avatarAttachment)) + slideDeck.addSlide(MediaUtil.getSlideForAttachment(contact.avatarAttachment)) } slideDeck to body @@ -517,7 +517,7 @@ class ConversationRepository( val slideDeck = SlideDeck() linkPreview.thumbnail.ifPresent { - slideDeck.addSlide(MediaUtil.getSlideForAttachment(context, it)) + slideDeck.addSlide(MediaUtil.getSlideForAttachment(it)) } slideDeck to conversationMessage.getDisplayBody(context) @@ -531,7 +531,7 @@ class ConversationRepository( if (messageRecord.isViewOnceMessage()) { val attachment = TombstoneAttachment(MediaUtil.VIEW_ONCE, true) slideDeck = SlideDeck() - slideDeck.addSlide(MediaUtil.getSlideForAttachment(context, attachment)) + slideDeck.addSlide(MediaUtil.getSlideForAttachment(attachment)) } slideDeck to conversationMessage.getDisplayBody(context) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt index 7bed188ce5..26c420374d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt @@ -5194,7 +5194,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat readReceiptCount = 0 } - val slideDeck = SlideDeck(context, MmsNotificationAttachment(status, messageSize)) + val slideDeck = SlideDeck(MmsNotificationAttachment(status, messageSize)) val giftBadge: GiftBadge? = if (body != null && MessageTypes.isGiftBadge(mailbox)) { try { GiftBadge.parseFrom(Base64.decode(body)) @@ -5389,7 +5389,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat val attachments = attachments.getAttachments(cursor) val quoteAttachments: List = attachments.filter { it.isQuote } - val quoteDeck = SlideDeck(context, quoteAttachments) + val quoteDeck = SlideDeck(quoteAttachments) return if (quoteId > 0 && quoteAuthor > 0) { if (quoteText != null && (quoteMentions.isNotEmpty() || bodyRanges != null)) { @@ -5442,7 +5442,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat .filterNot { it.isQuote } .sortedWith(DisplayOrderComparator()) - return SlideDeck(context, messageAttachments) + return SlideDeck(messageAttachments) } } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java index f9ce7047c9..c1fcc5f33a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java @@ -309,6 +309,6 @@ public class MediaMmsMessageRecord extends MmsMessageRecord { List quoteAttachments = attachments.stream().filter(Attachment::isQuote).collect(Collectors.toList()); - return quote.withAttachment(new SlideDeck(context, quoteAttachments)); + return quote.withAttachment(new SlideDeck(quoteAttachments)); } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaGalleryAllAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaGalleryAllAdapter.java index ebca48a55b..9df8e2f3d5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaGalleryAllAdapter.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaGalleryAllAdapter.java @@ -144,7 +144,7 @@ final class MediaGalleryAllAdapter extends StickyHeaderGridAdapter { @Override public int getSectionItemViewType(int section, int offset) { MediaTable.MediaRecord mediaRecord = media.get(section, offset); - Slide slide = MediaUtil.getSlideForAttachment(context, mediaRecord.getAttachment()); + Slide slide = MediaUtil.getSlideForAttachment(mediaRecord.getAttachment()); if (slide.hasAudio()) return AUDIO_DETAIL; if (slide.hasImage() || slide.hasVideo()) return detailView ? GALLERY_DETAIL : GALLERY; @@ -171,7 +171,7 @@ final class MediaGalleryAllAdapter extends StickyHeaderGridAdapter { @Override public void onBindItemViewHolder(ItemViewHolder viewHolder, int section, int offset) { MediaTable.MediaRecord mediaRecord = media.get(section, offset); - Slide slide = MediaUtil.getSlideForAttachment(context, mediaRecord.getAttachment()); + Slide slide = MediaUtil.getSlideForAttachment(mediaRecord.getAttachment()); ((SelectableViewHolder) viewHolder).bind(context, mediaRecord, slide); } diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/AudioSlide.java b/app/src/main/java/org/thoughtcrime/securesms/mms/AudioSlide.java index 631e7b6e06..b3b26a5e9a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/AudioSlide.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/AudioSlide.java @@ -34,37 +34,37 @@ import org.thoughtcrime.securesms.util.MediaUtil; public class AudioSlide extends Slide { - public static @NonNull AudioSlide createFromVoiceNoteDraft(@NonNull Context context, @NonNull DraftTable.Draft draft) { + public static @NonNull AudioSlide createFromVoiceNoteDraft(@NonNull DraftTable.Draft draft) { VoiceNoteDraft voiceNoteDraft = VoiceNoteDraft.fromDraft(draft); - return new AudioSlide(context, new UriAttachment(voiceNoteDraft.getUri(), - MediaUtil.AUDIO_AAC, - AttachmentTable.TRANSFER_PROGRESS_DONE, - voiceNoteDraft.getSize(), - 0, - 0, - null, - null, - true, - false, - false, - false, - null, - null, - null, - null, - null)); + return new AudioSlide(new UriAttachment(voiceNoteDraft.getUri(), + MediaUtil.AUDIO_AAC, + AttachmentTable.TRANSFER_PROGRESS_DONE, + voiceNoteDraft.getSize(), + 0, + 0, + null, + null, + true, + false, + false, + false, + null, + null, + null, + null, + null)); } public AudioSlide(Context context, Uri uri, long dataSize, boolean voiceNote) { super(constructAttachmentFromUri(context, uri, MediaUtil.AUDIO_UNSPECIFIED, dataSize, 0, 0, false, null, null, null, null, null, voiceNote, false, false, false)); } - public AudioSlide(Context context, Uri uri, long dataSize, String contentType, boolean voiceNote) { + public AudioSlide(Uri uri, long dataSize, String contentType, boolean voiceNote) { super(new UriAttachment(uri, contentType, AttachmentTable.TRANSFER_PROGRESS_STARTED, dataSize, 0, 0, null, null, voiceNote, false, false, false, null, null, null, null, null)); } - public AudioSlide(Context context, Attachment attachment) { + public AudioSlide(Attachment attachment) { super(attachment); } diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/DocumentSlide.java b/app/src/main/java/org/thoughtcrime/securesms/mms/DocumentSlide.java index b82b696d6f..dc1bdffb79 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/DocumentSlide.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/DocumentSlide.java @@ -12,7 +12,7 @@ import org.thoughtcrime.securesms.util.StorageUtil; public class DocumentSlide extends Slide { - public DocumentSlide(@NonNull Context context, @NonNull Attachment attachment) { + public DocumentSlide(@NonNull Attachment attachment) { super(attachment); } diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/MmsSlide.java b/app/src/main/java/org/thoughtcrime/securesms/mms/MmsSlide.java index e8606e1da6..b87576d56d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/MmsSlide.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/MmsSlide.java @@ -9,7 +9,7 @@ import org.thoughtcrime.securesms.attachments.Attachment; public class MmsSlide extends ImageSlide { - public MmsSlide(@NonNull Context context, @NonNull Attachment attachment) { + public MmsSlide(@NonNull Attachment attachment) { super(attachment); } diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/SlideDeck.java b/app/src/main/java/org/thoughtcrime/securesms/mms/SlideDeck.java index 4610c5bc39..2e1800de29 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/SlideDeck.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/SlideDeck.java @@ -16,8 +16,6 @@ */ package org.thoughtcrime.securesms.mms; -import android.content.Context; - import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -35,15 +33,15 @@ public class SlideDeck { private final List slides = new LinkedList<>(); - public SlideDeck(@NonNull Context context, @NonNull List attachments) { + public SlideDeck(@NonNull List attachments) { for (Attachment attachment : attachments) { - Slide slide = MediaUtil.getSlideForAttachment(context, attachment); + Slide slide = MediaUtil.getSlideForAttachment(attachment); if (slide != null) slides.add(slide); } } - public SlideDeck(@NonNull Context context, @NonNull Attachment attachment) { - Slide slide = MediaUtil.getSlideForAttachment(context, attachment); + public SlideDeck(@NonNull Attachment attachment) { + Slide slide = MediaUtil.getSlideForAttachment(attachment); if (slide != null) slides.add(slide); } diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/TextSlide.java b/app/src/main/java/org/thoughtcrime/securesms/mms/TextSlide.java index ab7b186361..b4d3acbfb1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/TextSlide.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/TextSlide.java @@ -12,7 +12,7 @@ import org.thoughtcrime.securesms.util.MediaUtil; public class TextSlide extends Slide { - public TextSlide(@NonNull Context context, @NonNull Attachment attachment) { + public TextSlide(@NonNull Attachment attachment) { super(attachment); } diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/VideoSlide.java b/app/src/main/java/org/thoughtcrime/securesms/mms/VideoSlide.java index 6e56e100f3..afa2105eb0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/VideoSlide.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/VideoSlide.java @@ -45,7 +45,7 @@ public class VideoSlide extends Slide { super(constructAttachmentFromUri(context, uri, MediaUtil.VIDEO_UNSPECIFIED, dataSize, width, height, MediaUtil.hasVideoThumbnail(context, uri), null, caption, null, null, null, false, false, gif, false, transformProperties)); } - public VideoSlide(Context context, Attachment attachment) { + public VideoSlide(Attachment attachment) { super(attachment); } diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/ViewOnceSlide.java b/app/src/main/java/org/thoughtcrime/securesms/mms/ViewOnceSlide.java index cc3be09115..b08e7a77f4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/ViewOnceSlide.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/ViewOnceSlide.java @@ -15,7 +15,7 @@ import org.thoughtcrime.securesms.util.MediaUtil; */ public class ViewOnceSlide extends Slide { - public ViewOnceSlide(@NonNull Context context, @NonNull Attachment attachment) { + public ViewOnceSlide(@NonNull Attachment attachment) { super(attachment); } diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java index 78af074104..23688d752d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java @@ -90,7 +90,7 @@ public class MediaUtil { } } - public static @NonNull Slide getSlideForAttachment(Context context, Attachment attachment) { + public static @NonNull Slide getSlideForAttachment(Attachment attachment) { if (attachment.isSticker()) { return new StickerSlide(attachment); } @@ -98,12 +98,12 @@ public class MediaUtil { switch (getSlideTypeFromContentType(attachment.getContentType())) { case GIF : return new GifSlide(attachment); case IMAGE : return new ImageSlide(attachment); - case VIDEO : return new VideoSlide(context, attachment); - case AUDIO : return new AudioSlide(context, attachment); - case MMS : return new MmsSlide(context, attachment); - case LONG_TEXT : return new TextSlide(context, attachment); - case VIEW_ONCE : return new ViewOnceSlide(context, attachment); - case DOCUMENT : return new DocumentSlide(context, attachment); + case VIDEO : return new VideoSlide(attachment); + case AUDIO : return new AudioSlide(attachment); + case MMS : return new MmsSlide(attachment); + case LONG_TEXT : return new TextSlide(attachment); + case VIEW_ONCE : return new ViewOnceSlide(attachment); + case DOCUMENT : return new DocumentSlide(attachment); default : throw new AssertionError(); } }