Răsfoiți Sursa

New notice logic

Signed-off-by: Mario Danic <mario@lovelyhq.com>
Mario Danic 5 ani în urmă
părinte
comite
0648ceb44c

+ 3 - 1
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) {