Clean up ApkUpdater (#4482)

Author: lfkellogg

firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/ApkUpdater.java

@@ -26,7 +26,6 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 import com.google.android.gms.tasks.Task;
-import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.appdistribution.FirebaseAppDistribution;
 import com.google.firebase.appdistribution.FirebaseAppDistributionException;
@@ -47,7 +46,6 @@ class ApkUpdater {
   private static final String REQUEST_METHOD_GET = "GET";
   private static final String DEFAULT_APK_FILE_NAME = "downloaded_release.apk";
 
-  private TaskCompletionSource<File> downloadTaskCompletionSource;
   private final Executor blockingExecutor; // Executor to run task listeners on a background thread
   private final Context context;
   private final ApkInstaller apkInstaller;
@@ -142,25 +140,11 @@ private void installApk(File file, boolean showDownloadNotificationManager) {
   @NonNull
   Task<File> downloadApk(
       @NonNull AppDistributionReleaseInternal newRelease, boolean showNotification) {
-    if (downloadTaskCompletionSource != null
-        && !downloadTaskCompletionSource.getTask().isComplete()) {
-      return downloadTaskCompletionSource.getTask();
-    }
-
-    downloadTaskCompletionSource = new TaskCompletionSource<>();
-
-    blockingExecutor.execute(
-        () -> {
-          try {
-            makeApkDownloadRequest(newRelease, showNotification);
-          } catch (FirebaseAppDistributionException e) {
-            safeSetTaskException(downloadTaskCompletionSource, e);
-          }
-        });
-    return downloadTaskCompletionSource.getTask();
+    return TaskUtils.runAsyncInTask(
+        blockingExecutor, () -> makeApkDownloadRequest(newRelease, showNotification));
   }
 
-  private void makeApkDownloadRequest(
+  private File makeApkDownloadRequest(
       @NonNull AppDistributionReleaseInternal newRelease, boolean showNotification)
       throws FirebaseAppDistributionException {
     String downloadUrl = newRelease.getDownloadUrl();
@@ -197,7 +181,7 @@ private void makeApkDownloadRequest(
         UpdateStatus.DOWNLOADED,
         showNotification,
         R.string.download_completed);
-    safeSetTaskResult(downloadTaskCompletionSource, apkFile);
+    return apkFile;
   }
 
   private static boolean isResponseSuccess(int responseCode) {

firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/ApkUpdaterTest.java

@@ -27,7 +27,6 @@
 
 import android.app.Activity;
 import androidx.test.core.app.ApplicationProvider;
-import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
@@ -264,13 +263,6 @@ public void updateApk_showNotificationFalse_doesNotUpdateNotificationManager() {
     verifyNoInteractions(mockNotificationsManager);
   }
 
-  @Test
-  public void downloadApk_whenCalledMultipleTimes_returnsSameTask() {
-    Task<File> task1 = apkUpdater.downloadApk(TEST_RELEASE, false);
-    Task<File> task2 = apkUpdater.downloadApk(TEST_RELEASE, false);
-    assertThat(task1).isEqualTo(task2);
-  }
-
   @Test
   public void updateApp_whenCalledMultipleTimesWithApk_returnsSameUpdateTask() {
     doReturn(Tasks.forResult(mockFile)).when(apkUpdater).downloadApk(TEST_RELEASE, false);