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/ui/ConversationsActivity.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/ui/ConversationsActivity.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java index e64e4afb8..3c4b9fb59 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java @@ -68,6 +68,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import de.pixart.messenger.Config; import de.pixart.messenger.R; +import de.pixart.messenger.crypto.OmemoSetting; import de.pixart.messenger.databinding.ActivityConversationsBinding; import de.pixart.messenger.entities.Account; import de.pixart.messenger.entities.Conversation; @@ -425,6 +426,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio @Override protected void onCreate(final Bundle savedInstanceState) { super.onCreate(savedInstanceState); + OmemoSetting.load(this); new EmojiService(this).init(useBundledEmoji()); this.binding = DataBindingUtil.setContentView(this, R.layout.activity_conversations); setSupportActionBar((Toolbar) binding.toolbar); |