From 0648ceb44c777bfd4ddf70baed4365cc09871c32 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Fri, 13 Sep 2019 12:39:50 +0200 Subject: [PATCH] New notice logic Signed-off-by: Mario Danic --- .../java/com/nextcloud/talk/controllers/ChatController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java index a165be714..d617bae1f 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java @@ -1164,6 +1164,8 @@ public class ChatController extends BaseController implements MessagesListAdapte adapter.addToStart(unreadChatMessage, false); } + boolean isThereANewNotice = shouldAddNewMessagesNotice || adapter.getMessagePositionByIdInReverse("-1") != -1; + for (int i = 0; i < chatMessageList.size(); i++) { chatMessage = chatMessageList.get(i); @@ -1179,7 +1181,7 @@ public class ChatController extends BaseController implements MessagesListAdapte } boolean shouldScroll = - !shouldAddNewMessagesNotice && layoutManager.findFirstVisibleItemPosition() == 0 || + !isThereANewNotice && !shouldAddNewMessagesNotice && layoutManager.findFirstVisibleItemPosition() == 0 || (adapter != null && adapter.getItemCount() == 0); if (!shouldAddNewMessagesNotice && !shouldScroll && popupBubble != null) {