From c3e7d6c74c118f1b4ba94e8ff5d1a39f12c86c21 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Thu, 14 Apr 2022 14:54:40 -0300 Subject: [PATCH] Fix bug causing cancellation of dialog fragment. --- .../securesms/components/KeyboardEntryDialogFragment.kt | 2 +- .../java/org/thoughtcrime/securesms/util/ViewUtil.java | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/KeyboardEntryDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/KeyboardEntryDialogFragment.kt index aeddc8d20..62ada1e9e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/KeyboardEntryDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/KeyboardEntryDialogFragment.kt @@ -35,7 +35,7 @@ abstract class KeyboardEntryDialogFragment(@LayoutRes contentLayoutId: Int) : dialog.window?.setDimAmount(0f) } - dialog.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE) + dialog.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE or WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE) return dialog } diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/ViewUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/ViewUtil.java index d8d0e76ef..9b4504683 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/ViewUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/ViewUtil.java @@ -52,17 +52,10 @@ public final class ViewUtil { } public static void focusAndMoveCursorToEndAndOpenKeyboard(@NonNull EditText input) { - input.requestFocus(); - int numberLength = input.getText().length(); input.setSelection(numberLength, numberLength); - InputMethodManager imm = (InputMethodManager) input.getContext().getSystemService(Context.INPUT_METHOD_SERVICE); - imm.showSoftInput(input, InputMethodManager.SHOW_IMPLICIT); - - if (!imm.isAcceptingText()) { - imm.toggleSoftInput(InputMethodManager.SHOW_IMPLICIT, InputMethodManager.HIDE_IMPLICIT_ONLY); - } + focusAndShowKeyboard(input); } public static void focusAndShowKeyboard(@NonNull View view) {