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

Fix view-once sync and quote descriptions.

Browse Source
This commit is contained in:
Greyson Parrelli
2020-01-09 12:03:52 -05:00
parent e2a48d1714
commit fd7aa9ccfa
17 changed files with 87 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/mms/Slide.java
View File

@@ -105,6 +105,10 @@ public abstract class Slide {
return false;
}
public boolean hasViewOnce() {
return false;
}
public @NonNull String getContentDescription() { return ""; }
public @NonNull Attachment asAttachment() {

2
app/src/main/java/org/thoughtcrime/securesms/mms/SlideDeck.java
View File

@@ -88,7 +88,7 @@ public class SlideDeck {
public boolean containsMediaSlide() {
for (Slide slide : slides) {
if (slide.hasImage() || slide.hasVideo() || slide.hasAudio() || slide.hasDocument() || slide.hasSticker()) {
if (slide.hasImage() || slide.hasVideo() || slide.hasAudio() || slide.hasDocument() || slide.hasSticker() || slide.hasViewOnce()) {
return true;
}
}

28
app/src/main/java/org/thoughtcrime/securesms/mms/ViewOnceSlide.java Normal file
View File

@@ -0,0 +1,28 @@
package org.thoughtcrime.securesms.mms;
import android.content.Context;
import android.net.Uri;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.thoughtcrime.securesms.attachments.Attachment;
import org.thoughtcrime.securesms.util.MediaUtil;
/**
* Slide used for attachments with contentType {@link MediaUtil#VIEW_ONCE}.
* Attachments will only get this type *after* they've been viewed, or if they were synced from a
* linked device. Incoming unviewed messages will have the appropriate image/video contentType.
*/
public class ViewOnceSlide extends Slide {
public ViewOnceSlide(@NonNull Context context, @NonNull Attachment attachment) {
super(context, attachment);
}
@Override
public boolean hasViewOnce() {
return true;
}
}