Merge branch 'release/cycle-4.6' into fix/mls-initialization

wireapp · Jan 10, 2025 · 1a17012 · 1a17012
2 parents 9385e44 + c9e1e24
commit 1a17012
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/MessageComposerInput.kt b/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/MessageComposerInput.kt
@@ -290,6 +290,7 @@ private fun MessageComposerTextInput(
         } else {
             isReadOnly = true
             keyboardController?.hide()
+            focusRequester.freeFocus()
         }
     }
 
@@ -312,9 +313,7 @@ private fun MessageComposerTextInput(
         modifier = modifier
             .focusRequester(focusRequester)
             .onFocusChanged { focusState ->
-                if (focusState.isFocused) {
-                    onFocusChanged(focusState.isFocused)
-                }
+                onFocusChanged(focusState.isFocused)
             }
             .onPreInterceptKeyBeforeSoftKeyboard { event ->
                 if (event.key.nativeKeyCode == android.view.KeyEvent.KEYCODE_BACK) {