Merge version-2.0.0-dev into master

.travis.yml

@@ -13,7 +13,7 @@ cache:
 android:
   components:
     - tools
-    - build-tools-25.0.2
+    - build-tools-25.0.3
     - android-25
     - platform-tools
     - extra-android-m2repository

README.md

@@ -10,11 +10,22 @@ 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. [Upgrading](#upgrading)
+  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 +58,15 @@ required.
 
 After the project is synchronized, we're ready to start using Firebase functionality in our app.
 
+## Upgrading
+
+If you are using an old version of FirebaseUI and upgrading, please see the appropriate
+migration guide:
+
+  * [Upgrade from 1.2.0 to 2.0](./docs/upgrade-to-2.0.md)
+
+## Dependencies
+
 ### Compatibility with Firebase / Google Play Services Libraries
 
 FirebaseUI libraries have the following transitive dependencies on the Firebase SDK:
@@ -67,29 +87,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/build.gradle

@@ -1,5 +1,4 @@
 apply plugin: 'com.android.application'
-apply plugin: 'com.neenbedankt.android-apt'
 apply from: '../library/quality/quality.gradle'
 
 android {
@@ -39,15 +38,18 @@ dependencies {
     compile "com.google.firebase:firebase-database:$firebaseVersion"
     compile "com.google.firebase:firebase-storage:$firebaseVersion"
 
+    compile('com.facebook.android:facebook-android-sdk:4.22.1')
+    compile("com.twitter.sdk.android:twitter-core:3.0.0@aar") { transitive = true }
+
     // The following dependencies are not required to use the Firebase UI library.
     // They are used to make some aspects of the demo app implementation simpler for
     // demonstrative purposes, and you may find them useful in your own apps; YMMV.
-    compile 'pub.devrel:easypermissions:0.3.0'
+    compile 'pub.devrel:easypermissions:0.4.0'
     compile 'com.jakewharton:butterknife:8.5.1'
-    apt 'com.jakewharton:butterknife-compiler:8.5.1'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
     debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'
-    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
-    testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
+    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
+    testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
 }
 
 apply plugin: 'com.google.gms.google-services'

app/src/main/AndroidManifest.xml

@@ -30,6 +30,9 @@
         <activity
             android:name=".database.ChatActivity"
             android:label="@string/name_chat"/>
+        <activity
+            android:name=".database.ChatIndexActivity"
+            android:label="@string/name_chat"/>
 
         <!-- Auth UI demo -->
         <activity

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)
@@ -69,6 +71,9 @@ public class AuthUiActivity extends AppCompatActivity {
     @BindView(R.id.email_provider)
     CheckBox mUseEmailProvider;
 
+    @BindView(R.id.phone_provider)
+    CheckBox mUsePhoneProvider;
+
     @BindView(R.id.google_provider)
     CheckBox mUseGoogleProvider;
 
@@ -84,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;
 
@@ -99,8 +110,11 @@ public class AuthUiActivity extends AppCompatActivity {
     @BindView(R.id.no_logo)
     RadioButton mNoLogo;
 
-    @BindView(R.id.smartlock_enabled)
-    CheckBox mEnableSmartLock;
+    @BindView(R.id.credential_selector_enabled)
+    CheckBox mEnableCredentialSelector;
+
+    @BindView(R.id.hint_selector_enabled)
+    CheckBox mEnableHintSelector;
 
     @BindView(R.id.allow_new_email_accounts)
     CheckBox mAllowNewEmailAccounts;
@@ -120,22 +134,22 @@ 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) {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.auth_ui_layout);
+        ButterKnife.bind(this);
 
         FirebaseAuth auth = FirebaseAuth.getInstance();
         if (auth.getCurrentUser() != null) {
-            startActivity(SignedInActivity.createIntent(this, null));
+            startSignedInActivity(null);
             finish();
+            return;
         }
 
-        setContentView(R.layout.auth_ui_layout);
-        ButterKnife.bind(this);
-
         if (!isGoogleConfigured()) {
             mUseGoogleProvider.setChecked(false);
             mUseGoogleProvider.setEnabled(false);
@@ -183,9 +197,11 @@ public void signIn(View view) {
                 AuthUI.getInstance().createSignInIntentBuilder()
                         .setTheme(getSelectedTheme())
                         .setLogo(getSelectedLogo())
-                        .setProviders(getSelectedProviders())
+                        .setAvailableProviders(getSelectedProviders())
                         .setTosUrl(getSelectedTosUrl())
-                        .setIsSmartLockEnabled(mEnableSmartLock.isChecked())
+                        .setPrivacyPolicyUrl(getSelectedPrivacyPolicyUrl())
+                        .setIsSmartLockEnabled(mEnableCredentialSelector.isChecked(),
+                                               mEnableHintSelector.isChecked())
                         .setAllowNewEmailAccounts(mAllowNewEmailAccounts.isChecked())
                         .build(),
                 RC_SIGN_IN);
@@ -208,7 +224,7 @@ private void handleSignInResponse(int resultCode, Intent data) {
 
         // Successfully signed in
         if (resultCode == ResultCodes.OK) {
-            startActivity(SignedInActivity.createIntent(this, response));
+            startSignedInActivity(response);
             finish();
             return;
         } else {
@@ -233,11 +249,25 @@ private void handleSignInResponse(int resultCode, Intent data) {
         showSnackbar(R.string.unknown_sign_in_response);
     }
 
+    private void startSignedInActivity(IdpResponse response) {
+        startActivity(
+                SignedInActivity.createIntent(
+                        this,
+                        response,
+                        new SignedInActivity.SignedInConfig(
+                                getSelectedLogo(),
+                                getSelectedTheme(),
+                                getSelectedProviders(),
+                                getSelectedTosUrl(),
+                                mEnableCredentialSelector.isChecked(),
+                                mEnableHintSelector.isChecked())));
+    }
+
     @MainThread
     private void setGoogleScopesEnabled(boolean enabled) {
         mGoogleScopesLabel.setEnabled(enabled);
         mGoogleScopeDriveFile.setEnabled(enabled);
-        mGoogleScopeGames.setEnabled(enabled);
+        mGoogleScopeYoutubeData.setEnabled(enabled);
     }
 
     @MainThread
@@ -280,12 +310,11 @@ private int getSelectedLogo() {
     private List<IdpConfig> getSelectedProviders() {
         List<IdpConfig> selectedProviders = new ArrayList<>();
 
-        if (mUseEmailProvider.isChecked()) {
-            selectedProviders.add(new IdpConfig.Builder(AuthUI.EMAIL_PROVIDER).build());
-        }
-
-        if (mUseTwitterProvider.isChecked()) {
-            selectedProviders.add(new IdpConfig.Builder(AuthUI.TWITTER_PROVIDER).build());
+        if (mUseGoogleProvider.isChecked()) {
+            selectedProviders.add(
+                    new IdpConfig.Builder(AuthUI.GOOGLE_PROVIDER)
+                            .setPermissions(getGooglePermissions())
+                            .build());
         }
 
         if (mUseFacebookProvider.isChecked()) {
@@ -295,11 +324,17 @@ private List<IdpConfig> getSelectedProviders() {
                             .build());
         }
 
-        if (mUseGoogleProvider.isChecked()) {
+        if (mUseTwitterProvider.isChecked()) {
+            selectedProviders.add(new IdpConfig.Builder(AuthUI.TWITTER_PROVIDER).build());
+        }
+
+        if (mUseEmailProvider.isChecked()) {
+            selectedProviders.add(new IdpConfig.Builder(AuthUI.EMAIL_PROVIDER).build());
+        }
+
+        if (mUsePhoneProvider.isChecked()) {
             selectedProviders.add(
-                    new IdpConfig.Builder(AuthUI.GOOGLE_PROVIDER)
-                            .setPermissions(getGooglePermissions())
-                            .build());
+                    new IdpConfig.Builder(AuthUI.PHONE_VERIFICATION_PROVIDER).build());
         }
 
         return selectedProviders;
@@ -314,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(
@@ -356,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);