Merge pull request #846 from cdhiraj40/issue842

App Crashes while clicking on the area just above the eye icon in sign in
enviroCar · Nov 2, 2021 · 109c313 · 109c313
2 parents a44c938 + f9e25a6
commit 109c313
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/org.envirocar.app/src/org/envirocar/app/views/login/SigninActivity.java b/org.envirocar.app/src/org/envirocar/app/views/login/SigninActivity.java
@@ -125,8 +125,11 @@ protected void onDestroy() {
 
     @OnClick(R.id.signin_background)
     protected void closeKeyboard(){
-        InputMethodManager imm = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
-        imm.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
+        View view = this.getCurrentFocus();
+        if (view != null) {
+            InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+            imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
+        }
     }
 
     @OnClick(R.id.activity_signin_register_button)

diff --git a/org.envirocar.app/src/org/envirocar/app/views/login/SignupActivity.java b/org.envirocar.app/src/org/envirocar/app/views/login/SignupActivity.java
@@ -160,8 +160,11 @@ protected void onDestroy() {
 
     @OnClick(R.id.imageView)
     protected void closeKeyboard(){
-        InputMethodManager imm = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
-        imm.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
+        View view = this.getCurrentFocus();
+        if (view != null) {
+            InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+            imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
+        }
     }
 
     @OnClick(R.id.activity_signup_login_button)