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

Fix crash

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-08-23 12:00:45 +02:00
parent d7b7fd466a
commit 3a83a1783e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -814,7 +814,8 @@ public class ChatController extends BaseController implements MessagesListAdapte
chatMessage.setBaseUrl(conversationUser.getBaseUrl());
chatMessageList.get(i).setActiveUserId(conversationUser.getUserId());
if (conversationUser.getUserId().equals("?") && !TextUtils.isEmpty(myFirstMessage.toString())) {
if (conversationUser.getUserId().equals("?") && myFirstMessage != null &&
!TextUtils.isEmpty(myFirstMessage.toString())) {
if (chatMessage.getActorType().equals("guests") &&
chatMessage.getActorDisplayName().equals(conversationUser.getDisplayName())) {
conversationUser.setUserId(chatMessage.getActorId());