diff options
| author | Christian S <christian@pix-art.de> | 2015-12-16 20:01:14 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-12-16 20:01:14 +0100 |
| commit | 2c2ec1f9e0dbc2a1c4f21b260aaf7cc587593271 (patch) | |
| tree | 966a359f00c4a3a239a21e33758ebcc4b7d26550 /src/main/java/eu/siacs/conversations/entities/Conversation.java | |
| parent | efaa1223b6e002d5afba0462d57ff30be91dd0e5 (diff) | |
| parent | 9522af539e80fdf24ce4e116d346294008826e0b (diff) | |
Merge branch 'refs/heads/siacs-master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/Conversation.java')
| -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 bef1e5bc8..81f789f8d 100644 --- a/src/main/java/eu/siacs/conversations/entities/Conversation.java +++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java @@ -630,7 +630,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 { |