Stop fearmongering about encryption

While standard TLS encryption is not E2E, it is hardly "unencrypted" and so we
should not be scaring people quite so strongly about it.
This commit is contained in:
Stephen Paul Weber 2022-04-12 08:24:24 -05:00
parent 2f818afee8
commit abde1336e8
No known key found for this signature in database
GPG Key ID: D11C2911CE519CDE
39 changed files with 39 additions and 41 deletions

View File

@ -793,7 +793,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
this.binding.textInputHint.setVisibility(View.GONE);
this.binding.textinput.setHint(R.string.send_corrected_message);
} else if (multi && conversation.getNextCounterpart() != null) {
this.binding.textinput.setHint(R.string.send_unencrypted_message);
this.binding.textinput.setHint(R.string.send_message);
this.binding.textInputHint.setVisibility(View.VISIBLE);
this.binding.textInputHint.setText(getString(
R.string.send_private_message_to,

View File

@ -102,9 +102,7 @@ public class ConversationMenuConfigurator {
return;
}
if (conversation.getNextEncryption() != Message.ENCRYPTION_NONE) {
menuSecure.setIcon(R.drawable.ic_lock_white_24dp);
}
menuSecure.setIcon(R.drawable.ic_lock_white_24dp);
pgp.setVisible(Config.supportOpenPgp());
none.setVisible(Config.supportUnencrypted() || conversation.getMode() == Conversation.MODE_MULTI);

View File

@ -544,7 +544,7 @@ public class UIHelper {
switch (conversation.getNextEncryption()) {
case Message.ENCRYPTION_NONE:
if (Config.multipleEncryptionChoices()) {
return context.getString(R.string.send_unencrypted_message);
return context.getString(R.string.send_message);
} else {
return context.getString(R.string.send_message_to_x, conversation.getName());
}

View File

@ -140,7 +140,7 @@
<string name="account_status_incompatible_server">لا يتوافق مع السيرفر</string>
<string name="account_status_stream_error">خطأ في التدفق</string>
<string name="account_status_stream_opening_error">خطأ عند فتح التدفق</string>
<string name="encryption_choice_unencrypted">غير مشفر</string>
<string name="encryption_choice_unencrypted">TLS</string>
<string name="encryption_choice_otr">رسالة مشفرة عبر OTR</string>
<string name="encryption_choice_pgp">رسالة مشفرة عبر OpenPGP</string>
<string name="encryption_choice_omemo">أوميمو OMEMO</string>

View File

@ -172,7 +172,7 @@
<string name="account_status_incompatible_server">Несъвместим сървър</string>
<string name="account_status_stream_error">Поточна грешка</string>
<string name="account_status_stream_opening_error">Проблем при отварянето на потока</string>
<string name="encryption_choice_unencrypted">Нешифровано</string>
<string name="encryption_choice_unencrypted">TLS</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>

View File

@ -164,7 +164,7 @@
<string name="account_status_incompatible_server">Servidor incompatible</string>
<string name="account_status_stream_error">Error de transmissió</string>
<string name="account_status_stream_opening_error">Error d\'obertura de la transmissió</string>
<string name="encryption_choice_unencrypted">Sense xifrar</string>
<string name="encryption_choice_unencrypted">TLS</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>

View File

@ -176,7 +176,7 @@
<string name="account_status_incompatible_server">Nekompatibilní server</string>
<string name="account_status_stream_error">Chyba přenosu</string>
<string name="account_status_stream_opening_error">Chyba při otevírání proudu</string>
<string name="encryption_choice_unencrypted">Nešifrováno</string>
<string name="encryption_choice_unencrypted">TLS</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>

View File

@ -172,7 +172,7 @@
<string name="account_status_incompatible_server">Inkompatibel server</string>
<string name="account_status_stream_error">Strømfejl</string>
<string name="account_status_stream_opening_error">Fejl ved streamåbning</string>
<string name="encryption_choice_unencrypted">Ukrypteret</string>
<string name="encryption_choice_unencrypted">TLS</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>

View File

@ -172,7 +172,7 @@
<string name="account_status_incompatible_server">Inkompatibler Server</string>
<string name="account_status_stream_error">Stream-Fehler</string>
<string name="account_status_stream_opening_error">Fehler beim Öffnen des Streams</string>
<string name="encryption_choice_unencrypted">Unverschlüsselt</string>
<string name="encryption_choice_unencrypted">TLS</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>

View File

@ -172,7 +172,7 @@
<string name="account_status_incompatible_server">Μη συμβατός διακομιστής</string>
<string name="account_status_stream_error">Σφάλμα μετάδοσης</string>
<string name="account_status_stream_opening_error">Σφάλμα στην εκκίνηση μετάδοσης</string>
<string name="encryption_choice_unencrypted">Μη κρυπτογραφημένο</string>
<string name="encryption_choice_unencrypted">TLS</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>

View File

@ -172,7 +172,7 @@
<string name="account_status_incompatible_server">Servidor incompatible</string>
<string name="account_status_stream_error">Error de flujo</string>
<string name="account_status_stream_opening_error">Error al abrir la secuencia</string>
<string name="encryption_choice_unencrypted">Sin cifrado</string>
<string name="encryption_choice_unencrypted">TLS</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>

View File

@ -135,7 +135,7 @@
<string name="account_status_incompatible_server">Zerbitzari ez bateragarria</string>
<string name="account_status_stream_error">Akatsa korrontean</string>
<string name="account_status_stream_opening_error">Akatsa korrontea irekitzerakoan</string>
<string name="encryption_choice_unencrypted">Enkriptatu gabe</string>
<string name="encryption_choice_unencrypted">TLS</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>

View File

@ -108,7 +108,7 @@
<string name="account_status_policy_violation">نقض سیاست</string>
<string name="account_status_incompatible_server">سرور ناسازگار</string>
<string name="account_status_stream_error">خطا در ارتباط</string>
<string name="encryption_choice_unencrypted">رمز نشده</string>
<string name="encryption_choice_unencrypted">TLS</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>

View File

@ -167,7 +167,7 @@
<string name="account_status_tls_error">TLS-kättely epäonnistui</string>
<string name="account_status_tls_error_domain">Verkkotunnuksen varmentaminen epäonnistui</string>
<string name="account_status_incompatible_server">Yhteensopimaton palvelin</string>
<string name="encryption_choice_unencrypted">Salaamaton</string>
<string name="encryption_choice_unencrypted">TLS</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>

View File

@ -171,7 +171,7 @@
<string name="account_status_incompatible_server">Serveur incompatible</string>
<string name="account_status_stream_error">Erreur de flux</string>
<string name="account_status_stream_opening_error">Erreur d\'ouverture du flux</string>
<string name="encryption_choice_unencrypted">Non chiffré</string>
<string name="encryption_choice_unencrypted">TLS</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>

View File

@ -172,7 +172,7 @@
<string name="account_status_incompatible_server">Servidor incompatible</string>
<string name="account_status_stream_error">Erro de fluxo</string>
<string name="account_status_stream_opening_error">Fallo ao abrir o fluxo</string>
<string name="encryption_choice_unencrypted">Non cifrado</string>
<string name="encryption_choice_unencrypted">TLS</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>

View File

@ -172,7 +172,7 @@
<string name="account_status_incompatible_server">Nem kompatibilis kiszolgáló</string>
<string name="account_status_stream_error">Adatfolyamhiba</string>
<string name="account_status_stream_opening_error">Adatfolyam megnyitási hiba</string>
<string name="encryption_choice_unencrypted">Titkosítatlan</string>
<string name="encryption_choice_unencrypted">TLS</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>

View File

@ -161,7 +161,7 @@
<string name="account_status_incompatible_server">Server tidak cocok</string>
<string name="account_status_stream_error">Kesalahan stream</string>
<string name="account_status_stream_opening_error">Kesalahan pembukaan stream</string>
<string name="encryption_choice_unencrypted">Tidak terenkripsi</string>
<string name="encryption_choice_unencrypted">TLS</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>

View File

@ -172,7 +172,7 @@
<string name="account_status_incompatible_server">Server non compatibile</string>
<string name="account_status_stream_error">Errore di stream</string>
<string name="account_status_stream_opening_error">Errore apertura flusso</string>
<string name="encryption_choice_unencrypted">Non cifrato</string>
<string name="encryption_choice_unencrypted">TLS</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>

View File

@ -97,7 +97,7 @@
<string name="account_status_regis_conflict">שם משתמש כבר בשימוש</string>
<string name="account_status_regis_success">הרשמה הושלמה</string>
<string name="account_status_incompatible_server">שרת לא מתאים</string>
<string name="encryption_choice_unencrypted">לא מוצפן</string>
<string name="encryption_choice_unencrypted">TLS</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>

View File

@ -169,7 +169,7 @@
<string name="account_status_incompatible_server">互換性のないサーバー</string>
<string name="account_status_stream_error">ストリーム エラー</string>
<string name="account_status_stream_opening_error">ストリームを開く際にエラー</string>
<string name="encryption_choice_unencrypted">暗号化されていない</string>
<string name="encryption_choice_unencrypted">TLS</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>

View File

@ -114,7 +114,7 @@
<string name="account_status_policy_violation">정책 위반</string>
<string name="account_status_incompatible_server">호환되지 않는 서버 </string>
<string name="account_status_stream_error">스트림 오류</string>
<string name="encryption_choice_unencrypted">암호화되지 않음</string>
<string name="encryption_choice_unencrypted">TLS</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP </string>
<string name="encryption_choice_omemo">OMEMO</string>

View File

@ -112,7 +112,7 @@
<string name="account_status_regis_conflict">ഉപയോക്തൃനാമം ഇതിനകം നിലവിലുണ്ട്</string>
<string name="account_status_regis_success">രജിസ്ട്രേഷൻ പൂർത്തിയായി</string>
<string name="account_status_policy_violation">നയ ലംഘനം</string>
<string name="encryption_choice_unencrypted">സുരക്ഷിതമല്ലാത്ത</string>
<string name="encryption_choice_unencrypted">TLS</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>

View File

@ -122,7 +122,7 @@
<string name="account_status_policy_violation">Praksisbrudd</string>
<string name="account_status_incompatible_server">Ukompatibel tjener</string>
<string name="account_status_stream_error">Strømmingsfeil</string>
<string name="encryption_choice_unencrypted">Ukryptert</string>
<string name="encryption_choice_unencrypted">TLS</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>

View File

@ -145,7 +145,7 @@
<string name="account_status_incompatible_server">Incompatibele server</string>
<string name="account_status_stream_error">Fout bij stream</string>
<string name="account_status_stream_opening_error">Fout bij openen van stream</string>
<string name="encryption_choice_unencrypted">Onversleuteld</string>
<string name="encryption_choice_unencrypted">TLS</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>

View File

@ -178,7 +178,7 @@
<string name="account_status_incompatible_server">Serwer niekompatybilny</string>
<string name="account_status_stream_error">Błąd strumienia</string>
<string name="account_status_stream_opening_error">Błąd otwierania strumienia</string>
<string name="encryption_choice_unencrypted">Bez szyfrowania</string>
<string name="encryption_choice_unencrypted">TLS</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>

View File

@ -172,7 +172,7 @@
<string name="account_status_incompatible_server">Servidor incompatível</string>
<string name="account_status_stream_error">Erro de fluxo</string>
<string name="account_status_stream_opening_error">Erro na abertura do fluxo</string>
<string name="encryption_choice_unencrypted">Descriptografada</string>
<string name="encryption_choice_unencrypted">TLS</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>

View File

@ -118,7 +118,7 @@
<string name="account_status_regis_conflict">O nome de utilizador já está em uso</string>
<string name="account_status_regis_success">Registo efetuado com sucesso</string>
<string name="account_status_incompatible_server">Servidor incompatível</string>
<string name="encryption_choice_unencrypted">Não cifrado</string>
<string name="encryption_choice_unencrypted">TLS</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>

View File

@ -175,7 +175,7 @@
<string name="account_status_incompatible_server">Server incompatibil</string>
<string name="account_status_stream_error">Eroare de date</string>
<string name="account_status_stream_opening_error">Eroare deschidere flux de date</string>
<string name="encryption_choice_unencrypted">Necriptat</string>
<string name="encryption_choice_unencrypted">TLS</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenGPG</string>
<string name="encryption_choice_omemo">OMEMO</string>

View File

@ -178,7 +178,7 @@
<string name="account_status_incompatible_server">Несовместимый сервер</string>
<string name="account_status_stream_error">Ошибка потока</string>
<string name="account_status_stream_opening_error">Ошибка открытия потока</string>
<string name="encryption_choice_unencrypted">Без шифра</string>
<string name="encryption_choice_unencrypted">TLS</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>

View File

@ -174,7 +174,7 @@
<string name="account_status_tls_error_domain">Doména sa nedá overiť</string>
<string name="account_status_policy_violation">Porušenie pravidiel</string>
<string name="account_status_incompatible_server">Nekompatibilný server</string>
<string name="encryption_choice_unencrypted">Nezašifrovaný</string>
<string name="encryption_choice_unencrypted">TLS</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>

View File

@ -171,7 +171,7 @@
<string name="account_status_incompatible_server">Некомпатибилан сервер</string>
<string name="account_status_stream_error">Грешка тока</string>
<string name="account_status_stream_opening_error">Грешка при отварању тока</string>
<string name="encryption_choice_unencrypted">Нешифровано</string>
<string name="encryption_choice_unencrypted">TLS</string>
<string name="encryption_choice_otr">ОТР</string>
<string name="encryption_choice_pgp">ОпенПГП</string>
<string name="encryption_choice_omemo">ОМЕМО</string>

View File

@ -172,7 +172,7 @@
<string name="account_status_incompatible_server">Inkompatibel server</string>
<string name="account_status_stream_error">Strömningsfel</string>
<string name="account_status_stream_opening_error">Fel vid öppning av ström</string>
<string name="encryption_choice_unencrypted">Okrypterat</string>
<string name="encryption_choice_unencrypted">TLS</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>

View File

@ -172,7 +172,7 @@
<string name="account_status_incompatible_server">Sunucu uyuşmazlığı</string>
<string name="account_status_stream_error">Akış hatası</string>
<string name="account_status_stream_opening_error">Akış açılım hatası</string>
<string name="encryption_choice_unencrypted">Şifrelenmemiş</string>
<string name="encryption_choice_unencrypted">TLS</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>

View File

@ -156,7 +156,7 @@
<string name="account_status_incompatible_server">Несумісний сервер</string>
<string name="account_status_stream_error">Помилка потоку</string>
<string name="account_status_stream_opening_error">Не вдалося відкрити мережевий потік</string>
<string name="encryption_choice_unencrypted">Без шифрування</string>
<string name="encryption_choice_unencrypted">TLS</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>

View File

@ -169,7 +169,7 @@
<string name="account_status_incompatible_server">Máy chủ không tương thích</string>
<string name="account_status_stream_error">Lỗi truyền phát</string>
<string name="account_status_stream_opening_error">Lỗi khi mở luồng truyền</string>
<string name="encryption_choice_unencrypted">Không mã hoá</string>
<string name="encryption_choice_unencrypted">TLS</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>

View File

@ -169,7 +169,7 @@
<string name="account_status_incompatible_server">服务器不兼容</string>
<string name="account_status_stream_error">流错误</string>
<string name="account_status_stream_opening_error">流打开错误</string>
<string name="encryption_choice_unencrypted">未加密</string>
<string name="encryption_choice_unencrypted">TLS</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>

View File

@ -115,7 +115,7 @@
<string name="account_status_policy_violation">違反政策</string>
<string name="account_status_incompatible_server">伺服器不相容</string>
<string name="account_status_stream_error">流錯誤</string>
<string name="encryption_choice_unencrypted">未加密</string>
<string name="encryption_choice_unencrypted">TLS</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>

View File

@ -171,7 +171,7 @@
<string name="account_status_incompatible_server">Incompatible server</string>
<string name="account_status_stream_error">Stream error</string>
<string name="account_status_stream_opening_error">Stream opening error</string>
<string name="encryption_choice_unencrypted">Unencrypted</string>
<string name="encryption_choice_unencrypted">TLS</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>