Update gradle, update dependencies, fix Facebook theme, fix Facebook CCT (#440)

Author: SUPERCILEX

.travis.yml

@@ -13,7 +13,7 @@ android:
   components:
     - platform-tools
     - tools
-    - build-tools-25.0.0
+    - build-tools-25.0.1
     - android-25
 
     # Extras

auth/build.gradle

@@ -41,7 +41,7 @@ dependencies {
     compile "com.google.firebase:firebase-auth:$firebase_version"
     compile "com.google.android.gms:play-services-auth:$firebase_version"
 
-    compile 'com.facebook.android:facebook-android-sdk:4.17.0'
+    compile 'com.facebook.android:facebook-android-sdk:4.18.0'
     compile("com.twitter.sdk.android:twitter:2.2.0@aar") { transitive = true }
 
     // The following libraries are needed to prevent incompatibilities with the facebook
@@ -51,8 +51,8 @@ dependencies {
 
 
     testCompile 'junit:junit:4.12'
-    testCompile 'org.mockito:mockito-core:2.2.22'
-    testCompile 'org.robolectric:robolectric:3.1.2'
+    testCompile 'org.mockito:mockito-core:2.2.28'
+    testCompile 'org.robolectric:robolectric:3.1.4'
     // See https://github.com/robolectric/robolectric/issues/1932#issuecomment-219796474
     testCompile 'org.khronos:opengl-api:gl1.1-android-2.1_r1'
 }

auth/src/main/AndroidManifest.xml

@@ -1,9 +1,9 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="com.firebase.ui.auth">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
 
     <application>
 
@@ -15,6 +15,10 @@
             android:name="io.fabric.ApiKey"
             android:value="@string/twitter_consumer_secret"/>
 
+        <meta-data
+            android:name="com.facebook.sdk.ApplicationId"
+            android:value="@string/facebook_application_id"/>
+
         <activity
             android:name=".KickoffActivity"
             android:label="@string/default_toolbar_title"
@@ -71,10 +75,8 @@
 
         <activity
             android:name="com.facebook.FacebookActivity"
-            android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
             android:label="@string/app_name"
-            android:theme="@style/Theme.AppCompat.NoActionBar"
-            tools:replace="android:theme"/>
+            android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"/>
 
         <activity
             android:name="com.facebook.CustomTabActivity"

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

@@ -18,6 +18,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.annotation.StyleRes;
 import android.util.Log;
 
 import com.facebook.CallbackManager;
@@ -29,7 +30,7 @@
 import com.facebook.GraphResponse;
 import com.facebook.login.LoginManager;
 import com.facebook.login.LoginResult;
-import com.firebase.ui.auth.AuthUI.IdpConfig;
+import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.BuildConfig;
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.R;
@@ -54,7 +55,7 @@ public class FacebookProvider implements IdpProvider, FacebookCallback<LoginResu
     private final List<String> mScopes;
     private IdpCallback mCallbackObject;
 
-    public FacebookProvider(Context appContext, IdpConfig idpConfig) {
+    public FacebookProvider(Context appContext, AuthUI.IdpConfig idpConfig, @StyleRes int theme) {
         appContext = appContext.getApplicationContext();
 
         if (appContext.getResources().getIdentifier(
@@ -70,9 +71,8 @@ public FacebookProvider(Context appContext, IdpConfig idpConfig) {
         } else {
             mScopes = scopes;
         }
-        String applicationId = appContext.getString(R.string.facebook_application_id);
         FacebookSdk.sdkInitialize(appContext);
-        FacebookSdk.setApplicationId(applicationId);
+        FacebookSdk.setWebDialogTheme(theme);
     }
 
     @Override

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

@@ -73,7 +73,8 @@ protected void onCreate(Bundle savedInstanceState) {
                         mIdpProvider = new GoogleProvider(this, idpConfig, getEmailFromIntent());
                         break;
                     case FacebookAuthProvider.PROVIDER_ID:
-                        mIdpProvider = new FacebookProvider(this, idpConfig);
+                        mIdpProvider = new FacebookProvider(
+                                this, idpConfig, mActivityHelper.getFlowParams().themeId);
                         break;
                     case TwitterAuthProvider.PROVIDER_ID:
                         mIdpProvider = new TwitterProvider(this);

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

@@ -95,7 +95,8 @@ private void populateIdpList(List<IdpConfig> providers) {
                     mIdpProviders.add(new GoogleProvider(this, idpConfig));
                     break;
                 case AuthUI.FACEBOOK_PROVIDER:
-                    mIdpProviders.add(new FacebookProvider(this, idpConfig));
+                    mIdpProviders.add(new FacebookProvider(
+                            this, idpConfig, mActivityHelper.getFlowParams().themeId));
                     break;
                 case AuthUI.TWITTER_PROVIDER:
                     mIdpProviders.add(new TwitterProvider(this));

auth/src/main/java/com/firebase/ui/auth/util/signincontainer/IdpSignInContainer.java

@@ -76,7 +76,8 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         if (provider.equalsIgnoreCase(GoogleAuthProvider.PROVIDER_ID)) {
             mIdpProvider = new GoogleProvider(getActivity(), providerConfig, email);
         } else if (provider.equalsIgnoreCase(FacebookAuthProvider.PROVIDER_ID)) {
-            mIdpProvider = new FacebookProvider(getContext(), providerConfig);
+            mIdpProvider = new FacebookProvider(
+                    getContext(), providerConfig, mHelper.getFlowParams().themeId);
         } else if (provider.equalsIgnoreCase(TwitterAuthProvider.PROVIDER_ID)) {
             mIdpProvider = new TwitterProvider(getContext());
         }

common/constants.gradle

@@ -1,10 +1,10 @@
-project.ext.firebase_version = '10.0.0'
+project.ext.firebase_version = '10.0.1'
 project.ext.support_library_version = '25.0.1'
 
 project.ext.submodules = ['database', 'auth', 'storage']
 project.ext.group = 'com.firebaseui'
 project.ext.version = '1.0.1'
 project.ext.pomdesc = 'Firebase UI Android'
-project.ext.buildTools = '25.0.0'
+project.ext.buildTools = '25.0.1'
 project.ext.compileSdk = 25
 project.ext.targetSdk = 25

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Thu Dec 01 19:35:20 PST 2016
+#Mon Dec 05 16:06:45 PST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -154,16 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
 # by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
   cd "$(dirname "$0")"
 fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"