sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bug fixes for forcing encryption

This commit is contained in:
iNPUTmice 2014-09-08 14:29:35 +02:00
parent 5cb11396f6
commit a6f0f0cb6e
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/eu/siacs/conversations/entities/Conversation.java
View File

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