aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/entities/Conversation.java
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-04-03 21:59:49 +0200
committerChristian Schneppe <christian@pix-art.de>2018-04-03 22:01:29 +0200
commite18855cd9c1a651bc39e651c814415cfff4e5680 (patch)
tree0a0e50960094d9fe4996ac9752591567120c8ab7 /src/main/java/de/pixart/messenger/entities/Conversation.java
parent810ac88a4995851892b1af7a084dba677f4e1fb3 (diff)
do not enable encryption for bug reports
Diffstat (limited to '')
-rw-r--r--src/main/java/de/pixart/messenger/entities/Conversation.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Conversation.java b/src/main/java/de/pixart/messenger/entities/Conversation.java
index c9bbbfca2..81c52aa1c 100644
--- a/src/main/java/de/pixart/messenger/entities/Conversation.java
+++ b/src/main/java/de/pixart/messenger/entities/Conversation.java
@@ -762,7 +762,9 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
public int getNextEncryption() {
final int defaultEncryption;
AxolotlService axolotlService = account.getAxolotlService();
- if (axolotlService != null && axolotlService.isConversationAxolotlCapable(this)) {
+ if (contactJid.asBareJid().equals(Config.BUG_REPORTS)) {
+ defaultEncryption = Message.ENCRYPTION_NONE;
+ } else if (axolotlService != null && axolotlService.isConversationAxolotlCapable(this)) {
defaultEncryption = Message.ENCRYPTION_AXOLOTL;
} else {
defaultEncryption = Message.ENCRYPTION_NONE;