Merge pull request firebase#1172 from firebase/version-3.2.2-release

Version 3.2.2
Artelis · Feb 27, 2018 · 0e5bb59 · 0e5bb59
2 parents 67d73b6 + f3db767
commit 0e5bb59
Show file tree

Hide file tree

Showing 147 changed files with 6,550 additions and 6,291 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,10 @@
 language: android
 jdk: oraclejdk8
-# See https://github.com/travis-ci/travis-ci/issues/5582
-sudo: required
+sudo: required # See https://github.com/travis-ci/travis-ci/issues/5582
+env:
+  global:
+    - secure: AeYETdNH/qdqvc3QScrZYJgV4Gupkj0LKeCpUP96I8DJBGmxZQeRWMI+mjtJzksTddnYnRQCU189UCJJJk8MH79cZQsvLAc9M8/f7nnX2s54NG2KZZV08t8xvlCS/XUmkwY6fCQsIoDAGA/+35pHp+pRU3j3gq/qxHtWWIJglt+Oew+fz5aHAO711EtnjuHwwFcc0WTPFDhOlo7goe0myAPG0I09g1yaW2odj1lQrej9bLOCvs6SJ6RRD/+4ZNLMw+r8Q662SGztOh//uCAZU67KD6FCst9AEgfECB6GPyN/UCr0rV/7HTU0rcjthr4QbNaCFPZ3hNCy13Wh7gPUM5quh481bgvx5YTtZCfKhAz0m53mkYseUlemlB7R54tOkcIezsByMhF8In2bOwVUD8JZmkhFb3bBDeao6g63defta0WIMlyYAWNxIdz//JDs40MCkOEj8s/VehvdOOnYUjwcXFsmSfqZP0Vf3Dpin51lxz1h+tSOMI5RmWEg5WICsIo/W7nvV85zgtd6/dWxunhDgKrhBpwrJsIrsOz2fDNIA9DB6BCAjYFK5rd/E4Ycww0Y8/Lxlqht39IJTSCApT17fNtFbF357z9fiKBeNXoaRIULPKXXPMMkHHPRai9RFYdCf8sCZ75aVkBJ4PsWexgBU+cTjHuw0saao68eS5s=
+    - secure: bPFo+6ADLN/iAZmhHBYIexE0zuiXQT5M4RA20/t0QSh6EZ8DCtbrLy8jT3L3YU1rge1Qxv8J258GxN3N6UelI/dg96e15dHUX1+8dZCx/txxPBe/q4YamaKwwJForXje/5bqMz2YqdT1e50ScxKVXo/YRWF26hynNGsq916ATKjwM9GRUep7A6aa7EKrCvuXwELzUZqV/gfA8KMD+s03T+9vpgsxfGv6tnp5lpHeR5dDtI4wFcTPLkoRfhbuIoUTBBRaHbNJpHm8fBhTQTpGTG5pxC7QVkIbArdgIwptv3XeTn/7iPdv0zcMXnof4C8hJ3tguitR3q4ae5wS/QZGi8wxpL7L/tLkeswLpkjflbIBj4/U+nUS2DayVisu4zSTSKR1A6ARvlWFhSEYxhjp9i8z45uytCod22PeXg939OUK2IosNpwychWGCab7fVECOqlwruFIwi7Tu25bng6IWtD7zipFtMrBK2JY9ykLjJx5InXN3T2OJsq3V/g6dNRCF3isIUhxWMkYqK+bMTRbcQRA55Tb3kvZ9x1GEOVLUhwtzYdFWDtRN6MlJkhrEvznL9hawa6AKYVf38wws65/K/scjtNpbkFlW0py1EBD1VSAJSl7nThZJPRIH64Uv3FbYztNR3a6rk54L3WBc53svpNcesPU/M2I/BzwUsjfvIM=
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
   - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
@@ -21,6 +24,7 @@ android:
     - tools
 before_script: mv library/google-services.json app/google-services.json
 script: ./gradlew clean assembleDebug check
+after_success: ./scripts/artifactory.sh
 after_failure:
   # tests
   - cat app/build/reports/tests/testDebugUnitTest/index.html

