Merge branch 'master' into wuandy/OverlayOfflineFix

# Conflicts:
#	firebase-firestore/CHANGELOG.md

Author: wu-hui

alternative-root-project.gradle

@@ -52,6 +52,8 @@ dependencies {
     implementation 'com.google.android.gms:play-services-tasks:18.0.1'
     implementation 'androidx.test:core:1.2.0'
 
+    javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
+
     testImplementation 'junit:junit:4.13-beta-2'
     testImplementation 'org.mockito:mockito-core:2.25.0'
     testImplementation "org.robolectric:robolectric:$robolectricVersion"

appcheck/firebase-appcheck-debug-testing/firebase-appcheck-debug-testing.gradle

@@ -49,6 +49,7 @@ dependencies {
     implementation 'com.google.android.gms:play-services-safetynet:18.0.0'
 
     javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
+    javadocClasspath 'org.checkerframework:checker-qual:2.5.2'
 
     testImplementation 'junit:junit:4.13-beta-2'
     testImplementation 'org.mockito:mockito-core:2.25.0'

appcheck/firebase-appcheck-safetynet/firebase-appcheck-safetynet.gradle

@@ -21,6 +21,7 @@
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentRegistrar;
 import com.google.firebase.components.Dependency;
+import com.google.firebase.heartbeatinfo.HeartBeatConsumerComponent;
 import com.google.firebase.heartbeatinfo.HeartBeatController;
 import com.google.firebase.platforminfo.LibraryVersionComponent;
 import java.util.Arrays;
@@ -48,6 +49,7 @@ public List<Component<?>> getComponents() {
                         container.getProvider(HeartBeatController.class)))
             .alwaysEager()
             .build(),
+        HeartBeatConsumerComponent.create(),
         LibraryVersionComponent.create("fire-app-check", BuildConfig.VERSION_NAME));
   }
 }

appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/FirebaseAppCheckRegistrar.java

@@ -34,7 +34,7 @@ public void testGetComponents() {
     FirebaseAppCheckRegistrar firebaseAppCheckRegistrar = new FirebaseAppCheckRegistrar();
     List<Component<?>> components = firebaseAppCheckRegistrar.getComponents();
     assertThat(components).isNotEmpty();
-    assertThat(components).hasSize(2);
+    assertThat(components).hasSize(3);
     Component<?> firebaseAppCheckComponent = components.get(0);
     assertThat(firebaseAppCheckComponent.getDependencies())
         .containsExactly(

appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/FirebaseAppCheckRegistrarTest.java

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import com.google.firebase.gradle.plugins.license.LicenseResolverPlugin
+import com.google.firebase.gradle.MultiProjectReleasePlugin
 
 buildscript {
     ext.kotlinVersion = '1.3.72'
@@ -56,6 +57,8 @@ apply plugin: com.google.firebase.gradle.plugins.publish.PublishingPlugin
 apply plugin: com.google.firebase.gradle.plugins.ci.ContinuousIntegrationPlugin
 apply plugin: com.google.firebase.gradle.plugins.ci.SmokeTestsPlugin
 
+apply plugin: MultiProjectReleasePlugin
+
 firebaseContinuousIntegration {
     ignorePaths = [
             /.*\.gitignore$/,

build.gradle

@@ -1,2 +1,2 @@
-version=21.0.1
-latestReleasedVersion=21.0.0
+version=21.0.2
+latestReleasedVersion=21.0.1

firebase-abt/gradle.properties

@@ -0,0 +1,26 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.firebase.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+/**
+ * Indicates that this object (class, method, etc) is experimental and that both its signature and
+ * implementation are subject to change. An API marked with this annotation provides no guarantee of
+ * API stability or backward-compatibility.
+ */
+@Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD, ElementType.CONSTRUCTOR})
+public @interface PreviewApi {}

firebase-annotations/src/main/java/com/google/firebase/annotations/PreviewApi.java

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=0.0.1
+version=16.0.1

firebase-appdistribution/gradle.properties

@@ -40,7 +40,7 @@
                 <category android:name="android.intent.category.DEFAULT"/>
                 <category android:name="android.intent.category.BROWSABLE"/>
 
-                <data android:scheme="appdistribution-${applicationId}" android:host="authredirect" />
+                <data android:scheme="intent" android:host="appdistribution" android:path="/${applicationId}"/>
 
             </intent-filter>
         </activity>

firebase-appdistribution/src/main/AndroidManifest.xml

@@ -128,7 +128,8 @@ private void installApk(File file, boolean showDownloadNotificationManager) {
                   file.length(),
                   file.length(),
                   UpdateStatus.INSTALL_FAILED,
-                  showDownloadNotificationManager);
+                  showDownloadNotificationManager,
+                  R.string.install_failed);
               setUpdateTaskCompletionErrorWithDefault(
                   e,
                   FirebaseAppDistributionException.ErrorMessages.APK_INSTALLATION_FAILED,
@@ -179,7 +180,8 @@ private void makeApkDownloadRequest(
     }
 
     long responseLength = connection.getContentLength();
-    postUpdateProgress(responseLength, 0, UpdateStatus.PENDING, showNotification);
+    postUpdateProgress(
+        responseLength, 0, UpdateStatus.PENDING, showNotification, R.string.downloading_app_update);
     String fileName = getApkFileName();
     LogWrapper.getInstance().v(TAG + "Attempting to download APK to disk");
 
@@ -188,7 +190,12 @@ private void makeApkDownloadRequest(
     File apkFile = context.getFileStreamPath(fileName);
     validateJarFile(apkFile, responseLength, showNotification, bytesDownloaded);
 
-    postUpdateProgress(responseLength, bytesDownloaded, UpdateStatus.DOWNLOADED, showNotification);
+    postUpdateProgress(
+        responseLength,
+        bytesDownloaded,
+        UpdateStatus.DOWNLOADED,
+        showNotification,
+        R.string.download_completed);
     safeSetTaskResult(downloadTaskCompletionSource, apkFile);
   }
 
@@ -220,12 +227,20 @@ private long downloadToDisk(
         if (currentTimeMs - lastMsUpdated > UPDATE_INTERVAL_MS) {
           lastMsUpdated = currentTimeMs;
           postUpdateProgress(
-              totalSize, bytesDownloaded, UpdateStatus.DOWNLOADING, showNotification);
+              totalSize,
+              bytesDownloaded,
+              UpdateStatus.DOWNLOADING,
+              showNotification,
+              R.string.downloading_app_update);
         }
       }
     } catch (IOException e) {
       postUpdateProgress(
-          totalSize, bytesDownloaded, UpdateStatus.DOWNLOAD_FAILED, showNotification);
+          totalSize,
+          bytesDownloaded,
+          UpdateStatus.DOWNLOAD_FAILED,
+          showNotification,
+          R.string.download_failed);
       throw new FirebaseAppDistributionException("Failed to download APK", DOWNLOAD_FAILURE, e);
     }
     return bytesDownloaded;
