Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Reworked ZRTP SAS validation dialog

Browse source
This commit is contained in:
Sylvain Berfini 2022-10-31 17:12:16 +01:00
parent d9dce51823
commit b9c178cc29
11 changed files with 12 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/build.gradle
View file

@ -6,7 +6,6 @@ plugins {
}
def appVersionName = "4.7.0"
// def appVersionCode = 40700
def appVersionCode = 40701
static def getPackageName() {

8
app/src/main/java/org/linphone/activities/voip/fragments/StatusFragment.kt
View file

@ -107,7 +107,7 @@ class StatusFragment : GenericFragment<VoipStatusFragmentBinding>() {
}
}
val viewModel = DialogViewModel(getString(R.string.zrtp_dialog_message), getString(R.string.zrtp_dialog_title))
val viewModel = DialogViewModel(getString(R.string.zrtp_dialog_explanation), getString(R.string.zrtp_dialog_title))
viewModel.showZrtp = true
viewModel.zrtpReadSas = toRead.uppercase(Locale.getDefault())
viewModel.zrtpListenSas = toListen.uppercase(Locale.getDefault())
@ -120,14 +120,14 @@ class StatusFragment : GenericFragment<VoipStatusFragmentBinding>() {
val dialog: Dialog = DialogUtils.getVoipDialog(requireContext(), viewModel)
viewModel.showDeleteButton(
viewModel.showCancelButton(
{
call.authenticationTokenVerified = false
this@StatusFragment.viewModel.updateEncryptionInfo(call)
dialog.dismiss()
zrtpDialog = null
},
getString(R.string.zrtp_dialog_deny_button_label)
getString(R.string.zrtp_dialog_later_button_label)
)
viewModel.showOkButton(
@ -137,7 +137,7 @@ class StatusFragment : GenericFragment<VoipStatusFragmentBinding>() {
dialog.dismiss()
zrtpDialog = null
},
getString(R.string.zrtp_dialog_ok_button_label)
getString(R.string.zrtp_dialog_correct_button_label)
)
viewModel.dismissEvent.observe(viewLifecycleOwner) {

3
app/src/main/res/values-es/strings.xml
View file

@ -89,9 +89,6 @@
<string name="missed_call_notification_body">Llamada perdida de %s</string>
<string name="missed_calls_notification_body">%d llamadas perdidas</string>
<string name="zrtp_dialog_title">Seguridad de comunicación</string>
<string name="zrtp_dialog_message">Confirme el siguiente código SAS con su corresponsal</string>
<string name="zrtp_dialog_ok_button_label">Aceptar</string>
<string name="zrtp_dialog_deny_button_label">Denegar</string>
<string name="dialog_zrtp_local_sas">Diga:</string>
<string name="dialog_do_not_ask_again">No mostrar de nuevo</string>
<string name="dialog_cancel">Cancelar</string>

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

@ -383,11 +383,11 @@
<string name="missed_calls_notification_body">%d appels manqués</string>
<string name="missed_call_notification_title">Appel manqué</string>
<string name="zrtp_dialog_title">Sécurité des communications</string>
<string name="zrtp_dialog_message">Confirmez avec votre interlocuteur le code SAS suivant</string>
<string name="zrtp_dialog_ok_button_label">Accepter</string>
<string name="zrtp_dialog_deny_button_label">Refuser</string>
<string name="zrtp_dialog_explanation">Pour accroitre le niveau de sécurité, vous pouvez confirmer les codes suivants avec votre interlocuteur.</string>
<string name="zrtp_dialog_later_button_label">Plus tard</string>
<string name="zrtp_dialog_correct_button_label">Correct</string>
<string name="dialog_zrtp_local_sas">Dites :</string>
<string name="dialog_zrtp_remote_sas">Confirmez que votre interlocuteur a bien dit :</string>
<string name="dialog_zrtp_remote_sas">Votre interlocuteur doit dire :</string>
<string name="dialog_cancel">Annuler</string>
<string name="dialog_delete">Supprimer</string>
<string name="dialog_ok">OK</string>

3
app/src/main/res/values-hu/strings.xml
View file

@ -299,9 +299,6 @@
<string name="incoming_call_notification_answer_action_label">Hívásfogadás</string>
<string name="received_chat_notification_mark_as_read_label">Megjelölés olvasottként</string>
<string name="missed_call_notification_title">Nem fogadott hívás</string>
<string name="zrtp_dialog_message">Erősítse meg a következő SAS-kódot a hívott felével</string>
<string name="zrtp_dialog_ok_button_label">Elfogad</string>
<string name="zrtp_dialog_deny_button_label">Elutasítás</string>
<string name="dialog_zrtp_local_sas">Mond:</string>
<string name="dialog_do_not_ask_again">Többet ne mutassa</string>
<string name="dialog_cancel">Mégse</string>

3
app/src/main/res/values-ka/strings.xml
View file

@ -574,8 +574,6 @@
<string name="received_chat_notification_reply_label">პასუხი</string>
<string name="received_chat_notification_mark_as_read_label">წაკითხულად მონიშვნა</string>
<string name="missed_call_notification_title">გამოტოვებული ზარი</string>
<string name="zrtp_dialog_ok_button_label">მიღება</string>
<string name="zrtp_dialog_deny_button_label">უარყოფა</string>
<string name="dialog_zrtp_local_sas">თქვით:</string>
<string name="dialog_zrtp_remote_sas">დაადასტურეთ, რომ მოსაუბრე ამბობს:</string>
<string name="dialog_do_not_ask_again">აღარ აჩვენოთ</string>
@ -702,7 +700,6 @@
<string name="missed_call_notification_body">გამოტოვებული ზარი %s-სგან</string>
<string name="missed_calls_notification_body" tools:ignore="PluralsCandidate">%d გამოტოვებული ზარი</string>
<string name="zrtp_dialog_title">კავშირის უსაფრთხოება</string>
<string name="zrtp_dialog_message">დაადასტურეთ შემდეგი SAS კოდი თქვენს მოსაუბრესთან</string>
<string name="dialog_lime_security_message">დაუყოვნებლივი შეტყობინებები არის ბოლოდან ბოლომდე დაშიფრული დაცულ საუბრებში. შესაძლებელია საუბრის უსაფრთხოების დონის ამაღლების მონაწილეთა აუთენტიფიკაციის მეშვეობით. ამისათვის, დაურეკეთ კონტაქტს და მიჰყევით აუთენტიფიკაციის პროცესს.</string>
<string name="dialog_update_available">ხელმისაწვდომია განახლება</string>
<string name="dialog_try_open_file_as_text_body">გსურთ, სცადოთ მისი გახსნა უბრალო ტექსტურ ფაილად\?</string>

3
app/src/main/res/values-pt/strings.xml
View file

@ -403,7 +403,6 @@
<string name="account_settings_user_id_summary">Digite ID de autenticação se diferente do nome de usuário (opcional)</string>
<string name="notification_channel_incoming_call_name">&appName; notificações de chamadas recebidas</string>
<string name="zrtp_dialog_message">Confirme o seguinte código SAS com o seu correspondente</string>
<string name="dialog_lime_security_message">As mensagens instantâneas são criptografadas de ponta a ponta em conversas seguras. É possível atualizar o nível de segurança de uma conversa autenticando os participantes. Para isso, ligue para o contato e siga o processo de autenticação.</string>
<string name="content_description_add_phone_number_field">Adicionar um campo de número de telefone</string>
<string name="content_description_pause_call">Pausar a chamada</string>
@ -465,8 +464,6 @@
<string name="missed_call_notification_body">Chamada perdida de %s</string>
<string name="missed_calls_notification_body" tools:ignore="PluralsCandidate">%d chamadas perdidas</string>
<string name="zrtp_dialog_title">Segurança de comunicação</string>
<string name="zrtp_dialog_ok_button_label">Aceitar</string>
<string name="zrtp_dialog_deny_button_label">Negar</string>
<string name="dialog_zrtp_local_sas">Diz:</string>
<string name="dialog_zrtp_remote_sas">Confirme se o seu interlocutor diz:</string>
<string name="dialog_do_not_ask_again">Não mostre novamente</string>

3
app/src/main/res/values-ru/strings.xml
View file

@ -357,8 +357,6 @@
<string name="missed_call_notification_title">Пропущенный звонок</string>
<string name="missed_call_notification_body">Пропущен звонок от %s</string>
<string name="zrtp_dialog_title">Безопасность связи</string>
<string name="zrtp_dialog_ok_button_label">Принять</string>
<string name="zrtp_dialog_deny_button_label">Отклонить</string>
<string name="dialog_zrtp_local_sas">Говорит:</string>
<string name="dialog_zrtp_remote_sas">Подтвердите, что ваш собеседник говорит:</string>
<string name="dialog_do_not_ask_again">Не показывать снова</string>
@ -555,7 +553,6 @@
<string name="notification_channel_chat_name">Уведомления о мгновенных сообщениях &appName;</string>
<string name="received_chat_notification_reply_label">Ответить</string>
<string name="missed_calls_notification_body" tools:ignore="PluralsCandidate">%d пропущенных звонков</string>
<string name="zrtp_dialog_message">Подтвердить предыдущий код SAS у вашего собеседника</string>
<string name="dialog_lime_security_message">Мгновенные сообщения шифруются сквозным шифрованием в защищенных разговорах. Можно повысить уровень безопасности разговора путем аутентификации участников. Для этого позвоните контакту и выполните процедуру аутентификации.</string>
<string name="dialog_try_open_file_as_text_body">Хотите попробовать открыть его как обычный текстовый файл\?</string>
<string name="content_description_switch_camera">Переключение с передней камеры на заднюю и наоборот</string>

3
app/src/main/res/values-zh-rCN/strings.xml
View file

@ -170,7 +170,6 @@
<string name="missed_call_notification_body">来自%s 的未接来电</string>
<string name="missed_calls_notification_body">%d 未接来电</string>
<string name="zrtp_dialog_title">通讯安全</string>
<string name="zrtp_dialog_ok_button_label">接受</string>
<string name="dialog_default_delete_one">你确定要删除这个项目吗？</string>
<string name="dialog_update_available">有可用的更新</string>
<string name="dialog_try_open_file_as_text_title">找不到此类文件的应用</string>
@ -292,7 +291,6 @@
<string name="account_settings_outbound_proxy_title">外出代理服务器</string>
<string name="account_settings_avpf_rr_interval_title">AVPF常规RTCP间隔</string>
<string name="notification_channel_incoming_call_name">&appName; 来电通知</string>
<string name="zrtp_dialog_message">请与您的联系人确认以下SAS代码</string>
<string name="yesterday">昨日</string>
<string name="transport_tcp">TCP传输控制协议</string>
<string name="app_description"><i>自由</i>的 SIP 客户端</string>
@ -488,7 +486,6 @@
<string name="assistant_link_account">关联账户</string>
<string name="assistant_remote_provisioning_title">获取远程配置</string>
<string name="assistant_remote_provisioning_desc">请提供您的配置网址</string>
<string name="zrtp_dialog_deny_button_label">拒绝</string>
<string name="dialog_zrtp_local_sas">说：</string>
<string name="dialog_zrtp_remote_sas">确认您的对话者说：</string>
<string name="dialog_do_not_ask_again">不再显示</string>

3
app/src/main/res/values-zh-rTW/strings.xml
View file

@ -410,9 +410,6 @@
<string name="missed_call_notification_body">來自 %s 的未接來電</string>
<string name="missed_calls_notification_body">%d 通未接來電</string>
<string name="zrtp_dialog_title">通訊安全性</string>
<string name="zrtp_dialog_message">請與對方確認下列 SAS 代碼</string>
<string name="zrtp_dialog_ok_button_label">接受</string>
<string name="zrtp_dialog_deny_button_label">拒絕</string>
<string name="dialog_zrtp_local_sas">說：</string>
<string name="dialog_do_not_ask_again">不再顯示</string>
<string name="dialog_cancel">取消</string>

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

@ -724,11 +724,11 @@
<!-- Dialog -->
<string name="zrtp_dialog_title">Communication security</string>
<string name="zrtp_dialog_message">Confirm the following SAS code with your correspondent</string>
<string name="zrtp_dialog_ok_button_label">Accept</string>
<string name="zrtp_dialog_deny_button_label">Deny</string>
<string name="zrtp_dialog_explanation">To raise the security level, you can check the following codes with your correspondent.</string>
<string name="zrtp_dialog_later_button_label">Later</string>
<string name="zrtp_dialog_correct_button_label">Correct</string>
<string name="dialog_zrtp_local_sas">Say:</string>
<string name="dialog_zrtp_remote_sas">Confirm that your interlocutor says:</string>
<string name="dialog_zrtp_remote_sas">Your correspondent must say:</string>
<string name="dialog_do_not_ask_again">Do not show again</string>
<string name="dialog_cancel">Cancel</string>
<string name="dialog_delete">Delete</string>