Merge remote-tracking branch 'upstream/master' into email-refactor

Author: SUPERCILEX

README.md

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

app/build.gradle

@@ -58,7 +58,7 @@ dependencies {
     // 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 "android.arch.lifecycle:runtime:$architectureVersion"
-    implementation 'pub.devrel:easypermissions:1.1.3'
+    implementation 'pub.devrel:easypermissions:1.2.0'
     implementation 'com.jakewharton:butterknife:8.8.1'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.4'

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

@@ -40,10 +40,12 @@
 import com.google.firebase.auth.EmailAuthProvider;
 import com.google.firebase.auth.FacebookAuthProvider;
 import com.google.firebase.auth.FirebaseAuth;
+import com.google.firebase.auth.FirebaseAuthProvider;
 import com.google.firebase.auth.FirebaseUser;
 import com.google.firebase.auth.GoogleAuthProvider;
 import com.google.firebase.auth.PhoneAuthProvider;
 import com.google.firebase.auth.TwitterAuthProvider;
+import com.google.firebase.auth.UserInfo;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -152,11 +154,11 @@ private void populateProfile() {
                 TextUtils.isEmpty(user.getDisplayName()) ? "No display name" : user.getDisplayName());
 
         List<String> providers = new ArrayList<>();
-        if (user.getProviders() == null || user.getProviders().isEmpty()) {
+        if (user.getProviderData().isEmpty()) {
             providers.add("Anonymous");
         } else {
-            for (String provider : user.getProviders()) {
-                switch (provider) {
+            for (UserInfo info : user.getProviderData()) {
+                switch (info.getProviderId()) {
                     case GoogleAuthProvider.PROVIDER_ID:
                         providers.add(getString(R.string.providers_google));
                         break;
@@ -172,8 +174,12 @@ private void populateProfile() {
                     case PhoneAuthProvider.PROVIDER_ID:
                         providers.add(getString(R.string.providers_phone));
                         break;
+                    case FirebaseAuthProvider.PROVIDER_ID:
+                        // Ignore this provider, it's not very meaningful
+                        break;
                     default:
-                        throw new IllegalStateException("Unknown provider: " + provider);
+                        throw new IllegalStateException(
+                                "Unknown provider: " + info.getProviderId());
                 }
             }
         }

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

@@ -42,6 +42,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:hint="@string/hint_message"
             android:imeOptions="actionDone"
             android:inputType="text" />
 

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

@@ -97,4 +97,5 @@
         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="hint_message">Say something…</string>
 </resources>

auth/README.md

@@ -62,7 +62,7 @@ Gradle, add the dependency:
 ```groovy
 dependencies {
     // ...
-    implementation 'com.firebaseui:firebase-ui-auth:3.2.2'
+    implementation 'com.firebaseui:firebase-ui-auth:3.3.0'
 
     // Required only if Facebook login support is required
     // Find the latest Facebook SDK releases here: https://goo.gl/Ce5L94
@@ -84,7 +84,7 @@ android {
 
     defaultConfig {
        // ...
-       resConfigs "auto"
+       resConfigs "en" // And any other languages you support
     }
 }
 ```

auth/build.gradle

@@ -36,7 +36,7 @@ android {
 dependencies {
     implementation "com.android.support:design:$supportLibraryVersion"
     implementation "com.android.support:customtabs:$supportLibraryVersion"
-    implementation 'com.android.support.constraint:constraint-layout:1.1.0-beta5'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.0-beta6'
 
     implementation "android.arch.lifecycle:extensions:$architectureVersion"
     annotationProcessor "android.arch.lifecycle:compiler:$architectureVersion"

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

@@ -1,6 +1,8 @@
 package com.firebase.ui.auth;
 
 import android.support.annotation.IntDef;
+import android.support.annotation.NonNull;
+import android.support.annotation.RestrictTo;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -50,4 +52,23 @@ public final class ErrorCodes {
     private ErrorCodes() {
         throw new AssertionError("No instance for you!");
     }
+
+    @NonNull
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+    public static String toFriendlyMessage(@Code int code) {
+        switch (code) {
+            case UNKNOWN_ERROR:
+                return "Unknown error";
+            case NO_NETWORK:
+                return "No internet connection";
+            case PLAY_SERVICES_UPDATE_CANCELLED:
+                return "Play Services update cancelled";
+            case DEVELOPER_ERROR:
+                return "Developer error";
+            case PROVIDER_ERROR:
+                return "Provider error";
+            default:
+                throw new IllegalArgumentException("Unknown code: " + code);
+        }
+    }
 }

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

@@ -11,7 +11,7 @@ public class FirebaseUiException extends Exception {
 
     @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     public FirebaseUiException(@ErrorCodes.Code int code) {
-        mErrorCode = code;
+        this(code, ErrorCodes.toFriendlyMessage(code));
     }
 
     @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
@@ -20,6 +20,11 @@ public FirebaseUiException(@ErrorCodes.Code int code, @NonNull String message) {
         mErrorCode = code;
     }
 
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+    public FirebaseUiException(@ErrorCodes.Code int code, @NonNull Throwable cause) {
+        this(code, ErrorCodes.toFriendlyMessage(code), cause);
+    }
+
     @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     public FirebaseUiException(@ErrorCodes.Code int code,
                                @NonNull String message,
@@ -28,12 +33,6 @@ public FirebaseUiException(@ErrorCodes.Code int code,
         mErrorCode = code;
     }
 
-    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-    public FirebaseUiException(@ErrorCodes.Code int code, @NonNull Throwable cause) {
-        super(cause);
-        mErrorCode = code;
-    }
-
     /**
      * @return error code associated with this exception
      * @see com.firebase.ui.auth.ErrorCodes

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

@@ -103,7 +103,9 @@ public static IdpResponse from(@NonNull Exception e) {
         if (e instanceof FirebaseUiException) {
             return new IdpResponse((FirebaseUiException) e);
         } else {
-            return new IdpResponse(new FirebaseUiException(ErrorCodes.UNKNOWN_ERROR, e));
+            FirebaseUiException wrapped = new FirebaseUiException(ErrorCodes.UNKNOWN_ERROR, e);
+            wrapped.setStackTrace(e.getStackTrace());
+            return new IdpResponse(wrapped);
         }
     }
 
@@ -213,7 +215,11 @@ public void writeToParcel(Parcel dest, int flags) {
         } catch (IOException e) {
             // Somewhere down the line, the exception is holding on to an object that isn't
             // serializable so default to some exception. It's the best we can do in this case.
-            dest.writeSerializable(new FirebaseUiException(ErrorCodes.UNKNOWN_ERROR));
+            FirebaseUiException fake = new FirebaseUiException(ErrorCodes.UNKNOWN_ERROR,
+                    "Fake exception created, original: " + mException
+                            + ", original cause: " + mException.getCause());
+            fake.setStackTrace(mException.getStackTrace());
+            dest.writeSerializable(fake);
         } finally {
             if (oos != null) {
                 try {