Auth code cleanup

.travis.yml

@@ -2,7 +2,6 @@ language: android
 jdk: oraclejdk8
 # See https://github.com/travis-ci/travis-ci/issues/5582
 sudo: required
-# See https://docs.travis-ci.com/user/languages/java/#Caching
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
   - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
@@ -18,8 +17,6 @@ android:
     - android-25
 
     # Extras
-    - extra-google-google_play_services
     - extra-google-m2repository
     - extra-android-m2repository
-    - addon-google_apis-google-24
 script: ./gradlew clean :library:testAll :library:prepareArtifacts

app/src/main/res/values/colors.xml

@@ -16,16 +16,11 @@
 
     <color name="material_gray_300">#E0E0E0</color>
 
-    <color name="material_lime_50">#F9FBE7</color>
     <color name="material_lime_a700">#AEEA00</color>
 
     <color name="material_purple_50">#F3E5F5</color>
     <color name="material_purple_a700">#AA00FF</color>
 
     <color name="material_red_a200">#FF5252</color>
 
-    <color name="material_grey_200">#EEEEEE</color>
-    <color name="material_grey_400">#BDBDBD</color>
-    <color name="material_grey_500">#9E9E9E</color>
-    <color name="material_grey_700">#616161</color>
 </resources>

app/src/main/res/values/strings.xml

@@ -33,7 +33,6 @@
     <string name="firebase_tos_label">Firebase TOS</string>
     <string name="tos_header">Terms of Service URL:</string>
     <string name="unknown_response">Unexpected onActivityResult response code</string>
-    <string name="ok_label">OK</string>
     <string name="unknown_sign_in_response">Unknown response from AuthUI sign-in</string>
     <string name="sign_in_cancelled">Sign in cancelled</string>
     <string name="no_internet_connection">No internet connection</string>

auth/build.gradle

@@ -29,22 +29,22 @@ android {
     }
 }
 
-
 dependencies {
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.mockito:mockito-core:2.2.0'
-    testCompile 'org.robolectric:robolectric:3.1.2'
-    // See https://github.com/robolectric/robolectric/issues/1932#issuecomment-219796474
-    testCompile 'org.khronos:opengl-api:gl1.1-android-2.1_r1'
-
-    compile 'com.facebook.android:facebook-android-sdk:4.14.1'
-    compile("com.twitter.sdk.android:twitter:2.0.0@aar") {
-        transitive = true;
-    }
     compile "com.android.support:design:${project.ext.support_library_version}"
 
     compile "com.google.firebase:firebase-auth:${project.ext.firebase_version}"
     compile "com.google.android.gms:play-services-auth:${project.ext.firebase_version}"
+
+    compile 'com.facebook.android:facebook-android-sdk:4.16.1'
+    compile("com.twitter.sdk.android:twitter:2.1.1@aar") {
+        transitive = true
+    }
+
+    testCompile 'junit:junit:4.12'
+    testCompile 'org.mockito:mockito-core:2.2.6'
+    testCompile 'org.robolectric:robolectric:3.1.2'
+    // See https://github.com/robolectric/robolectric/issues/1932#issuecomment-219796474
+    testCompile 'org.khronos:opengl-api:gl1.1-android-2.1_r1'
 }
 
 checkstyle {
@@ -64,8 +64,8 @@ javadoc.exclude([
         'com/firebase/ui/auth/ui/ExtraConstants',
         'com/firebase/ui/auth/ui/email/field_validators/**',
         'com/firebase/ui/auth/util/**',
-        ])
+])
 
 javadoc.include([
         'com/google/firebase/auth/**'
-        ])
+])

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

