Updates README and fixes Google error

Author: abeisgoat

README.md

@@ -40,15 +40,29 @@ FirebaseUI has a built-in dialog that you can use pop up to allow your users to
 
 To use FirebaseUI to authenticate users we need to do a few things:
 
-1. Add our Facebook/Twitter/Google keys to strings.xml
-2. Add our activities to our AndroidManifest.xml
-3. Inherit from FirebaseLoginBaseActivity
-4. Enable authentication providers
-5. Call showFirebaseLoginDialog();
+1. Add SDK dependencies
+2. Add Facebook/Twitter/Google keys to strings.xml
+3. Change our AndroidManifest.xml
+4. Inherit from FirebaseLoginBaseActivity
+5. Enable authentication providers
+6. Call showFirebaseLoginDialog();
 
 We'll go into each of these steps below.
 
-### Add our Facebook/Twitter/Google keys to strings.xml
+### Add SDK dependencies
+
+Since FirebaseUI depends on the SDKs of various providers, we'll need to include those in our depedencies as well.
+
+```
+dependencies {
+    ...
+    compile 'com.facebook.android:facebook-android-sdk:4.6.0'
+    compile 'com.google.android.gms:play-services-auth:8.3.0'
+    compile 'org.twitter4j:twitter4j-core:4.0.2'
+}
+```
+
+### Add Facebook/Twitter/Google keys to strings.xml
 
 Open your `res/values/strings.xml` file and add the following lines, replacing `[VALUE]` with your key.
 
@@ -63,10 +77,16 @@ Keep in mind, these are all optional. You only have to provide values for the pr
 <string name="google_client_id">[VALUE]</string>
 ```
 
-### Add our activities to our AndroidManifest.xml
+### Change our AndroidManifest.xml
 
 Open your `manifests/AndroidManifest.xml` file. This will allow Android to recognize the various activities that FirebaseUI exposes.
 
+First though, double check that you've requested the `INTERNET` permission in your `<manifest>` tag.
+
+```xml
+<uses-permission android:name="android.permission.INTERNET"></uses-permission>
+```
+
 If you're using Twitter authentication, add the following to your `<application>` tag.
 
 ```xml
@@ -96,15 +116,15 @@ If you're using Facebook authentication, add the following to your `<application
 
 If you're using Google authentication, add the following to your `<application>` tag.
 
-```
+```xml
 <!-- 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.
+**Note:** 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
 
@@ -127,12 +147,12 @@ public class MainActivity extends FirebaseLoginBaseActivity {
     }
 
     @Override
