From 23205ff1f7361f50ce5b464bc9318a4130e0c4bb Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 8 Jun 2021 10:47:42 +0200
Subject: [PATCH] Added back beta chat setting for ephemeral messages

---
 .../main/chat/fragments/DetailChatRoomFragment.kt         | 7 ++++++-
 .../main/settings/viewmodels/ChatSettingsViewModel.kt     | 8 ++++++++
 app/src/main/java/org/linphone/core/CorePreferences.kt    | 7 +++++++
 app/src/main/res/layout/settings_chat_fragment.xml        | 6 ++++++
 app/src/main/res/values-fr/strings.xml                    | 1 +
 app/src/main/res/values-hu/strings.xml                    | 1 +
 app/src/main/res/values-zh-rCN/strings.xml                | 1 +
 app/src/main/res/values/strings.xml                       | 1 +
 8 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
index 50971971b..4883cacdb 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
@@ -505,11 +505,16 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
                 builder.removeItem(R.id.chat_room_participants_devices)
             }
         }
+
         if (!viewModel.encryptedChatRoom) {
             builder.removeItem(R.id.chat_room_participants_devices)
             builder.removeItem(R.id.chat_room_ephemeral_messages)
+        } else {
+            // TODO: Remove for 4.6 release
+            if (!corePreferences.ephemeralMessagesEnabled) {
+                builder.removeItem(R.id.chat_room_ephemeral_messages)
+            }
         }
-        // TODO: hide ephemeral menu if not all participants support the feature
 
         builder.setCallback(object : MenuBuilder.Callback {
             override fun onMenuModeChange(menu: MenuBuilder) {}
diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/ChatSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/ChatSettingsViewModel.kt
index 7848f08a4..1967c38a1 100644
--- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/ChatSettingsViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/ChatSettingsViewModel.kt
@@ -119,6 +119,13 @@ class ChatSettingsViewModel : GenericSettingsViewModel() {
     }
     val hideRoomsRemovedProxies = MutableLiveData<Boolean>()
 
+    val ephemeralMessagesBetaListener = object : SettingListenerStub() {
+        override fun onBoolValueChanged(newValue: Boolean) {
+            prefs.ephemeralMessagesEnabled = newValue
+        }
+    }
+    val ephemeralMessagesBeta = MutableLiveData<Boolean>()
+
     val goToAndroidNotificationSettingsListener = object : SettingListenerStub() {
         override fun onClicked() {
             goToAndroidNotificationSettingsEvent.value = Event(true)
@@ -137,6 +144,7 @@ class ChatSettingsViewModel : GenericSettingsViewModel() {
         launcherShortcuts.value = prefs.chatRoomShortcuts
         hideEmptyRooms.value = prefs.hideEmptyRooms
         hideRoomsRemovedProxies.value = prefs.hideRoomsFromRemovedProxies
+        ephemeralMessagesBeta.value = prefs.ephemeralMessagesEnabled
         fileSharingUrl.value = core.fileTransferServer
         vfs.value = prefs.vfsEnabled
     }
diff --git a/app/src/main/java/org/linphone/core/CorePreferences.kt b/app/src/main/java/org/linphone/core/CorePreferences.kt
index f31509cbb..f447025fc 100644
--- a/app/src/main/java/org/linphone/core/CorePreferences.kt
+++ b/app/src/main/java/org/linphone/core/CorePreferences.kt
@@ -132,6 +132,13 @@ class CorePreferences constructor(private val context: Context) {
 
     /* Chat */
 
+    // TODO: Remove for 4.6 release
+    var ephemeralMessagesEnabled: Boolean
+        get() = config.getBool("app", "ephemeral", false)
+        set(value) {
+            config.setBool("app", "ephemeral", value)
+        }
+
     var preventMoreThanOneFilePerMessage: Boolean
         get() = config.getBool("app", "prevent_more_than_one_file_per_message", false)
         set(value) {
diff --git a/app/src/main/res/layout/settings_chat_fragment.xml b/app/src/main/res/layout/settings_chat_fragment.xml
index 0ca8256f9..7100fe262 100644
--- a/app/src/main/res/layout/settings_chat_fragment.xml
+++ b/app/src/main/res/layout/settings_chat_fragment.xml
@@ -133,6 +133,12 @@
                     linphone:listener="@{viewModel.hideRoomsRemovedProxiesListener}"
                     linphone:checked="@={viewModel.hideRoomsRemovedProxies}"/>
 
+                <include
+                    layout="@layout/settings_widget_switch"
+                    linphone:title="@{@string/chat_settins_enable_ephemeral_messages_beta_title}"
+                    linphone:listener="@{viewModel.ephemeralMessagesBetaListener}"
+                    linphone:checked="@={viewModel.ephemeralMessagesBeta}"/>
+
                 <include
                     layout="@layout/settings_widget_text"
                     linphone:title="@{@string/chat_settings_file_sharing_url_title}"
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 0144efbab..0eddcdc40 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -604,4 +604,5 @@
     <string name="chat_room_choose_conversation_for_message_forward">Sélectionnez ou créez une conversation pour transférer le message</string>
     <string name="chat_room_choose_conversation_for_file_sharing">Sélectionnez ou créez une conversation pour partager le(s) fichier(s)</string>
     <string name="chat_room_choose_conversation_for_text_sharing">Sélectionnez ou créez une conversation pour partager le texte</string>
+    <string name="chat_settins_enable_ephemeral_messages_beta_title">Messages éphémères (bêta)</string>
 </resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 772eaf7f6..32bb389e5 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -602,4 +602,5 @@
     <string name="chat_room_choose_conversation_for_message_forward">Beszélgetés kiválasztása vagy új létrehozása</string>
     <string name="chat_room_choose_conversation_for_file_sharing">Beszélgetés kiválasztása vagy új létrehozása</string>
     <string name="content_description_cancel_forward">Az üzenet továbbításának visszavonása</string>
+    <string name="chat_settins_enable_ephemeral_messages_beta_title">Ideiglenes üzenetek engedélyezése (béta)</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 9be7dbf40..4fc92bf15 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -568,4 +568,5 @@
     <string name="advanced_settings_reset_debug_logs_title">重启日志</string>
     <string name="settings_primary_account_display_name_title">显示名</string>
     <string name="settings_primary_account_username_title">用户名</string>
+    <string name="chat_settins_enable_ephemeral_messages_beta_title">启用短暂消息（测试版）</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 233016bd5..ef17326af 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -438,6 +438,7 @@
     <string name="chat_settings_go_to_android_notification_settings">Android notification settings</string>
     <string name="chat_settings_use_in_app_file_viewer_title">Always open files inside this app</string>
     <string name="chat_settings_use_in_app_file_viewer_summary">You\'ll still be able to export them in third-party apps</string>
+    <string name="chat_settins_enable_ephemeral_messages_beta_title">Enable ephemeral messages (beta)</string>
 
     <!-- Network settings -->
     <string name="network_settings_wifi_only_title">Use WiFi only</string>