From d5dffe22495d2211ccbe3dcf430e9e205b40ee72 Mon Sep 17 00:00:00 2001
From: NekoInverter <7741672-NekoInverter@users.noreply.gitlab.com>
Date: Wed, 30 Dec 2020 15:38:36 +0800
Subject: [PATCH] Fix closing keyboard for dialogs

---
 app/src/main/AndroidManifest.xml                      |  2 +-
 .../java/com/hippo/app/EditTextDialogBuilder.java     | 11 +----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e3bc5be00..ebc72381e 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -49,7 +49,7 @@
             android:configChanges="screenSize|uiMode"
             android:launchMode="singleTask"
             android:theme="@style/AppTheme.Main"
-            android:windowSoftInputMode="stateHidden">
+            android:windowSoftInputMode="stateAlwaysHidden">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/com/hippo/app/EditTextDialogBuilder.java b/app/src/main/java/com/hippo/app/EditTextDialogBuilder.java
index 72d0359c0..550741544 100644
--- a/app/src/main/java/com/hippo/app/EditTextDialogBuilder.java
+++ b/app/src/main/java/com/hippo/app/EditTextDialogBuilder.java
@@ -22,7 +22,6 @@ import android.content.DialogInterface;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
@@ -34,11 +33,10 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.textfield.TextInputLayout;
 import com.hippo.ehviewer.R;
 
-public class EditTextDialogBuilder extends MaterialAlertDialogBuilder implements EditText.OnEditorActionListener, DialogInterface.OnDismissListener {
+public class EditTextDialogBuilder extends MaterialAlertDialogBuilder implements EditText.OnEditorActionListener {
 
     private final TextInputLayout mTextInputLayout;
     private final EditText mEditText;
-    private final InputMethodManager mInputMethodManager;
     private AlertDialog mDialog;
 
     @SuppressLint("InflateParams")
@@ -52,7 +50,6 @@ public class EditTextDialogBuilder extends MaterialAlertDialogBuilder implements
         mEditText.setSelection(mEditText.getText().length());
         mEditText.setOnEditorActionListener(this);
         mTextInputLayout.setHint(hint);
-        mInputMethodManager = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
     }
 
     public EditText getEditText() {
@@ -71,7 +68,6 @@ public class EditTextDialogBuilder extends MaterialAlertDialogBuilder implements
     @Override
     public AlertDialog create() {
         mDialog = super.create();
-        mDialog.setOnDismissListener(this);
         return mDialog;
     }
 
@@ -87,9 +83,4 @@ public class EditTextDialogBuilder extends MaterialAlertDialogBuilder implements
             return false;
         }
     }
-
-    @Override
-    public void onDismiss(DialogInterface dialog) {
-        mInputMethodManager.toggleSoftInput(InputMethodManager.HIDE_IMPLICIT_ONLY, 0);
-    }
 }