From 06d4fd73e0ec3dadb7e44426b9a37f9a25d8eb37 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Sun, 29 Apr 2018 15:56:22 +0200 Subject: never use isStranger logic in conversation with self --- src/main/java/de/pixart/messenger/entities/Conversation.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/main/java/de/pixart/messenger/entities/Conversation.java') 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; } -- cgit v1.2.3