diff --git a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt index cee7e41cc..0927a1504 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt @@ -185,10 +185,6 @@ class ConversationFragment : SlidingPaneChildFragment() { private val dataObserver = object : AdapterDataObserver() { override fun onItemRangeInserted(positionStart: Int, itemCount: Int) { - if (positionStart > 0) { - adapter.notifyItemChanged(positionStart - 1) // For grouping purposes - } - if (viewModel.isUserScrollingUp.value == true) { Log.i( "$TAG [$itemCount] events have been loaded but user was scrolling up in conversation, do not scroll" @@ -207,6 +203,10 @@ class ConversationFragment : SlidingPaneChildFragment() { ) } scrollToFirstUnreadMessageOrBottom() + + if (positionStart > 0) { + adapter.notifyItemChanged(positionStart - 1) // For grouping purposes + } } } diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/SendMessageInConversationViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/SendMessageInConversationViewModel.kt index b0ad11e6f..4b736e74b 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/SendMessageInConversationViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/SendMessageInConversationViewModel.kt @@ -377,6 +377,7 @@ class SendMessageInConversationViewModel @UiThread constructor() : ViewModel() { } coreContext.postOnCoreThread { + requestKeyboardHidingEvent.postValue(Event(true)) isVoiceRecording.postValue(true) initVoiceRecorder() diff --git a/app/src/main/res/layout/chat_conversation_send_area.xml b/app/src/main/res/layout/chat_conversation_send_area.xml index 3ae871925..18d53839a 100644 --- a/app/src/main/res/layout/chat_conversation_send_area.xml +++ b/app/src/main/res/layout/chat_conversation_send_area.xml @@ -148,6 +148,7 @@ android:text="@={viewModel.textToSend}" android:textColorHint="?attr/color_main2_400" android:textSize="14sp" + android:enabled="@{!viewModel.isVoiceRecording}" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/send_barrier" app:layout_constraintStart_toStartOf="@id/message_area_background"