Merge branch 'version-2.0.0-dev' into phone-auth

Change-Id: I6d2bedb15d96f39e3d3e71682e33388fa41f3439

Author: samtstern

README.md

@@ -10,11 +10,21 @@ A compatible FirebaseUI client is also available for [iOS](https://github.com/fi
 
 ## Table of Contents
 
-  1. [Installation](#installation)
   1. [Usage](#usage)
+  1. [Installation](#installation)
+  1. [Dependencies](#dependencies)
   1. [Sample App](#sample-app)
   1. [Contributing](#contributing)
 
+## Usage
+
+FirebaseUI has separate modules for using Firebase Database, Auth, and Storage. To
+get started, see the individual instructions for each module:
+
+  * [firebase-ui-database](database/README.md)
+  * [firebase-ui-auth](auth/README.md)
+  * [firebase-ui-storage](storage/README.md)
+
 ## Installation
 
 FirebaseUI is published as a collection of libraries separated by the
@@ -47,6 +57,8 @@ required.
 
 After the project is synchronized, we're ready to start using Firebase functionality in our app.
 
+## Dependencies
+
 ### Compatibility with Firebase / Google Play Services Libraries
 
 FirebaseUI libraries have the following transitive dependencies on the Firebase SDK:
@@ -67,29 +79,52 @@ in `common/constants.gradle`.  If you are using any dependencies in your app of
 `compile 'com.google.firebase:firebase-*:x.y.z'` or `compile 'com.google.android.gms:play-services-*:x.y.z'`
 you need to make sure that you use the same version that your chosen version of FirebaseUI requires.
 
-For convenience, here are some examples:
+For convenience, here are some recent examples:
 
 | FirebaseUI Version | Firebase/Play Services Version |
 |--------------------|--------------------------------|
 | 1.2.0              | 10.2.0                         |
 | 1.1.1              | 10.0.0 or 10.0.1               |
 | 1.0.1              | 10.0.0 or 10.0.1               |
 | 1.0.0              | 9.8.0                          |
-| 0.6.2              | 9.8.0                          |
-| 0.6.1              | 9.6.1                          |
-| 0.6.0              | 9.6.0                          |
-| 0.5.3              | 9.4.0                          |
-| 0.4.4              | 9.4.0                          |
-| 0.4.3              | 9.2.1                          |
-| 0.4.2              | 9.2.0                          |
-| 0.4.1              | 9.0.2                          |
-| 0.4.0              | 9.0.0                          |
 
-## Usage
 
-  * [firebase-ui-database](database/README.md)
-  * [firebase-ui-auth](auth/README.md)
-  * [firebase-ui-storage](storage/README.md)
+## Upgrading dependencies
+
+If you would like to use a newer version of one of FirebaseUI's transitive dependencies, such
+as Firebase, Play services, or the Android support libraries you need add explicit
+`compile` declarations in your `build.gradle` for all of FirebaseUI's dependencies at the version
+you want to use. For example if you want to use Play services/Firebase version `FOO` and support
+libraries version `BAR` add the following extra lines for each FirebaseUI module you're using:
+
+Auth:
+
+```groovy
+compile "com.google.firebase:firebase-auth:$FOO"
+compile "com.google.android.gms:play-services-auth:$FOO"
+
+compile "com.android.support:design:$BAR"
+compile "com.android.support:customtabs:$BAR"
+compile "com.android.support:cardview-v7:$BAR"
+```
+
+Database:
+
+```groovy
+compile "com.google.firebase:firebase-database:$FOO"
+
+compile "com.android.support:recyclerview-v7:$BAR"
+compile "com.android.support:support-v4:$BAR"
+```
+
+Storage:
+
+```groovy
+compile "com.google.firebase:firebase-storage:$FOO"
+
+compile "com.android.support:appcompat-v7:$BAR"
+compile "com.android.support:palette-v7:$BAR"
+```
 
 ## Sample App
 

app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java

@@ -52,6 +52,8 @@ public class AuthUiActivity extends AppCompatActivity {
     private static final String UNCHANGED_CONFIG_VALUE = "CHANGE-ME";
     private static final String GOOGLE_TOS_URL = "https://www.google.com/policies/terms/";
     private static final String FIREBASE_TOS_URL = "https://firebase.google.com/terms/";
+    private static final String GOOGLE_PRIVACY_POLICY_URL = "https://www.google.com/policies/privacy/";
+    private static final String FIREBASE_PRIVACY_POLICY_URL = "https://firebase.google.com/terms/analytics/#7_privacy";
     private static final int RC_SIGN_IN = 100;
 
     @BindView(R.id.default_theme)
@@ -87,6 +89,12 @@ public class AuthUiActivity extends AppCompatActivity {
     @BindView(R.id.firebase_tos)
     RadioButton mUseFirebaseTos;
 
+    @BindView(R.id.google_privacy)
+    RadioButton mUseGooglePrivacyPolicy;
+
+    @BindView(R.id.firebase_privacy)
+    RadioButton mUseFirebasePrivacyPolicy;
+
     @BindView(R.id.sign_in)
     Button mSignIn;
 
@@ -126,8 +134,8 @@ public class AuthUiActivity extends AppCompatActivity {
     @BindView(R.id.google_scope_drive_file)
     CheckBox mGoogleScopeDriveFile;
 
-    @BindView(R.id.google_scope_games)
-    CheckBox mGoogleScopeGames;
+    @BindView(R.id.google_scope_youtube_data)
+    CheckBox mGoogleScopeYoutubeData;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -191,6 +199,7 @@ public void signIn(View view) {
                         .setLogo(getSelectedLogo())
                         .setAvailableProviders(getSelectedProviders())
                         .setTosUrl(getSelectedTosUrl())
+                        .setPrivacyPolicyUrl(getSelectedPrivacyPolicyUrl())
                         .setIsSmartLockEnabled(mEnableCredentialSelector.isChecked(),
                                                mEnableHintSelector.isChecked())
                         .setAllowNewEmailAccounts(mAllowNewEmailAccounts.isChecked())
@@ -258,7 +267,7 @@ private void startSignedInActivity(IdpResponse response) {
     private void setGoogleScopesEnabled(boolean enabled) {
         mGoogleScopesLabel.setEnabled(enabled);
         mGoogleScopeDriveFile.setEnabled(enabled);
-        mGoogleScopeGames.setEnabled(enabled);
+        mGoogleScopeYoutubeData.setEnabled(enabled);
     }
 
     @MainThread
@@ -340,6 +349,15 @@ private String getSelectedTosUrl() {
         return FIREBASE_TOS_URL;
     }
 
+    @MainThread
+    private String getSelectedPrivacyPolicyUrl() {
+        if (mUseGooglePrivacyPolicy.isChecked()) {
+            return GOOGLE_PRIVACY_POLICY_URL;
+        }
+
+        return FIREBASE_PRIVACY_POLICY_URL;
+    }
+
     @MainThread
     private boolean isGoogleConfigured() {
         return !UNCHANGED_CONFIG_VALUE.equals(
@@ -382,8 +400,8 @@ private List<String> getFacebookPermissions() {
     @MainThread
     private List<String> getGooglePermissions() {
         List<String> result = new ArrayList<>();
-        if (mGoogleScopeGames.isChecked()) {
-            result.add(Scopes.GAMES);
+        if (mGoogleScopeYoutubeData.isChecked()) {
+            result.add("https://www.googleapis.com/auth/youtube.readonly");
         }
         if (mGoogleScopeDriveFile.isChecked()) {
             result.add(Scopes.DRIVE_FILE);

app/src/main/res/layout/auth_ui_layout.xml

@@ -147,6 +147,34 @@
 
             </RadioGroup>
 
+            <TextView
+                style="@style/Base.TextAppearance.AppCompat.Subhead"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="8dp"
+                android:layout_marginTop="16dp"
+                android:text="@string/privacy_policy_header"/>
+
+            <RadioGroup
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <RadioButton
+                    android:id="@+id/google_privacy"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:checked="true"
+                    android:text="@string/google_privacy_label"/>
+
+                <RadioButton
+                    android:id="@+id/firebase_privacy"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/firebase_privacy_label"/>
+
+            </RadioGroup>
+
             <TextView
                 style="@style/Base.TextAppearance.AppCompat.Subhead"
                 android:layout_width="wrap_content"
@@ -214,18 +242,18 @@
                 android:text="@string/extra_google_scopes"/>
 
             <CheckBox
-                android:id="@+id/google_scope_games"
+                android:id="@+id/google_scope_drive_file"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:checked="false"
-                android:text="@string/games"/>
+                android:text="@string/drive_file_scope"/>
 
             <CheckBox
-                android:id="@+id/google_scope_drive_file"
+                android:id="@+id/google_scope_youtube_data"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:checked="false"
-                android:text="@string/drive_file"/>
+                android:text="@string/youtube_data_scope"/>
 
             <TextView
                 style="@style/Base.TextAppearance.AppCompat.Subhead"

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

@@ -32,7 +32,10 @@
     <string name="google_label_missing_config">Google - configuration missing</string>
     <string name="google_tos_label">Google TOS</string>
     <string name="firebase_tos_label">Firebase TOS</string>
+    <string name="google_privacy_label">Google Privacy Policy</string>
+    <string name="firebase_privacy_label">Firebase Privacy Policy</string>
     <string name="tos_header">Terms of Service URL:</string>
+    <string name="privacy_policy_header">Privacy Policy URL:</string>
     <string name="unknown_response">Unexpected onActivityResult response code</string>
     <string name="unknown_sign_in_response">Unknown response from AuthUI sign-in</string>
     <string name="sign_in_cancelled">Sign in cancelled</string>
@@ -50,7 +53,8 @@
     <string name="rational_image_perm">This sample will read an image from local storage to upload to Cloud Storage.</string>
     <string name="anonymous_auth_failed_msg">Anonymous authentication failed, various components of the demo will not work. Make sure your device is online and that Anonymous Auth is configured in your Firebase project(https://console.firebase.google.com/project/_/authentication/providers)</string>
     <string name="extra_google_scopes">Example extra Google scopes</string>
-    <string name="games">Games</string>
+    <string name="drive_file_scope">Drive File</string>
+    <string name="youtube_data_scope">Youtube data</string>
     <string name="extra_facebook_scopes">Example extra Facebook scopes</string>
     <string name="friends">Friends</string>
     <string name="photos">Photos</string>
@@ -62,7 +66,6 @@
     <string name="upload">Upload</string>
     <string name="choose_image">Choose Image</string>
     <string name="accessibility_downloaded_image">Downloaded image</string>
-    <string name="drive_file">Drive File</string>
     <string name="allow_new_email_acccount">Allow account creation if email does not exist.</string>
     <string name="reauthenticate">Reauth</string>
     <string name="reauthentication_reason">Reauth was requested from the test app. Please login to continue.</string>

auth/build.gradle

@@ -44,7 +44,7 @@ dependencies {
     compile "com.google.firebase:firebase-auth:$firebaseVersion"
     compile "com.google.android.gms:play-services-auth:$firebaseVersion"
 
-    compile 'com.facebook.android:facebook-android-sdk:4.22.1'
+    compile 'com.facebook.android:facebook-android-sdk:4.23.0'
     compile("com.twitter.sdk.android:twitter:2.3.2@aar") { transitive = true }
 
     // The following libraries are needed to prevent incompatibilities with the facebook

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

@@ -456,6 +456,7 @@ private abstract class AuthIntentBuilder<T extends AuthIntentBuilder> {
         int mTheme = getDefaultTheme();
         List<IdpConfig> mProviders = new ArrayList<>();
         String mTosUrl;
+        String mPrivacyPolicyUrl;
         boolean mEnableCredentials = true;
         boolean mEnableHints = true;
 
@@ -491,6 +492,14 @@ public T setTosUrl(@Nullable String tosUrl) {
             return (T) this;
         }
 
+        /**
+         * Specifies the privacy policy URL for the application.
+         */
+        public T setPrivacyPolicyUrl(@Nullable String privacyPolicyUrl) {
+            mPrivacyPolicyUrl = privacyPolicyUrl;
+            return (T) this;
+        }
+
         /**
          * Specified the set of supported authentication providers. At least one provider must
          * be specified. There may only be one instance of each provider.
@@ -659,6 +668,7 @@ protected FlowParameters getFlowParams() {
                     mTheme,
                     mLogo,
                     mTosUrl,
+                    mPrivacyPolicyUrl,
                     mEnableCredentials,
                     mEnableHints,
                     false,
@@ -695,6 +705,7 @@ protected FlowParameters getFlowParams() {
                     mTheme,
                     mLogo,
                     mTosUrl,
+                    mPrivacyPolicyUrl,
                     mEnableCredentials,
                     mEnableHints,
                     mAllowNewEmailAccounts,

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

@@ -48,6 +48,9 @@ public class FlowParameters implements Parcelable {
     @Nullable
     public final String termsOfServiceUrl;
 
+    @Nullable
+    public final String privacyPolicyUrl;
+
     public final boolean allowNewEmailAccounts;
 
     @Nullable
@@ -63,6 +66,7 @@ public FlowParameters(
             @StyleRes int themeId,
             @DrawableRes int logoId,
             @Nullable String termsOfServiceUrl,
+            @Nullable String privacyPolicyUrl,
             boolean enableCredentials,
             boolean enableHints,
             boolean allowNewEmailAccounts,
@@ -74,6 +78,7 @@ public FlowParameters(
         this.themeId = themeId;
         this.logoId = logoId;
         this.termsOfServiceUrl = termsOfServiceUrl;
+        this.privacyPolicyUrl = privacyPolicyUrl;
         this.enableCredentials = enableCredentials;
         this.enableHints = enableHints;
         this.allowNewEmailAccounts = allowNewEmailAccounts;
@@ -88,6 +93,7 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeInt(themeId);
         dest.writeInt(logoId);
         dest.writeString(termsOfServiceUrl);
+        dest.writeString(privacyPolicyUrl);
         dest.writeInt(enableCredentials ? 1 : 0);
         dest.writeInt(enableHints ? 1 : 0);
         dest.writeInt(allowNewEmailAccounts ? 1 : 0);
@@ -108,6 +114,7 @@ public FlowParameters createFromParcel(Parcel in) {
             int themeId = in.readInt();
             int logoId = in.readInt();
             String termsOfServiceUrl = in.readString();
+            String privacyPolicyUrl = in.readString();
             boolean enableCredentials = in.readInt() != 0;
             boolean enableHints = in.readInt() != 0;
             boolean allowNewEmailAccounts = in.readInt() != 0;
@@ -120,6 +127,7 @@ public FlowParameters createFromParcel(Parcel in) {
                     themeId,
                     logoId,
                     termsOfServiceUrl,
+                    privacyPolicyUrl,
                     enableCredentials,
                     enableHints,
                     allowNewEmailAccounts,