bug fixes for forcing encryption

This commit is contained in:
iNPUTmice 2014-09-08 14:29:35 +02:00
parent 5cb11396f6
commit a6f0f0cb6e

View file

@ -363,7 +363,12 @@ public class Conversation extends AbstractEntity {
return latest; return latest;
} }
} }
return this.nextMessageEncryption; if (this.nextMessageEncryption == Message.ENCRYPTION_NONE && force
&& getMode() == MODE_SINGLE) {
return Message.ENCRYPTION_OTR;
} else {
return this.nextMessageEncryption;
}
} }
public void setNextEncryption(int encryption) { public void setNextEncryption(int encryption) {