narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

work around -1 in next encryption

Browse source
This commit is contained in:
Daniel Gultsch 2016-11-15 21:11:35 +01:00
parent 48afeb571b
commit ec63900ef3
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/entities/Conversation.java
View file

@ -697,7 +697,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
} }
public int getNextEncryption() { public int getNextEncryption() {
return this.getIntAttribute(ATTRIBUTE_NEXT_ENCRYPTION, Message.ENCRYPTION_NONE); return Math.max(this.getIntAttribute(ATTRIBUTE_NEXT_ENCRYPTION, Message.ENCRYPTION_NONE), Message.ENCRYPTION_NONE);
} }
public void setNextEncryption(int encryption) { public void setNextEncryption(int encryption) {