empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Remove unnecessary context args in slide creation.

Browse source
This commit is contained in:
Greyson Parrelli 2023-08-30 12:44:23 -04:00 • committed by Nicholas Tinsley
parent a911a007d2
commit b42dd5289b
15 changed files with 49 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/components/ThreadPhotoRailView.java
View file

@ -91,7 +91,7 @@ public class ThreadPhotoRailView extends FrameLayout {
public void onBindItemViewHolder(ThreadPhotoViewHolder viewHolder, @NonNull Cursor cursor) { public void onBindItemViewHolder(ThreadPhotoViewHolder viewHolder, @NonNull Cursor cursor) {
ThumbnailView imageView = viewHolder.imageView; ThumbnailView imageView = viewHolder.imageView;
MediaTable.MediaRecord mediaRecord = MediaTable.MediaRecord.from(cursor); MediaTable.MediaRecord mediaRecord = MediaTable.MediaRecord.from(cursor);
Slide slide = MediaUtil.getSlideForAttachment(getContext(), mediaRecord.getAttachment()); Slide slide = MediaUtil.getSlideForAttachment(mediaRecord.getAttachment());
if (slide != null) { if (slide != null) {
imageView.setImageResource(glideRequests, slide, false, false); imageView.setImageResource(glideRequests, slide, false, false);

2
app/src/main/java/org/thoughtcrime/securesms/conversation/VoiceNoteDraftView.kt
View file

@ -51,7 +51,7 @@ class VoiceNoteDraftView @JvmOverloads constructor(
fun setDraft(draft: DraftTable.Draft) { fun setDraft(draft: DraftTable.Draft) {
audioView.setAudio( audioView.setAudio(
AudioSlide.createFromVoiceNoteDraft(context, draft), AudioSlide.createFromVoiceNoteDraft(draft),
AudioViewCallbacksAdapter(), AudioViewCallbacksAdapter(),
true, true,
false false

4
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
View file

@ -1789,7 +1789,7 @@ class ConversationFragment :
if (slideDeck == null) { if (slideDeck == null) {
val voiceNote: DraftTable.Draft? = draftViewModel.voiceNoteDraft val voiceNote: DraftTable.Draft? = draftViewModel.voiceNoteDraft
if (voiceNote != null) { if (voiceNote != null) {
sendMessageWithoutComposeInput(slide = AudioSlide.createFromVoiceNoteDraft(requireContext(), voiceNote), clearCompose = true) sendMessageWithoutComposeInput(slide = AudioSlide.createFromVoiceNoteDraft(voiceNote), clearCompose = true)
return return
} }
} }
@ -4060,7 +4060,7 @@ class ConversationFragment :
} }
override fun sendVoiceNote(draft: VoiceNoteDraft) { 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( sendMessageWithoutComposeInput(
slide = audioSlide, slide = audioSlide,

6
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationRepository.kt
View file

@ -508,7 +508,7 @@ class ConversationRepository(
val slideDeck = SlideDeck() val slideDeck = SlideDeck()
if (contact.avatarAttachment != null) { if (contact.avatarAttachment != null) {
slideDeck.addSlide(MediaUtil.getSlideForAttachment(context, contact.avatarAttachment)) slideDeck.addSlide(MediaUtil.getSlideForAttachment(contact.avatarAttachment))
} }
slideDeck to body slideDeck to body
@ -517,7 +517,7 @@ class ConversationRepository(
val slideDeck = SlideDeck() val slideDeck = SlideDeck()
linkPreview.thumbnail.ifPresent { linkPreview.thumbnail.ifPresent {
slideDeck.addSlide(MediaUtil.getSlideForAttachment(context, it)) slideDeck.addSlide(MediaUtil.getSlideForAttachment(it))
} }
slideDeck to conversationMessage.getDisplayBody(context) slideDeck to conversationMessage.getDisplayBody(context)
@ -531,7 +531,7 @@ class ConversationRepository(
if (messageRecord.isViewOnceMessage()) { if (messageRecord.isViewOnceMessage()) {
val attachment = TombstoneAttachment(MediaUtil.VIEW_ONCE, true) val attachment = TombstoneAttachment(MediaUtil.VIEW_ONCE, true)
slideDeck = SlideDeck() slideDeck = SlideDeck()
slideDeck.addSlide(MediaUtil.getSlideForAttachment(context, attachment)) slideDeck.addSlide(MediaUtil.getSlideForAttachment(attachment))
} }
slideDeck to conversationMessage.getDisplayBody(context) slideDeck to conversationMessage.getDisplayBody(context)

6
app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt
View file

@ -5194,7 +5194,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
readReceiptCount = 0 readReceiptCount = 0
} }
val slideDeck = SlideDeck(context, MmsNotificationAttachment(status, messageSize)) val slideDeck = SlideDeck(MmsNotificationAttachment(status, messageSize))
val giftBadge: GiftBadge? = if (body != null && MessageTypes.isGiftBadge(mailbox)) { val giftBadge: GiftBadge? = if (body != null && MessageTypes.isGiftBadge(mailbox)) {
try { try {
GiftBadge.parseFrom(Base64.decode(body)) GiftBadge.parseFrom(Base64.decode(body))
@ -5389,7 +5389,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
val attachments = attachments.getAttachments(cursor) val attachments = attachments.getAttachments(cursor)
val quoteAttachments: List<Attachment> = attachments.filter { it.isQuote } val quoteAttachments: List<Attachment> = attachments.filter { it.isQuote }
val quoteDeck = SlideDeck(context, quoteAttachments) val quoteDeck = SlideDeck(quoteAttachments)
return if (quoteId > 0 && quoteAuthor > 0) { return if (quoteId > 0 && quoteAuthor > 0) {
if (quoteText != null && (quoteMentions.isNotEmpty() || bodyRanges != null)) { if (quoteText != null && (quoteMentions.isNotEmpty() || bodyRanges != null)) {
@ -5442,7 +5442,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
.filterNot { it.isQuote } .filterNot { it.isQuote }
.sortedWith(DisplayOrderComparator()) .sortedWith(DisplayOrderComparator())
return SlideDeck(context, messageAttachments) return SlideDeck(messageAttachments)
} }
} }
} }

2
app/src/main/java/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java
View file

@ -309,6 +309,6 @@ public class MediaMmsMessageRecord extends MmsMessageRecord {
List<DatabaseAttachment> quoteAttachments = attachments.stream().filter(Attachment::isQuote).collect(Collectors.toList()); List<DatabaseAttachment> quoteAttachments = attachments.stream().filter(Attachment::isQuote).collect(Collectors.toList());
return quote.withAttachment(new SlideDeck(context, quoteAttachments)); return quote.withAttachment(new SlideDeck(quoteAttachments));
} }
} }

4
app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaGalleryAllAdapter.java
View file

@ -144,7 +144,7 @@ final class MediaGalleryAllAdapter extends StickyHeaderGridAdapter {
@Override @Override
public int getSectionItemViewType(int section, int offset) { public int getSectionItemViewType(int section, int offset) {
MediaTable.MediaRecord mediaRecord = media.get(section, 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.hasAudio()) return AUDIO_DETAIL;
if (slide.hasImage() || slide.hasVideo()) return detailView ? GALLERY_DETAIL : GALLERY; if (slide.hasImage() || slide.hasVideo()) return detailView ? GALLERY_DETAIL : GALLERY;
@ -171,7 +171,7 @@ final class MediaGalleryAllAdapter extends StickyHeaderGridAdapter {
@Override @Override
public void onBindItemViewHolder(ItemViewHolder viewHolder, int section, int offset) { public void onBindItemViewHolder(ItemViewHolder viewHolder, int section, int offset) {
MediaTable.MediaRecord mediaRecord = media.get(section, 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); ((SelectableViewHolder) viewHolder).bind(context, mediaRecord, slide);
} }

40
app/src/main/java/org/thoughtcrime/securesms/mms/AudioSlide.java
View file

@ -34,37 +34,37 @@ import org.thoughtcrime.securesms.util.MediaUtil;
public class AudioSlide extends Slide { 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); VoiceNoteDraft voiceNoteDraft = VoiceNoteDraft.fromDraft(draft);
return new AudioSlide(context, new UriAttachment(voiceNoteDraft.getUri(), return new AudioSlide(new UriAttachment(voiceNoteDraft.getUri(),
MediaUtil.AUDIO_AAC, MediaUtil.AUDIO_AAC,
AttachmentTable.TRANSFER_PROGRESS_DONE, AttachmentTable.TRANSFER_PROGRESS_DONE,
voiceNoteDraft.getSize(), voiceNoteDraft.getSize(),
0, 0,
0, 0,
null, null,
null, null,
true, true,
false, false,
false, false,
false, false,
null, null,
null, null,
null, null,
null, null,
null)); null));
} }
public AudioSlide(Context context, Uri uri, long dataSize, boolean voiceNote) { 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)); 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)); 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); super(attachment);
} }

2
app/src/main/java/org/thoughtcrime/securesms/mms/DocumentSlide.java
View file

@ -12,7 +12,7 @@ import org.thoughtcrime.securesms.util.StorageUtil;
public class DocumentSlide extends Slide { public class DocumentSlide extends Slide {
public DocumentSlide(@NonNull Context context, @NonNull Attachment attachment) { public DocumentSlide(@NonNull Attachment attachment) {
super(attachment); super(attachment);
} }

2
app/src/main/java/org/thoughtcrime/securesms/mms/MmsSlide.java
View file

@ -9,7 +9,7 @@ import org.thoughtcrime.securesms.attachments.Attachment;
public class MmsSlide extends ImageSlide { public class MmsSlide extends ImageSlide {
public MmsSlide(@NonNull Context context, @NonNull Attachment attachment) { public MmsSlide(@NonNull Attachment attachment) {
super(attachment); super(attachment);
} }

10
app/src/main/java/org/thoughtcrime/securesms/mms/SlideDeck.java
View file

@ -16,8 +16,6 @@
*/ */
package org.thoughtcrime.securesms.mms; package org.thoughtcrime.securesms.mms;
import android.content.Context;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
@ -35,15 +33,15 @@ public class SlideDeck {
private final List<Slide> slides = new LinkedList<>(); private final List<Slide> slides = new LinkedList<>();
public SlideDeck(@NonNull Context context, @NonNull List<? extends Attachment> attachments) { public SlideDeck(@NonNull List<? extends Attachment> attachments) {
for (Attachment attachment : attachments) { for (Attachment attachment : attachments) {
Slide slide = MediaUtil.getSlideForAttachment(context, attachment); Slide slide = MediaUtil.getSlideForAttachment(attachment);
if (slide != null) slides.add(slide); if (slide != null) slides.add(slide);
} }
} }
public SlideDeck(@NonNull Context context, @NonNull Attachment attachment) { public SlideDeck(@NonNull Attachment attachment) {
Slide slide = MediaUtil.getSlideForAttachment(context, attachment); Slide slide = MediaUtil.getSlideForAttachment(attachment);
if (slide != null) slides.add(slide); if (slide != null) slides.add(slide);
} }

2
app/src/main/java/org/thoughtcrime/securesms/mms/TextSlide.java
View file

@ -12,7 +12,7 @@ import org.thoughtcrime.securesms.util.MediaUtil;
public class TextSlide extends Slide { public class TextSlide extends Slide {
public TextSlide(@NonNull Context context, @NonNull Attachment attachment) { public TextSlide(@NonNull Attachment attachment) {
super(attachment); super(attachment);
} }

2
app/src/main/java/org/thoughtcrime/securesms/mms/VideoSlide.java
View file

@ -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)); 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); super(attachment);
} }

2
app/src/main/java/org/thoughtcrime/securesms/mms/ViewOnceSlide.java
View file

@ -15,7 +15,7 @@ import org.thoughtcrime.securesms.util.MediaUtil;
*/ */
public class ViewOnceSlide extends Slide { public class ViewOnceSlide extends Slide {
public ViewOnceSlide(@NonNull Context context, @NonNull Attachment attachment) { public ViewOnceSlide(@NonNull Attachment attachment) {
super(attachment); super(attachment);
} }

14
app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java
View file

@ -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()) { if (attachment.isSticker()) {
return new StickerSlide(attachment); return new StickerSlide(attachment);
} }
@ -98,12 +98,12 @@ public class MediaUtil {
switch (getSlideTypeFromContentType(attachment.getContentType())) { switch (getSlideTypeFromContentType(attachment.getContentType())) {
case GIF : return new GifSlide(attachment); case GIF : return new GifSlide(attachment);
case IMAGE : return new ImageSlide(attachment); case IMAGE : return new ImageSlide(attachment);
case VIDEO : return new VideoSlide(context, attachment); case VIDEO : return new VideoSlide(attachment);
case AUDIO : return new AudioSlide(context, attachment); case AUDIO : return new AudioSlide(attachment);
case MMS : return new MmsSlide(context, attachment); case MMS : return new MmsSlide(attachment);
case LONG_TEXT : return new TextSlide(context, attachment); case LONG_TEXT : return new TextSlide(attachment);
case VIEW_ONCE : return new ViewOnceSlide(context, attachment); case VIEW_ONCE : return new ViewOnceSlide(attachment);
case DOCUMENT : return new DocumentSlide(context, attachment); case DOCUMENT : return new DocumentSlide(attachment);
default : throw new AssertionError(); default : throw new AssertionError();
} }
} }