aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-04-29 15:56:22 +0200
committerChristian Schneppe <christian@pix-art.de>2018-04-29 15:56:22 +0200
commit06d4fd73e0ec3dadb7e44426b9a37f9a25d8eb37 (patch)
treef4f45dcb8cdf399438f4f68d64987518b86cae3a /src/main/java/de
parent8d58a17aadd50320d1bdde4769cd05fe4c5750c2 (diff)
never use isStranger logic in conversation with self
Diffstat (limited to 'src/main/java/de')
-rw-r--r--src/main/java/de/pixart/messenger/entities/Conversation.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Conversation.java b/src/main/java/de/pixart/messenger/entities/Conversation.java
index a6c79050c..6f995b2be 100644
--- a/src/main/java/de/pixart/messenger/entities/Conversation.java
+++ b/src/main/java/de/pixart/messenger/entities/Conversation.java
@@ -1107,9 +1107,11 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
}
public boolean isWithStranger() {
+ final Contact contact = getContact();
return mode == MODE_SINGLE
- && !getJid().equals(Jid.ofDomain(account.getJid().getDomain()))
- && !getContact().showInRoster()
+ && !contactJid.equals(Jid.ofDomain(account.getJid().getDomain()))
+ && !contact.showInRoster()
+ && !contact.isSelf()
&& sentMessagesCount() == 0;
}