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

getNextEncryption does not honor ENCYPTION_MASK (#2899)

Browse source
This commit is contained in:
ChaosKid42 2018-03-26 12:44:21 +02:00 committed by Daniel Gultsch
parent 1749009d10
commit 536149723e
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -593,6 +593,9 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
public int getNextEncryption() { public int getNextEncryption() {
final int defaultEncryption; final int defaultEncryption;
if (!Config.supportOmemo() && !Config.supportOpenPgp()) {
return Message.ENCRYPTION_NONE;
}
AxolotlService axolotlService = account.getAxolotlService(); AxolotlService axolotlService = account.getAxolotlService();
if (contactJid.asBareJid().equals(Config.BUG_REPORTS)) { if (contactJid.asBareJid().equals(Config.BUG_REPORTS)) {
defaultEncryption = Message.ENCRYPTION_NONE; defaultEncryption = Message.ENCRYPTION_NONE;