Oh boy, this should work

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

Author: SUPERCILEX

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

@@ -9,7 +9,7 @@
 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.OnCompleteListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
@@ -68,16 +68,23 @@ public void onResult(@NonNull R result) {
         }
     }
 
-    protected abstract static class ExceptionForwarder<TResult> implements OnSuccessListener<TResult>, OnFailureListener {
+    protected static class ExceptionForwarder<TResult> implements OnCompleteListener<TResult> {
         private TaskCompletionSource mSource;
+        private OnSuccessListener<TResult> mListener;
 
-        public ExceptionForwarder(TaskCompletionSource source) {
+        public ExceptionForwarder(TaskCompletionSource source,
+                                  OnSuccessListener<TResult> listener) {
             mSource = source;
+            mListener = listener;
         }
 
         @Override
-        public void onFailure(@NonNull Exception e) {
-            mSource.setException(e);
+        public void onComplete(@NonNull Task<TResult> task) {
+            if (task.isSuccessful()) {
+                mListener.onSuccess(task.getResult());
+            } else {
+                mSource.setException(task.getException());
+            }
         }
     }
 }

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

@@ -8,6 +8,7 @@
 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;
 
@@ -25,39 +26,45 @@ public static GoogleSignInHelper getInstance(FragmentActivity activity) {
 
     public Task<Status> signOut() {
         final TaskCompletionSource<Status> statusTask = new TaskCompletionSource<>();
-        getConnectedApiTask().addOnSuccessListener(new ExceptionForwarder<Bundle>(statusTask) {
-            @Override
-            public void onSuccess(Bundle bundle) {
-                Auth.GoogleSignInApi.signOut(mClient)
-                        .setResultCallback(new TaskResultCaptor<>(statusTask));
-            }
-        });
+        getConnectedApiTask().addOnCompleteListener(new ExceptionForwarder<>(
+                statusTask,
+                new OnSuccessListener<Bundle>() {
+                    @Override
+                    public void onSuccess(Bundle status) {
+                        Auth.GoogleSignInApi.signOut(mClient)
+                                .setResultCallback(new TaskResultCaptor<>(statusTask));
+                    }
+                }));
         return statusTask.getTask();
     }
 
     @Override
     public Task<Status> disableAutoSignIn() {
         final TaskCompletionSource<Status> statusTask = new TaskCompletionSource<>();
-        getConnectedApiTask().addOnSuccessListener(new ExceptionForwarder<Bundle>(statusTask) {
-            @Override
-            public void onSuccess(Bundle bundle) {
-                Auth.CredentialsApi.disableAutoSignIn(mClient)
-                        .setResultCallback(new TaskResultCaptor<>(statusTask));
-            }
-        });
+        getConnectedApiTask().addOnCompleteListener(new ExceptionForwarder<>(
+                statusTask,
+                new OnSuccessListener<Bundle>() {
+                    @Override
+                    public void onSuccess(Bundle status) {
+                        Auth.CredentialsApi.disableAutoSignIn(mClient)
+                                .setResultCallback(new TaskResultCaptor<>(statusTask));
+                    }
+                }));
         return statusTask.getTask();
     }
 
     @Override
     public Task<Status> delete(final Credential credential) {
         final TaskCompletionSource<Status> statusTask = new TaskCompletionSource<>();
-        getConnectedApiTask().addOnSuccessListener(new ExceptionForwarder<Bundle>(statusTask) {
-            @Override
-            public void onSuccess(Bundle bundle) {
-                Auth.CredentialsApi.delete(mClient, credential)
-                        .setResultCallback(new TaskResultCaptor<>(statusTask));
-            }
-        });
+        getConnectedApiTask().addOnCompleteListener(new ExceptionForwarder<>(
+                statusTask,
+                new OnSuccessListener<Bundle>() {
+                    @Override
+                    public void onSuccess(Bundle status) {
+                        Auth.CredentialsApi.delete(mClient, credential)
+                                .setResultCallback(new TaskResultCaptor<>(statusTask));
+                    }
+                }));
         return statusTask.getTask();
     }
 }