mirror of
https://github.com/nextcloud/talk-android
synced 2025-06-23 05:29:54 +01:00
Merge pull request #4451 from nextcloud/bugfix/noid/fixNpeMessageInputConversationInternalId
fix NPE currentConversation!!.internalId
This commit is contained in:
commit
eb9eb99ca3
@ -248,7 +248,7 @@ class MessageInputFragment : Fragment() {
|
|||||||
if (isOnline) {
|
if (isOnline) {
|
||||||
chatActivity.messageInputViewModel.switchToMessageQueue(false)
|
chatActivity.messageInputViewModel.switchToMessageQueue(false)
|
||||||
chatActivity.messageInputViewModel.sendAndEmptyMessageQueue(
|
chatActivity.messageInputViewModel.sendAndEmptyMessageQueue(
|
||||||
chatActivity.currentConversation!!.internalId,
|
conversationInternalId,
|
||||||
chatActivity.conversationUser!!.getCredentials(),
|
chatActivity.conversationUser!!.getCredentials(),
|
||||||
ApiUtils.getUrlForChat(
|
ApiUtils.getUrlForChat(
|
||||||
chatActivity.chatApiVersion,
|
chatActivity.chatApiVersion,
|
||||||
@ -796,7 +796,7 @@ class MessageInputFragment : Fragment() {
|
|||||||
|
|
||||||
private fun sendMessage(message: CharSequence, replyTo: Int?, sendWithoutNotification: Boolean) {
|
private fun sendMessage(message: CharSequence, replyTo: Int?, sendWithoutNotification: Boolean) {
|
||||||
chatActivity.messageInputViewModel.sendChatMessage(
|
chatActivity.messageInputViewModel.sendChatMessage(
|
||||||
chatActivity.currentConversation!!.internalId,
|
conversationInternalId,
|
||||||
chatActivity.conversationUser!!.getCredentials(),
|
chatActivity.conversationUser!!.getCredentials(),
|
||||||
ApiUtils.getUrlForChat(
|
ApiUtils.getUrlForChat(
|
||||||
chatActivity.chatApiVersion,
|
chatActivity.chatApiVersion,
|
||||||
|
Loading…
Reference in New Issue
Block a user