From 06b13d0fa3a27e0f478a05b95850db590c135b80 Mon Sep 17 00:00:00 2001 From: panpansh Date: Wed, 16 Jan 2019 20:53:13 +0100 Subject: [PATCH] Don't add in occupants if newOccupant Nickname is null Don't add in occupants if newOccupant Nickname is null --- .../com/xabber/android/data/extension/muc/RoomChat.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xabber/src/main/java/com/xabber/android/data/extension/muc/RoomChat.java b/xabber/src/main/java/com/xabber/android/data/extension/muc/RoomChat.java index 9d11721a9e..abbfc28921 100644 --- a/xabber/src/main/java/com/xabber/android/data/extension/muc/RoomChat.java +++ b/xabber/src/main/java/com/xabber/android/data/extension/muc/RoomChat.java @@ -309,7 +309,9 @@ else createAndSaveNewMessage(true, uid, resource, text, null, delay, true, notif Occupant oldOccupant = occupants.get(resource); Occupant newOccupant = createOccupant(resource, presence); newOccupant.setJid(from); - occupants.put(resource, newOccupant); + if (newOccupant != null && newOccupant.getNickname() != null) { + occupants.put(resource, newOccupant); + } if (oldOccupant == null) { onAvailable(resource); RosterManager.onContactChanged(account, user); @@ -623,4 +625,4 @@ protected void onDisconnect() { } } -} \ No newline at end of file +}