From e0bab3e77c555d3bea443b767f96b9b7ff8dd2b0 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 23 Aug 2021 14:43:38 +0200
Subject: [PATCH] Refactoring

---
 .../eu/faircode/email/AdapterKeyword.java     |  6 +----
 .../eu/faircode/email/FragmentCompose.java    | 13 ++---------
 .../eu/faircode/email/FragmentMessages.java   |  7 +-----
 .../main/java/eu/faircode/email/Helper.java   | 22 +++++++++++--------
 4 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterKeyword.java b/app/src/main/java/eu/faircode/email/AdapterKeyword.java
index 7db177d94d..7842cae4d1 100644
--- a/app/src/main/java/eu/faircode/email/AdapterKeyword.java
+++ b/app/src/main/java/eu/faircode/email/AdapterKeyword.java
@@ -28,7 +28,6 @@ import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.inputmethod.InputMethodManager;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.EditText;
@@ -165,10 +164,7 @@ public class AdapterKeyword extends RecyclerView.Adapter<AdapterKeyword.ViewHold
                     @Override
                     public void run() {
                         etKeyword.requestFocus();
-                        InputMethodManager imm =
-                                (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
-                        if (imm != null)
-                            imm.showSoftInput(etKeyword, InputMethodManager.SHOW_IMPLICIT);
+                        Helper.showKeyboard(etKeyword);
                     }
                 });
             } else if (itemId == R.id.ibSave) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 850c384e6b..5fc346f184 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -93,7 +93,6 @@ import android.view.MotionEvent;
 import android.view.SubMenu;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
 import android.widget.Button;
 import android.widget.CheckBox;
@@ -6171,18 +6170,10 @@ public class FragmentCompose extends FragmentBase {
                     target.requestFocus();
 
                     Context context = target.getContext();
-
                     SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
                     boolean keyboard = prefs.getBoolean("keyboard", true);
-                    if (!keyboard || !restore)
-                        return;
-
-                    InputMethodManager imm =
-                            (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
-                    if (imm == null)
-                        return;
-
-                    imm.showSoftInput(target, InputMethodManager.SHOW_IMPLICIT);
+                    if (keyboard && restore)
+                        Helper.showKeyboard(target);
 
                 } catch (Throwable ex) {
                     Log.e(ex);
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 7c6c097d1f..1ccd3f05e8 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -103,7 +103,6 @@ import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.view.animation.TranslateAnimation;
 import android.view.inputmethod.EditorInfo;
-import android.view.inputmethod.InputMethodManager;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
@@ -5961,11 +5960,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         etSearch.setText(null);
         etSearch.setVisibility(View.VISIBLE);
         etSearch.requestFocus();
-
-        InputMethodManager imm =
-                (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
-        if (imm != null)
-            imm.showSoftInput(etSearch, InputMethodManager.SHOW_IMPLICIT);
+        Helper.showKeyboard(etSearch);
     }
 
     private void endSearch() {
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 0e30bcaa8a..0f501880af 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -1131,22 +1131,26 @@ public class Helper {
         return (tv.string != null && !"light".contentEquals(tv.string));
     }
 
-    static void hideKeyboard(final View view) {
+    static void showKeyboard(final View view) {
+        final Context context = view.getContext();
         InputMethodManager imm =
-                (InputMethodManager) view.getContext().getSystemService(Activity.INPUT_METHOD_SERVICE);
+                (InputMethodManager) context.getSystemService(Activity.INPUT_METHOD_SERVICE);
         if (imm == null)
             return;
 
-        imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
+        Log.i("showKeyboard view=" + view);
+        imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
     }
 
-    static void hideKeyboard(Activity activity) {
-        if (activity == null)
+    static void hideKeyboard(final View view) {
+        final Context context = view.getContext();
+        InputMethodManager imm =
+                (InputMethodManager) context.getSystemService(Activity.INPUT_METHOD_SERVICE);
+        if (imm == null)
             return;
-        View focused = activity.getCurrentFocus();
-        if (focused == null)
-            return;
-        hideKeyboard(focused);
+
+        Log.i("hideKeyboard view=" + view);
+        imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
     }
 
     // Formatting