From 3b5e444e7668c1607228f5991fb27b8c317aa4a0 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Thu, 2 Jan 2020 11:02:15 -0500 Subject: [PATCH] Enable view-once send support. --- .../securesms/mediasend/MediaSendViewModel.java | 11 +++-------- src/org/thoughtcrime/securesms/util/FeatureFlags.java | 3 --- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java b/src/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java index 385828efc3..ce45c74a26 100644 --- a/src/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java +++ b/src/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java @@ -188,11 +188,7 @@ class MediaSendViewModel extends ViewModel { buttonState = (recipient != null) ? ButtonState.SEND : ButtonState.CONTINUE; if (viewOnceState == ViewOnceState.GONE && viewOnceSupported()) { - if (FeatureFlags.VIEW_ONCE_SENDING) { - viewOnceState = TextSecurePreferences.isRevealableMessageEnabled(application) ? ViewOnceState.ENABLED : ViewOnceState.DISABLED; - } else { - viewOnceState = ViewOnceState.GONE; - } + viewOnceState = TextSecurePreferences.isRevealableMessageEnabled(application) ? ViewOnceState.ENABLED : ViewOnceState.DISABLED; } else if (!viewOnceSupported()) { viewOnceState = ViewOnceState.GONE; } @@ -452,7 +448,7 @@ class MediaSendViewModel extends ViewModel { } boolean isViewOnce() { - return FeatureFlags.VIEW_ONCE_SENDING && viewOnceState == ViewOnceState.ENABLED; + return viewOnceState == ViewOnceState.ENABLED; } @NonNull MediaConstraints getMediaConstraints() { @@ -477,13 +473,12 @@ class MediaSendViewModel extends ViewModel { } private HudState buildHudState() { - ViewOnceState updatedViewOnceState = FeatureFlags.VIEW_ONCE_SENDING ? viewOnceState : ViewOnceState.GONE; List selectedMedia = getSelectedMediaOrDefault(); int selectionCount = selectedMedia.size(); ButtonState updatedButtonState = buttonState == ButtonState.COUNT && selectionCount == 0 ? ButtonState.GONE : buttonState; boolean updatedCaptionVisible = captionVisible && (selectedMedia.size() > 1 || (selectedMedia.size() > 0 && selectedMedia.get(0).getCaption().isPresent())); - return new HudState(hudVisible, composeVisible, updatedCaptionVisible, selectionCount, updatedButtonState, railState, updatedViewOnceState); + return new HudState(hudVisible, composeVisible, updatedCaptionVisible, selectionCount, updatedButtonState, railState, viewOnceState); } private void clearPersistedMedia() { diff --git a/src/org/thoughtcrime/securesms/util/FeatureFlags.java b/src/org/thoughtcrime/securesms/util/FeatureFlags.java index ea767c8801..fc5ea68050 100644 --- a/src/org/thoughtcrime/securesms/util/FeatureFlags.java +++ b/src/org/thoughtcrime/securesms/util/FeatureFlags.java @@ -5,9 +5,6 @@ package org.thoughtcrime.securesms.util; * After a feature has been launched, the flag should be removed. */ public class FeatureFlags { - /** Send support for view-once media. */ - public static final boolean VIEW_ONCE_SENDING = false; - /** UUID-related stuff that shouldn't be activated until the user-facing launch. */ public static final boolean UUIDS = false;