Merge pull request #160 from amandle/testing3

Remove AccountLinkInitActivity, add more Robolectric tests

Author: iainmcgin

auth/src/main/java/com/firebase/ui/auth/provider/FacebookProvider.java

@@ -39,14 +39,13 @@
 import java.util.Arrays;
 
 public class FacebookProvider implements IDPProvider, FacebookCallback<LoginResult> {
+    public static final String ACCESS_TOKEN = "facebook_access_token";
 
     protected static final String ERROR = "err";
     protected static final String ERROR_MSG = "err_msg";
 
     private static final String TAG = "FacebookProvider";
-    private static final String ACCESS_TOKEN = "facebook_access_token";
     private static final String APPLICATION_ID = "application_id";
-
     private CallbackManager mCallbackManager;
     private IDPCallback mCallbackObject;
 

auth/src/main/java/com/firebase/ui/auth/provider/GoogleProvider.java

@@ -31,9 +31,10 @@
 import com.google.firebase.auth.GoogleAuthProvider;
 
 public class GoogleProvider implements IDPProvider, OnClickListener {
+    public static final String TOKEN_KEY = "token_key";
+
     private static final int RC_SIGN_IN = 20;
     private static final String ERROR_KEY = "error";
-    private static final String TOKEN_KEY = "token_key";
     private static final String CLIENT_ID_KEY = "client_id_key";
     private GoogleApiClient mGoogleApiClient;
     private Activity mActivity;

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

@@ -21,6 +21,8 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.StringRes;
 
+import com.google.android.gms.auth.api.Auth;
+import com.google.android.gms.auth.api.credentials.CredentialsApi;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseUser;
@@ -86,6 +88,10 @@ public FirebaseAuth getFirebaseAuth() {
         return FirebaseAuth.getInstance(getFirebaseApp());
     }
 
+    public CredentialsApi getCredentialsApi() {
+        return Auth.CredentialsApi;
+    }
+
     public FirebaseUser getCurrentUser() {
         return getFirebaseAuth().getCurrentUser();
     }

auth/src/main/java/com/firebase/ui/auth/ui/account_link/AccountLinkInitActivity.java

@@ -27,10 +27,10 @@
 import com.firebase.ui.auth.BuildConfig;
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.ui.ActivityHelper;
+import com.firebase.ui.auth.ui.AppCompatBase;
 import com.firebase.ui.auth.ui.ExtraConstants;
 import com.firebase.ui.auth.ui.FlowParameters;
 import com.firebase.ui.auth.util.FirebaseAuthWrapperFactory;
-import com.firebase.ui.auth.ui.AppCompatBase;
 import com.google.android.gms.auth.api.Auth;
 import com.google.android.gms.auth.api.credentials.Credential;
 import com.google.android.gms.auth.api.credentials.IdentityProviders;
@@ -63,6 +63,7 @@ protected void onCreate(Bundle savedInstanceState) {
         if (!FirebaseAuthWrapperFactory.getFirebaseAuthWrapper(mActivityHelper.getAppName())
                 .isPlayServicesAvailable(this)) {
             finish(RESULT_FIRST_USER, getIntent());
+            return;
         }
         mName = getIntent().getStringExtra(ExtraConstants.EXTRA_NAME);
         mEmail = getIntent().getStringExtra(ExtraConstants.EXTRA_EMAIL);
@@ -117,7 +118,9 @@ public void onConnected(@Nullable Bundle bundle) {
         if (mProfilePictureUri != null) {
             builder.setProfilePictureUri(Uri.parse(mProfilePictureUri));
         }
-        Auth.CredentialsApi.save(mCredentialsApiClient, builder.build()).setResultCallback(this);
+        mActivityHelper.getCredentialsApi()
+                .save(mCredentialsApiClient, builder.build())
+                .setResultCallback(this);
     }
 
     @Override
@@ -148,7 +151,6 @@ public void onConnectionFailed(@NonNull ConnectionResult connectionResult) {
 
     @Override
     public void onResult(@NonNull Status status) {
-
         if (status.isSuccess()) {
             finish(RESULT_OK, getIntent());
         } else {
@@ -184,7 +186,9 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
         } else if (requestCode == RC_UPDATE_SERVICE) {
             if (resultCode == RESULT_OK) {
                 Credential credential = new Credential.Builder(mEmail).setPassword(mPassword).build();
-                Auth.CredentialsApi.save(mCredentialsApiClient, credential).setResultCallback(this);
+                mActivityHelper.getCredentialsApi()
+                        .save(mCredentialsApiClient, credential)
+                        .setResultCallback(this);
             } else {
                 Log.e(TAG, "SAVE: Canceled by user");
                 finish(RESULT_FIRST_USER, getIntent());