Merge branch 'master' into crashlytics/anrs

Author: tejasd

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

@@ -32,8 +32,7 @@ android {
         minSdkVersion project.minSdkVersion
         versionName version
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        // TODO: Uncomment the line below once we configure the debug secret environment variable in the public repo.
-        // testInstrumentationRunnerArgument "firebaseAppCheckDebugSecret", System.getenv("FIREBASE_APP_CHECK_DEBUG_SECRET") ?: ''
+        testInstrumentationRunnerArgument "firebaseAppCheckDebugSecret", System.getenv("FIREBASE_APP_CHECK_DEBUG_SECRET") ?: ''
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

appcheck/firebase-appcheck-debug-testing/src/androidTest/java/com/google/firebase/appcheck/debug/testing/FirebaseAppCheckTest.java

@@ -34,7 +34,6 @@
 import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
-@Ignore("TODO: Re-enable after setting up debug secret environment variable in public repo.")
 public class FirebaseAppCheckTest {
   private final DebugAppCheckTestHelper debugAppCheckTestHelper =
       DebugAppCheckTestHelper.fromInstrumentationArgs();

appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/DefaultAppCheckToken.java

@@ -96,12 +96,10 @@ public long getExpireTimeMillis() {
     return receivedAtTimestamp + expiresInMillis;
   }
 
-  @VisibleForTesting
   long getReceivedAtTimestamp() {
     return receivedAtTimestamp;
   }
 
-  @VisibleForTesting
   long getExpiresInMillis() {
     return expiresInMillis;
   }

appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/TokenRefreshManager.java

@@ -29,7 +29,8 @@
 public final class TokenRefreshManager {
 
   private static final long REFRESH_BUFFER_ABSOLUTE_MILLIS = 60 * 1000; // 60 seconds
-  private static final double REFRESH_BUFFER_FRACTION = 0.9;
+  private static final double REFRESH_BUFFER_FRACTION = 0.5;
+  private static final long FIVE_MINUTES_IN_MILLIS = 5 * 60 * 1000;
   private static final long UNSET_REFRESH_TIME = -1;
 
   private final DefaultTokenRefresher tokenRefresher;
@@ -84,13 +85,16 @@ public void maybeScheduleTokenRefresh(@NonNull AppCheckToken token) {
       defaultToken = DefaultAppCheckToken.constructFromRawToken(token.getToken());
     }
 
-    // The next refresh time is either receivedAt + 0.9*expiresIn or 60 seconds before expiration,
-    // whichever is earlier.
+    // The next refresh time is receivedAt + 0.5*expiresIn + 5 minutes.
     nextRefreshTimeMillis =
-        Math.min(
-            defaultToken.getReceivedAtTimestamp()
-                + (long) (REFRESH_BUFFER_FRACTION * defaultToken.getExpiresInMillis()),
-            defaultToken.getExpireTimeMillis() - REFRESH_BUFFER_ABSOLUTE_MILLIS);
+        defaultToken.getReceivedAtTimestamp()
+            + (long) (REFRESH_BUFFER_FRACTION * defaultToken.getExpiresInMillis())
+            + FIVE_MINUTES_IN_MILLIS;
+    if (nextRefreshTimeMillis > defaultToken.getExpireTimeMillis()) {
+      // This shouldn't happen, as the minimum allowed TTL should be at least 15 minutes, but adding
+      // this check to be safe.
+      nextRefreshTimeMillis = defaultToken.getExpireTimeMillis() - REFRESH_BUFFER_ABSOLUTE_MILLIS;
+    }
     if (shouldScheduleRefresh()) {
       tokenRefresher.scheduleRefresh(nextRefreshTimeMillis - clock.currentTimeMillis());
     }

appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/internal/TokenRefreshManagerTest.java

@@ -36,7 +36,7 @@ public class TokenRefreshManagerTest {
   private static final String TOKEN_PAYLOAD = "tokenPayload";
   private static final long EXPIRES_IN_ONE_HOUR_MILLIS = 60L * 60L * 1000L;
   private static final long EXPIRE_IN_THREE_MINUTES_MILLIS = 3L * 60L * 1000L;
-  private static final long NINE_TENTHS_HOUR_MILLIS = 3240000L; // 0.9 * 1 hour
+  private static final long THIRTY_FIVE_MINUTES_MILLIS = 35L * 60L * 1000L;
   private static final long TWO_MINUTES_MILLIS = 2L * 60L * 1000L;
   private static final long CURRENT_TIME_MILLIS = 1000L;
 
@@ -73,11 +73,14 @@ public void maybeScheduleTokenRefresh_useExpirationTimeFractionBuffer() {
     tokenRefreshManager.onListenerCountChanged(/* newListenerCount= */ 1);
     tokenRefreshManager.maybeScheduleTokenRefresh(expiresInOneHourToken);
 
-    verify(mockTokenRefresher).scheduleRefresh(NINE_TENTHS_HOUR_MILLIS);
+    verify(mockTokenRefresher).scheduleRefresh(THIRTY_FIVE_MINUTES_MILLIS);
   }
 
   @Test
   public void maybeScheduleTokenRefresh_useExpirationTimeAbsoluteBuffer() {
+    // This should not occur, as the minimum TTL should be at least 15 minutes, but this test case
+    // checks to make sure that in the case we receive a shorter-than-expected TTL from the backend,
+    // we handle it gracefully.
     DefaultAppCheckToken expiresInThreeMinutesToken =
         new DefaultAppCheckToken(
             TOKEN_PAYLOAD, EXPIRE_IN_THREE_MINUTES_MILLIS, mockClock.currentTimeMillis());

buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/BomGeneratorTask.java

@@ -83,6 +83,8 @@ public class BomGeneratorTask extends DefaultTask {
           "com.google.firebase:firebase-messaging-directboot",
           "com.google.firebase:firebase-messaging-ktx",
           "com.google.firebase:firebase-ml-model-interpreter",
+          "com.google.firebase:firebase-ml-modeldownloader",
+          "com.google.firebase:firebase-ml-modeldownloader-ktx",
           "com.google.firebase:firebase-ml-vision",
           "com.google.firebase:firebase-perf",
           "com.google.firebase:firebase-perf-ktx",

firebase-annotations/gradle.properties

@@ -13,3 +13,4 @@
 # limitations under the License.
 
 version=16.0.1
+latestReleasedVersion=16.0.0

firebase-config/gradle.properties

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version=20.0.4
-latestReleasedVersion=20.0.3
+version=20.0.5
+latestReleasedVersion=20.0.4
 android.enableUnitTestBinaryResources=true
 

firebase-crashlytics-ndk/gradle.properties

@@ -1,2 +1,2 @@
-version=17.4.0
-latestReleasedVersion=17.3.1
+version=17.4.2
+latestReleasedVersion=17.4.1

firebase-crashlytics/gradle.properties

@@ -1,2 +1,2 @@
-version=17.4.0
-latestReleasedVersion=17.3.1
+version=17.4.2
+latestReleasedVersion=17.4.1