diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-04-13 22:34:52 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-04-13 22:49:42 +0200 |
commit | df45a1153db622511cab205395c2dc7fd33a25f5 (patch) | |
tree | 0292b864ee1f2244ea71771c482e18c3efa8e107 /src/main/java/de/pixart/messenger/services/XmppConnectionService.java | |
parent | 0f7f4bf5ed4bc8d07c333daf2c5c519dd0c7fdc9 (diff) |
introduced tri state omemo setting (off by default, on by default, always)
Diffstat (limited to '')
-rw-r--r-- | src/main/java/de/pixart/messenger/services/XmppConnectionService.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java index 48c39c18b..5d36f7bd0 100644 --- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java +++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java @@ -74,6 +74,7 @@ import java.util.concurrent.atomic.AtomicLong; import de.pixart.messenger.BuildConfig; import de.pixart.messenger.Config; import de.pixart.messenger.R; +import de.pixart.messenger.crypto.OmemoSetting; import de.pixart.messenger.crypto.PgpDecryptionService; import de.pixart.messenger.crypto.PgpEngine; import de.pixart.messenger.crypto.axolotl.AxolotlService; @@ -1068,6 +1069,7 @@ public class XmppConnectionService extends Service { @SuppressLint("TrulyRandom") @Override public void onCreate() { + OmemoSetting.load(this); ExceptionHelper.init(getApplicationContext()); PRNGFixes.apply(); Resolver.init(this); |