diff options
author | steckbrief <steckbrief@chefmail.de> | 2016-03-02 16:54:18 +0100 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2016-03-02 16:54:18 +0100 |
commit | 5d21abac1dd2fed7a5e87f8fb23bc15ee0912322 (patch) | |
tree | 2f1e62051972c0be576794f09a67bf9036a8b915 /src/main/java/eu/siacs/conversations/Config.java | |
parent | c26f907263209325dc23b1c3e4b59b8cb6e6610e (diff) |
Fixes FS#147: Disable OMEMO
Diffstat (limited to 'src/main/java/eu/siacs/conversations/Config.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/Config.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java index 553abb9c..16db57e0 100644 --- a/src/main/java/eu/siacs/conversations/Config.java +++ b/src/main/java/eu/siacs/conversations/Config.java @@ -2,6 +2,7 @@ package eu.siacs.conversations; import android.graphics.Bitmap; +import de.thedevstack.conversationsplus.ConversationsPlusPreferences; import eu.siacs.conversations.xmpp.chatstate.ChatState; public final class Config { @@ -31,7 +32,7 @@ public final class Config { } public static boolean supportOmemo() { - return (ENCRYPTION_MASK & OMEMO) != 0; + return ConversationsPlusPreferences.omemoEnabled(); } public static boolean multipleEncryptionChoices() { |