Cleanup

Signed-off-by: Alex Saveau <[email protected]>

Author: SUPERCILEX

auth/src/main/java/com/firebase/ui/auth/ui/FragmentBase.java

@@ -12,6 +12,7 @@
 
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class FragmentBase extends Fragment {
+    private HelperActivityBase mActivity;
     private ProgressDialogHolder mProgressDialogHolder;
 
     @Override
@@ -21,6 +22,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         if (!(getActivity() instanceof HelperActivityBase)) {
             throw new IllegalStateException("Cannot use this fragment without the helper activity");
         }
+        mActivity = (HelperActivityBase) getActivity();
 
         mProgressDialogHolder = new ProgressDialogHolder(new ContextThemeWrapper(
                 getContext(), getFlowParams().themeId));
@@ -33,13 +35,13 @@ public void onDestroy() {
     }
 
     public FlowParameters getFlowParams() {
-        return ((HelperActivityBase) getActivity()).getFlowParams();
+        return mActivity.getFlowParams();
     }
 
     public void startSaveCredentials(
             FirebaseUser firebaseUser,
             IdpResponse response,
             @Nullable String password) {
-        ((HelperActivityBase) getActivity()).startSaveCredentials(firebaseUser, response, password);
+        mActivity.startSaveCredentials(firebaseUser, response, password);
     }
 }

auth/src/main/java/com/firebase/ui/auth/ui/email/CheckEmailFragment.java

@@ -117,7 +117,7 @@ protected void onSuccess(@NonNull User user) {
                 String provider = user.getProviderId();
 
                 mEmailEditText.setText(email);
-                //noinspection ConstantConditions
+                //noinspection ConstantConditions new user
                 if (provider == null) {
                     mListener.onNewUser(new User.Builder(EmailAuthProvider.PROVIDER_ID, email)
                             .setName(user.getName())
@@ -148,13 +148,6 @@ protected void onFailure(@NonNull Exception e) {
         }
     }
 
-    private void validateAndProceed() {
-        String email = mEmailEditText.getText().toString();
-        if (mEmailFieldValidator.validate(email)) {
-            mHandler.fetchProvider(email);
-        }
-    }
-
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         mHandler.onActivityResult(requestCode, resultCode, data);
@@ -175,4 +168,11 @@ public void onClick(View view) {
     public void onDonePressed() {
         validateAndProceed();
     }
+
+    private void validateAndProceed() {
+        String email = mEmailEditText.getText().toString();
+        if (mEmailFieldValidator.validate(email)) {
+            mHandler.fetchProvider(email);
+        }
+    }
 }

auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailFragment.java

@@ -115,13 +115,6 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         mPasswordEditText = view.findViewById(R.id.password);
         mEmailInput = view.findViewById(R.id.email_layout);
         mPasswordInput = view.findViewById(R.id.password_layout);
-
-        mEmailEditText = view.findViewById(R.id.email);
-        mNameEditText = view.findViewById(R.id.name);
-        mPasswordEditText = view.findViewById(R.id.password);
-        mEmailInput = view.findViewById(R.id.email_layout);
-        mPasswordInput = view.findViewById(R.id.password_layout);
-
         TextInputLayout nameInput = view.findViewById(R.id.name_layout);
 
         // Get configuration
@@ -144,6 +137,9 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         mPasswordEditText.setOnFocusChangeListener(this);
         view.findViewById(R.id.button_create).setOnClickListener(this);
 
+        // Only show the name field if required
+        nameInput.setVisibility(requireName ? View.VISIBLE : View.GONE);
+
         PreambleHandler.setup(
                 getContext(),
                 getFlowParams(),

auth/src/main/java/com/firebase/ui/auth/ui/email/WelcomeBackPasswordPrompt.java

@@ -107,9 +107,8 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
                 this, R.string.fui_progress_dialog_signing_in) {
             @Override
             protected void onSuccess(@NonNull IdpResponse response) {
-                startSaveCredentials(mHandler.getCurrentUser(),
-                        response,
-                        mHandler.getPendingPassword());
+                startSaveCredentials(
+                        mHandler.getCurrentUser(), response, mHandler.getPendingPassword());
             }
 
             @Override

auth/src/main/java/com/firebase/ui/auth/viewmodel/idp/EmailProviderResponseHandler.java

@@ -4,7 +4,6 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.RestrictTo;
 
-import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.data.model.IntentRequiredException;
 import com.firebase.ui.auth.data.model.Resource;
@@ -35,8 +34,9 @@ public void startSignIn(@NonNull final IdpResponse response, @NonNull String pas
             setResult(Resource.<IdpResponse>forFailure(response.getError()));
             return;
         }
-        if (AuthUI.SOCIAL_PROVIDERS.contains(response.getProviderType())) {
-            throw new IllegalStateException("This handler cannot be used with social providers");
+        if (!response.getProviderType().equals(EmailAuthProvider.PROVIDER_ID)) {
+            throw new IllegalStateException(
+                    "This handler can only be used with the email provider");
         }
         setResult(Resource.<IdpResponse>forLoading());
 

auth/src/test/java/com/firebase/ui/auth/ui/email/WelcomeBackPasswordPromptTest.java

@@ -51,8 +51,8 @@ private WelcomeBackPasswordPrompt createActivity() {
                 RuntimeEnvironment.application,
                 TestHelper.getFlowParameters(Collections.singletonList(EmailAuthProvider.PROVIDER_ID)),
                 new IdpResponse.Builder(new User.Builder(
-                        EmailAuthProvider.PROVIDER_ID,
-                        TestConstants.EMAIL).build()).build());
+                        EmailAuthProvider.PROVIDER_ID, TestConstants.EMAIL
+                ).build()).build());
         return Robolectric
                 .buildActivity(WelcomeBackPasswordPrompt.class, startIntent)
                 .create()