@@ -238,7 +253,11 @@ private void validateJarFile(
       new JarFile(apkFile).close();
     } catch (IOException e) {
       postUpdateProgress(
-          totalSize, bytesDownloaded, UpdateStatus.DOWNLOAD_FAILED, showNotification);
+          totalSize,
+          bytesDownloaded,
+          UpdateStatus.DOWNLOAD_FAILED,
+          showNotification,
+          R.string.download_failed);
       throw new FirebaseAppDistributionException(
           "Downloaded APK was not a valid JAR file", DOWNLOAD_FAILURE, e);
     }
@@ -274,7 +293,11 @@ private void setUpdateTaskCompletionErrorWithDefault(Exception e, String message
   }
 
   private void postUpdateProgress(
-      long totalBytes, long downloadedBytes, UpdateStatus status, boolean showNotification) {
+      long totalBytes,
+      long downloadedBytes,
+      UpdateStatus status,
+      boolean showNotification,
+      int stringResourceId) {
     synchronized (updateTaskLock) {
       cachedUpdateTask.updateProgress(
           UpdateProgress.builder()
@@ -284,7 +307,8 @@ private void postUpdateProgress(
               .build());
     }
     if (showNotification) {
-      appDistributionNotificationsManager.updateNotification(totalBytes, downloadedBytes, status);
+      appDistributionNotificationsManager.updateNotification(
+          totalBytes, downloadedBytes, stringResourceId);
     }
   }
 }

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

@@ -46,13 +46,13 @@ class FirebaseAppDistributionNotificationsManager {
     this.appIconSource = appIconSource;
   }
 
