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

Revert "otr fixes"

Browse source 
This reverts commit a136138daa.
This commit is contained in:
kosyak 2024-07-14 12:23:01 +02:00
parent 516f6321ef
commit 61af01ff28
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1127,10 +1127,8 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
defaultEncryption = Message.ENCRYPTION_NONE;
}
int encryption = this.getIntAttribute(ATTRIBUTE_NEXT_ENCRYPTION, defaultEncryption);
if (encryption < 0) {
if (encryption == Message.ENCRYPTION_OTR || encryption < 0) {
return defaultEncryption;
} else if (encryption == Message.ENCRYPTION_OTR) {
return encryption;
} else {
return encryption;
}