gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-19 18:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

New notice logic

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-09-13 12:39:50 +02:00
parent 0a0aece7d0
commit 0648ceb44c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
View File

@ -1164,6 +1164,8 @@ public class ChatController extends BaseController implements MessagesListAdapte
adapter.addToStart(unreadChatMessage, false); adapter.addToStart(unreadChatMessage, false);
} }
boolean isThereANewNotice = shouldAddNewMessagesNotice || adapter.getMessagePositionByIdInReverse("-1") != -1;
for (int i = 0; i < chatMessageList.size(); i++) { for (int i = 0; i < chatMessageList.size(); i++) {
chatMessage = chatMessageList.get(i); chatMessage = chatMessageList.get(i);
@ -1179,7 +1181,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
} }
boolean shouldScroll = boolean shouldScroll =
!shouldAddNewMessagesNotice && layoutManager.findFirstVisibleItemPosition() == 0 || !isThereANewNotice && !shouldAddNewMessagesNotice && layoutManager.findFirstVisibleItemPosition() == 0 ||
(adapter != null && adapter.getItemCount() == 0); (adapter != null && adapter.getItemCount() == 0);
if (!shouldAddNewMessagesNotice && !shouldScroll && popupBubble != null) { if (!shouldAddNewMessagesNotice && !shouldScroll && popupBubble != null) {