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 5ecaad8f7da647bd530c02c603f5fdf2a5c75fbf..2d7d796d7e49943e2f77ef7bc0c595089c38eade 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; + } } } }