From 33cd22552f866183a13f4a18a18e456e2346864f Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Fri, 4 Sep 2020 14:24:43 +0200
Subject: [PATCH] make 'disappearing messages' a standard-feature

---
 res/menu/conversation.xml                                | 3 +--
 res/xml/preferences_advanced.xml                         | 5 -----
 src/org/thoughtcrime/securesms/ConversationActivity.java | 4 ----
 src/org/thoughtcrime/securesms/util/Prefs.java           | 5 -----
 4 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/res/menu/conversation.xml b/res/menu/conversation.xml
index e82ca7ed4..23477e5cb 100644
--- a/res/menu/conversation.xml
+++ b/res/menu/conversation.xml
@@ -26,8 +26,7 @@
         app:showAsAction="always"/>
 
     <item android:id="@+id/menu_ephemeral_messages"
-        android:title="@string/ephemeral_messages"
-        android:visible="false" />
+        android:title="@string/ephemeral_messages" />
 
     <item android:title="@string/menu_mute"
         android:id="@+id/menu_mute_notifications"/>
diff --git a/res/xml/preferences_advanced.xml b/res/xml/preferences_advanced.xml
index 0edf93b60..5a2ed35f8 100644
--- a/res/xml/preferences_advanced.xml
+++ b/res/xml/preferences_advanced.xml
@@ -56,11 +56,6 @@
             android:key="pref_location_streaming_enabled"
             android:title="@string/pref_on_demand_location_streaming"/>
 
-        <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-            android:defaultValue="false"
-            android:key="pref_ephemeral_messages"
-            android:title="Disappearing messages options"/>
-
         <Preference android:key="pref_webrtc_instance"
             android:title="Video chat instance"
             android:summary="@string/none"/>
diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index 400f50e06..ead2a002e 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -447,10 +447,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       menu.findItem(R.id.menu_show_map).setVisible(false);
     }
 
-    if (Prefs.isEphemeralMessagesEnabled(this) || dcContext.getChatEphemeralTimer(chatId) != 0) {
-      menu.findItem(R.id.menu_ephemeral_messages).setVisible(true);
-    }
-
     if (!dcContext.isWebrtcConfigOk() || !dcChat.canVideochat()) {
       menu.findItem(R.id.menu_videochat_invite).setVisible(false);
     }
diff --git a/src/org/thoughtcrime/securesms/util/Prefs.java b/src/org/thoughtcrime/securesms/util/Prefs.java
index 48bc0fc7c..3c9e5820d 100644
--- a/src/org/thoughtcrime/securesms/util/Prefs.java
+++ b/src/org/thoughtcrime/securesms/util/Prefs.java
@@ -51,7 +51,6 @@ public class Prefs {
   private static final String PROMPTED_DOZE_MSG_ID_PREF        = "pref_prompted_doze_msg_id";
   private static final String IN_THREAD_NOTIFICATION_PREF      = "pref_key_inthread_notifications";
   public  static final String MESSAGE_BODY_TEXT_SIZE_PREF      = "pref_message_body_text_size";
-  public  static final String EPHEMERAL_MESSAGES_PREF          = "pref_ephemeral_messages";
 
   public  static final String NOTIFICATION_PRIVACY_PREF        = "pref_notification_privacy";
   public  static final String NOTIFICATION_PRIORITY_PREF       = "pref_notification_priority";
@@ -187,10 +186,6 @@ public class Prefs {
     }
   }
 
-  public static boolean isEphemeralMessagesEnabled(Context context) {
-      return getBooleanPreference(context, EPHEMERAL_MESSAGES_PREF, false);
-  }
-
   // ringtone
 
   public static @NonNull Uri getNotificationRingtone(Context context) {