Forward exceptions

Signed-off-by: Alex Saveau <[email protected]>

Author: SUPERCILEX

auth/src/main/java/com/firebase/ui/auth/util/CredentialsApiHelper.java

@@ -85,20 +85,20 @@ public void onResult(@NonNull Status status) {
                 });
     }
 
-    private abstract static class ExceptionForwardingContinuation<InT, OutT>
-            implements Continuation<InT, Task<OutT>> {
+    private abstract static class ExceptionForwardingContinuation<TIn, TOut>
+            implements Continuation<TIn, Task<TOut>> {
 
         @Override
-        public final Task<OutT> then(@NonNull Task<InT> task) throws Exception {
-            TaskCompletionSource<OutT> source = new TaskCompletionSource<>();
+        public final Task<TOut> then(@NonNull Task<TIn> task) throws Exception {
+            TaskCompletionSource<TOut> source = new TaskCompletionSource<>();
             // calling task.getResult() will implicitly re-throw the exception of the original
             // task, which will be returned as the result for the output task. Similarly,
             // if process() throws an exception, this will be turned into the task result.
             process(task.getResult(), source);
             return source.getTask();
         }
 
-        protected abstract void process(InT in, TaskCompletionSource<OutT> result);
+        protected abstract void process(TIn in, TaskCompletionSource<TOut> result);
     }
 
     private static final class TaskResultCaptor<R extends Result> implements ResultCallback<R> {

auth/src/main/java/com/firebase/ui/auth/util/GoogleApiHelper.java

@@ -9,6 +9,8 @@
 import com.google.android.gms.common.api.GoogleApiClient;
 import com.google.android.gms.common.api.Result;
 import com.google.android.gms.common.api.ResultCallback;
+import com.google.android.gms.tasks.OnFailureListener;
+import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
 
@@ -65,4 +67,17 @@ public void onResult(@NonNull R result) {
             mSource.setResult(result);
         }
     }
+
+    protected static abstract class ExceptionForwarder<TResult> implements OnSuccessListener<TResult>, OnFailureListener {
+        private TaskCompletionSource mSource;
+
+        public ExceptionForwarder(TaskCompletionSource source) {
+            mSource = source;
+        }
+
+        @Override
+        public void onFailure(@NonNull Exception e) {
+            mSource.setException(e);
+        }
+    }
 }

auth/src/main/java/com/firebase/ui/auth/util/GoogleSignInHelper.java

@@ -8,7 +8,6 @@
 import com.google.android.gms.auth.api.signin.GoogleSignInOptions;
 import com.google.android.gms.common.api.GoogleApiClient;
 import com.google.android.gms.common.api.Status;
-import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
 
@@ -26,7 +25,7 @@ public static GoogleSignInHelper getInstance(FragmentActivity activity) {
 
     public Task<Status> signOut() {
         final TaskCompletionSource<Status> statusTask = new TaskCompletionSource<>();
-        getConnectedApiTask().addOnSuccessListener(new OnSuccessListener<Bundle>() {
+        getConnectedApiTask().addOnSuccessListener(new ExceptionForwarder<Bundle>(statusTask) {
             @Override
             public void onSuccess(Bundle bundle) {
                 Auth.GoogleSignInApi.signOut(mClient)
@@ -39,7 +38,7 @@ public void onSuccess(Bundle bundle) {
     @Override
     public Task<Status> disableAutoSignIn() {
         final TaskCompletionSource<Status> statusTask = new TaskCompletionSource<>();
-        getConnectedApiTask().addOnSuccessListener(new OnSuccessListener<Bundle>() {
+        getConnectedApiTask().addOnSuccessListener(new ExceptionForwarder<Bundle>(statusTask) {
             @Override
             public void onSuccess(Bundle bundle) {
                 Auth.CredentialsApi.disableAutoSignIn(mClient)
@@ -52,7 +51,7 @@ public void onSuccess(Bundle bundle) {
     @Override
     public Task<Status> delete(final Credential credential) {
         final TaskCompletionSource<Status> statusTask = new TaskCompletionSource<>();
-        getConnectedApiTask().addOnSuccessListener(new OnSuccessListener<Bundle>() {
+        getConnectedApiTask().addOnSuccessListener(new ExceptionForwarder<Bundle>(statusTask) {
             @Override
             public void onSuccess(Bundle bundle) {
                 Auth.CredentialsApi.delete(mClient, credential)