diff --git a/app/src/main/kotlin/org/fossify/messages/activities/ThreadActivity.kt b/app/src/main/kotlin/org/fossify/messages/activities/ThreadActivity.kt index b616dcd2..43a301f5 100644 --- a/app/src/main/kotlin/org/fossify/messages/activities/ThreadActivity.kt +++ b/app/src/main/kotlin/org/fossify/messages/activities/ThreadActivity.kt @@ -453,7 +453,7 @@ class ThreadActivity : SimpleActivity() { setupAdapter() runOnUiThread { - if (messages.isEmpty()) { + if (messages.isEmpty() && !isSpecialNumber()) { window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE) binding.messageHolder.threadTypeMessage.requestFocus() } @@ -981,6 +981,8 @@ class ThreadActivity : SimpleActivity() { private fun maybeDisableShortCodeReply() { if (isSpecialNumber() && !isRecycleBin) { + currentFocus?.clearFocus() + hideKeyboard() binding.messageHolder.threadTypeMessage.text?.clear() binding.messageHolder.root.beGone() binding.shortCodeHolder.root.beVisible()