Skip to content

Commit 36ba3ea

Browse files
authored
Merge pull request #4462 from nextcloud/backport/4451/stable-20.0
[stable-20.0] fix NPE currentConversation!!.internalId
2 parents 301e008 + 54fc057 commit 36ba3ea

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ class MessageInputFragment : Fragment() {
248248
if (isOnline) {
249249
chatActivity.messageInputViewModel.switchToMessageQueue(false)
250250
chatActivity.messageInputViewModel.sendAndEmptyMessageQueue(
251-
chatActivity.currentConversation!!.internalId,
251+
conversationInternalId,
252252
chatActivity.conversationUser!!.getCredentials(),
253253
ApiUtils.getUrlForChat(
254254
chatActivity.chatApiVersion,
@@ -796,7 +796,7 @@ class MessageInputFragment : Fragment() {
796796

797797
private fun sendMessage(message: CharSequence, replyTo: Int?, sendWithoutNotification: Boolean) {
798798
chatActivity.messageInputViewModel.sendChatMessage(
799-
chatActivity.currentConversation!!.internalId,
799+
conversationInternalId,
800800
chatActivity.conversationUser!!.getCredentials(),
801801
ApiUtils.getUrlForChat(
802802
chatActivity.chatApiVersion,

0 commit comments

Comments
 (0)