Added onActivityResult to the FirebaseAuthProvider base class

This way we can invoke it from a loop in FirebaseLoginDialog. All
existing implementations are now (implicit) overrides of the empty
method in the base class.

Author: puf

library/src/main/java/com/firebase/ui/auth/core/FirebaseAuthProvider.java

@@ -1,6 +1,7 @@
 package com.firebase.ui.auth.core;
 
 import android.content.Context;
+import android.content.Intent;
 import android.util.Log;
 
 import com.firebase.client.AuthData;
@@ -34,16 +35,28 @@ protected FirebaseAuthProvider(Context context, AuthProviderType providerType, S
     }
 
     public void login() {
-        Log.d("FirebaseAuthProvider", "Login() is not supported for provider type " + getProviderName());
+        Log.w("FirebaseAuthProvider", "Login() is not supported for provider type " + getProviderName());
     };
     public void login(String email, String password) {
-        Log.d("FirebaseAuthProvider", "Login(String email, String password) is not supported for provider type " + getProviderName());
+        Log.w("FirebaseAuthProvider", "Login(String email, String password) is not supported for provider type " + getProviderName());
     };
 
     public void onFirebaseTokenReceived(FirebaseOAuthToken token, TokenAuthHandler handler) {
         authenticateRefWithOAuthFirebasetoken(token, handler);
     }
 
+    /**
+     * Override this method in your provider subclass if you start an activity from the login() method.
+     * Receive the result from a previous call to startActivityForResult(Intent, int). This follows
+     * the related Activity API as described there in onActivityResult(int, int, Intent).
+     * @param requestCode The integer request code originally supplied to startActivityForResult(),
+     *                    allowing you to identify who this result came from/
+     * @param resultCode The integer result code returned by the child activity through its setResult().
+     * @param data An Intent, which can return result data to the caller (various data can be attached to Intent "extras").
+     */
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+    }
+
     private void authenticateRefWithOAuthFirebasetoken(FirebaseOAuthToken token, final TokenAuthHandler handler) {
         Firebase.AuthResultHandler authResultHandler = new Firebase.AuthResultHandler() {
             @Override

library/src/main/java/com/firebase/ui/auth/core/FirebaseLoginDialog.java

@@ -6,6 +6,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.EditText;
@@ -23,9 +24,9 @@
 
 public class FirebaseLoginDialog extends DialogFragment {
 
-    Map<SocialProvider, FirebaseAuthProvider> mEnabledProvidersByType = new HashMap<>();
+    Map<AuthProviderType, FirebaseAuthProvider> mEnabledProvidersByType = new HashMap<>();
     TokenAuthHandler mHandler;
-    SocialProvider mActiveProvider;
+    AuthProviderType mActiveProvider;
     Firebase mRef;
     Context mContext;
     View mView;
@@ -58,16 +59,8 @@ public void cleanUp() {
     }
 
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (getFacebookAuthProvider() != null) {
-            getFacebookAuthProvider().mCallbackManager.onActivityResult(requestCode, resultCode, data);
-        }
-
-        if (getTwitterAuthProvider() != null) {
-            getTwitterAuthProvider().onActivityResult(requestCode, resultCode, data);
-        }
-
-        if (getGoogleAuthProvider() != null) {
-            getGoogleAuthProvider().onActivityResult(requestCode, resultCode, data);
+        for (FirebaseAuthProvider provider: mEnabledProvidersByType.values()) {
+            provider.onActivityResult(requestCode, resultCode, data);
         }
     }
 
@@ -78,7 +71,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
 
         mView = inflater.inflate(R.layout.fragment_firebase_login, null);
 
-        for (SocialProvider providerType : SocialProvider.values()) {
+        for (AuthProviderType providerType : AuthProviderType.values()) {
             if (mEnabledProvidersByType.keySet().contains(providerType)) {
                 showLoginOption(mEnabledProvidersByType.get(providerType), providerType.getButtonId());
             }
@@ -87,8 +80,8 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
             }
         }
 
-        if (mEnabledProvidersByType.containsKey(SocialProvider.PASSWORD) &&
-           !(mEnabledProvidersByType.containsKey(SocialProvider.FACEBOOK) || mEnabledProvidersByType.containsKey(SocialProvider.GOOGLE) || mEnabledProvidersByType.containsKey(SocialProvider.TWITTER))) {
+        if (mEnabledProvidersByType.containsKey(AuthProviderType.PASSWORD) &&
+           !(mEnabledProvidersByType.containsKey(AuthProviderType.FACEBOOK) || mEnabledProvidersByType.containsKey(AuthProviderType.GOOGLE) || mEnabledProvidersByType.containsKey(AuthProviderType.TWITTER))) {
             mView.findViewById(R.id.or_section).setVisibility(View.GONE);
         }
 
@@ -142,7 +135,7 @@ public void onProviderError(FirebaseLoginError err) {
         return this;
     }
 
-    public FirebaseLoginDialog setEnabledProvider(SocialProvider provider) {
+    public FirebaseLoginDialog setEnabledProvider(AuthProviderType provider) {
         if (!mEnabledProvidersByType.containsKey(provider)) {
             mEnabledProvidersByType.put(provider, provider.createProvider(mContext, mRef, mHandler));
         }
@@ -153,7 +146,7 @@ private void showLoginOption(final FirebaseAuthProvider helper, int id) {
         mView.findViewById(id).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                if (SocialProvider.getTypeForProvider(helper) == SocialProvider.PASSWORD) {
+                if (AuthProviderType.getTypeForProvider(helper) == AuthProviderType.PASSWORD) {
                     EditText emailText = (EditText) mView.findViewById(R.id.email);
                     EditText passwordText = (EditText) mView.findViewById(R.id.password);
                     helper.login(emailText.getText().toString(), passwordText.getText().toString());
@@ -169,19 +162,7 @@ public void onClick(View view) {
         });
     }
 
-    public FacebookAuthProvider getFacebookAuthProvider() {
-        return (FacebookAuthProvider) mEnabledProvidersByType.get(SocialProvider.FACEBOOK);
-    }
-
-    public TwitterAuthProvider getTwitterAuthProvider() {
-        return (TwitterAuthProvider) mEnabledProvidersByType.get(SocialProvider.TWITTER);
-    }
-
     public GoogleAuthProvider getGoogleAuthProvider() {
-        return (GoogleAuthProvider) mEnabledProvidersByType.get(SocialProvider.GOOGLE);
-    }
-
-    public PasswordAuthProvider getPasswordAuthProvider() {
-        return (PasswordAuthProvider) mEnabledProvidersByType.get(SocialProvider.PASSWORD);
+        return (GoogleAuthProvider) mEnabledProvidersByType.get(AuthProviderType.GOOGLE);
     }
 }