diff options
author | Christian S <christian@pix-art.de> | 2015-10-31 17:14:53 +0100 |
---|---|---|
committer | Christian S <christian@pix-art.de> | 2015-10-31 17:14:53 +0100 |
commit | c5dc1628a4068b8af3b2250080897e35937dc815 (patch) | |
tree | 727ded0485a61fa64d613defb9b6917d9a6fa0ef /src/main/java/eu/siacs/conversations/utils/CryptoHelper.java | |
parent | 107acd1a5b03d25aa38d1ad73b957482ea781035 (diff) | |
parent | b9de159e97090e132b74e934bc42fa6186105fd2 (diff) |
Merge remote-tracking branch 'siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/utils/CryptoHelper.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/utils/CryptoHelper.java | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java b/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java index 8091a9966..ab407249c 100644 --- a/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java @@ -23,6 +23,8 @@ import java.util.LinkedHashSet; import java.util.List; import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.Message; import eu.siacs.conversations.xmpp.jid.InvalidJidException; import eu.siacs.conversations.xmpp.jid.Jid; @@ -164,4 +166,17 @@ public final class CryptoHelper { return null; } } + + public static int encryptionTypeToText(int encryption) { + switch (encryption) { + case Message.ENCRYPTION_OTR: + return R.string.encryption_choice_otr; + case Message.ENCRYPTION_AXOLOTL: + return R.string.encryption_choice_omemo; + case Message.ENCRYPTION_NONE: + return R.string.encryption_choice_unencrypted; + default: + return R.string.encryption_choice_pgp; + } + } } |