mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 03:18:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed media encryption label show end-to-end encrypted call while in conference instead of point-to-point

Browse source
This commit is contained in:
Sylvain Berfini 2025-09-03 08:42:02 +02:00
parent f0e899bb95
commit 7d7900e081
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/res/layout/call_media_encryption_info.xml
View file

@ -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"

1
app/src/main/res/values-fr/strings.xml
View file

@ -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>

1
app/src/main/res/values/strings.xml
View file

@ -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>