Browse Source

Fix crash

Signed-off-by: Mario Danic <mario@lovelyhq.com>
Mario Danic 6 years ago
parent
commit
3a83a1783e

+ 2 - 1
app/src/main/java/com/nextcloud/talk/controllers/ChatController.java

@@ -814,7 +814,8 @@ public class ChatController extends BaseController implements MessagesListAdapte
 
 
                     chatMessage.setBaseUrl(conversationUser.getBaseUrl());
                     chatMessage.setBaseUrl(conversationUser.getBaseUrl());
                     chatMessageList.get(i).setActiveUserId(conversationUser.getUserId());
                     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") &&
                         if (chatMessage.getActorType().equals("guests") &&
                                 chatMessage.getActorDisplayName().equals(conversationUser.getDisplayName())) {
                                 chatMessage.getActorDisplayName().equals(conversationUser.getDisplayName())) {
                             conversationUser.setUserId(chatMessage.getActorId());
                             conversationUser.setUserId(chatMessage.getActorId());