Show specific label for end-to-end encrypted meetings

app/src/main/java/org/linphone/ui/call/conference/viewmodel/ConferenceViewModel.kt

@@ -66,6 +66,8 @@ class ConferenceViewModel
 
     val isCurrentCallInConference = MutableLiveData<Boolean>()
 
+    val isEndToEndEncrypted = MutableLiveData<Boolean>()
+
     val conferenceLayout = MutableLiveData<Int>()
 
     val screenSharingParticipantName = MutableLiveData<String>()
@@ -280,6 +282,10 @@ class ConferenceViewModel
                 isPaused.postValue(!isIn)
                 Log.i("$TAG We [${if (isIn) "are" else "aren't"}] in the conference")
 
+                val conferenceSecurityLevel = conference.currentParams.securityLevel
+                Log.i("$TAG Conference call security level is [$conferenceSecurityLevel]")
+                isEndToEndEncrypted.postValue(conferenceSecurityLevel == Conference.SecurityLevel.EndToEnd)
+
                 subject.postValue(conference.subjectUtf8.orEmpty())
                 computeParticipants(false)
                 if (conference.participantList.size >= 1) { // we do not count
@@ -316,6 +322,10 @@ class ConferenceViewModel
         }
 
         isCurrentCallInConference.postValue(true)
+        val conferenceSecurityLevel = conf.currentParams.securityLevel
+        Log.i("$TAG Conference call security level is [$conferenceSecurityLevel]")
+        isEndToEndEncrypted.postValue(conferenceSecurityLevel == Conference.SecurityLevel.EndToEnd)
+
         conference = conf
         conference.addListener(conferenceListener)
         conferenceConfigured = true

app/src/main/res/layout/call_media_encryption_info.xml

@@ -144,7 +144,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="5dp"
-            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:text="@{viewModel.conferenceModel.isCurrentCallInConference ? (viewModel.conferenceModel.isEndToEndEncrypted ? @string/call_conference_end_to_end_encrypted : (viewModel.isZrtp ? @string/call_zrtp_point_to_point_encrypted : @string/call_srtp_point_to_point_encrypted)) : 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:textSize="12sp"
             android:textColor="@color/blue_info_500"
             android:maxLines="1"

app/src/main/res/values-fr/strings.xml

@@ -723,6 +723,7 @@
     <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_conference_end_to_end_encrypted">Conférence chiffrée de bout en bout</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>

app/src/main/res/values/strings.xml

@@ -766,6 +766,7 @@
     <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_conference_end_to_end_encrypted">End-to-end encrypted</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>