diff options
| author | Christian Schneppe <christian@pix-art.de> | 2018-11-23 12:53:15 +0100 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2018-11-23 12:53:15 +0100 |
| commit | 0290fa1b011c02698fc1313342ac0f8b5fd31d16 (patch) | |
| tree | 8b7cef1b2a511a41609c6eeed6151b6cee516ed8 /src/main/java/de/pixart/messenger | |
| parent | 0028bd6e8e18bf9a80aac0b05710c00898febfe7 (diff) | |
quicksy server is not a stranger
Diffstat (limited to 'src/main/java/de/pixart/messenger')
| -rw-r--r-- | src/main/java/de/pixart/messenger/Config.java | 3 | ||||
| -rw-r--r-- | src/main/java/de/pixart/messenger/entities/Conversation.java | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/Config.java b/src/main/java/de/pixart/messenger/Config.java index d79f8ca64..68ab52590 100644 --- a/src/main/java/de/pixart/messenger/Config.java +++ b/src/main/java/de/pixart/messenger/Config.java @@ -18,7 +18,6 @@ public final class Config { private static final int OMEMO = 8; private static final int ENCRYPTION_MASK = UNENCRYPTED | OPENPGP | OTR | OMEMO; - public static boolean supportUnencrypted() { return (ENCRYPTION_MASK & UNENCRYPTED) != 0; } @@ -39,6 +38,7 @@ public final class Config { return (ENCRYPTION_MASK & (ENCRYPTION_MASK - 1)) != 0; } + public static final String LOGTAG = "Pix-Art_Messenger"; public static final Jid BUG_REPORTS = Jid.of("bugs@pix-art.de"); @@ -52,6 +52,7 @@ public final class Config { public static final Integer[] XMPP_Ports = null; //BuildConfig.XMPP_Ports; // set to null means disable public static final String DOMAIN_LOCK = null; //BuildConfig.DOMAIN_LOCK; //only allow account creation for this domain public static final String MAGIC_CREATE_DOMAIN = "blabber.im"; + public static final String QUICKSY_DOMAIN = "quicksy.im"; public static final boolean DISALLOW_REGISTRATION_IN_UI = false; //hide the register checkbox public static final boolean USE_RANDOM_RESOURCE_ON_EVERY_BIND = false; diff --git a/src/main/java/de/pixart/messenger/entities/Conversation.java b/src/main/java/de/pixart/messenger/entities/Conversation.java index 4dcd79e9d..96f55c711 100644 --- a/src/main/java/de/pixart/messenger/entities/Conversation.java +++ b/src/main/java/de/pixart/messenger/entities/Conversation.java @@ -1149,6 +1149,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl && !contact.isOwnServer() && !contact.showInContactList() && !contact.isSelf() + && !Config.QUICKSY_DOMAIN.equals(contact.getJid().getDomain()) && sentMessagesCount() == 0; } |