Merge remote-tracking branch 'origin/master' into fiam-crash-4716

Author: eldhosembabu

encoders/firebase-encoders-json/gradle.properties

@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=18.0.1
-latestReleasedVersion=18.0.0
+version=18.0.2
+latestReleasedVersion=18.0.1

firebase-appdistribution-api/CHANGELOG.md

@@ -1,6 +1,17 @@
 # Unreleased
 * [fixed] Fixed a crash when showing feedback notification on devices running Android 4 and below.
 
+
+# 16.0.0-beta08
+* [fixed] Fixed an issue where a crash happened whenever a feedback
+  notification was shown on devices running Android 4.4 and lower.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-appdistribution-api` library. The Kotlin extensions library has no
+additional updates.
+
 # 16.0.0-beta07
 * [feature] Added support for testers to attach JPEG screenshots to their
   feedback.

firebase-appdistribution-api/gradle.properties

@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=16.0.0-beta08
-latestReleasedVersion=16.0.0-beta07
+version=16.0.0-beta09
+latestReleasedVersion=16.0.0-beta08

firebase-appdistribution/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Unreleased
 * [fixed] Fixed a crash when showing feedback notification on devices running Android 4 and below.
 
+
+# 16.0.0-beta08
+* [fixed] Fixed an issue where a crash happened whenever a feedback
+  notification was shown on devices running Android 4.4 and lower.
+
 # 16.0.0-beta07
 * [feature] Added support for testers to attach JPEG screenshots to their
   feedback.

firebase-appdistribution/gradle.properties

@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=16.0.0-beta08
-latestReleasedVersion=16.0.0-beta07
+version=16.0.0-beta09
+latestReleasedVersion=16.0.0-beta08

firebase-database/CHANGELOG.md

@@ -2,11 +2,17 @@
 * [unchanged] Updated to accommodate the release of the updated
   [database] Kotlin extensions library.
 
+
+# 20.2.0
+* [unchanged] Updated to accommodate the release of the updated
+  [database] Kotlin extensions library.
+
+
 ## Kotlin
 * [feature] Added
   [`Query.values<T>()`](/docs/reference/kotlin/com/google/firebase/database/ktx/package-summary#values)
-  Kotlin Flows to listen for realtime updates and convert its values to a specific type.
-
+  Kotlin Flows to listen for realtime updates and convert its values to a
+  specific type.
 # 20.1.0
 * [unchanged] Updated to accommodate the release of the updated
 [database] Kotlin extensions library.

firebase-database/gradle.properties

@@ -12,6 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=20.2.0
-latestReleasedVersion=20.1.0
+version=20.2.1
+latestReleasedVersion=20.2.0
 android.enableUnitTestBinaryResources=true

firebase-datatransport/gradle.properties

@@ -1,4 +1,4 @@
-version=18.1.8
-latestReleasedVersion=18.1.7
+version=18.1.9
+latestReleasedVersion=18.1.8
 android.enableUnitTestBinaryResources=true
 

firebase-firestore/CHANGELOG.md

@@ -2,24 +2,34 @@
 * [fixed] Fixed stack overflow caused by deeply nested server timestamps (#4702).
 * [feature] Add new cache config APIs to customize SDK's cache setup.
 
+
+# 24.5.0
+* [fixed] Fixed stack overflow caused by deeply nested server timestamps.
+  (GitHub [#4702](//github.com/firebase/firebase-android-sdk/issues/4702){: .external})
+
+
 ## Kotlin
 * [feature] Added
   [`Query.dataObjects<T>()`](/docs/reference/kotlin/com/google/firebase/firestore/ktx/package-summary#dataObjects)
   and
   [`DocumentReference.dataObjects<T>()`](/docs/reference/kotlin/com/google/firebase/firestore/ktx/package-summary#dataObjects_1)
-  Kotlin Flows to listen for realtime updates and convert its values to a specific type.
-
+  Kotlin Flows to listen for realtime updates and convert its values to a
+  specific type.
 # 24.4.5
-* [feature] Add support for disjunctions in queries (`OR` queries).
+* [feature] Added support for disjunctions in queries (`OR` queries).
+
 
 ## Kotlin
 The Kotlin extensions library transitively includes the updated
 `firebase-firestore` library. The Kotlin extensions library has no additional
 updates.
 
 # 24.4.4
-* [changed] Relaxed certain query validations performed by the SDK (#4231).
-* [changed] Updated grpc to 1.52.1 and javalite, protoc, protobufjavautil to 3.21.11.
+* [changed] Relaxed certain query validations performed by the SDK
+  ([GitHub Issue #4231](//github.com/firebase/firebase-android-sdk/issues/4231)).
+* [changed] Updated gRPC to 1.52.1, and updated JavaLite, protoc, and
+  protobuf-java-util to 3.21.11.
+
 
 ## Kotlin
 The Kotlin extensions library transitively includes the updated
@@ -374,7 +384,7 @@ updates.
   and
   [`Query.whereNotEqualTo()`](/docs/reference/android/com/google/firebase/firestore/Query#whereNotEqualTo(java.lang.String,%20java.lang.Object))
   query operators.
-
+  
   * `Query.whereNotIn()` finds documents where a specified field's value is
     not in a specified array.
   * `Query.whereNotEqualTo()` finds documents where a specified field's value
@@ -486,7 +496,7 @@ updates.
   is IN a specified array. `Query.whereArrayContainsAny()` finds documents
   where a specified field is an array and contains ANY element of a specified
   array.
-
+  
 - [changed] Improved the performance of repeatedly executed queries. Recently
   executed queries should see dramatic improvements. This benefit is reduced
   if changes accumulate while the query is inactive. Queries that use the
@@ -744,7 +754,7 @@ updates.
   https://github.com/firebase/firebase-android-sdk/issues/134
 
 # 17.1.4
-* [fixed] Fixed a SQLite transaction-handling issue that occasionally masked
+* [fixed] Fixed a SQLite transaction-handling issue that occasionally masked 
   exceptions when Firestore closed a transaction that was never started. For
   more information, see the [issue report in GitHub](https://github.com/firebase/firebase-android-sdk/issues/115).
 * [fixed] Fixed a race condition that caused a `SQLiteDatabaseLockedException`
@@ -792,3 +802,4 @@ updates.
   or
   [`FieldValue.serverTimestamp()`](/docs/reference/android/com/google/firebase/firestore/FieldValue.html#serverTimestamp())
   values.
+

firebase-firestore/api.txt

@@ -316,11 +316,34 @@ package com.google.firebase.firestore {
   }
 
   public final class MemoryCacheSettings implements com.google.firebase.firestore.LocalCacheSettings {
+    method @NonNull public com.google.firebase.firestore.MemoryGarbageCollectorSettings getGarbageCollectorSettings();
     method @NonNull public static com.google.firebase.firestore.MemoryCacheSettings.Builder newBuilder();
   }
 
   public static class MemoryCacheSettings.Builder {
     method @NonNull public com.google.firebase.firestore.MemoryCacheSettings build();
+    method @NonNull public com.google.firebase.firestore.MemoryCacheSettings.Builder setGcSettings(@NonNull com.google.firebase.firestore.MemoryGarbageCollectorSettings);
+  }
+
+  public final class MemoryEagerGcSettings implements com.google.firebase.firestore.MemoryGarbageCollectorSettings {
+    method @NonNull public static com.google.firebase.firestore.MemoryEagerGcSettings.Builder newBuilder();
+  }
+
+  public static class MemoryEagerGcSettings.Builder {
+    method @NonNull public com.google.firebase.firestore.MemoryEagerGcSettings build();
+  }
+
+  public interface MemoryGarbageCollectorSettings {
+  }
+
+  public final class MemoryLruGcSettings implements com.google.firebase.firestore.MemoryGarbageCollectorSettings {
+    method public long getSizeBytes();
+    method @NonNull public static com.google.firebase.firestore.MemoryLruGcSettings.Builder newBuilder();
+  }
+
+  public static class MemoryLruGcSettings.Builder {
+    method @NonNull public com.google.firebase.firestore.MemoryLruGcSettings build();
+    method public void setSizeBytes(long);
   }
 
   public enum MetadataChanges {

firebase-firestore/gradle.properties

@@ -1,2 +1,2 @@
-version=24.5.0
-latestReleasedVersion=24.4.5
+version=24.5.1
+latestReleasedVersion=24.5.0

firebase-firestore/ktx/api.txt

@@ -12,6 +12,8 @@ package com.google.firebase.firestore.ktx {
     method public static inline <reified T> T getField(@NonNull com.google.firebase.firestore.DocumentSnapshot, @NonNull com.google.firebase.firestore.FieldPath fieldPath, @NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior serverTimestampBehavior);
     method @NonNull public static com.google.firebase.firestore.FirebaseFirestore getFirestore(@NonNull com.google.firebase.ktx.Firebase);
     method @NonNull public static com.google.firebase.firestore.MemoryCacheSettings memoryCacheSettings(@NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.firestore.MemoryCacheSettings.Builder,kotlin.Unit> init);
+    method @NonNull public static com.google.firebase.firestore.MemoryEagerGcSettings memoryEagerGcSettings(@NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.firestore.MemoryEagerGcSettings.Builder,kotlin.Unit> init);
+    method @NonNull public static com.google.firebase.firestore.MemoryLruGcSettings memoryLruGcSettings(@NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.firestore.MemoryLruGcSettings.Builder,kotlin.Unit> init);
     method @NonNull public static com.google.firebase.firestore.PersistentCacheSettings persistentCacheSettings(@NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.firestore.PersistentCacheSettings.Builder,kotlin.Unit> init);
     method @NonNull public static kotlinx.coroutines.flow.Flow<com.google.firebase.firestore.DocumentSnapshot> snapshots(@NonNull com.google.firebase.firestore.DocumentReference, @NonNull com.google.firebase.firestore.MetadataChanges metadataChanges = com.google.firebase.firestore.MetadataChanges.EXCLUDE);
     method @NonNull public static kotlinx.coroutines.flow.Flow<com.google.firebase.firestore.QuerySnapshot> snapshots(@NonNull com.google.firebase.firestore.Query, @NonNull com.google.firebase.firestore.MetadataChanges metadataChanges = com.google.firebase.firestore.MetadataChanges.EXCLUDE);

firebase-firestore/ktx/src/main/kotlin/com/google/firebase/firestore/ktx/Firestore.kt

@@ -182,6 +182,18 @@ fun memoryCacheSettings(init: MemoryCacheSettings.Builder.() -> Unit): MemoryCac
   return builder.build()
 }
 
+fun memoryEagerGcSettings(init: MemoryEagerGcSettings.Builder.() -> Unit): MemoryEagerGcSettings {
+  val builder = MemoryEagerGcSettings.newBuilder()
+  builder.init()
+  return builder.build()
+}
+
+fun memoryLruGcSettings(init: MemoryLruGcSettings.Builder.() -> Unit): MemoryLruGcSettings {
+  val builder = MemoryLruGcSettings.newBuilder()
+  builder.init()
+  return builder.build()
+}
+
 fun persistentCacheSettings(
   init: PersistentCacheSettings.Builder.() -> Unit
 ): PersistentCacheSettings {

firebase-firestore/ktx/src/test/kotlin/com/google/firebase/firestore/ktx/FirestoreTests.kt

@@ -124,6 +124,34 @@ class FirestoreTests : BaseTestCase() {
     assertThat(otherSettings.isSslEnabled).isEqualTo(true)
     assertThat(otherSettings.isPersistenceEnabled).isFalse()
   }
+
+  @Test
+  fun `MemoryCacheSettings Garbage Collector builder works`() {
+    val host = "http://10.0.2.2:8080"
+    val isSslEnabled = false
+
+    val settings = firestoreSettings {
+      this.host = host
+      this.isSslEnabled = isSslEnabled
+      this.setLocalCacheSettings(memoryCacheSettings {})
+    }
+
+    assertThat(host).isEqualTo(settings.host)
+    assertThat(isSslEnabled).isEqualTo(settings.isSslEnabled)
+    assertThat(settings.isPersistenceEnabled).isFalse()
+    assertThat(settings.cacheSettings)
+      .isEqualTo(memoryCacheSettings { setGcSettings(memoryEagerGcSettings {}) })
+
+    val otherSettings = firestoreSettings {
+      this.setLocalCacheSettings(
+        memoryCacheSettings { setGcSettings(memoryLruGcSettings { setSizeBytes(1_000) }) }
+      )
+    }
+
+    assertThat(otherSettings.host).isEqualTo(FirebaseFirestoreSettings.DEFAULT_HOST)
+    assertThat(otherSettings.isPersistenceEnabled).isFalse()
+    assertThat(otherSettings.cacheSizeBytes).isEqualTo(1_000)
+  }
 }
 
 @RunWith(RobolectricTestRunner::class)

firebase-firestore/src/androidTest/java/com/google/firebase/firestore/FirestoreTest.java

@@ -1298,4 +1298,43 @@ public void testNewCacheConfigForPersistentCache() {
     DocumentSnapshot snap = waitFor(instance.document("coll/doc").get(Source.CACHE));
     assertEquals(map("foo", "bar"), snap.getData());
   }
+
+  @Test
+  public void testCanGetDocumentWithMemoryLruGCEnabled() {
+    FirebaseFirestore db = testFirestore();
+    db.setFirestoreSettings(
+        new FirebaseFirestoreSettings.Builder(db.getFirestoreSettings())
+            .setLocalCacheSettings(
+                MemoryCacheSettings.newBuilder()
+                    .setGcSettings(MemoryLruGcSettings.newBuilder().build())
+                    .build())
+            .build());
+
+    DocumentReference doc = db.collection("abc").document("123");
+    waitFor(doc.set(map("key", "value")));
+
+    DocumentSnapshot snapshot = waitFor(doc.get(Source.CACHE));
+    assertTrue(snapshot.exists());
+    assertTrue(snapshot.getMetadata().isFromCache());
+    assertEquals(snapshot.getData(), map("key", "value"));
+  }
+
+  @Test
+  public void testCannotGetDocumentWithMemoryEagerGcEnabled() {
+    FirebaseFirestore db = testFirestore();
+    db.setFirestoreSettings(
+        new FirebaseFirestoreSettings.Builder(db.getFirestoreSettings())
+            .setLocalCacheSettings(
+                MemoryCacheSettings.newBuilder()
+                    .setGcSettings(MemoryEagerGcSettings.newBuilder().build())
+                    .build())
+            .build());
+
+    DocumentReference doc = db.collection("abc").document("123");
+    waitFor(doc.set(map("key", "value")));
+
+    Exception e = waitForException(doc.get(Source.CACHE));
+    assertTrue(e instanceof FirebaseFirestoreException);
+    assertEquals(((FirebaseFirestoreException) e).getCode(), Code.UNAVAILABLE);
+  }
 }

firebase-firestore/src/main/java/com/google/firebase/firestore/FirebaseFirestoreSettings.java

@@ -40,6 +40,7 @@ public static final class Builder {
     private String host;
     private boolean sslEnabled;
     private boolean persistenceEnabled;
+
     private long cacheSizeBytes;
     private LocalCacheSettings cacheSettings;
 
@@ -319,6 +320,12 @@ public long getCacheSizeBytes() {
       if (cacheSettings instanceof PersistentCacheSettings) {
         return ((PersistentCacheSettings) cacheSettings).getSizeBytes();
       } else {
+        MemoryCacheSettings memorySettings = (MemoryCacheSettings) cacheSettings;
+        if (memorySettings.getGarbageCollectorSettings() instanceof MemoryLruGcSettings) {
+          return ((MemoryLruGcSettings) memorySettings.getGarbageCollectorSettings())
+              .getSizeBytes();
+        }
+
         return CACHE_SIZE_UNLIMITED;
       }
     }

firebase-firestore/src/main/java/com/google/firebase/firestore/MemoryCacheSettings.java

@@ -27,42 +27,58 @@
  * `FirebaseFirestoreSettings` instance to configure Firestore SDK.
  */
 public final class MemoryCacheSettings implements LocalCacheSettings {
+  private MemoryGarbageCollectorSettings gcSettings;
 
   /** Returns a new instance of {@link MemoryCacheSettings.Builder} with default configurations. */
   @NonNull
   public static MemoryCacheSettings.Builder newBuilder() {
     return new MemoryCacheSettings.Builder();
   }
 
-  private MemoryCacheSettings() {}
+  private MemoryCacheSettings(MemoryGarbageCollectorSettings settings) {
+    gcSettings = settings;
+  }
 
   @Override
   public int hashCode() {
-    return super.hashCode();
+    return gcSettings.hashCode();
   }
 
   @Override
   public boolean equals(@Nullable Object obj) {
     if (this == obj) return true;
     if (obj == null || getClass() != obj.getClass()) return false;
 
-    return true;
+    return getGarbageCollectorSettings()
+        .equals(((MemoryCacheSettings) obj).getGarbageCollectorSettings());
   }
 
   @Override
   public String toString() {
-    return "MemoryCacheSettings{}";
+    return "MemoryCacheSettings{gcSettings=" + getGarbageCollectorSettings() + "}";
+  }
+
+  @NonNull
+  public MemoryGarbageCollectorSettings getGarbageCollectorSettings() {
+    return gcSettings;
   }
 
   /** A Builder for creating {@code MemoryCacheSettings} instance. */
   public static class Builder {
+    private MemoryGarbageCollectorSettings gcSettings = MemoryEagerGcSettings.newBuilder().build();
 
     private Builder() {}
 
     /** Creates a {@code MemoryCacheSettings} instance. */
     @NonNull
     public MemoryCacheSettings build() {
-      return new MemoryCacheSettings();
+      return new MemoryCacheSettings(gcSettings);
+    }
+
+    @NonNull
+    public Builder setGcSettings(@NonNull MemoryGarbageCollectorSettings gcSettings) {
+      this.gcSettings = gcSettings;
+      return this;
     }
   }
 }