Merge

Author: schmidt-sebastian

firebase-app-distribution-stub/api.txt renamed to firebase-appdistribution-stub/api.txt

@@ -34,7 +34,6 @@ package com.google.firebase.appdistribution {
     enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status AUTHENTICATION_CANCELED;
     enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status AUTHENTICATION_FAILURE;
     enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status DOWNLOAD_FAILURE;
-    enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status FOREGROUND_ACTIVITY_NOT_AVAILABLE;
     enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status INSTALLATION_CANCELED;
     enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status INSTALLATION_FAILURE;
     enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status INSTALLATION_FAILURE_SIGNATURE_MISMATCH;

firebase-app-distribution-stub/firebase-app-distribution-stub.gradle renamed to firebase-appdistribution-stub/firebase-appdistribution-stub.gradle

@@ -18,7 +18,7 @@ plugins {
 }
 
 firebaseLibrary {
-    releaseWith project(':firebase-app-distribution-stub')
+    releaseWith project(':firebase-appdistribution-stub')
     testLab.enabled = true
     publishJavadoc = true
     publishSources = true
@@ -50,7 +50,7 @@ dependencies {
     implementation project(':firebase-components')
     implementation project(':firebase-common:ktx')
     implementation 'androidx.annotation:annotation:1.1.0'
-    implementation project(':firebase-app-distribution-stub')
+    implementation project(':firebase-appdistribution-stub')
 
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
     testImplementation 'junit:junit:4.12'

firebase-app-distribution-stub/gradle.properties renamed to firebase-appdistribution-stub/gradle.properties

@@ -42,10 +42,6 @@ public enum Status {
     /** Installation canceled */
     INSTALLATION_CANCELED,
 
-    /** No foreground activity available for a given intent */
-    // TODO(rachelprince): add this to API council review
-    FOREGROUND_ACTIVITY_NOT_AVAILABLE,
-
     /** Update not available for the current tester and app */
     UPDATE_NOT_AVAILABLE,
 

firebase-app-distribution-stub/ktx/api.txt renamed to firebase-appdistribution-stub/ktx/api.txt

@@ -34,7 +34,6 @@ package com.google.firebase.appdistribution {
     enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status AUTHENTICATION_CANCELED;
     enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status AUTHENTICATION_FAILURE;
     enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status DOWNLOAD_FAILURE;
-    enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status FOREGROUND_ACTIVITY_NOT_AVAILABLE;
     enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status INSTALLATION_CANCELED;
     enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status INSTALLATION_FAILURE;
     enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status INSTALLATION_FAILURE_SIGNATURE_MISMATCH;

firebase-app-distribution-stub/ktx/gradle.properties renamed to firebase-appdistribution-stub/ktx/gradle.properties

@@ -18,7 +18,7 @@ plugins {
 }
 
 firebaseLibrary {
-    releaseWith project(':firebase-app-distribution')
+    releaseWith project(':firebase-appdistribution')
     testLab.enabled = true
     publishJavadoc = true
     publishSources = true
@@ -50,7 +50,7 @@ dependencies {
     implementation project(':firebase-components')
     implementation project(':firebase-common:ktx')
     implementation 'androidx.annotation:annotation:1.1.0'
-    implementation project(path: ':firebase-app-distribution')
+    implementation project(path: ':firebase-appdistribution')
 
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
     testImplementation 'junit:junit:4.12'

firebase-app-distribution-stub/ktx/ktx.gradle renamed to firebase-appdistribution-stub/ktx/ktx.gradle

@@ -36,7 +36,7 @@
 
 /** Class that handles updateApp functionality for AABs in {@link FirebaseAppDistribution}. */
 class AabUpdater {
-  private static final String TAG = "UpdateAabClient:";
+  private static final String TAG = "AabUpdater:";
 
   private final FirebaseAppDistributionLifecycleNotifier lifecycleNotifier;
   private final HttpsUrlConnectionFactory httpsUrlConnectionFactory;

firebase-app-distribution-stub/ktx/src/androidTest/AndroidManifest.xml renamed to firebase-appdistribution-stub/ktx/src/androidTest/AndroidManifest.xml

@@ -27,18 +27,12 @@
 
 /** Class that handles installing APKs in {@link FirebaseAppDistribution}. */
 class ApkInstaller {
-  private static final String TAG = "ApkInstallClient:";
+  private static final String TAG = "ApkInstaller:";
   private final FirebaseAppDistributionLifecycleNotifier lifeCycleNotifier;
 
   @GuardedBy("installTaskLock")
   private TaskCompletionSource<Void> installTaskCompletionSource;
 
-  @GuardedBy("installTaskLock")
-  private boolean promptInstallOnActivityResume = false;
-
-  @GuardedBy("installTaskLock")
-  private String cachedInstallApkPath = "";
-
   private final Object installTaskLock = new Object();
 
   ApkInstaller(FirebaseAppDistributionLifecycleNotifier lifeCycleNotifier) {
@@ -59,8 +53,6 @@ void onActivityStarted(@Nullable Activity activity) {
         return;
       }
     }
-
-    handleAppResume(activity);
   }
 
   void onActivityDestroyed(@Nullable Activity activity) {
@@ -71,30 +63,9 @@ void onActivityDestroyed(@Nullable Activity activity) {
     }
   }
 
-  void handleAppResume(Activity activity) {
-    // This ensures that if the app was backgrounded during download, installation would continue
-    // after app resume
+  Task<Void> installApk(String path, Activity currentActivity) {
     synchronized (installTaskLock) {
-      if (promptInstallOnActivityResume
-          && cachedInstallApkPath != null
-          && !cachedInstallApkPath.isEmpty()) {
-        startInstallActivity(cachedInstallApkPath, activity);
-      }
-    }
-  }
-
-  Task<Void> installApk(String path) {
-    synchronized (installTaskLock) {
-      Activity currentActivity = lifeCycleNotifier.getCurrentActivity();
-      // This ensures that we save the state of the install if the app is backgrounded during
-      // APK download
-      if (currentActivity == null) {
-        promptInstallOnActivityResume = true;
-        cachedInstallApkPath = path;
-      } else {
-        // only start the install activity if current Activity is in the foreground
-        startInstallActivity(path, currentActivity);
-      }
+      startInstallActivity(path, currentActivity);
 
       if (this.installTaskCompletionSource == null
           || this.installTaskCompletionSource.getTask().isComplete()) {
@@ -105,10 +76,6 @@ Task<Void> installApk(String path) {
   }
 
   private void startInstallActivity(String path, Activity currentActivity) {
-    synchronized (installTaskLock) {
-      promptInstallOnActivityResume = false;
-      cachedInstallApkPath = "";
-    }
     Intent intent = new Intent(currentActivity, InstallActivity.class);
     intent.putExtra("INSTALL_PATH", path);
     currentActivity.startActivity(intent);

firebase-app-distribution-stub/ktx/src/androidTest/kotlin/com/google/firebase/appdistribution/ktx/FirebaseAppDistributionTests.kt renamed to firebase-appdistribution-stub/ktx/src/androidTest/kotlin/com/google/firebase/appdistribution/ktx/FirebaseAppDistributionTests.kt

@@ -44,17 +44,17 @@
 class ApkUpdater {
 
   private static final int UPDATE_INTERVAL_MS = 250;
-  private static final String TAG = "UpdateApkClient:";
+  private static final String TAG = "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 taskExecutor; // Executor to run task listeners on a background thread
-  private final FirebaseApp firebaseApp;
   private final Context context;
   private final ApkInstaller apkInstaller;
   private final FirebaseAppDistributionNotificationsManager appDistributionNotificationsManager;
   private final HttpsUrlConnectionFactory httpsUrlConnectionFactory;
+  private final FirebaseAppDistributionLifecycleNotifier lifeCycleNotifier;
 
   @GuardedBy("updateTaskLock")
   private UpdateTaskImpl cachedUpdateTask;
@@ -64,25 +64,27 @@ class ApkUpdater {
   public ApkUpdater(@NonNull FirebaseApp firebaseApp, @NonNull ApkInstaller apkInstaller) {
     this(
         Executors.newSingleThreadExecutor(),
-        firebaseApp,
+        firebaseApp.getApplicationContext(),
         apkInstaller,
         new FirebaseAppDistributionNotificationsManager(firebaseApp.getApplicationContext()),
-        new HttpsUrlConnectionFactory());
+        new HttpsUrlConnectionFactory(),
+        FirebaseAppDistributionLifecycleNotifier.getInstance());
   }
 
   @VisibleForTesting
   public ApkUpdater(
       @NonNull Executor taskExecutor,
-      @NonNull FirebaseApp firebaseApp,
+      @NonNull Context context,
       @NonNull ApkInstaller apkInstaller,
       @NonNull FirebaseAppDistributionNotificationsManager appDistributionNotificationsManager,
-      @NonNull HttpsUrlConnectionFactory httpsUrlConnectionFactory) {
+      @NonNull HttpsUrlConnectionFactory httpsUrlConnectionFactory,
+      @NonNull FirebaseAppDistributionLifecycleNotifier lifeCycleNotifier) {
     this.taskExecutor = taskExecutor;
-    this.firebaseApp = firebaseApp;
+    this.context = context;
     this.apkInstaller = apkInstaller;
     this.appDistributionNotificationsManager = appDistributionNotificationsManager;
     this.httpsUrlConnectionFactory = httpsUrlConnectionFactory;
-    this.context = firebaseApp.getApplicationContext();
+    this.lifeCycleNotifier = lifeCycleNotifier;
   }
 
   UpdateTaskImpl updateApk(
@@ -110,8 +112,9 @@ UpdateTaskImpl updateApk(
   }
 
   private void installApk(File file, boolean showDownloadNotificationManager) {
-    apkInstaller
-        .installApk(file.getPath())
+    lifeCycleNotifier
+        .getForegroundActivity()
+        .onSuccessTask(taskExecutor, activity -> apkInstaller.installApk(file.getPath(), activity))
         .addOnSuccessListener(
             taskExecutor,
             unused -> {

firebase-app-distribution-stub/ktx/src/main/AndroidManifest.xml renamed to firebase-appdistribution-stub/ktx/src/main/AndroidManifest.xml

@@ -37,8 +37,6 @@ static class ErrorMessages {
 
     public static final String DOWNLOAD_URL_NOT_FOUND = "Download URL not found";
 
-    public static final String APP_BACKGROUNDED = "No foreground activity available";
-
     public static final String APK_INSTALLATION_FAILED =
         "The APK failed to install or installation was cancelled";
   }

firebase-app-distribution-stub/ktx/src/main/kotlin/com/google/firebase/appdistribution/ktx/FirebaseAppDistribution.kt renamed to firebase-appdistribution-stub/ktx/src/main/kotlin/com/google/firebase/appdistribution/ktx/FirebaseAppDistribution.kt

@@ -23,7 +23,6 @@
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
-import android.os.Looper;
 import androidx.annotation.GuardedBy;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -64,7 +63,7 @@ public class FirebaseAppDistribution {
 
   private Task<AppDistributionRelease> cachedCheckForNewReleaseTask;
   private AlertDialog updateDialog;
-  private AlertDialog signInDialog;
+  private AlertDialog signInConfirmationDialog;
 
   /** Constructor for FirebaseAppDistribution */
   @VisibleForTesting
@@ -137,19 +136,11 @@ public UpdateTask updateIfNewReleaseAvailable() {
         return cachedUpdateIfNewReleaseTask;
       }
       cachedUpdateIfNewReleaseTask = new UpdateTaskImpl();
-
-      if (isOnBackgroundThread()) {
-        LogWrapper.getInstance()
-            .e("updateIfNewReleaseAvailable cannot be called from a background thread");
-        setCachedUpdateIfNewReleaseCompletionError(
-            new FirebaseAppDistributionException(
-                "updateIfNewReleaseAvailable cannot be called from a background thread",
-                Status.UNKNOWN));
-        return cachedUpdateIfNewReleaseTask;
-      }
     }
 
-    showSignInDialog()
+    lifecycleNotifier
+        .getForegroundActivity()
+        .onSuccessTask(this::showSignInConfirmationDialog)
         // TODO(rachelprince): Revisit this comment once changes to checkForNewRelease are reviewed
         // Even though checkForNewRelease() calls signInTester(), we explicitly call signInTester
         // here both for code clarifty, and because we plan to remove the signInTester() call
@@ -179,7 +170,9 @@ public UpdateTask updateIfNewReleaseAvailable() {
                 setCachedUpdateIfNewReleaseResult();
                 return Tasks.forResult(null);
               }
-              return showUpdateAlertDialog(release);
+              return lifecycleNotifier
+                  .getForegroundActivity()
+                  .onSuccessTask((activity) -> showUpdateAlertDialog(activity, release));
             })
         .onSuccessTask(
             unused ->
@@ -192,49 +185,38 @@ public UpdateTask updateIfNewReleaseAvailable() {
     }
   }
 
-  private boolean isOnBackgroundThread() {
-    return Looper.myLooper() != Looper.getMainLooper();
-  }
-
-  private Task<Void> showSignInDialog() {
+  private Task<Void> showSignInConfirmationDialog(Activity hostActivity) {
     if (isTesterSignedIn()) {
       return Tasks.forResult(null);
     }
 
     TaskCompletionSource<Void> showDialogTask = new TaskCompletionSource<>();
 
-    Activity currentActivity;
-    try {
-      currentActivity = lifecycleNotifier.getNonNullCurrentActivity();
-    } catch (FirebaseAppDistributionException e) {
-      return Tasks.forException(e);
-    }
-
-    signInDialog = new AlertDialog.Builder(currentActivity).create();
+    signInConfirmationDialog = new AlertDialog.Builder(hostActivity).create();
     Context context = firebaseApp.getApplicationContext();
-    signInDialog.setTitle(context.getString(R.string.signin_dialog_title));
-    signInDialog.setMessage(context.getString(R.string.singin_dialog_message));
+    signInConfirmationDialog.setTitle(context.getString(R.string.signin_dialog_title));
+    signInConfirmationDialog.setMessage(context.getString(R.string.singin_dialog_message));
 
-    signInDialog.setButton(
+    signInConfirmationDialog.setButton(
         AlertDialog.BUTTON_POSITIVE,
         context.getString(R.string.singin_yes_button),
         (dialogInterface, i) -> showDialogTask.setResult(null));
 
-    signInDialog.setButton(
+    signInConfirmationDialog.setButton(
         AlertDialog.BUTTON_NEGATIVE,
         context.getString(R.string.singin_no_button),
         (dialogInterface, i) ->
             showDialogTask.setException(
                 new FirebaseAppDistributionException(
                     ErrorMessages.AUTHENTICATION_CANCELED, AUTHENTICATION_CANCELED)));
 
-    signInDialog.setOnCancelListener(
+    signInConfirmationDialog.setOnCancelListener(
         dialogInterface ->
             showDialogTask.setException(
                 new FirebaseAppDistributionException(
                     ErrorMessages.AUTHENTICATION_CANCELED, AUTHENTICATION_CANCELED)));
 
-    signInDialog.show();
+    signInConfirmationDialog.show();
     return showDialogTask.getTask();
   }
 
@@ -344,7 +326,7 @@ void onActivityDestroyed(@NonNull Activity activity) {
       // SignInResult is internal to the SDK and is destroyed after creation
       return;
     }
-    if (signInDialog != null && signInDialog.isShowing()) {
+    if (signInConfirmationDialog != null && signInConfirmationDialog.isShowing()) {
       setCachedUpdateIfNewReleaseCompletionError(
           new FirebaseAppDistributionException(
               ErrorMessages.AUTHENTICATION_CANCELED, AUTHENTICATION_CANCELED));
@@ -371,19 +353,13 @@ AppDistributionReleaseInternal getCachedNewRelease() {
     }
   }
 
-  private Task<Void> showUpdateAlertDialog(AppDistributionRelease newRelease) {
+  private Task<Void> showUpdateAlertDialog(
+      Activity hostActivity, AppDistributionRelease newRelease) {
     TaskCompletionSource<Void> showUpdateDialogTask = new TaskCompletionSource<>();
 
-    Activity currentActivity;
-    try {
-      currentActivity = lifecycleNotifier.getNonNullCurrentActivity();
-    } catch (FirebaseAppDistributionException e) {
-      return Tasks.forException(e);
-    }
-
     Context context = firebaseApp.getApplicationContext();
 
-    updateDialog = new AlertDialog.Builder(currentActivity).create();
+    updateDialog = new AlertDialog.Builder(hostActivity).create();
     updateDialog.setTitle(context.getString(R.string.update_dialog_title));
 
     StringBuilder message =
@@ -444,8 +420,8 @@ private void setCachedUpdateIfNewReleaseResult() {
   }
 
   private void dismissDialogs() {
-    if (signInDialog != null && signInDialog.isShowing()) {
-      signInDialog.dismiss();
+    if (signInConfirmationDialog != null && signInConfirmationDialog.isShowing()) {
+      signInConfirmationDialog.dismiss();
     }
     if (updateDialog != null && updateDialog.isShowing()) {
       updateDialog.dismiss();

firebase-app-distribution-stub/src/main/AndroidManifest.xml renamed to firebase-appdistribution-stub/src/main/AndroidManifest.xml

@@ -42,10 +42,6 @@ public enum Status {
     /** Installation canceled */
     INSTALLATION_CANCELED,
 
-    /** No foreground activity available for a given intent */
-    // TODO(rachelprince): add this to API council review
-    FOREGROUND_ACTIVITY_NOT_AVAILABLE,
-
     /** Update not available for the current tester and app */
     UPDATE_NOT_AVAILABLE,