Merge pull request #1219 from SUPERCILEX/error-messages

Improve exception error messages

Author: samtstern

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 {