diff --git a/app/src/main/java/org/linphone/ui/call/conference/viewmodel/ConferenceViewModel.kt b/app/src/main/java/org/linphone/ui/call/conference/viewmodel/ConferenceViewModel.kt index 5c1272cce..c5a850a28 100644 --- a/app/src/main/java/org/linphone/ui/call/conference/viewmodel/ConferenceViewModel.kt +++ b/app/src/main/java/org/linphone/ui/call/conference/viewmodel/ConferenceViewModel.kt @@ -66,6 +66,8 @@ class ConferenceViewModel val isCurrentCallInConference = MutableLiveData() + val isEndToEndEncrypted = MutableLiveData() + val conferenceLayout = MutableLiveData() val screenSharingParticipantName = MutableLiveData() @@ -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 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 3ab420a07..8fc5cf59d 100644 --- a/app/src/main/res/layout/call_media_encryption_info.xml +++ b/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" diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 212246015..455ece602 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -723,6 +723,7 @@ En attente du chiffrement… Appel chiffré de bout en bout Appel chiffré de point à point + Conférence chiffrée de bout en bout Faire la vérification à nouveau Vérification nécessaire Appel chiffré de point à point diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 79a147bfd..b6e1a08b5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -766,6 +766,7 @@ Waiting for encryption… End-to-end encrypted by ZRTP Point-to-point encrypted by ZRTP + End-to-end encrypted Validate ZRTP SAS again Validation required Point-to-point encrypted by SRTP