aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorSam Whited <sam@samwhited.com>2015-01-17 13:40:15 -0500
committerSam Whited <sam@samwhited.com>2015-01-19 11:02:13 -0500
commit503237087ffc5585876dfdb96ef167960bef0f15 (patch)
tree1dec69c436bd031de1e7a26fed75e919458b90ad /src/main/res
parent1e607d7b1b0accf03d0e170fe67d418dac7c2114 (diff)
Remove legacy SSL support
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/values-cs/strings.xml1
-rw-r--r--src/main/res/values-de/strings.xml1
-rw-r--r--src/main/res/values-es/strings.xml1
-rw-r--r--src/main/res/values-eu/strings.xml1
-rw-r--r--src/main/res/values-fr/strings.xml1
-rw-r--r--src/main/res/values-it/strings.xml1
-rw-r--r--src/main/res/values-nl/strings.xml1
-rw-r--r--src/main/res/values-sv/strings.xml1
-rw-r--r--src/main/res/values/strings.xml2
-rw-r--r--src/main/res/xml/preferences.xml5
10 files changed, 0 insertions, 15 deletions
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 77b169f2..f05020b7 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -267,7 +267,6 @@
<string name="pref_force_encryption_summary">Vždy zasílat šifrované zprávy (mimo konference)</string>
<string name="pref_dont_save_encrypted">Neukládat šifrované zprávy</string>
<string name="pref_dont_save_encrypted_summary">Varování: Toto může vést ke ztrátě zpráv</string>
- <string name="pref_enable_legacy_ssl">Povolit zastaralé SSL</string>
<string name="pref_expert_options">Expertní nastavení</string>
<string name="pref_expert_options_summary">S tímto zacházejte velmi opatrně</string>
<string name="title_activity_about">O aplikaci Conversations</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 60596bf8..eb9d5dd5 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -267,7 +267,6 @@
<string name="pref_force_encryption_summary">Nachrichten immer verschlüsseln (außer für Konferenzen)</string>
<string name="pref_dont_save_encrypted">Verschlüsselte Nachrichten nicht speichern</string>
<string name="pref_dont_save_encrypted_summary">Achtung: kann zu Nachrichtenverlust führen</string>
- <string name="pref_enable_legacy_ssl">Alte SSL-Version aktivieren</string>
<string name="pref_expert_options">Einstellungen für Experten</string>
<string name="pref_expert_options_summary">Hier bitte vorsichtig sein</string>
<string name="title_activity_about">Über Conversations</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index efc51dd9..7a20341d 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -267,7 +267,6 @@
<string name="pref_force_encryption_summary">Siempre enviar mensajes cifrados (excepto para conversaciones en grupo)</string>
<string name="pref_dont_save_encrypted">No guardar mensajes cifrados</string>
<string name="pref_dont_save_encrypted_summary">Aviso: Esto podría llevar a pérdida de mensajes</string>
- <string name="pref_enable_legacy_ssl">Habilitar SSL heredado</string>
<string name="pref_expert_options">Ajustes avanzados</string>
<string name="pref_expert_options_summary">Por favor, cuidado con estas opciones</string>
<string name="title_activity_about">Acerca de Conversations</string>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index fa22ddb3..5e325695 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -267,7 +267,6 @@
<string name="pref_force_encryption_summary">Mezuak beti enkriptatuta bidali (konferentzietan izan ezik)</string>
<string name="pref_dont_save_encrypted">Ez gorde enkriptatutako mezuak</string>
<string name="pref_dont_save_encrypted_summary">Adi: Honek mezuen galera ekar lezake</string>
- <string name="pref_enable_legacy_ssl">Oinordetutako SSL gaitu</string>
<string name="pref_expert_options">Adituentzako aukerak</string>
<string name="pref_expert_options_summary">Mesedez kontuz ibili hauekin</string>
<string name="title_activity_about">Conversationsi buruz</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index e9b09b7d..7767fb60 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -267,7 +267,6 @@
<string name="pref_force_encryption_summary">Toujours envoyer des messages chiffrés (sauf pour les conférences)</string>
<string name="pref_dont_save_encrypted">Ne pas sauvegarder les messages chiffrés</string>
<string name="pref_dont_save_encrypted_summary">Attention: Celà peut mener à une perte de messages</string>
- <string name="pref_enable_legacy_ssl">Activer SSL hérité</string>
<string name="pref_expert_options">Options avancées</string>
<string name="pref_expert_options_summary">A utiliser avec précautions</string>
<string name="title_activity_about">Sur Conversations</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 0e659e45..e733dff8 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -267,7 +267,6 @@
<string name="pref_force_encryption_summary">Manda sempre messaggi cifrati (ad eccezione delle conferenze)</string>
<string name="pref_dont_save_encrypted">Non salvare i messaggi cifrati</string>
<string name="pref_dont_save_encrypted_summary">Attenzione: Questo potrebbe comportare la perdita di messaggi</string>
- <string name="pref_enable_legacy_ssl">Abilita il vecchio SSL</string>
<string name="pref_expert_options">Opzioni da Esperto</string>
<string name="pref_expert_options_summary">Fai attenzione con queste impostazioni</string>
<string name="title_activity_about">Info su Conversations</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index bd347bff..540914dd 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -267,7 +267,6 @@
<string name="pref_force_encryption_summary">Stuur berichten altijd versleuteld (behalve in groepsgesprekken)</string>
<string name="pref_dont_save_encrypted">Sla versleutelde berichten niet op</string>
<string name="pref_dont_save_encrypted_summary"><b>Waarschuwing:</b> Dit kan leiden tot verlies van berichten</string>
- <string name="pref_enable_legacy_ssl">Sta legacy SSL toe</string>
<string name="pref_expert_options">Expert-instellingen</string>
<string name="pref_expert_options_summary">Wees voorzichtig met deze instellingen</string>
<string name="title_activity_about">Over Conversations</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index f7bcd5b5..79a8656b 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -267,7 +267,6 @@
<string name="pref_force_encryption_summary">Sänd alltid krypterade meddelanden (utom för konferenser)</string>
<string name="pref_dont_save_encrypted">Spara in krypterade meddelanden</string>
<string name="pref_dont_save_encrypted_summary">Varning: Detta kan leda till att meddelanden förloras</string>
- <string name="pref_enable_legacy_ssl">Aktivera förlegad SSL</string>
<string name="pref_expert_options">Expertinställningar</string>
<string name="pref_expert_options_summary">Var försiktig med dem</string>
<string name="title_activity_about">Om Conversations</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 2dac29da..dc4c1bdb 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -269,8 +269,6 @@
<string name="pref_force_encryption_summary">Always send messages encrypted (except for conferences)</string>
<string name="pref_dont_save_encrypted">Don’t save encrypted messages</string>
<string name="pref_dont_save_encrypted_summary">Warning: This could lead to message loss</string>
- <string name="pref_enable_legacy_ssl">Enable legacy SSL</string>
- <string name="pref_enable_legacy_ssl_summary">Enables legacy SSLv3 support and insecure SSL ciphers.</string>
<string name="pref_expert_options">Expert options</string>
<string name="pref_expert_options_summary">Please be careful with these</string>
<string name="title_activity_about">About Conversations</string>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 2ff6800b..7c92530f 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -116,11 +116,6 @@
android:key="dont_save_encrypted"
android:summary="@string/pref_dont_save_encrypted_summary"
android:title="@string/pref_dont_save_encrypted" />
- <CheckBoxPreference
- android:defaultValue="false"
- android:key="enable_legacy_ssl"
- android:summary="@string/pref_enable_legacy_ssl_summary"
- android:title="@string/pref_enable_legacy_ssl" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/pref_input_options">
<CheckBoxPreference