From 89655f6233ed4ef41830719bb77b51dc12787cd5 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Wed, 31 May 2017 21:23:34 +0200
Subject: rename downgrade attack to downgraded sasl mechanism

---
 src/main/java/de/pixart/messenger/entities/Account.java   | 2 +-
 src/main/java/de/pixart/messenger/entities/Presences.java | 2 +-
 src/main/res/values-de/strings.xml                        | 4 ++--
 src/main/res/values/strings.xml                           | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/de/pixart/messenger/entities/Account.java b/src/main/java/de/pixart/messenger/entities/Account.java
index 4907d26b6..437dfa47a 100644
--- a/src/main/java/de/pixart/messenger/entities/Account.java
+++ b/src/main/java/de/pixart/messenger/entities/Account.java
@@ -183,7 +183,7 @@ public class Account extends AbstractEntity {
                 case SESSION_FAILURE:
                     return R.string.session_failure;
                 case DOWNGRADE_ATTACK:
-                    return R.string.downgrade_attack;
+                    return R.string.sasl_downgrade;
                 case HOST_UNKNOWN:
                     return R.string.account_status_host_unknown;
                 case POLICY_VIOLATION:
diff --git a/src/main/java/de/pixart/messenger/entities/Presences.java b/src/main/java/de/pixart/messenger/entities/Presences.java
index 3f3f670da..d57515392 100644
--- a/src/main/java/de/pixart/messenger/entities/Presences.java
+++ b/src/main/java/de/pixart/messenger/entities/Presences.java
@@ -144,6 +144,6 @@ public class Presences {
                 }
             }
         }
-        return new Pair(typeMap, nameMap);
+        return new Pair<>(typeMap, nameMap);
     }
 }
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index e854a5d66..5e8dccff9 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -726,8 +726,8 @@
     <string name="timeout_12_months">12 Monate</string>
     <string name="pref_show_connection_options">Erweiterte Verbindungsoptionen</string>
     <string name="pref_show_connection_options_summary">Hostname- und Port-Optionen bei Kontoeinrichtung anzeigen</string>
-    <string name="account_status_tls_error">TLS Fehler</string>
-    <string name="downgrade_attack">Downgrade Angriff</string>
+    <string name="account_status_tls_error">TLS-Aushandlung fehlgeschlagen</string>
+    <string name="sasl_downgrade">SASL-Mechanismus zurückgestuft</string>
     <string name="retry_decryption">Entschlüsseln wiederholen</string>
     <string name="session_failure">Sitzungsfehler</string>
     <string name="unpublish_pgp">Öffentlichen OpenPGP-Schlüssel verwerfen</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 375179423..e1183ab07 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -150,7 +150,7 @@
     <string name="account_status_regis_conflict">Username already in use</string>
     <string name="account_status_regis_success">Registration completed</string>
     <string name="account_status_regis_not_sup">Server does not support registration</string>
-    <string name="account_status_tls_error">TLS error</string>
+    <string name="account_status_tls_error">TLS negotiation failed</string>
     <string name="account_status_policy_violation">Policy violation</string>
     <string name="account_status_incompatible_server">Incompatible server</string>
     <string name="account_status_stream_error">Stream error</string>
@@ -778,5 +778,5 @@
     <string name="pref_show_connection_options">Extended connection settings</string>
     <string name="retry_decryption">Retry decryption</string>
     <string name="session_failure">Session failure</string>
-    <string name="downgrade_attack">Downgrade attack</string>
+    <string name="sasl_downgrade">Downgraded SASL mechanism</string>
 </resources>
-- 
cgit v1.2.3