From 48a68ab5c221b6a9d42199c2355851c80c139a95 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 2 May 2023 17:11:06 +0200
Subject: [PATCH] Added account setting allowing to disable bundle mode

---
 .../settings/viewmodels/AccountSettingsViewModel.kt    | 10 ++++++++++
 app/src/main/res/layout/settings_account_fragment.xml  |  7 +++++++
 app/src/main/res/values-fr/strings.xml                 |  2 ++
 app/src/main/res/values/strings.xml                    |  2 ++
 4 files changed, 21 insertions(+)

diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt
index 55abd1ad3..f9febad28 100644
--- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt
@@ -448,6 +448,15 @@ class AccountSettingsViewModel(val account: Account) : GenericSettingsViewModel(
     }
     val publishPresence = MutableLiveData<Boolean>()
 
+    val disableBundleModeListener = object : SettingListenerStub() {
+        override fun onBoolValueChanged(newValue: Boolean) {
+            val params = account.params.clone()
+            params.isRtpBundleEnabled = !newValue
+            account.params = params
+        }
+    }
+    val disableBundleMode = MutableLiveData<Boolean>()
+
     init {
         update()
         account.addListener(listener)
@@ -509,6 +518,7 @@ class AccountSettingsViewModel(val account: Account) : GenericSettingsViewModel(
 
         hideLinkPhoneNumber.value = corePreferences.hideLinkPhoneNumber || params.identityAddress?.domain != corePreferences.defaultDomain
         publishPresence.value = params.isPublishEnabled
+        disableBundleMode.value = !params.isRtpBundleEnabled
     }
 
     private fun initTransportList() {
diff --git a/app/src/main/res/layout/settings_account_fragment.xml b/app/src/main/res/layout/settings_account_fragment.xml
index 1a3674469..3b6c9891b 100644
--- a/app/src/main/res/layout/settings_account_fragment.xml
+++ b/app/src/main/res/layout/settings_account_fragment.xml
@@ -264,6 +264,13 @@
                     android:visibility="gone"
                     linphone:inputType="@{InputType.TYPE_CLASS_TEXT}"/>
 
+                <include
+                    layout="@layout/settings_widget_switch"
+                    linphone:title="@{@string/account_setting_disable_bundle_mode_title}"
+                    linphone:subtitle="@{@string/account_setting_disable_bundle_mode_summary}"
+                    linphone:listener="@{viewModel.disableBundleModeListener}"
+                    linphone:checked="@={viewModel.disableBundleMode}"/>
+
             </LinearLayout>
 
         </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 250324cfe..5dbb3116a 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -780,4 +780,6 @@
     <string name="settings_password_protection_dialog_input_hint">Mot de passe</string>
     <string name="settings_password_protection_dialog_ok_label">Valider</string>
     <string name="settings_password_protection_dialog_invalid_input">Le mot de passe est invalide !</string>
+    <string name="account_setting_disable_bundle_mode_title">Désactiver le mode bundle</string>
+    <string name="account_setting_disable_bundle_mode_summary"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9299f83da..bb98d3699 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -719,6 +719,8 @@
     <string name="account_setting_delete_dialog_title">Do you want to delete your account?</string>
     <string name="account_setting_delete_generic_confirmation_dialog">Your account will only be deleted locally.\nTo delete it permanently, go on your SIP provider website.</string>
     <string name="account_setting_delete_sip_linphone_org_confirmation_dialog">Your account will only be deleted locally.\nTo delete it permanently, go to our account management platform:</string>
+    <string name="account_setting_disable_bundle_mode_title">Disable bundle mode</string>
+    <string name="account_setting_disable_bundle_mode_summary"></string>
 
     <!-- Conferences settings -->
     <string name="conferences_settings_layout_title">Default layout</string>