another attempt to fix race in SignUpFragment

tinode · Mar 30, 2023 · c2a1f62 · c2a1f62
1 parent 9f3458e
commit c2a1f62
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/app/src/main/java/co/tinode/tindroid/SignUpFragment.java b/app/src/main/java/co/tinode/tindroid/SignUpFragment.java
@@ -169,16 +169,20 @@ private void setupCredentials(Activity activity, String[] methods) {
                     continue;
                 }
 
+                View field = null;
                 if (method.equals("tel")) {
-                    activity.findViewById(R.id.phone).setVisibility(View.VISIBLE);
+                    field = activity.findViewById(R.id.phone);
                 } else if (method.equals("email")) {
-                    activity.findViewById(R.id.emailWrapper).setVisibility(View.VISIBLE);
+                    field = activity.findViewById(R.id.emailWrapper);
                 } else {
                     // TODO: show generic text prompt for unknown method.
                     Log.i(TAG, "Show generic validation field for " + method);
                 }
 
-                activity.findViewById(R.id.newLogin).requestFocus();
+                if (field != null) {
+                    field.setVisibility(View.VISIBLE);
+                    activity.findViewById(R.id.newLogin).requestFocus();
+                }
             }
         });
     }