aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2017-05-31 21:23:34 +0200
committerChristian Schneppe <christian@pix-art.de>2017-05-31 21:23:34 +0200
commit89655f6233ed4ef41830719bb77b51dc12787cd5 (patch)
treee1bee860920435563fa44b492709431ef4cb83f1 /src/main/java
parent6ae1c187057b6148722c0af5b2e4525d1f15b2ff (diff)
rename downgrade attack to downgraded sasl mechanism
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/de/pixart/messenger/entities/Account.java2
-rw-r--r--src/main/java/de/pixart/messenger/entities/Presences.java2
2 files changed, 2 insertions, 2 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);
}
}