Various fixes from feedback

Author: abeisgoat

README.md

@@ -1,6 +1,6 @@
 # FirebaseUI for Android — UI Bindings for Firebase
 
-FirebaseUI is an open-source library for Android that allows you to quickly connect common UI elements to the [Firebase](https://www.firebase.com) database for data storage, allowing views to be updated in realtime as they change, providing simple interfaces for common tasks like displaying lists or collections of items, and displaying prompts for user authentication. 
+FirebaseUI is an open-source library for Android that allows you to quickly connect common UI elements to the [Firebase](https://www.firebase.com) database for data storage, allowing views to be updated in realtime as they change, providing simple interfaces for common tasks like displaying lists or collections of items, and displaying prompts for user authentication.
 
 A compatible FirebaseUI client is also available for [iOS](https://github.com/firebase/firebaseui-ios).
 
@@ -12,7 +12,7 @@ A compatible FirebaseUI client is also available for [iOS](https://github.com/fi
 4. [Using FirebaseUI to Populate a RecyclerView](#using-firebaseui-to-populate-a-recyclerview)
 5. [Contributing](#contributing)
 
-## Installation 
+## Installation
 
 If your Android app already uses Firebase, you have added a dependency to the Firebase SDK to your dependencies.
 In this step we'll add the FirebaseUI library as another dependency.
@@ -94,6 +94,18 @@ If you're using Facebook authentication, add the following to your `<application
     android:value="@string/facebook_app_id" />
 ```
 
+If you're using Google authentication, add the following to your `<application>` tag.
+
+```
+<!-- Google Configuration -->
+ <meta-data
+     android:name="com.firebase.ui.GoogleClientId"
+     android:value="@string/google_client_id" />
+ ```
+
+ If you're using Google Sign-in you'll also need to ensure that your `google-services.json` file is created
+ and placed in your app folder.
+
 ### Inherit from FirebaseLoginBaseActivity
 
 Now we get to the juicy bits. Open your `MainActivity` and change your activity to extend `FirebaseLoginBaseActivity`
@@ -113,7 +125,7 @@ public class MainActivity extends FirebaseLoginBaseActivity {
     public Firebase getFirebaseRef() {
         // TODO: Return your Firebase ref
     }
-    
+
     @Override
     public void onFirebaseLoginSuccess(AuthData authData) {
         // TODO: Handle successful login
@@ -382,7 +394,7 @@ You're done! You now have a minimal, yet fully functional, chat app in about 30
 ## Using FirebaseUI to Populate a RecyclerView
 
 RecyclerView is the new preferred way to handle potentially long lists of items. Since Firebase collections
-can contain many items, there is an `FirebaseRecyclerViewAdapter` too. Here's how you use it:
+can contain many items, there is an `FirebaseRecyclerAdapter` too. Here's how you use it:
 
 1. Create a custom ViewHolder class
 2. Create a custom subclass FirebaseListAdapter

app/src/main/AndroidManifest.xml

@@ -39,6 +39,11 @@
             android:name="com.facebook.sdk.ApplicationId"
             android:value="@string/facebook_app_id" />
 
+        <!-- Google Configuration -->
+        <meta-data
+            android:name="com.firebase.ui.GoogleClientId"
+            android:value="@string/google_client_id" />
+
 
     </application>
 

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;
@@ -91,6 +92,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
         mView.findViewById(R.id.loading_section).setVisibility(View.GONE);
 
         builder.setView(mView);
+
         return builder.create();
     }
 
@@ -110,20 +112,10 @@ public void reset() {
     }
 
     public void logout() {
-        switch (mActiveProvider) {
-            case twitter:
-                mTwitterAuthProvider.logout();
-                break;
-            case facebook:
-                mFacebookAuthProvider.logout();
-                break;
-            case google:
-                mGoogleAuthProvider.logout();
-                break;
-            case password:
-                mPasswordAuthProvider.logout();
-                break;
-        }
+        if (mTwitterAuthProvider != null) mTwitterAuthProvider.logout();
+        if (mFacebookAuthProvider != null) mFacebookAuthProvider.logout();
+        if (mGoogleAuthProvider != null) mGoogleAuthProvider.logout();
+        if (mPasswordAuthProvider != null) mPasswordAuthProvider.logout();
         mRef.unauth();
     }
 

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

@@ -2,15 +2,15 @@
 
 public class FirebaseLoginError {
     public String message;
-    public int error;
+    public FirebaseResponse error;
 
-    public FirebaseLoginError(int error, String message) {
+    public FirebaseLoginError(FirebaseResponse error, String message) {
         this.message = message;
         this.error = error;
     }
 
     public String toString() {
-        return Integer.toString(error) + ": " + message;
+        return error.toString() + ": " + message;
     }
 
 }

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

@@ -1,12 +1,12 @@
 package com.firebase.ui.auth.core;
 
-public class FirebaseResponse {
-    public static int WRONG_CREDENTIALS = 0;
-    public static int PROVIDER_NOT_ENABLED = 1;
-    public static int LOGIN_CANCELLED = 2;
-    public static int MISC_PROVIDER_ERROR = 3;
-    public static int INVALID_PROVIDER_APP_ID = 4;
-    public static int INVALID_PROVIDER_APP_KEY = 5;
-    public static int MISSING_PROVIDER_APP_ID = 6;
-    public static int MISSING_PROVIDER_APP_KEY = 7;
+public enum FirebaseResponse {
+    WRONG_CREDENTIALS,
+    PROVIDER_NOT_ENABLED,
+    LOGIN_CANCELLED,
+    MISC_PROVIDER_ERROR,
+    INVALID_PROVIDER_APP_ID,
+    INVALID_PROVIDER_APP_KEY,
+    MISSING_PROVIDER_APP_ID,
+    MISSING_PROVIDER_APP_KEY
 }

library/src/main/java/com/firebase/ui/auth/google/GoogleActions.java

@@ -0,0 +1,7 @@
+package com.firebase.ui.auth.google;
+
+public class GoogleActions {
+    private static int base = 9000;
+    public static int SIGN_IN = base+0;
+    public static int SIGN_OUT = base+1;
+}

library/src/main/java/com/firebase/ui/auth/google/GoogleAuthProvider.java

@@ -7,6 +7,7 @@
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
+import android.util.Log;
 
 import com.firebase.client.Firebase;
 import com.firebase.ui.auth.core.FirebaseAuthProvider;
@@ -26,16 +27,17 @@
 
 public class GoogleAuthProvider extends FirebaseAuthProvider implements
         GoogleApiClient.OnConnectionFailedListener,
+        GoogleApiClient.ConnectionCallbacks,
         GoogleOAuthTaskHandler {
 
     public final static String PROVIDER_NAME = "google";
     public static final SocialProvider PROVIDER_TYPE = SocialProvider.google;
-    private static final int RC_SIGN_IN = 9001;
     private final String TAG = "GoogleAuthProvider";
     private GoogleApiClient mGoogleApiClient;
     private TokenAuthHandler mHandler;
     private Activity mActivity;
     private Firebase mRef;
+    private Integer onConnectedAction;
 
     public GoogleAuthProvider(Context context, Firebase ref, TokenAuthHandler handler) {
         mActivity = (Activity) context;
@@ -82,19 +84,41 @@ public GoogleAuthProvider(Context context, Firebase ref, TokenAuthHandler handle
     public Firebase getFirebaseRef() { return mRef; }
     public SocialProvider getProviderType() { return PROVIDER_TYPE; };
 
+    @Override
+    public void onConnected(Bundle bundle) {
+        if (onConnectedAction == GoogleActions.SIGN_IN) {
+            login();
+        } else if (onConnectedAction == GoogleActions.SIGN_OUT) {
+            logout();
+        }
+
+        onConnectedAction = 0;
+    }
+
+    @Override
+    public void onConnectionSuspended(int i) {}
+
     public void logout() {
-        Auth.GoogleSignInApi.signOut(mGoogleApiClient).setResultCallback(
-                new ResultCallback<Status>() {
-                    @Override
-                    public void onResult(Status status) {
-                        revokeAccess();
-                    }
-                });
+        if (mGoogleApiClient.isConnected()) {
+            Auth.GoogleSignInApi.signOut(mGoogleApiClient).setResultCallback(
+                    new ResultCallback<Status>() {
+                        @Override
+                        public void onResult(Status status) {
+                            revokeAccess();
+                        }
+                    });
+        } else {
+            onConnectedAction = GoogleActions.SIGN_OUT;
+        }
     }
 
     public void login() {
-        Intent signInIntent = Auth.GoogleSignInApi.getSignInIntent(mGoogleApiClient);
-        mActivity.startActivityForResult(signInIntent, RC_SIGN_IN);
+        if (mGoogleApiClient.isConnected()) {
+            Intent signInIntent = Auth.GoogleSignInApi.getSignInIntent(mGoogleApiClient);
+            mActivity.startActivityForResult(signInIntent, GoogleActions.SIGN_IN);
+        } else {
+            onConnectedAction = GoogleActions.SIGN_IN;
+        }
     }
     private void revokeAccess() {
         Auth.GoogleSignInApi.revokeAccess(mGoogleApiClient).setResultCallback(
@@ -107,12 +131,12 @@ public void onResult(Status status) {
     }
 
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == RC_SIGN_IN && resultCode == -1) {
+        if (requestCode == GoogleActions.SIGN_IN && resultCode == -1) {
             GoogleSignInResult result = Auth.GoogleSignInApi.getSignInResultFromIntent(data);
             handleSignInResult(result);
         }
 
-        if (requestCode == RC_SIGN_IN && resultCode == 0) {
+        if (requestCode == GoogleActions.SIGN_IN && resultCode == 0) {
             mHandler.onUserError(new FirebaseLoginError(FirebaseResponse.LOGIN_CANCELLED, "User closed login dialog."));
         }
     }

library/src/main/java/com/firebase/ui/auth/twitter/TwitterAuthProvider.java

@@ -8,6 +8,7 @@
 import com.firebase.ui.auth.core.FirebaseAuthProvider;
 import com.firebase.ui.auth.core.FirebaseLoginError;
 import com.firebase.ui.auth.core.FirebaseOAuthToken;
+import com.firebase.ui.auth.core.FirebaseResponse;
 import com.firebase.ui.auth.core.SocialProvider;
 import com.firebase.ui.auth.core.TokenAuthHandler;
 
@@ -48,9 +49,11 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
                     data.getStringExtra("user_id"));
             onFirebaseTokenReceived(token, mHandler);
         } else if (resultCode == TwitterActions.USER_ERROR) {
-            mHandler.onUserError(new FirebaseLoginError(data.getIntExtra("code", 0), data.getStringExtra("error")));
+            FirebaseResponse error = FirebaseResponse.values()[data.getIntExtra("code", 0)];
+            mHandler.onUserError(new FirebaseLoginError(error, data.getStringExtra("error")));
         } else if (resultCode == TwitterActions.PROVIDER_ERROR) {
-            mHandler.onProviderError(new FirebaseLoginError(data.getIntExtra("code", 0), data.getStringExtra("error")));
+            FirebaseResponse error = FirebaseResponse.values()[data.getIntExtra("code", 0)];
+            mHandler.onProviderError(new FirebaseLoginError(error, data.getStringExtra("error")));
         }
     }
 }

library/src/main/java/com/firebase/ui/auth/twitter/TwitterPromptActivity.java

@@ -26,7 +26,7 @@ public class TwitterPromptActivity extends Activity {
 
     @Override
     public void onBackPressed() {
-        sendResultError(TwitterActions.USER_ERROR, FirebaseResponse.LOGIN_CANCELLED, "User closed login prompt.");
+        sendResultError(TwitterActions.USER_ERROR, FirebaseResponse.LOGIN_CANCELLED.ordinal(), "User closed login prompt.");
         super.onBackPressed();
     }
 
@@ -46,12 +46,12 @@ protected void onCreate(Bundle savedInstanceState) {
         } catch (NullPointerException e) {}
 
         if (twitterKey == null || twitterSecret == null) {
-            sendResultError(TwitterActions.PROVIDER_ERROR, FirebaseResponse.MISSING_PROVIDER_APP_KEY, "Missing Twitter key/secret, are they set in your AndroidManifest.xml?");
+            sendResultError(TwitterActions.PROVIDER_ERROR, FirebaseResponse.MISSING_PROVIDER_APP_KEY.ordinal(), "Missing Twitter key/secret, are they set in your AndroidManifest.xml?");
             return;
         }
 
         if (twitterKey.compareTo("") == 0|| twitterSecret.compareTo("") == 0) {
-            sendResultError(TwitterActions.PROVIDER_ERROR, FirebaseResponse.INVALID_PROVIDER_APP_KEY, "Invalid Twitter key/secret, are they set in your res/values/strings.xml?");
+            sendResultError(TwitterActions.PROVIDER_ERROR, FirebaseResponse.INVALID_PROVIDER_APP_KEY.ordinal(), "Invalid Twitter key/secret, are they set in your res/values/strings.xml?");
             return;
         }
 
@@ -75,7 +75,7 @@ protected RequestToken doInBackground(Void... params) {
                 try {
                     token = mTwitter.getOAuthRequestToken("oauth://cb");
                 } catch (TwitterException te) {
-                    sendResultError(TwitterActions.PROVIDER_ERROR, FirebaseResponse.MISC_PROVIDER_ERROR, te.toString());
+                    sendResultError(TwitterActions.PROVIDER_ERROR, FirebaseResponse.MISC_PROVIDER_ERROR.ordinal(), te.toString());
                 }
                 return token;
             }
@@ -90,7 +90,7 @@ public void onPageFinished(final WebView view, final String url) {
                             if (url.contains("oauth_verifier")) {
                                 getTwitterOAuthTokenAndLogin(token, Uri.parse(url).getQueryParameter("oauth_verifier"));
                             } else if (url.contains("denied")) {
-                                sendResultError(TwitterActions.USER_ERROR, FirebaseResponse.LOGIN_CANCELLED, "User denied access to their account.");
+                                sendResultError(TwitterActions.USER_ERROR, FirebaseResponse.LOGIN_CANCELLED.ordinal(), "User denied access to their account.");
                             }
                         }
                     }
@@ -108,7 +108,7 @@ protected AccessToken doInBackground(Void... params) {
                 try {
                     accessToken = mTwitter.getOAuthAccessToken(requestToken, oauthVerifier);
                 } catch (TwitterException te) {
-                    sendResultError(TwitterActions.PROVIDER_ERROR, FirebaseResponse.MISC_PROVIDER_ERROR, te.toString());
+                    sendResultError(TwitterActions.PROVIDER_ERROR, FirebaseResponse.MISC_PROVIDER_ERROR.ordinal(), te.toString());
                 }
                 return accessToken;
             }