From 7d7900e0812aeca55d18782ed9b4b50d461d0626 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 3 Sep 2025 08:42:02 +0200
Subject: [PATCH] Fixed media encryption label show end-to-end encrypted call
 while in conference instead of point-to-point

---
 app/src/main/res/layout/call_media_encryption_info.xml | 2 +-
 app/src/main/res/values-fr/strings.xml                 | 1 +
 app/src/main/res/values/strings.xml                    | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/call_media_encryption_info.xml b/app/src/main/res/layout/call_media_encryption_info.xml
index 9dd6e4c96..f709ce9ce 100644
--- a/app/src/main/res/layout/call_media_encryption_info.xml
+++ b/app/src/main/res/layout/call_media_encryption_info.xml
@@ -145,7 +145,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="5dp"
-            android:text="@{viewModel.isZrtp ? @string/call_zrtp_end_to_end_encrypted : @string/call_srtp_point_to_point_encrypted, default=@string/call_zrtp_end_to_end_encrypted}"
+            android:text="@{viewModel.isZrtp ? (viewModel.conferenceModel.isCurrentCallInConference ? @string/call_zrtp_point_to_point_encrypted : @string/call_zrtp_end_to_end_encrypted) : @string/call_srtp_point_to_point_encrypted, default=@string/call_zrtp_end_to_end_encrypted}"
             android:textSize="12sp"
             android:textColor="@color/blue_info_500"
             android:maxLines="1"
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 323aa7f57..28956bcd1 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -703,6 +703,7 @@
     <string name="call_state_ended">Terminé</string>
     <string name="call_waiting_for_encryption_info">En attente du chiffrement…</string>
     <string name="call_zrtp_end_to_end_encrypted">Appel chiffré de bout en bout</string>
+    <string name="call_zrtp_point_to_point_encrypted">Appel chiffré de point à point</string>
     <string name="call_do_zrtp_sas_validation_again">Faire la vérification à nouveau</string>
     <string name="call_zrtp_sas_validation_required">Vérification nécessaire</string>
     <string name="call_srtp_point_to_point_encrypted">Appel chiffré de point à point</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 53f1e3981..4b5d61d4d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -746,6 +746,7 @@
     <string name="call_state_ended">Ended</string>
     <string name="call_waiting_for_encryption_info">Waiting for encryption…</string>
     <string name="call_zrtp_end_to_end_encrypted">End-to-end encrypted by ZRTP</string>
+    <string name="call_zrtp_point_to_point_encrypted">Point-to-point encrypted by ZRTP</string>
     <string name="call_do_zrtp_sas_validation_again">Validate ZRTP SAS again</string>
     <string name="call_zrtp_sas_validation_required">Validation required</string>
     <string name="call_srtp_point_to_point_encrypted">Point-to-point encrypted by SRTP</string>