aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/utils
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-11-16 12:28:21 +0100
committeriNPUTmice <daniel@gultsch.de>2014-11-16 12:28:21 +0100
commit84b2ce10b7a38aaaa9d2d3ee8ad4e1213402640f (patch)
tree9fb75476bd57dfb964ea4e9cf422385a7e21cc1f /src/main/java/eu/siacs/conversations/utils
parentd43aeb721835e43a15e3496b3c06dda54d516d76 (diff)
parent2c6547753275a5c988ae4b6a4f15993700c736a6 (diff)
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/utils')
-rw-r--r--src/main/java/eu/siacs/conversations/utils/CryptoHelper.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java b/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java
index b4a6e65c5..7a36e2bab 100644
--- a/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java
@@ -80,7 +80,7 @@ public class CryptoHelper {
}
public static String saslPrep(final String s) {
- return saslEscape(Normalizer.normalize(s, Normalizer.Form.NFKC));
+ return Normalizer.normalize(s, Normalizer.Form.NFKC);
}
public static String prettifyFingerprint(String fingerprint) {