From 9f191f64da52f3e339c23851f78eeece241f06f9 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 19 Aug 2018 22:13:13 +0200
Subject: [PATCH] do not display 'user left' toast in members only groups.
 fixes #3144

---
 .../java/eu/siacs/conversations/ui/ConversationFragment.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 86efe38fa..4df20878c 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -955,11 +955,12 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
 			final boolean received = message.getStatus() <= Message.STATUS_RECEIVED;
 			if (received) {
 				if (message.getConversation() instanceof Conversation && message.getConversation().getMode() == Conversation.MODE_MULTI) {
+					Jid tcp = message.getTrueCounterpart();
 					Jid user = message.getCounterpart();
 					if (user != null && !user.isBareJid()) {
 						final MucOptions mucOptions = ((Conversation) message.getConversation()).getMucOptions();
 						if (mucOptions.participating() || ((Conversation) message.getConversation()).getNextCounterpart() != null) {
-							if (!mucOptions.isUserInRoom(user)) {
+							if (!mucOptions.isUserInRoom(user) && mucOptions.findUserByRealJid(tcp == null ? null : tcp.asBareJid()) == null) {
 								Toast.makeText(getActivity(), activity.getString(R.string.user_has_left_conference, user.getResource()), Toast.LENGTH_SHORT).show();
 							}
 							highlightInConference(user.getResource());