@@ -391,7 +391,7 @@ public static AuthUI getInstance() {
      * Retrieves the {@link AuthUI} instance associated  the the specified app.
      */
     public static AuthUI getInstance(FirebaseApp app) {
-        AuthUI authUi = null;
+        AuthUI authUi;
         synchronized (INSTANCES) {
             authUi = INSTANCES.get(app);
             if (authUi == null) {
@@ -407,8 +407,6 @@ public static AuthUI getInstance(FirebaseApp app) {
      * customization is required.
      */
     public static @StyleRes int getDefaultTheme() {
-        // TODO(iainmgin): figure out why this works as a static method but not as a static
-        //                 final variable.
         return R.style.FirebaseUI;
     }
 

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

@@ -35,8 +35,8 @@ public interface IdpProvider {
 
     void startLogin(Activity activity);
 
-    public interface IdpCallback {
-        public void onSuccess(IdpResponse idpResponse);
-        public void onFailure(Bundle extra);
+    interface IdpCallback {
+        void onSuccess(IdpResponse idpResponse);
+        void onFailure(Bundle extra);
     }
 }

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

@@ -32,10 +32,10 @@
 
 public class AcquireEmailHelper {
     private static final String TAG = "AcquireEmailHelper";
-    public static final int RC_REGISTER_ACCOUNT = 14;
-    public static final int RC_WELCOME_BACK_IDP = 15;
+    private static final int RC_REGISTER_ACCOUNT = 14;
+    private static final int RC_WELCOME_BACK_IDP = 15;
     public static final int RC_SIGN_IN = 16;
-    public static final List<Integer> REQUEST_CODES = Arrays.asList(
+    private static final List<Integer> REQUEST_CODES = Arrays.asList(
             RC_REGISTER_ACCOUNT,
             RC_WELCOME_BACK_IDP,
             RC_SIGN_IN
@@ -80,30 +80,22 @@ private void startEmailHandler(String email, List<String> providers) {
             mActivityHelper.startActivityForResult(registerIntent, RC_REGISTER_ACCOUNT);
         } else {
             // account does exist
-            for (String provider : providers) {
-                if (provider.equalsIgnoreCase(EmailAuthProvider.PROVIDER_ID)) {
-                    Intent signInIntent = SignInActivity.createIntent(
-                            mActivityHelper.getApplicationContext(),
-                            mActivityHelper.getFlowParams(),
-                            email);
-                    mActivityHelper.startActivityForResult(signInIntent, RC_SIGN_IN);
-                    return;
-                }
-
-                Intent intent = WelcomeBackIdpPrompt.createIntent(
+            if (providers.get(0).equalsIgnoreCase(EmailAuthProvider.PROVIDER_ID)) {
+                Intent signInIntent = SignInActivity.createIntent(
                         mActivityHelper.getApplicationContext(),
                         mActivityHelper.getFlowParams(),
-                        provider,
-                        null,
                         email);
-                mActivityHelper.startActivityForResult(intent, RC_WELCOME_BACK_IDP);
+                mActivityHelper.startActivityForResult(signInIntent, RC_SIGN_IN);
                 return;
             }
 
-            Intent signInIntent = new Intent(
-                    mActivityHelper.getApplicationContext(), SignInActivity.class);
-            signInIntent.putExtra(ExtraConstants.EXTRA_EMAIL, email);
-            mActivityHelper.startActivityForResult(signInIntent, RC_SIGN_IN);
+            Intent intent = WelcomeBackIdpPrompt.createIntent(
+                    mActivityHelper.getApplicationContext(),
+                    mActivityHelper.getFlowParams(),
+                    providers.get(0),
+                    null,
+                    email);
+            mActivityHelper.startActivityForResult(intent, RC_WELCOME_BACK_IDP);
         }
     }
 

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

@@ -22,8 +22,5 @@ public class ExtraConstants {
     public static final String EXTRA_ERROR_MESSAGE = "extra_error_msg";
     public static final String EXTRA_FLOW_PARAMS = "extra_flow_params";
     public static final String EXTRA_IDP_RESPONSE = "extra_idp_response";
-    public static final String EXTRA_NAME = "extra_name";
-    public static final String EXTRA_PASSWORD = "extra_password";
-    public static final String EXTRA_PROFILE_PICTURE_URI = "extra_profile_picture_uri";
     public static final String EXTRA_PROVIDER = "extra_provider";
 }

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

@@ -53,22 +53,21 @@ public class WelcomeBackIdpPrompt extends AppCompatBase
 
     private static final String TAG = "WelcomeBackIDPPrompt";
     private IdpProvider mIdpProvider;
-    private String mProviderId;
     private IdpResponse mPrevIdpResponse;
     private AuthCredential mPrevCredential;
 
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mProviderId = getProviderIdFromIntent();
+        String providerId = getProviderIdFromIntent();
         mPrevIdpResponse = getIntent().getParcelableExtra(ExtraConstants.EXTRA_IDP_RESPONSE);
         setContentView(R.layout.welcome_back_idp_prompt_layout);
 
         mIdpProvider = null;
         for (IdpConfig idpConfig: mActivityHelper.getFlowParams().providerInfo) {
-            if (mProviderId.equals(idpConfig.getProviderId())) {
-                switch (mProviderId) {
+            if (providerId.equals(idpConfig.getProviderId())) {
+                switch (providerId) {
                     case GoogleAuthProvider.PROVIDER_ID:
                         mIdpProvider = new GoogleProvider(this, idpConfig, getEmailFromIntent());
                         break;
@@ -79,7 +78,7 @@ protected void onCreate(Bundle savedInstanceState) {
                         mIdpProvider = new TwitterProvider(this);
                         break;
                     default:
-                        Log.w(TAG, "Unknown provider: " + mProviderId);
+                        Log.w(TAG, "Unknown provider: " + providerId);
                         finish(RESULT_CANCELED, getIntent());
                         return;
                 }
@@ -205,7 +204,7 @@ public static Intent createIntent(
                 .putExtra(ExtraConstants.EXTRA_EMAIL, email);
     }
 
-    private class FinishListener implements OnCompleteListener {
+    private class FinishListener implements OnCompleteListener<AuthResult> {
         private final IdpResponse mIdpResponse;
 
         FinishListener(IdpResponse idpResponse) {

auth/src/main/java/com/firebase/ui/auth/ui/idp/IdpSignInContainerActivity.java

@@ -42,18 +42,16 @@ public class IdpSignInContainerActivity extends IDPBaseActivity implements IdpCa
     private static final int RC_WELCOME_BACK_IDP = 4;
 
     private IdpProvider mIdpProvider;
-    private String mProvider;
-    private String mEmail;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        mProvider = getIntent().getStringExtra(ExtraConstants.EXTRA_PROVIDER);
-        mEmail = getIntent().getStringExtra(ExtraConstants.EXTRA_EMAIL);
+        String provider = getIntent().getStringExtra(ExtraConstants.EXTRA_PROVIDER);
+        String email = getIntent().getStringExtra(ExtraConstants.EXTRA_EMAIL);
         IdpConfig providerConfig = null;
         for (IdpConfig config : mActivityHelper.getFlowParams().providerInfo) {
-            if (config.getProviderId().equalsIgnoreCase(mProvider)) {
+            if (config.getProviderId().equalsIgnoreCase(provider)) {
                 providerConfig = config;
                 break;
             }
@@ -63,11 +61,11 @@ protected void onCreate(Bundle savedInstanceState) {
             finish(RESULT_CANCELED, new Intent());
             return;
         }
-        if (mProvider.equalsIgnoreCase(FacebookAuthProvider.PROVIDER_ID)) {
+        if (provider.equalsIgnoreCase(FacebookAuthProvider.PROVIDER_ID)) {
             mIdpProvider = new FacebookProvider(this, providerConfig);
-        } else if (mProvider.equalsIgnoreCase(GoogleAuthProvider.PROVIDER_ID)) {
-            mIdpProvider = new GoogleProvider(this, providerConfig, mEmail);
-        } else if (mProvider.equalsIgnoreCase(TwitterAuthProvider.PROVIDER_ID)) {
+        } else if (provider.equalsIgnoreCase(GoogleAuthProvider.PROVIDER_ID)) {
+            mIdpProvider = new GoogleProvider(this, providerConfig, email);
+        } else if (provider.equalsIgnoreCase(TwitterAuthProvider.PROVIDER_ID)) {
             mIdpProvider = new TwitterProvider(this);
         }
         mIdpProvider.setAuthenticationCallback(this);

auth/src/main/java/com/firebase/ui/auth/util/CredentialsApiHelper.java

@@ -17,6 +17,7 @@
 import android.app.Activity;
 import android.app.PendingIntent;
 import android.support.annotation.NonNull;
+
 import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.AuthUI.IdpConfig;
 import com.google.android.gms.auth.api.Auth;
@@ -32,6 +33,7 @@
 import com.google.android.gms.tasks.Continuation;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -76,8 +78,7 @@ public Task<CredentialRequestResult> request(final CredentialRequest request) {
                     @Override
                     protected void process(
                             final GoogleApiClient client,
-                            final TaskCompletionSource<CredentialRequestResult> source)
-                            throws Exception {
+                            final TaskCompletionSource<CredentialRequestResult> source) {
                         Auth.CredentialsApi.request(client, request)
                                 .setResultCallback(new TaskResultCaptor<>(source));
                     }
@@ -90,10 +91,9 @@ public Task<Status> save(final Credential credential) {
                     @Override
                     protected void process(
                             GoogleApiClient client,
-                            TaskCompletionSource<Status> source)
-                            throws Exception {
+                            TaskCompletionSource<Status> source) {
                         Auth.CredentialsApi.save(client, credential)
-                                .setResultCallback(new TaskResultCaptor<Status>(source));
+                                .setResultCallback(new TaskResultCaptor<>(source));
                     }
                 });
     }
@@ -104,8 +104,7 @@ public Task<PendingIntent> getHintPickerIntent(final HintRequest request) {
                     @Override
                     protected void process(
                             GoogleApiClient client,
-                            TaskCompletionSource<PendingIntent> source)
-                            throws Exception {
+                            TaskCompletionSource<PendingIntent> source) {
                         source.setResult(Auth.CredentialsApi.getHintPickerIntent(client, request));
                     }
                 });
@@ -117,9 +116,9 @@ public Task<Status> delete(final Credential credential) {
                     @Override
                     protected void process(
                             GoogleApiClient client,
-                            TaskCompletionSource<Status> source) throws Exception {
+                            TaskCompletionSource<Status> source) {
                         Auth.CredentialsApi.delete(client, credential)
-                                .setResultCallback(new TaskResultCaptor<Status>(source));
+                                .setResultCallback(new TaskResultCaptor<>(source));
                     }
                 });
     }
@@ -130,8 +129,7 @@ public Task<Status> disableAutoSignIn() {
                     @Override
                     protected void process(
                             final GoogleApiClient client,
-                            final TaskCompletionSource<Status> source)
-                            throws Exception {
+                            final TaskCompletionSource<Status> source) {
                         Auth.CredentialsApi.disableAutoSignIn(client)
                                 .setResultCallback(new ResultCallback<Status>() {
                                     @Override
@@ -169,7 +167,7 @@ public final Task<OutT> then(@NonNull Task<InT> task) throws Exception {
             return source.getTask();
         }
 
-        protected abstract void process(InT in, TaskCompletionSource<OutT> result) throws Exception;
+        protected abstract void process(InT in, TaskCompletionSource<OutT> result);
     }
 
     private static final class TaskResultCaptor<R extends Result> implements ResultCallback<R> {

auth/src/main/java/com/firebase/ui/auth/util/FirebaseAuthWrapperImpl.java

@@ -14,7 +14,6 @@
 
 package com.firebase.ui.auth.util;
 
-import android.app.Fragment;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.os.Bundle;
@@ -67,10 +66,7 @@ public FirebaseAuthWrapperImpl(@NonNull FirebaseAuth firebaseAuth) {
     @Override
     @WorkerThread
     public boolean isExistingAccount(@Nullable final String email) {
-        if (email == null) {
-            return false;
-        }
-        return hasProviders(await(mFirebaseAuth.fetchProvidersForEmail(email)));
+        return email != null && hasProviders(await(mFirebaseAuth.fetchProvidersForEmail(email)));
     }
 
     @Override

auth/src/main/res/layout/auth_method_picker_layout.xml

@@ -13,7 +13,8 @@
 
         <ImageView
             android:id="@+id/logo"
-            style="@style/FirebaseUI.AuthMethodPicker.Logo"/>
+            style="@style/FirebaseUI.AuthMethodPicker.Logo"
+            android:contentDescription="@string/accessibility_logo"/>
 
     </LinearLayout>