check various task states before returning (#1739)

adamvduke · web-flow · commit 7c83b556cd6e · 2020-07-01T09:49:17.000-04:00
It's possible that the task was not successful, was canceled or timed
out which should be checked before returning. Existing callers of this
method catch Exception so new exception types being thrown are safe.
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/Utils.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/Utils.java
@@ -27,6 +27,7 @@
 import java.util.Comparator;
 import java.util.List;
 import java.util.concurrent.Callable;
+import java.util.concurrent.CancellationException;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
@@ -171,12 +172,9 @@ public static <T> T awaitEvenIfOnMainThread(Task<T> task)
 
     task.continueWith(
         TASK_CONTINUATION_EXECUTOR_SERVICE,
-        new Continuation<T, Object>() {
-          @Override
-          public Object then(@NonNull Task<T> task) throws Exception {
-            latch.countDown();
-            return null;
-          }
+        unusedTask -> {
+          latch.countDown();
+          return null;
         });
 
     if (Looper.getMainLooper() == Looper.myLooper()) {
@@ -185,8 +183,12 @@ public Object then(@NonNull Task<T> task) throws Exception {
       latch.await();
     }
 
-    if (task.isComplete()) {
+    if (task.isSuccessful()) {
       return task.getResult();
+    } else if (task.isCanceled()) {
+      throw new CancellationException("Task is already canceled");
+    } else if (task.isComplete()) {
+      throw new IllegalStateException(task.getException());
     } else {
       throw new TimeoutException();
     }
