From 8016df7885ea405f952af8fa96d3fbb7266a1ce1 Mon Sep 17 00:00:00 2001 From: Rafael da Veiga Cabral Date: Fri, 15 May 2020 18:31:42 -0300 Subject: [PATCH] NY-9852: [AN]: Ensure message from message list is not null --- .../communicator/ui/adapters/BaseChatAdapter.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/nynja/mobile/communicator/ui/adapters/BaseChatAdapter.java b/app/src/main/java/com/nynja/mobile/communicator/ui/adapters/BaseChatAdapter.java index 5ecaad8f7d..2d7d796d7e 100644 --- a/app/src/main/java/com/nynja/mobile/communicator/ui/adapters/BaseChatAdapter.java +++ b/app/src/main/java/com/nynja/mobile/communicator/ui/adapters/BaseChatAdapter.java @@ -190,15 +190,18 @@ public abstract class BaseChatAdapter extends BaseMessagesAdapter { return NO_POSITION; } - public int getPositionCurrentOrPrevByMessageServerId(Long serverId) { + protected int getPositionCurrentOrPrevByMessageServerId(Long serverId) { int position = NO_POSITION; if (serverId > 0) { synchronized (mList) { for (int i = 0; i < mList.size(); i++) { - Long currentServerId = mList.get(i).serverId; - boolean b = currentServerId != null; - if (b && currentServerId.equals(serverId)) return i; - if (b && currentServerId < serverId) position = i; + MessageModel message = mList.get(i); + if (message != null) { + Long currentServerId = message.serverId; + boolean b = currentServerId != null; + if (b && currentServerId.equals(serverId)) return i; + if (b && currentServerId < serverId) position = i; + } } } } -- GitLab