Merge branch 'master' into wuandy/OverlayRelease

# Conflicts:
#	firebase-firestore/CHANGELOG.md
#	firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLiteSchema.java

Author: wu-hui

.github/workflows/update-cpp-sdk-on-release.yml

@@ -71,4 +71,5 @@ jobs:
 
       - name: Trigger firebase-cpp-sdk update
         run: |
+          pip install -r scripts/gha/requirements.txt
           python scripts/gha/trigger_workflow.py -t ${{ steps.generate-token.outputs.token }} -w update-dependencies.yml -p updateAndroid 1 -p updateiOS 0 -p comment "[Triggered]($GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID) by [firebase-android-sdk $(date '+%b %d') release]($GITHUB_SERVER_URL/$GITHUB_REPOSITORY/commit/${{ github.sha }})." -s 10 -A

buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/tagging/GitClient.java

@@ -99,7 +99,7 @@ private void configureSshCommand() {
             + " -o IdentitiesOnly=yes"
             + " -o UserKnownHostsFile=/dev/null"
             + " -o StrictHostKeyChecking=no";
-    String command = String.format("git config core.sshCommand %s", ssh);
+    String command = String.format("git config core.sshCommand \"%s\"", ssh);
     executor.execute(command, handler);
   }
 }

firebase-app-distribution/src/main/java/com/google/firebase/app/distribution/internal/AppDistributionReleaseInternal.java renamed to firebase-app-distribution/src/main/java/com/google/firebase/app/distribution/AppDistributionReleaseInternal.java