diff --git a/README.md b/README.md
@@ -47,16 +47,16 @@ libraries.
 ```groovy
 dependencies {
 // FirebaseUI for Firebase Realtime Database
-implementation 'com.firebaseui:firebase-ui-database:3.2.1'
+implementation 'com.firebaseui:firebase-ui-database:3.2.2'
 
 // FirebaseUI for Cloud Firestore
-implementation 'com.firebaseui:firebase-ui-firestore:3.2.1'
+implementation 'com.firebaseui:firebase-ui-firestore:3.2.2'
 
 // FirebaseUI for Firebase Auth
-implementation 'com.firebaseui:firebase-ui-auth:3.2.1'
+implementation 'com.firebaseui:firebase-ui-auth:3.2.2'
 
 // FirebaseUI for Cloud Storage
-implementation 'com.firebaseui:firebase-ui-storage:3.2.1'
+implementation 'com.firebaseui:firebase-ui-storage:3.2.2'
 }
 ```
 
@@ -103,7 +103,7 @@ For convenience, here are some recent examples:
 
 | FirebaseUI Version | Firebase/Play Services Version |
 |--------------------|--------------------------------|
-| 3.2.1              | 11.8.0                         |
+| 3.2.2              | 11.8.0                         |
 | 3.1.3              | 11.8.0                         |
 | 3.1.2              | 11.6.2                         |
 | 3.1.0              | 11.4.2                         |

