From c346f32762673cba7f802254be8e8991fae6d92b Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Tue, 7 Jan 2020 16:18:07 -0500
Subject: [PATCH] Made view-once a non-sticky setting.

---
 .../securesms/mediasend/MediaSendViewModel.java          | 5 +----
 .../securesms/util/TextSecurePreferences.java            | 9 ---------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java
index 968087e9104..8ba243d7cd3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java
@@ -194,7 +194,7 @@ void onImageEditorStarted() {
     buttonState    = (recipient != null) ? ButtonState.SEND : ButtonState.CONTINUE;
 
     if (viewOnceState == ViewOnceState.GONE && viewOnceSupported()) {
-      viewOnceState = TextSecurePreferences.isViewOnceMessageEnabled(application) ? ViewOnceState.ENABLED : ViewOnceState.DISABLED;
+      viewOnceState = ViewOnceState.DISABLED;
       showViewOnceTooltipIfNecessary(viewOnceState);
     } else if (!viewOnceSupported()) {
       viewOnceState = ViewOnceState.GONE;
@@ -272,9 +272,6 @@ void onRevealButtonToggled() {
                                     .toList();
 
     selectedMedia.setValue(uncaptioned);
-
-    TextSecurePreferences.setIsViewOnceMessageEnabled(application, viewOnceState == ViewOnceState.ENABLED);
-
     hudState.setValue(buildHudState());
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java b/app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java
index 5f283ab3442..341081903d4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java
@@ -200,7 +200,6 @@ public class TextSecurePreferences {
 
   private static final String MEDIA_KEYBOARD_MODE = "pref_media_keyboard_mode";
 
-  private static final String VIEW_ONCE_DEFAULT      = "pref_revealable_message_default";
   private static final String VIEW_ONCE_TOOLTIP_SEEN = "pref_revealable_message_tooltip_seen";
 
   private static final String SEEN_CAMERA_FIRST_TOOLTIP = "pref_seen_camera_first_tooltip";
@@ -1276,14 +1275,6 @@ public static MediaKeyboardMode getMediaKeyboardMode(Context context) {
     return MediaKeyboardMode.valueOf(name);
   }
 
-  public static void setIsViewOnceMessageEnabled(Context context, boolean value) {
-    setBooleanPreference(context, VIEW_ONCE_DEFAULT, value);
-  }
-
-  public static boolean isViewOnceMessageEnabled(Context context) {
-    return getBooleanPreference(context, VIEW_ONCE_DEFAULT, false);
-  }
-
   public static void setHasSeenViewOnceTooltip(Context context, boolean value) {
     setBooleanPreference(context, VIEW_ONCE_TOOLTIP_SEEN, value);
   }