bug fixes for forcing encryption

2014-09-08 14:29:35 +02:00 · 2014-09-08 14:29:35 +02:00 · a6f0f0cb6e
parent 5cb11396f6
commit a6f0f0cb6e
1 changed files with 6 additions and 1 deletions
--- a/src/eu/siacs/conversations/entities/Conversation.java
+++ b/src/eu/siacs/conversations/entities/Conversation.java
@ -363,7 +363,12 @@ public class Conversation extends AbstractEntity {
 				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) {