diff options
| author | Daniel Lublin <daniel@lublin.se> | 2020-12-22 11:59:48 +0300 |
|---|---|---|
| committer | Daniel Lublin <daniel@lublin.se> | 2020-12-22 11:59:48 +0300 |
| commit | 3c8ad58c992a6778270830b19653415e45c26ff3 (patch) | |
| tree | 3717dc56d07200f52bb6d67a55191fa638da0914 | |
| parent | 45f3298ecca0ae4958df3aa5d8b806d688109c3a (diff) | |
Fix NullPointerException
| -rw-r--r-- | src/main/java/se/lublin/humla/protocol/ModelHandler.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/se/lublin/humla/protocol/ModelHandler.java b/src/main/java/se/lublin/humla/protocol/ModelHandler.java index 0aaa6d0..b763b7d 100644 --- a/src/main/java/se/lublin/humla/protocol/ModelHandler.java +++ b/src/main/java/se/lublin/humla/protocol/ModelHandler.java @@ -265,7 +265,9 @@ public class ModelHandler extends HumlaTCPMessageListener.Stub { if(msg.hasSelfDeaf()) user.setSelfDeafened(msg.getSelfDeaf()); - if(self != null && user.getSession() != self.getSession() && user.getChannel().equals(self.getChannel())) { + Channel selfChan = self.getChannel(); + Channel userChan = user.getChannel(); + if (self != null && user.getSession() != self.getSession() && userChan != null && selfChan != null && userChan.equals(selfChan)) { if(user.isSelfMuted() && user.isSelfDeafened()) mLogger.logInfo(mContext.getString(R.string.chat_notify_now_muted_deafened, MessageFormatter.highlightString(user.getName()))); else if(user.isSelfMuted()) |