aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities/Conversation.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-12-14 10:54:55 +0100
committerDaniel Gultsch <daniel@gultsch.de>2015-12-14 10:54:55 +0100
commitf6b22dad2032453bd2e1157488b142af1a86d413 (patch)
tree7337be50e19cabfc3fffc257a59b8a10bdb324be /src/main/java/eu/siacs/conversations/entities/Conversation.java
parent042939e44d2d98c669b1dc5414f7f8353e9cde27 (diff)
splite PARANOIA_MODE into three different options
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/Conversation.java')
-rw-r--r--src/main/java/eu/siacs/conversations/entities/Conversation.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index 8b7aa894..a085f0c0 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -616,7 +616,7 @@ public class Conversation extends AbstractEntity implements Blockable {
next = outgoing;
}
}
- if (Config.PARANOID_MODE && mode == MODE_SINGLE && next <= 0) {
+ if (Config.FORCE_ENCRYPTION && mode == MODE_SINGLE && next <= 0) {
if (getAccount().getAxolotlService().isContactAxolotlCapable(getContact())) {
return Message.ENCRYPTION_AXOLOTL;
} else {