mirror of
https://github.com/nextcloud/talk-android
synced 2025-03-06 14:27:24 +00:00
Fix crash
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
parent
d7b7fd466a
commit
3a83a1783e
@ -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());
|
||||||
|
Loading…
Reference in New Issue
Block a user