diff --git a/app/build.gradle b/app/build.gradle
@@ -45,19 +45,20 @@ dependencies {
     implementation project(path: ':database')
     implementation project(path: ':storage')
 
-    implementation 'com.facebook.android:facebook-login:4.29.0'
+    implementation 'com.facebook.android:facebook-login:4.30.0'
     // Needed to override Facebook
     implementation "com.android.support:cardview-v7:$supportLibraryVersion"
     implementation "com.android.support:customtabs:$supportLibraryVersion"
     implementation("com.twitter.sdk.android:twitter-core:3.1.1@aar") { transitive = true }
 
-    implementation 'com.github.bumptech.glide:glide:4.4.0'
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.4.0'
+    implementation 'com.github.bumptech.glide:glide:4.6.1'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.6.1'
 
     // 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.
-    implementation 'pub.devrel:easypermissions:1.1.1'
+    implementation "android.arch.lifecycle:runtime:$architectureVersion"
+    implementation 'pub.devrel:easypermissions:1.1.3'
     implementation 'com.jakewharton:butterknife:8.8.1'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.4'

diff --git a/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java b/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java
@@ -18,12 +18,12 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.DrawableRes;
-import android.support.annotation.MainThread;
 import android.support.annotation.StringRes;
 import android.support.annotation.StyleRes;
 import android.support.design.widget.Snackbar;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.app.AppCompatDelegate;
+import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.CheckBox;
@@ -49,6 +49,8 @@
 import butterknife.OnClick;
 
 public class AuthUiActivity extends AppCompatActivity {
+    private static final String TAG = "AuthUiActivity";
+
     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/";
@@ -231,15 +233,13 @@ protected void onResume() {
         }
     }
 
-    @MainThread
     private void handleSignInResponse(int resultCode, Intent data) {
         IdpResponse response = IdpResponse.fromResultIntent(data);
 
         // Successfully signed in
         if (resultCode == RESULT_OK) {
             startSignedInActivity(response);
             finish();
-            return;
         } else {
             // Sign in failed
             if (response == null) {
@@ -248,18 +248,14 @@ private void handleSignInResponse(int resultCode, Intent data) {
                 return;
             }
 
-            if (response.getErrorCode() == ErrorCodes.NO_NETWORK) {
+            if (response.getError().getErrorCode() == ErrorCodes.NO_NETWORK) {
                 showSnackbar(R.string.no_internet_connection);
                 return;
             }
 
-            if (response.getErrorCode() == ErrorCodes.UNKNOWN_ERROR) {
-                showSnackbar(R.string.unknown_error);
-                return;
-            }
+            showSnackbar(R.string.unknown_error);
+            Log.e(TAG, "Sign-in error: ", response.getError());
         }
-
-        showSnackbar(R.string.unknown_sign_in_response);
     }
 
     private void startSignedInActivity(IdpResponse response) {
@@ -276,14 +272,12 @@ private void startSignedInActivity(IdpResponse response) {
                                 mEnableHintSelector.isChecked())));
     }
 
-    @MainThread
     private void setGoogleScopesEnabled(boolean enabled) {
         mGoogleScopesLabel.setEnabled(enabled);
         mGoogleScopeDriveFile.setEnabled(enabled);
         mGoogleScopeYoutubeData.setEnabled(enabled);
     }
 
-    @MainThread
     private void setFacebookScopesEnabled(boolean enabled) {
         mFacebookScopesLabel.setEnabled(enabled);
         mFacebookScopeFriends.setEnabled(enabled);
@@ -298,7 +292,6 @@ public void toggleDarkTheme() {
         getDelegate().setLocalNightMode(mode);
     }
 
-    @MainThread
     @StyleRes
     private int getSelectedTheme() {
         if (mUseGreenTheme.isChecked()) {
@@ -312,7 +305,6 @@ private int getSelectedTheme() {
         return AuthUI.getDefaultTheme();
     }
 
-    @MainThread
     @DrawableRes
     private int getSelectedLogo() {
         if (mFirebaseLogo.isChecked()) {
@@ -323,7 +315,6 @@ private int getSelectedLogo() {
         return AuthUI.NO_LOGO;
     }
 
-    @MainThread
     private List<IdpConfig> getSelectedProviders() {
         List<IdpConfig> selectedProviders = new ArrayList<>();
 
@@ -356,7 +347,6 @@ private List<IdpConfig> getSelectedProviders() {
         return selectedProviders;
     }
 
-    @MainThread
     private String getSelectedTosUrl() {
         if (mUseGoogleTos.isChecked()) {
             return GOOGLE_TOS_URL;
@@ -365,7 +355,6 @@ private String getSelectedTosUrl() {
         return FIREBASE_TOS_URL;
     }
 
-    @MainThread
     private String getSelectedPrivacyPolicyUrl() {
         if (mUseGooglePrivacyPolicy.isChecked()) {
             return GOOGLE_PRIVACY_POLICY_URL;
@@ -374,17 +363,14 @@ private String getSelectedPrivacyPolicyUrl() {
         return FIREBASE_PRIVACY_POLICY_URL;
     }
 
-    @MainThread
     private boolean isGoogleMisconfigured() {
         return AuthUI.UNCONFIGURED_CONFIG_VALUE.equals(getString(R.string.default_web_client_id));
     }
 
-    @MainThread
     private boolean isFacebookMisconfigured() {
         return AuthUI.UNCONFIGURED_CONFIG_VALUE.equals(getString(R.string.facebook_application_id));
     }
 
-    @MainThread
     private boolean isTwitterMisconfigured() {
         List<String> twitterConfigs = Arrays.asList(
                 getString(R.string.twitter_consumer_key),
@@ -394,12 +380,10 @@ private boolean isTwitterMisconfigured() {
         return twitterConfigs.contains(AuthUI.UNCONFIGURED_CONFIG_VALUE);
     }
 
-    @MainThread
     private void showSnackbar(@StringRes int errorMessageRes) {
         Snackbar.make(mRootView, errorMessageRes, Snackbar.LENGTH_LONG).show();
     }
 
-    @MainThread
     private List<String> getFacebookPermissions() {
         List<String> result = new ArrayList<>();
         if (mFacebookScopeFriends.isChecked()) {
@@ -411,7 +395,6 @@ private List<String> getFacebookPermissions() {
         return result;
     }
 
-    @MainThread
     private List<String> getGoogleScopes() {
         List<String> result = new ArrayList<>();
         if (mGoogleScopeYoutubeData.isChecked()) {

diff --git a/app/src/main/java/com/firebase/uidemo/auth/SignedInActivity.java b/app/src/main/java/com/firebase/uidemo/auth/SignedInActivity.java
@@ -20,13 +20,13 @@
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.MainThread;
 import android.support.annotation.NonNull;
 import android.support.annotation.StringRes;
 import android.support.design.widget.Snackbar;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -56,6 +56,8 @@
 
 public class SignedInActivity extends AppCompatActivity {
 
+    private static final String TAG = "SignedInActivity";
+
     private static final String EXTRA_IDP_RESPONSE = "extra_idp_response";
     private static final String EXTRA_SIGNED_IN_CONFIG = "extra_signed_in_config";
 
@@ -126,6 +128,7 @@ public void onComplete(@NonNull Task<Void> task) {
                             startActivity(AuthUiActivity.createIntent(SignedInActivity.this));
                             finish();
                         } else {
+                            Log.w(TAG, "signOut:failure", task.getException());
                             showSnackbar(R.string.sign_out_failed);
                         }
                     }
@@ -162,7 +165,6 @@ public void onComplete(@NonNull Task<Void> task) {
                 });
     }
 
-    @MainThread
     private void populateProfile() {
         FirebaseUser user = FirebaseAuth.getInstance().getCurrentUser();
         if (user.getPhotoUrl() != null) {
@@ -241,7 +243,6 @@ private void populateIdpToken() {
         }
     }
 
-    @MainThread
     private void showSnackbar(@StringRes int errorMessageRes) {
         Snackbar.make(mRootView, errorMessageRes, Snackbar.LENGTH_LONG).show();
     }

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -62,7 +62,6 @@
     <string name="require_name">Require first/last name with email accounts.</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>
     <string name="no_internet_connection">No internet connection</string>
     <string name="unknown_error">An unknown error occurred</string>

diff --git a/auth/README.md b/auth/README.md
@@ -62,7 +62,7 @@ Gradle, add the dependency:
 ```groovy
 dependencies {
     // ...
-    implementation 'com.firebaseui:firebase-ui-auth:3.2.1'
+    implementation 'com.firebaseui:firebase-ui-auth:3.2.2'
 
     // Required only if Facebook login support is required
     // Find the latest Facebook SDK releases here: https://goo.gl/Ce5L94

diff --git a/auth/auth-proguard.pro b/auth/auth-proguard.pro
@@ -2,13 +2,18 @@
 -dontwarn com.twitter.**
 -dontwarn com.facebook.**
 
+# Don't note a bunch of dynamically referenced classes
+-dontnote com.google.**
+-dontnote com.facebook.**
+-dontnote com.twitter.**
+-dontnote com.squareup.okhttp.**
+-dontnote okhttp3.internal.**
+
 # Recommended flags for Firebase Auth
 -keepattributes Signature
 -keepattributes *Annotation*
 
-# Don't warn about retrofit or okio classes
--dontwarn okio.**
--dontwarn retrofit2.Call
+# Retrofit config
 -dontnote retrofit2.Platform
--dontnote retrofit2.Platform$IOS$MainThreadExecutor
 -dontwarn retrofit2.Platform$Java8
+-keepattributes Exceptions
diff --git a/auth/build.gradle b/auth/build.gradle
@@ -36,25 +36,25 @@ android {
 dependencies {
     implementation "com.android.support:design:$supportLibraryVersion"
     implementation "com.android.support:customtabs:$supportLibraryVersion"
-    implementation 'com.android.support.constraint:constraint-layout:1.1.0-beta3'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.0-beta5'
 
     implementation "android.arch.lifecycle:extensions:$architectureVersion"
     annotationProcessor "android.arch.lifecycle:compiler:$architectureVersion"
 
     api "com.google.firebase:firebase-auth:$firebaseVersion"
     api "com.google.android.gms:play-services-auth:$firebaseVersion"
 
-    compileOnly 'com.facebook.android:facebook-login:4.28.0'
+    compileOnly 'com.facebook.android:facebook-login:4.30.0'
     // Needed to override Facebook
     implementation "com.android.support:cardview-v7:$supportLibraryVersion"
     implementation "com.android.support:customtabs:$supportLibraryVersion"
     compileOnly("com.twitter.sdk.android:twitter-core:3.1.1@aar") { transitive = true }
 
     testImplementation 'junit:junit:4.12'
     //noinspection GradleDynamicVersion
-    testImplementation 'org.mockito:mockito-core:2.13.+'
-    testImplementation 'org.robolectric:robolectric:3.6.1'
-    testImplementation 'com.facebook.android:facebook-login:4.29.0'
+    testImplementation 'org.mockito:mockito-core:2.15.+'
+    testImplementation 'org.robolectric:robolectric:3.7'
+    testImplementation 'com.facebook.android:facebook-login:4.30.0'
     testImplementation("com.twitter.sdk.android:twitter-core:3.1.1@aar") { transitive = true }
 
     debugImplementation project(':internal:lintchecks')

diff --git a/auth/src/main/AndroidManifest.xml b/auth/src/main/AndroidManifest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
@@ -11,6 +12,7 @@
         <meta-data
             android:name="com.google.android.gms.version"
             android:value="@integer/google_play_services_version" />
+
         <meta-data
             android:name="com.facebook.sdk.ApplicationId"
             android:value="@string/facebook_application_id" />
@@ -60,6 +62,12 @@
             android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
             tools:ignore="MissingRegistered" />
 
+        <activity
+            android:name=".ui.credentials.CredentialSaveActivity"
+            android:label=""
+            android:exported="false"
+            android:theme="@style/FirebaseUI.Transparent" />
+
         <activity
             android:name="com.facebook.CustomTabActivity"
             android:exported="true"