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

Revert "Inline MP4 GIF flag."

Browse source 
This reverts commit e2e0caa94a.
This commit is contained in:
Alex Hart 2021-09-23 11:17:54 -03:00
parent 4d6bb95aa4
commit 91645e6adc
4 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/giph/mp4/GiphyMp4PlaybackPolicy.java
View file

@ -23,6 +23,10 @@ public final class GiphyMp4PlaybackPolicy {
private GiphyMp4PlaybackPolicy() { } private GiphyMp4PlaybackPolicy() { }
public static boolean sendAsMp4() {
return FeatureFlags.mp4GifSendSupport();
}
public static boolean autoplay() { public static boolean autoplay() {
return !DeviceProperties.isLowMemoryDevice(ApplicationDependencies.getApplication()); return !DeviceProperties.isLowMemoryDevice(ApplicationDependencies.getApplication());
} }

10
app/src/main/java/org/thoughtcrime/securesms/giph/mp4/GiphyMp4Repository.java
View file

@ -51,15 +51,19 @@ final class GiphyMp4Repository {
@WorkerThread @WorkerThread
private @NonNull Uri saveToBlobInternal(@NonNull GiphyImage giphyImage, boolean isForMms) throws IOException { private @NonNull Uri saveToBlobInternal(@NonNull GiphyImage giphyImage, boolean isForMms) throws IOException {
boolean sendAsMp4 = GiphyMp4PlaybackPolicy.sendAsMp4();
String url; String url;
String mime; String mime;
if (isForMms) { if (sendAsMp4) {
url = giphyImage.getMp4Url();
mime = MediaUtil.VIDEO_MP4;
} else if (isForMms) {
url = giphyImage.getGifMmsUrl(); url = giphyImage.getGifMmsUrl();
mime = MediaUtil.IMAGE_GIF; mime = MediaUtil.IMAGE_GIF;
} else { } else {
url = giphyImage.getMp4Url(); url = giphyImage.getGifUrl();
mime = MediaUtil.VIDEO_MP4; mime = MediaUtil.IMAGE_GIF;
} }
Request request = new Request.Builder().url(url).build(); Request request = new Request.Builder().url(url).build();

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

@ -37,7 +37,7 @@ public class GifSlide extends ImageSlide {
null, null,
false, false,
borderless, borderless,
true, FeatureFlags.mp4GifSendSupport(),
false)); false));
this.borderless = borderless; this.borderless = borderless;

7
app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
View file

@ -74,6 +74,7 @@ public final class FeatureFlags {
private static final String ANIMATED_STICKER_MIN_TOTAL_MEMORY = "android.animatedStickerMinTotalMemory"; private static final String ANIMATED_STICKER_MIN_TOTAL_MEMORY = "android.animatedStickerMinTotalMemory";
private static final String MESSAGE_PROCESSOR_ALARM_INTERVAL = "android.messageProcessor.alarmIntervalMins"; private static final String MESSAGE_PROCESSOR_ALARM_INTERVAL = "android.messageProcessor.alarmIntervalMins";
private static final String MESSAGE_PROCESSOR_DELAY = "android.messageProcessor.foregroundDelayMs"; private static final String MESSAGE_PROCESSOR_DELAY = "android.messageProcessor.foregroundDelayMs";
private static final String MP4_GIF_SEND_SUPPORT = "android.mp4GifSendSupport.2";
private static final String MEDIA_QUALITY_LEVELS = "android.mediaQuality.levels"; private static final String MEDIA_QUALITY_LEVELS = "android.mediaQuality.levels";
private static final String RETRY_RECEIPT_LIFESPAN = "android.retryReceiptLifespan"; private static final String RETRY_RECEIPT_LIFESPAN = "android.retryReceiptLifespan";
private static final String RETRY_RESPOND_MAX_AGE = "android.retryRespondMaxAge"; private static final String RETRY_RESPOND_MAX_AGE = "android.retryRespondMaxAge";
@ -111,6 +112,7 @@ public final class FeatureFlags {
ANIMATED_STICKER_MIN_TOTAL_MEMORY, ANIMATED_STICKER_MIN_TOTAL_MEMORY,
MESSAGE_PROCESSOR_ALARM_INTERVAL, MESSAGE_PROCESSOR_ALARM_INTERVAL,
MESSAGE_PROCESSOR_DELAY, MESSAGE_PROCESSOR_DELAY,
MP4_GIF_SEND_SUPPORT,
MEDIA_QUALITY_LEVELS, MEDIA_QUALITY_LEVELS,
RETRY_RECEIPT_LIFESPAN, RETRY_RECEIPT_LIFESPAN,
RETRY_RESPOND_MAX_AGE, RETRY_RESPOND_MAX_AGE,
@ -162,6 +164,7 @@ public final class FeatureFlags {
ANIMATED_STICKER_MIN_TOTAL_MEMORY, ANIMATED_STICKER_MIN_TOTAL_MEMORY,
MESSAGE_PROCESSOR_ALARM_INTERVAL, MESSAGE_PROCESSOR_ALARM_INTERVAL,
MESSAGE_PROCESSOR_DELAY, MESSAGE_PROCESSOR_DELAY,
MP4_GIF_SEND_SUPPORT,
MEDIA_QUALITY_LEVELS, MEDIA_QUALITY_LEVELS,
RETRY_RECEIPT_LIFESPAN, RETRY_RECEIPT_LIFESPAN,
RETRY_RESPOND_MAX_AGE, RETRY_RESPOND_MAX_AGE,
@ -348,6 +351,10 @@ public final class FeatureFlags {
return getInteger(ANIMATED_STICKER_MIN_TOTAL_MEMORY, (int) ByteUnit.GIGABYTES.toMegabytes(3)); return getInteger(ANIMATED_STICKER_MIN_TOTAL_MEMORY, (int) ByteUnit.GIGABYTES.toMegabytes(3));
} }
public static boolean mp4GifSendSupport() {
return getBoolean(MP4_GIF_SEND_SUPPORT, false);
}
public static @NonNull String getMediaQualityLevels() { public static @NonNull String getMediaQualityLevels() {
return getString(MEDIA_QUALITY_LEVELS, ""); return getString(MEDIA_QUALITY_LEVELS, "");
} }