diff options
author | Christian Schneppe <christian.schneppe@pix-art.de> | 2020-01-24 20:36:29 +0100 |
---|---|---|
committer | Christian Schneppe <christian.schneppe@pix-art.de> | 2020-01-24 20:36:29 +0100 |
commit | b9962f7b50a03a9d40ecb426be1bd95ce4b7b9bd (patch) | |
tree | 2714b0ad523162ab0cb39ae753743d9847e1c143 /src/main/java/de/pixart/messenger/entities | |
parent | a917c5403f89c8c6351bc379fc91e981139dd25e (diff) |
omemo changes: use 12 byte IV, no longer accept auth tag appended to payload
Diffstat (limited to '')
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/Conversation.java | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/MucOptions.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Conversation.java b/src/main/java/de/pixart/messenger/entities/Conversation.java index 13bfecfca..0635a4553 100644 --- a/src/main/java/de/pixart/messenger/entities/Conversation.java +++ b/src/main/java/de/pixart/messenger/entities/Conversation.java @@ -89,8 +89,8 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl private transient MucOptions mucOptions = null; private byte[] symmetricKey; private boolean messagesLeftOnServer = true; - private ChatState mOutgoingChatState = Config.DEFAULT_CHATSTATE; - private ChatState mIncomingChatState = Config.DEFAULT_CHATSTATE; + private ChatState mOutgoingChatState = Config.DEFAULT_CHAT_STATE; + private ChatState mIncomingChatState = Config.DEFAULT_CHAT_STATE; private String mLastReceivedOtrMessageId = null; private String mFirstMamReference = null; diff --git a/src/main/java/de/pixart/messenger/entities/MucOptions.java b/src/main/java/de/pixart/messenger/entities/MucOptions.java index 40a0be58d..c4e711400 100644 --- a/src/main/java/de/pixart/messenger/entities/MucOptions.java +++ b/src/main/java/de/pixart/messenger/entities/MucOptions.java @@ -96,7 +96,7 @@ public class MucOptions { public void resetChatState() { synchronized (users) { for (User user : users) { - user.chatState = Config.DEFAULT_CHATSTATE; + user.chatState = Config.DEFAULT_CHAT_STATE; } } } @@ -747,7 +747,7 @@ public class MucOptions { private long pgpKeyId = 0; private Avatar avatar; private MucOptions options; - private ChatState chatState = Config.DEFAULT_CHATSTATE; + private ChatState chatState = Config.DEFAULT_CHAT_STATE; public User(MucOptions options, Jid fullJid) { this.options = options; |