-    public void onFirebaseLoginSuccess(AuthData authData) {
+    public void onFirebaseLoggedIn(AuthData authData) {
         // TODO: Handle successful login
     }
 
     @Override
-    public void onFirebaseLogout() {
+    public void onFirebaseLoggedOut() {
         // TODO: Handle logout
     }
 

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

@@ -2,6 +2,7 @@
 
 import android.content.Intent;
 import android.support.v7.app.AppCompatActivity;
+import android.util.Log;
 
 import com.firebase.client.AuthData;
 import com.firebase.client.Firebase;
@@ -72,6 +73,10 @@ public void resetFirebaseLoginDialog() {
         mDialog.reset();
     }
 
+    public void setEnabledAuthProvider(SocialProvider provider) {
+        mDialog.setEnabledProvider(provider);
+    }
+
     @Override
     protected void onStart() {
         super.onStart();
@@ -113,12 +118,21 @@ public void onAuthStateChanged(AuthData authData) {
         getFirebaseRef().addAuthStateListener(mAuthStateListener);
     }
 
-    public void setEnabledAuthProvider(SocialProvider provider) {
-        mDialog.setEnabledProvider(provider);
-    }
-
     protected void onStop() {
         super.onStop();
         getFirebaseRef().removeAuthStateListener(mAuthStateListener);
+        mDialog.cleanUp();
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        mDialog.cleanUp();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        mDialog.cleanUp();
     }
 }

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

@@ -31,37 +31,41 @@ public class FirebaseLoginDialog extends DialogFragment {
     Context mContext;
     View mView;
 
-    public void onStart() {
-        super.onStart();
-        if (mGoogleAuthProvider != null) mGoogleAuthProvider.onStart();
-    }
-
-
     /*
     We need to be extra aggressive about building / destroying mGoogleauthProviders so we don't
     end up with two clients connected at the same time.
      */
 
     public void onStop() {
         super.onStop();
-        if (mGoogleAuthProvider != null) mGoogleAuthProvider.onStop();
+        cleanUp();
     }
 
     public void onDestroy() {
         super.onDestroy();
-        if (mGoogleAuthProvider != null) mGoogleAuthProvider.onStop();
+        cleanUp();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+       cleanUp();
+    }
+
+    public void cleanUp() {
+        if (mGoogleAuthProvider != null) mGoogleAuthProvider.cleanUp();
     }
 
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (mFacebookAuthProvider != null && mActiveProvider == SocialProvider.facebook) {
+        if (mFacebookAuthProvider != null) {
             mFacebookAuthProvider.mCallbackManager.onActivityResult(requestCode, resultCode, data);
         }
 
-        if (mTwitterAuthProvider != null && mActiveProvider == SocialProvider.twitter) {
+        if (mTwitterAuthProvider != null) {
             mTwitterAuthProvider.onActivityResult(requestCode, resultCode, data);
         }
 
-        if (mGoogleAuthProvider != null && mActiveProvider == SocialProvider.google) {
+        if (mGoogleAuthProvider != null) {
             mGoogleAuthProvider.onActivityResult(requestCode, resultCode, data);
         }
     }
@@ -120,12 +124,10 @@ public void logout() {
     }
 
     public FirebaseLoginDialog setHandler(final TokenAuthHandler handler) {
-        //TODO: Make this idiomatic?
-        final DialogFragment self = this;
         mHandler = new TokenAuthHandler() {
             @Override
             public void onSuccess(AuthData auth) {
-                self.dismiss();
+                dismiss();
                 handler.onSuccess(auth);
             }
 

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

@@ -78,6 +78,9 @@ public GoogleAuthProvider(Context context, Firebase ref, TokenAuthHandler handle
                 .enableAutoManage((FragmentActivity) mActivity, this)
                 .addApi(Auth.GOOGLE_SIGN_IN_API, gso)
                 .build();
+
+        mGoogleApiClient.connect();
+
     }
 
     public String getProviderName() { return PROVIDER_NAME; }
@@ -137,6 +140,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
         }
 
         if (requestCode == GoogleActions.SIGN_IN && resultCode == 0) {
+            Log.d(TAG, data.getExtras().keySet().toString());
             mHandler.onUserError(new FirebaseLoginError(FirebaseResponse.LOGIN_CANCELLED, "User closed login dialog."));
         }
     }
@@ -164,13 +168,8 @@ public void onOAuthFailure(FirebaseLoginError firebaseError) {
         mHandler.onProviderError(firebaseError);
     }
 
-    public void onStart() {
-        if (mGoogleApiClient != null)
-            mGoogleApiClient.connect();
-    }
-
-    public void onStop() {
-        if (mGoogleApiClient != null && mGoogleApiClient.isConnected()) {
+    public void cleanUp() {
+        if (mGoogleApiClient != null) {
             mGoogleApiClient.disconnect();
             mGoogleApiClient.stopAutoManage((FragmentActivity) mActivity);
         }

library/src/main/res/layout/fragment_firebase_login.xml

@@ -97,13 +97,14 @@
                 android:background="@drawable/facebook_button"
                 android:textColor="#ffffff"
                 android:typeface="normal"
-                android:textAlignment="center"
+                android:textAlignment="gravity"
                 android:drawableLeft="@drawable/ic_facebook"
                 android:drawablePadding="10dp"
-                android:gravity="left|center"
                 android:textStyle="bold"
                 android:paddingLeft="12dp"
-                android:layout_marginBottom="10dp" />
+                android:layout_marginBottom="10dp"
+                android:layout_gravity="left"
+                android:gravity="left|center_vertical" />
 
             <Button
                 android:layout_width="match_parent"
@@ -113,13 +114,13 @@
                 android:background="@drawable/google_button"
                 android:textColor="#ffffff"
                 android:typeface="normal"
-                android:textAlignment="center"
+                android:textAlignment="gravity"
                 android:drawableLeft="@drawable/ic_google"
                 android:drawablePadding="10dp"
-                android:gravity="left|center"
                 android:textStyle="bold"
                 android:paddingLeft="12dp"
-                android:layout_marginBottom="10dp" />
+                android:layout_marginBottom="10dp"
+                android:gravity="left|center_vertical" />
 
             <Button
                 android:layout_width="match_parent"
@@ -129,13 +130,13 @@
                 android:background="@drawable/twitter_button"
                 android:textColor="#ffffff"
                 android:typeface="normal"
-                android:textAlignment="center"
+                android:textAlignment="gravity"
                 android:drawableLeft="@drawable/ic_twitter"
                 android:drawablePadding="10dp"
-                android:gravity="left|center"
                 android:textStyle="bold"
                 android:paddingLeft="12dp"
-                android:layout_marginBottom="10dp" />
+                android:layout_marginBottom="10dp"
+                android:gravity="left|center_vertical" />
 
         </LinearLayout>
     </LinearLayout>