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 2c583760e..71be6c0dc 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java @@ -226,7 +226,7 @@ public class ChatController extends BaseController implements MessagesListAdapte } } - getActivity().runOnUiThread(() -> setupMentionAutocomplete()); + setupMentionAutocomplete(); joinRoomWithPassword(); } @@ -356,13 +356,15 @@ public class ChatController extends BaseController implements MessagesListAdapte AutocompletePresenter presenter = new MentionAutocompletePresenter(getApplicationContext(), roomToken); AutocompleteCallback callback = new MentionAutocompleteCallback(); - mentionAutocomplete = Autocomplete.on(messageInput.getInputEditText()) - .with(elevation) - .with(backgroundDrawable) - .with(new CharPolicy('@')) - .with(presenter) - .with(callback) - .build(); + if (messageInput != null && messageInput.getInputEditText() != null) { + mentionAutocomplete = Autocomplete.on(messageInput.getInputEditText()) + .with(elevation) + .with(backgroundDrawable) + .with(new CharPolicy('@')) + .with(presenter) + .with(callback) + .build(); + } } @Override