@@ -12,12 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.app.distribution.internal;
+package com.google.firebase.app.distribution;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.auto.value.AutoValue;
-import com.google.firebase.app.distribution.BinaryType;
 
 /**
  * This class represents the AppDistributionRelease object returned by the App Distribution backend

firebase-app-distribution/src/main/java/com/google/firebase/app/distribution/CheckForNewReleaseClient.java

@@ -14,7 +14,7 @@
 
 package com.google.firebase.app.distribution;
 
-import static com.google.firebase.app.distribution.internal.ReleaseIdentificationUtils.calculateApkHash;
+import static com.google.firebase.app.distribution.ReleaseIdentificationUtils.calculateApkHash;
 
 import android.content.Context;
 import android.content.pm.PackageInfo;
@@ -25,8 +25,6 @@
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
-import com.google.firebase.app.distribution.internal.AppDistributionReleaseInternal;
-import com.google.firebase.app.distribution.internal.ReleaseIdentificationUtils;
 import com.google.firebase.installations.FirebaseInstallationsApi;
 import com.google.firebase.installations.InstallationTokenResult;
 import java.io.File;
@@ -42,8 +40,8 @@ class CheckForNewReleaseClient {
   private final FirebaseApp firebaseApp;
   private final FirebaseAppDistributionTesterApiClient firebaseAppDistributionTesterApiClient;
   private final FirebaseInstallationsApi firebaseInstallationsApi;
+  // Maintain an in-memory mapping from source file to APK hash to avoid re-calculating the hash
   private static final ConcurrentMap<String, String> cachedApkHashes = new ConcurrentHashMap<>();
-  private final ReleaseIdentifierStorage releaseIdentifierStorage;
 
   Task<AppDistributionReleaseInternal> cachedCheckForNewRelease = null;
   private final Executor checkForNewReleaseExecutor;
@@ -56,20 +54,16 @@ class CheckForNewReleaseClient {
     this.firebaseAppDistributionTesterApiClient = firebaseAppDistributionTesterApiClient;
     this.firebaseInstallationsApi = firebaseInstallationsApi;
     this.checkForNewReleaseExecutor = Executors.newSingleThreadExecutor();
-    this.releaseIdentifierStorage =
-        new ReleaseIdentifierStorage(firebaseApp.getApplicationContext());
   }
 
   CheckForNewReleaseClient(
       @NonNull FirebaseApp firebaseApp,
       @NonNull FirebaseAppDistributionTesterApiClient firebaseAppDistributionTesterApiClient,
       @NonNull FirebaseInstallationsApi firebaseInstallationsApi,
-      @NonNull ReleaseIdentifierStorage releaseIdentifierStorage,
       @NonNull Executor executor) {
     this.firebaseApp = firebaseApp;
     this.firebaseAppDistributionTesterApiClient = firebaseAppDistributionTesterApiClient;
     this.firebaseInstallationsApi = firebaseInstallationsApi;
-    this.releaseIdentifierStorage = releaseIdentifierStorage;
     this.checkForNewReleaseExecutor = executor;
   }
 
@@ -160,7 +154,8 @@ private boolean isNewerBuildVersion(AppDistributionReleaseInternal newRelease)
   }
 
   @VisibleForTesting
-  boolean isSameAsInstalledRelease(AppDistributionReleaseInternal newRelease) {
+  boolean isSameAsInstalledRelease(AppDistributionReleaseInternal newRelease)
+      throws FirebaseAppDistributionException {
     if (newRelease.getBinaryType().equals(BinaryType.APK)) {
       return hasSameHashAsInstalledRelease(newRelease);
     }
@@ -203,7 +198,8 @@ String extractApkHash(PackageInfo packageInfo) {
     return cachedApkHashes.get(key);
   }
 
-  private boolean hasSameHashAsInstalledRelease(AppDistributionReleaseInternal newRelease) {
+  private boolean hasSameHashAsInstalledRelease(AppDistributionReleaseInternal newRelease)
+      throws FirebaseAppDistributionException {
     try {
       Context context = firebaseApp.getApplicationContext();
       PackageInfo metadataPackageInfo =
@@ -213,12 +209,9 @@ private boolean hasSameHashAsInstalledRelease(AppDistributionReleaseInternal new
       String installedReleaseApkHash = extractApkHash(metadataPackageInfo);
 
       if (installedReleaseApkHash.isEmpty() || newRelease.getApkHash().isEmpty()) {
-        // We don't have enough information about the APK hashes. Fallback to the external codehash.
-        // TODO: Consider removing this when all returned releases have the efficient ApkHash
-        String externalCodeHash =
-            releaseIdentifierStorage.getExternalCodeHash(installedReleaseApkHash);
-        LogWrapper.getInstance().v(TAG + "Defaulting to external codehash " + externalCodeHash);
-        return externalCodeHash != null && externalCodeHash.equals(newRelease.getCodeHash());
+        LogWrapper.getInstance().e(TAG + "Missing APK hash.");
+        throw new FirebaseAppDistributionException(
+            Constants.ErrorMessages.UNKNOWN_ERROR, FirebaseAppDistributionException.Status.UNKNOWN);
       }
       // If the hash of the zipped APK for the retrieved newRelease is equal to the stored hash
       // of the installed release, then they are the same release.

firebase-app-distribution/src/main/java/com/google/firebase/app/distribution/FirebaseAppDistribution.java

@@ -15,6 +15,7 @@
 package com.google.firebase.app.distribution;
 
 import static com.google.firebase.app.distribution.FirebaseAppDistributionException.Status.AUTHENTICATION_FAILURE;
+import static com.google.firebase.app.distribution.FirebaseAppDistributionException.Status.UPDATE_NOT_AVAILABLE;
 import static com.google.firebase.app.distribution.TaskUtils.safeSetTaskException;
 import static com.google.firebase.app.distribution.TaskUtils.safeSetTaskResult;
 
@@ -31,8 +32,6 @@
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.app.distribution.Constants.ErrorMessages;
 import com.google.firebase.app.distribution.FirebaseAppDistributionException.Status;
-import com.google.firebase.app.distribution.internal.AppDistributionReleaseInternal;
-import com.google.firebase.app.distribution.internal.FirebaseAppDistributionLifecycleNotifier;
 import com.google.firebase.installations.FirebaseInstallationsApi;
 
 public class FirebaseAppDistribution {
@@ -41,8 +40,9 @@ public class FirebaseAppDistribution {
   private final FirebaseApp firebaseApp;
   private final TesterSignInClient testerSignInClient;
   private final CheckForNewReleaseClient checkForNewReleaseClient;
-  private final UpdateAppClient updateAppClient;
   private final FirebaseAppDistributionLifecycleNotifier lifecycleNotifier;
+  private final UpdateApkClient updateApkClient;
+  private final UpdateAabClient updateAabClient;
   private final SignInStorage signInStorage;
 
   private final Object updateIfNewReleaseTaskLock = new Object();
@@ -65,13 +65,15 @@ public class FirebaseAppDistribution {
       @NonNull FirebaseApp firebaseApp,
       @NonNull TesterSignInClient testerSignInClient,
       @NonNull CheckForNewReleaseClient checkForNewReleaseClient,
-      @NonNull UpdateAppClient updateAppClient,
+      @NonNull UpdateApkClient updateApkClient,
+      @NonNull UpdateAabClient updateAabClient,
       @NonNull SignInStorage signInStorage,
       @NonNull FirebaseAppDistributionLifecycleNotifier lifecycleNotifier) {
     this.firebaseApp = firebaseApp;
     this.testerSignInClient = testerSignInClient;
     this.checkForNewReleaseClient = checkForNewReleaseClient;
-    this.updateAppClient = updateAppClient;
+    this.updateApkClient = updateApkClient;
+    this.updateAabClient = updateAabClient;
     this.signInStorage = signInStorage;
     this.lifecycleNotifier = lifecycleNotifier;
     lifecycleNotifier.addOnActivityDestroyedListener(this::onActivityDestroyed);
@@ -88,7 +90,8 @@ public FirebaseAppDistribution(
         new TesterSignInClient(firebaseApp, firebaseInstallationsApi, signInStorage),
         new CheckForNewReleaseClient(
             firebaseApp, new FirebaseAppDistributionTesterApiClient(), firebaseInstallationsApi),
-        new UpdateAppClient(firebaseApp),
+        new UpdateApkClient(firebaseApp, new InstallApkClient()),
+        new UpdateAabClient(),
         signInStorage,
         lifecycleNotifier);
   }
@@ -240,9 +243,26 @@ private UpdateTask updateApp(boolean showDownloadInNotificationManager) {
               Constants.ErrorMessages.AUTHENTICATION_ERROR, AUTHENTICATION_FAILURE));
       return updateTask;
     }
-
     synchronized (cachedNewReleaseLock) {
-      return this.updateAppClient.updateApp(cachedNewRelease, showDownloadInNotificationManager);
+      if (cachedNewRelease == null) {
+        LogWrapper.getInstance().v("New release not found.");
+        return getErrorUpdateTask(
+            new FirebaseAppDistributionException(
+                Constants.ErrorMessages.NOT_FOUND_ERROR, UPDATE_NOT_AVAILABLE));
+      }
+      if (cachedNewRelease.getDownloadUrl() == null) {
+        LogWrapper.getInstance().v("Download failed to execute");
+        return getErrorUpdateTask(
+            new FirebaseAppDistributionException(
+                Constants.ErrorMessages.DOWNLOAD_URL_NOT_FOUND,
+                FirebaseAppDistributionException.Status.DOWNLOAD_FAILURE));
+      }
+
+      if (cachedNewRelease.getBinaryType() == BinaryType.AAB) {
+        return this.updateAabClient.updateAab(cachedNewRelease);
+      } else {
+        return this.updateApkClient.updateApk(cachedNewRelease, showDownloadInNotificationManager);
+      }
     }
   }
 
@@ -383,4 +403,10 @@ private void dismissUpdateDialog() {
       updateDialogShown = false;
     }
   }
+
+  private UpdateTask getErrorUpdateTask(Exception e) {
+    UpdateTaskImpl updateTask = new UpdateTaskImpl();
+    updateTask.setException(e);
+    return updateTask;
+  }
 }

firebase-app-distribution/src/main/java/com/google/firebase/app/distribution/internal/FirebaseAppDistributionLifecycleNotifier.java renamed to firebase-app-distribution/src/main/java/com/google/firebase/app/distribution/FirebaseAppDistributionLifecycleNotifier.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.app.distribution.internal;
+package com.google.firebase.app.distribution;
 
 import android.app.Activity;
 import android.app.Application;

firebase-app-distribution/src/main/java/com/google/firebase/app/distribution/FirebaseAppDistributionRegistrar.java

@@ -18,7 +18,6 @@
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
 import com.google.firebase.FirebaseApp;
-import com.google.firebase.app.distribution.internal.FirebaseAppDistributionLifecycleNotifier;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentContainer;
 import com.google.firebase.components.ComponentRegistrar;

firebase-app-distribution/src/main/java/com/google/firebase/app/distribution/FirebaseAppDistributionTesterApiClient.java

@@ -22,7 +22,6 @@
 import androidx.annotation.NonNull;
 import com.google.android.gms.common.util.AndroidUtilsLight;
 import com.google.android.gms.common.util.Hex;
-import com.google.firebase.app.distribution.internal.AppDistributionReleaseInternal;
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

firebase-app-distribution/src/main/java/com/google/firebase/app/distribution/InstallApkClient.java

@@ -22,7 +22,6 @@
 import androidx.annotation.Nullable;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
-import com.google.firebase.app.distribution.internal.FirebaseAppDistributionLifecycleNotifier;
 
 class InstallApkClient {
   private static final String TAG = "ApkInstallClient:";

firebase-app-distribution/src/main/java/com/google/firebase/app/distribution/internal/ReleaseIdentificationUtils.java renamed to firebase-app-distribution/src/main/java/com/google/firebase/app/distribution/ReleaseIdentificationUtils.java

@@ -12,14 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.app.distribution.internal;
+package com.google.firebase.app.distribution;
 
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import com.google.firebase.app.distribution.LogWrapper;
 import java.io.File;
 import java.io.IOException;
 import java.nio.ByteBuffer;

firebase-app-distribution/src/main/java/com/google/firebase/app/distribution/ReleaseIdentifierStorage.java

@@ -14,8 +14,6 @@
 
 package com.google.firebase.app.distribution;
 
-import com.google.firebase.app.distribution.internal.AppDistributionReleaseInternal;
-
 class ReleaseUtils {
   static AppDistributionRelease convertToAppDistributionRelease(
       AppDistributionReleaseInternal internalRelease) {

firebase-app-distribution/src/main/java/com/google/firebase/app/distribution/ReleaseUtils.java

@@ -37,7 +37,6 @@
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.app.distribution.Constants.ErrorMessages;
-import com.google.firebase.app.distribution.internal.FirebaseAppDistributionLifecycleNotifier;
 import com.google.firebase.installations.FirebaseInstallationsApi;
 import java.util.List;
 

firebase-app-distribution/src/main/java/com/google/firebase/app/distribution/TesterSignInClient.java

@@ -23,8 +23,6 @@
 import androidx.annotation.GuardedBy;
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
-import com.google.firebase.app.distribution.internal.AppDistributionReleaseInternal;
-import com.google.firebase.app.distribution.internal.FirebaseAppDistributionLifecycleNotifier;
 import java.io.IOException;
 import java.net.URL;
 import java.util.concurrent.Executor;

firebase-app-distribution/src/main/java/com/google/firebase/app/distribution/UpdateAabClient.java

@@ -17,7 +17,6 @@
 import static com.google.firebase.app.distribution.FirebaseAppDistributionException.Status.NETWORK_FAILURE;
 import static com.google.firebase.app.distribution.TaskUtils.safeSetTaskException;
 import static com.google.firebase.app.distribution.TaskUtils.safeSetTaskResult;
-import static com.google.firebase.app.distribution.internal.ReleaseIdentificationUtils.calculateApkHash;
 
 import android.content.Context;
 import androidx.annotation.GuardedBy;
@@ -26,7 +25,6 @@
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.firebase.FirebaseApp;
-import com.google.firebase.app.distribution.internal.AppDistributionReleaseInternal;
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.IOException;
@@ -52,8 +50,6 @@ class UpdateApkClient {
   @GuardedBy("updateTaskLock")
   private UpdateTaskImpl cachedUpdateTask;
 
-  private final ReleaseIdentifierStorage releaseIdentifierStorage;
-
   private final Object updateTaskLock = new Object();
 
   public UpdateApkClient(
@@ -65,8 +61,6 @@ public UpdateApkClient(
       @NonNull Executor downloadExecutor,
       @NonNull FirebaseApp firebaseApp,
       @NonNull InstallApkClient installApkClient) {
-    this.releaseIdentifierStorage =
-        new ReleaseIdentifierStorage(firebaseApp.getApplicationContext());
     this.appDistributionNotificationsManager =
         new FirebaseAppDistributionNotificationsManager(firebaseApp);
     this.downloadExecutor = downloadExecutor;
@@ -251,14 +245,6 @@ private void downloadToDisk(
               FirebaseAppDistributionException.Status.DOWNLOAD_FAILURE));
     }
 
-    File downloadedFile = new File(firebaseApp.getApplicationContext().getFilesDir(), fileName);
-
-    String internalCodeHash = calculateApkHash(downloadedFile);
-
-    if (internalCodeHash != null) {
-      releaseIdentifierStorage.setCodeHashMap(internalCodeHash, newRelease);
-    }
-
     // completion
     postUpdateProgress(
         totalSize, totalSize, UpdateStatus.DOWNLOADED, showDownloadNotificationManager);