aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2017-03-14 23:00:14 +0100
committerChristian Schneppe <christian@pix-art.de>2017-03-14 23:00:14 +0100
commitb6a916b705454e16ed4d5aa12bf27c3319ae0518 (patch)
tree1c3cd273471d432b413a73ff3ca016d7412c766e
parentb7f839e14b6aab969411ea2ae68c527a3b2ea7a5 (diff)
never mark conversation w/ own server as stranger
-rw-r--r--src/main/java/de/pixart/messenger/entities/Conversation.java9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Conversation.java b/src/main/java/de/pixart/messenger/entities/Conversation.java
index d735b9c39..e3e2f0bc5 100644
--- a/src/main/java/de/pixart/messenger/entities/Conversation.java
+++ b/src/main/java/de/pixart/messenger/entities/Conversation.java
@@ -1057,11 +1057,10 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
}
public boolean isWithStranger() {
- if (mode == MODE_SINGLE) {
- return !getContact().mutualPresenceSubscription() && sentMessagesCount() == 0;
- } else {
- return false;
- }
+ return mode == MODE_SINGLE
+ && !getJid().equals(account.getJid().toDomainJid())
+ && !getContact().mutualPresenceSubscription()
+ && sentMessagesCount() == 0;
}
public class Smp {