diff options
Diffstat (limited to 'src/eu/siacs/conversations/entities/Conversation.java')
| -rw-r--r-- | src/eu/siacs/conversations/entities/Conversation.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/eu/siacs/conversations/entities/Conversation.java b/src/eu/siacs/conversations/entities/Conversation.java index add51d52..d800cfd4 100644 --- a/src/eu/siacs/conversations/entities/Conversation.java +++ b/src/eu/siacs/conversations/entities/Conversation.java @@ -56,7 +56,7 @@ public class Conversation extends AbstractEntity { private transient String otrFingerprint = null; - private int nextMessageEncryption = Message.ENCRYPTION_NONE; + private int nextMessageEncryption = -1; private String nextMessage; private transient MucOptions mucOptions = null; @@ -332,6 +332,9 @@ public class Conversation extends AbstractEntity { } public int getNextEncryption() { + if (this.nextMessageEncryption == -1) { + return this.getLatestEncryption(); + } return this.nextMessageEncryption; } |