-  void updateNotification(long totalBytes, long downloadedBytes, UpdateStatus status) {
+  void updateNotification(long totalBytes, long downloadedBytes, int stringResourceId) {
     NotificationManager notificationManager = createNotificationManager(context);
     NotificationCompat.Builder notificationBuilder =
         new NotificationCompat.Builder(context, NOTIFICATION_CHANNEL_ID)
             .setOnlyAlertOnce(true)
             .setSmallIcon(appIconSource.getNonAdaptiveIconOrDefault(context))
-            .setContentTitle(context.getString(getNotificationContentTitleId(status)))
+            .setContentTitle(context.getString(stringResourceId))
             .setProgress(
                 100,
                 (int) (((float) downloadedBytes / (float) totalBytes) * 100),
@@ -64,25 +64,6 @@ void updateNotification(long totalBytes, long downloadedBytes, UpdateStatus stat
     notificationManager.notify(NOTIFICATION_TAG, /*id =*/ 0, notificationBuilder.build());
   }
 
-  int getNotificationContentTitleId(UpdateStatus status) {
-    if (isErrorState(status)) {
-      return R.string.download_failed;
-    } else if (status.equals(UpdateStatus.DOWNLOADED)) {
-      return R.string.download_completed;
-    } else {
-      return R.string.downloading_app_update;
-    }
-  }
-
-  // CHECK THIS LATER
-  private boolean isErrorState(UpdateStatus status) {
-    return status.equals(UpdateStatus.DOWNLOAD_FAILED)
-        || status.equals(UpdateStatus.INSTALL_FAILED)
-        || status.equals(UpdateStatus.INSTALL_CANCELED)
-        || status.equals(UpdateStatus.NEW_RELEASE_CHECK_FAILED)
-        || status.equals(UpdateStatus.UPDATE_CANCELED);
-  }
-
   private NotificationManager createNotificationManager(Context context) {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
       NotificationChannel channel =
@@ -110,6 +91,20 @@ private PendingIntent createAppLaunchIntent() {
       LogWrapper.getInstance().w(TAG + "No activity found to launch app");
       return null;
     }
-    return PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_ONE_SHOT);
+    return PendingIntent.getActivity(
+        context, 0, intent, getPendingIntentFlags(PendingIntent.FLAG_ONE_SHOT));
+  }
+
+  /**
+   * Adds {@link PendingIntent#FLAG_IMMUTABLE} to a PendingIntent's flags since any PendingIntents
+   * used here don't need to be modified.
+   *
+   * <p>Specifying mutability is required starting at SDK level 31.
+   */
+  private static int getPendingIntentFlags(int baseFlags) {
+    // Only add on platform levels that support FLAG_IMMUTABLE.
+    return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
+        ? baseFlags | PendingIntent.FLAG_IMMUTABLE
+        : baseFlags;
   }
 }

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

@@ -45,7 +45,7 @@
 class TesterSignInManager {
   private static final String TAG = "TesterSignInManager:";
   private static final String SIGNIN_REDIRECT_URL =
-      "https://appdistribution.firebase.google.com/pub/testerapps/%s/installations/%s/buildalerts?appName=%s&packageName=%s";
+      "https://appdistribution.firebase.google.com/pub/testerapps/%s/installations/%s/buildalerts?appName=%s&packageName=%s&newRedirectScheme=true";
 
   private final FirebaseApp firebaseApp;
   private final Provider<FirebaseInstallationsApi> firebaseInstallationsApiProvider;
@@ -83,7 +83,7 @@ class TesterSignInManager {
     this.lifecycleNotifier = lifecycleNotifier;
 
     lifecycleNotifier.addOnActivityCreatedListener(this::onActivityCreated);
-    lifecycleNotifier.addOnActivityStartedListener(this::onActivityStarted);
+    lifecycleNotifier.addOnActivityResumedListener(this::onActivityResumed);
   }
 
   @VisibleForTesting
@@ -98,7 +98,7 @@ void onActivityCreated(Activity activity) {
   }
 
   @VisibleForTesting
-  void onActivityStarted(Activity activity) {
+  void onActivityResumed(Activity activity) {
     if (activity instanceof SignInResultActivity || activity instanceof InstallActivity) {
       // SignInResult and InstallActivity are internal to the SDK and should not be treated as
       // reentering the app

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

@@ -25,6 +25,10 @@
   <string name="downloading_app_update">Downloading in-app update...</string>
   <string name="download_completed">Download completed</string>
   <string name="download_failed">Download failed</string>
+  <string name="download_pending">Download pending</string>
+  <string name="install_failed">Install failed</string>
+  <string name="install_canceled">Install canceled</string>
+  <string name="update_canceled">Update canceled </string>
   <string name="notifications_channel_name">App Distribution App Update Downloads</string>
   <string name="notifications_channel_description">Shows download progress of in-app updates from App Distribution SDK</string>
   <string name="unknown_sources_dialog_title">Enable Unknown Sources</string>

firebase-appdistribution/src/main/res/values/strings.xml

@@ -196,7 +196,7 @@ public void updateApk_whenInstallFailed_setsError() {
     assertThat(progressEvents).hasSize(1);
     assertThat(progressEvents.get(0).getUpdateStatus()).isEqualTo(UpdateStatus.INSTALL_FAILED);
     assertThat(updateTask.isSuccessful()).isFalse();
-    verify(mockNotificationsManager).updateNotification(1000, 1000, UpdateStatus.INSTALL_FAILED);
+    verify(mockNotificationsManager).updateNotification(1000, 1000, R.string.install_failed);
   }
 
   @Test