introduced build-time paranoia mode that disables unencrypted chats a…

…nd forces TOR

1 files changed, 9 insertions, 2 deletions

diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index ee1eb2110..271ddd621 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -626,9 +626,16 @@ public class Conversation extends AbstractEntity implements Blockable {
 		if (next == -1) {
 			int outgoing = this.getMostRecentlyUsedOutgoingEncryption();
 			if (outgoing == Message.ENCRYPTION_NONE) {
-				return this.getMostRecentlyUsedIncomingEncryption();
+				next = this.getMostRecentlyUsedIncomingEncryption();
 			} else {
-				return outgoing;
+				next = outgoing;
+			}
+		}
+		if (Config.PARANOID_MODE && mode == MODE_SINGLE && next <= 0) {
+			if (getAccount().getAxolotlService().isContactAxolotlCapable(getContact())) {
+				return Message.ENCRYPTION_AXOLOTL;
+			} else {
+				return Message.ENCRYPTION_OTR;
 			}
 		}
 		return next;