From 3a83a1783ede1d1d43683903f220e79d87cb7be9 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Thu, 23 Aug 2018 12:00:45 +0200 Subject: [PATCH] Fix crash Signed-off-by: Mario Danic --- .../java/com/nextcloud/talk/controllers/ChatController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java index f9ffb0ade..0e526f79a 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java +++ b/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()); 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());