Merge branch 'master' into fad-remove-unsued-enums

Author: manny-jimenez

README.md

@@ -22,6 +22,8 @@ dependencies:
   * `firebase-inappmessaging-ktx`
   * `firebase-inappmessaging-display`
   * `firebase-inappmessaging-display-ktx`
+  * `firebase-messaging`
+  * `firebase-messaging-directboot`
   * `firebase-perf`
   * `firebase-perf-ktx`
   * `firebase-remote-config`

build.gradle

@@ -18,14 +18,14 @@ buildscript {
     ext.kotlinVersion = '1.3.72'
     repositories {
         google()
-        jcenter()
         mavenCentral()
         maven {
             url "https://plugins.gradle.org/m2/"
         }
         maven {
             url 'https://storage.googleapis.com/android-ci/mvn/'
         }
+        jcenter()
     }
 
     dependencies {
@@ -70,11 +70,11 @@ if(JavaVersion.current() != JavaVersion.VERSION_11){
 configure(subprojects) {
     repositories {
         google()
-        jcenter()
         mavenLocal()
         maven {
             url 'https://storage.googleapis.com/android-ci/mvn/'
         }
+        jcenter()
     }
 
     apply plugin: "org.jlleitschuh.gradle.ktlint"

ci/fireci/fireciplugins/fireperf.py

@@ -42,7 +42,7 @@ def fireperf_e2e_test(target_environment, plugin_repo_dir):
 
   _logger.info('Building fireperf plugin ...')
   with chdir(plugin_repo_dir):
-    build_plugin_task = ':firebase-performance:performance-gradle:publishToMavenLocal'
+    build_plugin_task = ':firebase-performance:perf-plugin:publishToMavenLocal'
     gradle.run(build_plugin_task, gradle.P('publishMode', 'SNAPSHOT'))
 
   version = _find_fireperf_plugin_version()

ci/fireci/fireciplugins/macrobenchmark.py

@@ -184,7 +184,7 @@ async def _execute_benchmark_tests(self):
     args += ['--type', 'instrumentation']
     args += ['--app', app_apk_path]
     args += ['--test', test_apk_path]
-    args += ['--device', 'model=flame,version=30,locale=en,orientation=portrait']
+    args += ['--device', 'model=redfin,version=30,locale=en,orientation=portrait']
     args += ['--directories-to-pull', '/sdcard/Download']
     args += ['--results-bucket', f'gs://{self.test_results_bucket}']
     args += ['--results-dir', self.test_results_dir]

firebase-appdistribution-stub/firebase-appdistribution-stub.gradle

@@ -39,8 +39,6 @@ android {
 
 dependencies {
     implementation 'org.jetbrains:annotations:15.0'
-    implementation project(':firebase-components')
-    implementation project(':firebase-common')
     implementation 'com.google.android.gms:play-services-tasks:17.0.0'
 
     testImplementation 'junit:junit:4.13.2'

firebase-appdistribution/api.txt

@@ -34,6 +34,7 @@ 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 HOST_ACTIVITY_INTERRUPTED;
     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 NETWORK_FAILURE;

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

@@ -72,7 +72,7 @@ class FirebaseAppDistributionTests : BaseTestCase() {
     }
 }
 
-internal const val LIBRARY_NAME: String = "fire-app-distribution-ktx"
+internal const val LIBRARY_NAME: String = "fire-appdistribution-ktx"
 
 @RunWith(AndroidJUnit4ClassRunner::class)
 class LibraryVersionTest : BaseTestCase() {

firebase-appdistribution/ktx/src/main/kotlin/com/google/firebase/appdistribution/ktx/FirebaseAppDistribution.kt

@@ -27,7 +27,7 @@ import com.google.firebase.platforminfo.LibraryVersionComponent
 val Firebase.appDistribution: FirebaseAppDistribution
     get() = FirebaseAppDistribution.getInstance()
 
-internal const val LIBRARY_NAME: String = "fire-app-distribution-ktx"
+internal const val LIBRARY_NAME: String = "fire-appdistribution-ktx"
 
 /** @suppress */
 @Keep

firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/AabUpdater.java

@@ -16,10 +16,10 @@
 
 import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.DOWNLOAD_FAILURE;
 import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.NETWORK_FAILURE;
+import static com.google.firebase.appdistribution.TaskUtils.runAsyncInTask;
 import static com.google.firebase.appdistribution.TaskUtils.safeSetTaskException;
 
 import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import androidx.annotation.GuardedBy;
@@ -36,35 +36,34 @@
 
 /** 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;
   private final Executor executor;
 
+  private final Object updateAabLock = new Object();
+
   @GuardedBy("updateAabLock")
   private UpdateTaskImpl cachedUpdateTask;
 
   @GuardedBy("updateAabLock")
   private AppDistributionReleaseInternal aabReleaseInProgress;
 
-  private final Object updateAabLock = new Object();
-  private final Context context;
+  @GuardedBy("updateAabLock")
+  private boolean hasBeenSentToPlayForCurrentTask = false;
 
-  AabUpdater(@NonNull Context context) {
+  AabUpdater() {
     this(
-        context,
         FirebaseAppDistributionLifecycleNotifier.getInstance(),
         new HttpsUrlConnectionFactory(),
         Executors.newSingleThreadExecutor());
   }
 
   AabUpdater(
-      @NonNull Context context,
       @NonNull FirebaseAppDistributionLifecycleNotifier lifecycleNotifier,
       @NonNull HttpsUrlConnectionFactory httpsUrlConnectionFactory,
       @NonNull Executor executor) {
-    this.context = context;
     this.lifecycleNotifier = lifecycleNotifier;
     this.httpsUrlConnectionFactory = httpsUrlConnectionFactory;
     lifecycleNotifier.addOnActivityStartedListener(this::onActivityStarted);
@@ -76,9 +75,13 @@ void onActivityStarted(Activity activity) {
     if (activity instanceof SignInResultActivity || activity instanceof InstallActivity) {
       return;
     }
-    // If app resumes and aab update task is in progress, assume that installation didn't happen so
-    // cancel the task
-    this.tryCancelAabUpdateTask();
+    // If app resumes and update is in progress, assume that installation didn't happen and cancel
+    // the task
+    synchronized (updateAabLock) {
+      if (awaitingUpdateFromPlay()) {
+        this.tryCancelAabUpdateTask();
+      }
+    }
   }
 
   UpdateTaskImpl updateAab(@NonNull AppDistributionReleaseInternal newRelease) {
@@ -89,7 +92,15 @@ UpdateTaskImpl updateAab(@NonNull AppDistributionReleaseInternal newRelease) {
 
       cachedUpdateTask = new UpdateTaskImpl();
       aabReleaseInProgress = newRelease;
-      redirectToPlayForAabUpdate(newRelease.getDownloadUrl());
+      hasBeenSentToPlayForCurrentTask = false;
+
+      // On a background thread, fetch the redirect URL and open it in the Play app
+      runAsyncInTask(executor, () -> fetchDownloadRedirectUrl(newRelease.getDownloadUrl()))
+          .onSuccessTask(
+              redirectUrl ->
+                  lifecycleNotifier.applyToForegroundActivity(
+                      activity -> openRedirectUrlInPlay(redirectUrl, activity)))
+          .addOnFailureListener(this::setUpdateTaskCompletionError);
 
       return cachedUpdateTask;
     }
@@ -138,38 +149,30 @@ private static boolean isRedirectResponse(int responseCode) {
     return responseCode >= 300 && responseCode < 400;
   }
 
-  private void redirectToPlayForAabUpdate(String downloadUrl) {
-    // The 302 redirect is obtained here to open the play store directly and avoid opening chrome
-    executor.execute( // Execute the network calls on a background thread
-        () -> {
-          String redirectUrl;
-          try {
-            redirectUrl = fetchDownloadRedirectUrl(downloadUrl);
-          } catch (FirebaseAppDistributionException e) {
-            setUpdateTaskCompletionError(e);
-            return;
-          }
-
-          Intent updateIntent = new Intent(Intent.ACTION_VIEW);
-          updateIntent.setData(Uri.parse(redirectUrl));
-          updateIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-          LogWrapper.getInstance().v(TAG + "Redirecting to play");
-
-          synchronized (updateAabLock) {
-            context.startActivity(updateIntent);
-            cachedUpdateTask.updateProgress(
-                UpdateProgress.builder()
-                    .setApkBytesDownloaded(-1)
-                    .setApkFileTotalBytes(-1)
-                    .setUpdateStatus(UpdateStatus.REDIRECTED_TO_PLAY)
-                    .build());
-          }
-        });
+  private void openRedirectUrlInPlay(String redirectUrl, Activity hostActivity) {
+    Intent updateIntent = new Intent(Intent.ACTION_VIEW);
+    updateIntent.setData(Uri.parse(redirectUrl));
+    updateIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+    LogWrapper.getInstance().v(TAG + "Redirecting to play");
+
+    // Launch the intent before the synchronized block to avoid failing to update in the rare
+    // scenario where the activity moves to the background while we're awaiting the lock.
+    hostActivity.startActivity(updateIntent);
+
+    synchronized (updateAabLock) {
+      cachedUpdateTask.updateProgress(
+          UpdateProgress.builder()
+              .setApkBytesDownloaded(-1)
+              .setApkFileTotalBytes(-1)
+              .setUpdateStatus(UpdateStatus.REDIRECTED_TO_PLAY)
+              .build());
+      hasBeenSentToPlayForCurrentTask = true;
+    }
   }
 
-  private void setUpdateTaskCompletionError(FirebaseAppDistributionException e) {
+  private void setUpdateTaskCompletionError(Exception e) {
     synchronized (updateAabLock) {
-      safeSetTaskException(cachedUpdateTask, e);
+      safeSetTaskException(cachedUpdateTask, FirebaseAppDistributionException.wrap(e));
     }
   }
 
@@ -183,4 +186,12 @@ void tryCancelAabUpdateTask() {
               ReleaseUtils.convertToAppDistributionRelease(aabReleaseInProgress)));
     }
   }
+
+  private boolean awaitingUpdateFromPlay() {
+    synchronized (updateAabLock) {
+      return cachedUpdateTask != null
+          && !cachedUpdateTask.isComplete()
+          && hasBeenSentToPlayForCurrentTask;
+    }
+  }
 }

firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/ApkInstaller.java

@@ -27,7 +27,7 @@
 
 /** 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")

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

@@ -44,7 +44,7 @@
 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";
 
@@ -113,8 +113,8 @@ UpdateTaskImpl updateApk(
 
   private void installApk(File file, boolean showDownloadNotificationManager) {
     lifeCycleNotifier
-        .getForegroundActivity()
-        .onSuccessTask(taskExecutor, activity -> apkInstaller.installApk(file.getPath(), activity))
+        .applyToForegroundActivityTask(
+            activity -> apkInstaller.installApk(file.getPath(), activity))
         .addOnSuccessListener(
             taskExecutor,
             unused -> {

firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/Constants.java

@@ -37,6 +37,9 @@ static class ErrorMessages {
 
     public static final String DOWNLOAD_URL_NOT_FOUND = "Download URL not found";
 
+    public static final String HOST_ACTIVITY_INTERRUPTED =
+        "Host activity interrupted while dialog was showing";
+
     public static final String APK_INSTALLATION_FAILED =
         "The APK failed to install or installation was cancelled";
   }