From 51cd951e0664a3f3ac30657ee7f877a6793ad81b Mon Sep 17 00:00:00 2001
From: Sam Stern <samstern@google.com>
Date: Wed, 10 Aug 2016 13:24:35 -0700
Subject: [PATCH] Update SDK, allow Facebook to use Chrome Custom Tabs

Change-Id: If37b630e311a5b6fcb329cfa8daf57a65dea29e8
---
 app/src/main/res/values/config.xml  |  5 +++++
 auth/build.gradle                   |  2 +-
 auth/src/main/AndroidManifest.xml   | 25 ++++++++++++++++++++-----
 auth/src/main/res/values/config.xml | 10 ++++++++++
 4 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/values/config.xml b/app/src/main/res/values/config.xml
index d1d73c6e4..187ef872f 100644
--- a/app/src/main/res/values/config.xml
+++ b/app/src/main/res/values/config.xml
@@ -5,4 +5,9 @@
     and provide your value here.
     -->
     <string name="facebook_application_id" translatable="false">CHANGE-ME</string>
+
+    <!--
+    Facebook Application ID, prefixed by 'fb'.  Enables Chrome Custom tabs.
+    -->
+    <string name="facebook_login_protocol_scheme" translatable="false">fbYOUR_APP_ID</string>
 </resources>
diff --git a/auth/build.gradle b/auth/build.gradle
index 2e198db98..0bc1cae6c 100644
--- a/auth/build.gradle
+++ b/auth/build.gradle
@@ -24,7 +24,7 @@ dependencies {
     testCompile 'org.mockito:mockito-core:1.10.19'
     testCompile "org.robolectric:robolectric:3.1-rc1"
     compile "com.android.support:appcompat-v7:${project.ext.support_library_version}"
-    compile 'com.facebook.android:facebook-android-sdk:4.11.0'
+    compile 'com.facebook.android:facebook-android-sdk:4.14.1'
     compile "com.android.support:design:${project.ext.support_library_version}"
 
     compile "com.google.firebase:firebase-auth:${project.ext.firebase_version}"
diff --git a/auth/src/main/AndroidManifest.xml b/auth/src/main/AndroidManifest.xml
index 4daaf5e38..db7c01d42 100644
--- a/auth/src/main/AndroidManifest.xml
+++ b/auth/src/main/AndroidManifest.xml
@@ -1,4 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.firebase.ui.auth">
 
     <application>
@@ -32,10 +33,24 @@
         <activity android:theme="@style/FirebaseUI.Translucent"
                    android:name=".ui.ChooseAccountActivity" >
         </activity>
-        <activity android:theme="@style/FirebaseUI.Translucent"
-                  android:name="com.facebook.FacebookActivity"
-            android:configChanges=
-                "keyboard|keyboardHidden|screenLayout|screenSize|orientation"
-            android:label="@string/app_name" />
+
+        <activity
+            android:name="com.facebook.FacebookActivity"
+            android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
+            android:label="@string/app_name"
+            android:theme="@style/FirebaseUI.Translucent"
+            tools:replace="android:theme" />
+
+        <activity
+            android:name="com.facebook.CustomTabActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="@string/facebook_login_protocol_scheme" />
+            </intent-filter>
+        </activity>
+
     </application>
 </manifest>
diff --git a/auth/src/main/res/values/config.xml b/auth/src/main/res/values/config.xml
index 3c55db4c1..95a0da212 100644
--- a/auth/src/main/res/values/config.xml
+++ b/auth/src/main/res/values/config.xml
@@ -9,6 +9,16 @@
     -->
     <string name="facebook_application_id" translatable="false">CHANGE-ME</string>
 
+    <!--
+     To enable Chrome Custom Tabs for Facebook Login on devices without the Facebook app
+     installed, change this value to your Facebook App ID prefixed with 'fb'. This should be
+     'fb' + the value of the facebook_application_id string above
+
+     See:
+     https://developers.facebook.com/docs/facebook-login/android#chrome_custom_tabs
+    -->
+    <string name="facebook_login_protocol_scheme" translatable="false">fbYOUR_APP_ID</string>
+
 
     <!--
     The facebook permissions that this Android Application will request from the