diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-01-22 11:20:31 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-01-22 11:20:31 +0100 |
| commit | 40005cec1b1a864c529ead082a6e41a1471c874c (patch) | |
| tree | 8e42c210500630e14e354d9724871afc69aa2fef /src/main/java/eu/siacs/conversations/entities | |
| parent | 77c0fb0b2ae257b7bf257417ed689f2334507f2c (diff) | |
added config variable to allow non-tls connections
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Conversation.java | 2 |
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 dea9d661..22607fc6 100644 --- a/src/main/java/eu/siacs/conversations/entities/Conversation.java +++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java @@ -626,7 +626,7 @@ public class Conversation extends AbstractEntity implements Blockable { next = outgoing; } } - if (Config.FORCE_ENCRYPTION && mode == MODE_SINGLE && next <= 0) { + if (Config.FORCE_E2E_ENCRYPTION && mode == MODE_SINGLE && next <= 0) { if (axolotlService != null && axolotlService.isContactAxolotlCapable(getContact())) { return Message.ENCRYPTION_AXOLOTL; } else { |