gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues with setting the title

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-09-27 11:42:02 +02:00
parent 1f556d73cf
commit 7eeefa3ae6
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -508,7 +508,6 @@ public class ChatController extends BaseController implements MessagesListAdapte
if (currentConversation != null && currentConversation.getRoomId() != null) { if (currentConversation != null && currentConversation.getRoomId() != null) {
loadAvatarForStatusBar(); loadAvatarForStatusBar();
checkLobbyState();
setTitle(); setTitle();
} }
@ -712,7 +711,11 @@ public class ChatController extends BaseController implements MessagesListAdapte
@Override @Override
protected String getTitle() { protected String getTitle() {
return String.valueOf(EmojiCompat.get().process(currentConversation.getDisplayName())); if (currentConversation != null) {
return String.valueOf(EmojiCompat.get().process(currentConversation.getDisplayName()));
} else {
return "";
}
} }
@Override @Override
@ -1160,6 +1163,10 @@ public class ChatController extends BaseController implements MessagesListAdapte
chatMessage.setActiveUser(conversationUser); chatMessage.setActiveUser(conversationUser);
chatMessage.setLinkPreviewAllowed(isLinkPreviewAllowed); chatMessage.setLinkPreviewAllowed(isLinkPreviewAllowed);
if (chatMessage.getJsonMessageId() > globalLastKnownFutureMessageId) {
globalLastKnownFutureMessageId = chatMessage.getJsonMessageId();
}
// if credentials are empty, we're acting as a guest // if credentials are empty, we're acting as a guest
if (TextUtils.isEmpty(credentials) && myFirstMessage != null && !TextUtils.isEmpty(myFirstMessage.toString())) { if (TextUtils.isEmpty(credentials) && myFirstMessage != null && !TextUtils.isEmpty(myFirstMessage.toString())) {
if (chatMessage.getActorType().equals("guests")) { if (chatMessage.getActorType().equals("guests")) {
@ -1169,7 +1176,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
} }
boolean shouldScroll = boolean shouldScroll =
!isThereANewNotice && !shouldAddNewMessagesNotice && layoutManager.findFirstVisibleItemPosition() == 0 || !isThereANewNotice && layoutManager.findFirstVisibleItemPosition() == 0 ||
(adapter != null && adapter.getItemCount() == 0); (adapter != null && adapter.getItemCount() == 0);
if (!shouldAddNewMessagesNotice && !shouldScroll && popupBubble != null) { if (!shouldAddNewMessagesNotice && !shouldScroll && popupBubble != null) {