Merge pull request firebase#452 from firebase/mc/cache

morganchen12 · web-flow · commit cb45c74aa36e · 2023-05-22T10:55:26.000-07:00
Add android snippets
diff --git a/firestore/app/src/main/java/com/google/example/firestore/DocSnippets.java b/firestore/app/src/main/java/com/google/example/firestore/DocSnippets.java
@@ -27,7 +27,9 @@
 import com.google.firebase.firestore.FirebaseFirestoreException;
 import com.google.firebase.firestore.FirebaseFirestoreSettings;
 import com.google.firebase.firestore.ListenerRegistration;
+import com.google.firebase.firestore.MemoryCacheSettings;
 import com.google.firebase.firestore.MetadataChanges;
+import com.google.firebase.firestore.PersistentCacheSettings;
 import com.google.firebase.firestore.Query;
 import com.google.firebase.firestore.Query.Direction;
 import com.google.firebase.firestore.QueryDocumentSnapshot;
@@ -128,18 +130,28 @@ public void setup() {
         // [END get_firestore_instance]
 
         // [START set_firestore_settings]
-        FirebaseFirestoreSettings settings = new FirebaseFirestoreSettings.Builder()
-                .setPersistenceEnabled(true)
-                .build();
+        FirebaseFirestoreSettings settings = 
+        new FirebaseFirestoreSettings.Builder(db.getFirestoreSettings())
+            // Use memory-only cache
+            .setLocalCacheSettings(MemoryCacheSettings.newBuilder().build())
+            // Use persistent disk cache (default)
+            .setLocalCacheSettings(PersistentCacheSettings.newBuilder()
+                                    .build())
+            .build();
         db.setFirestoreSettings(settings);
         // [END set_firestore_settings]
     }
 
     public void setupCacheSize() {
+        FirebaseFirestore db = FirebaseFirestore.getInstance();
         // [START fs_setup_cache]
-        FirebaseFirestoreSettings settings = new FirebaseFirestoreSettings.Builder()
-                .setCacheSizeBytes(FirebaseFirestoreSettings.CACHE_SIZE_UNLIMITED)
-                .build();
+        FirebaseFirestoreSettings settings = 
+        new FirebaseFirestoreSettings.Builder(db.getFirestoreSettings())
+            .setLocalCacheSettings(PersistentCacheSettings.newBuilder()
+                                    // Set size to 1 MB
+                                    .setSizeBytes(1_000_000)
+                                    .build())
+            .build();
         db.setFirestoreSettings(settings);
         // [END fs_setup_cache]
     }
diff --git a/firestore/app/src/main/java/com/google/example/firestore/kotlin/DocSnippets.kt b/firestore/app/src/main/java/com/google/example/firestore/kotlin/DocSnippets.kt
@@ -11,12 +11,15 @@ import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.firestore.FirebaseFirestoreException
 import com.google.firebase.firestore.FirebaseFirestoreSettings
 import com.google.firebase.firestore.MetadataChanges
+import com.google.firebase.firestore.PersistentCacheSettings
 import com.google.firebase.firestore.Query
 import com.google.firebase.firestore.ServerTimestamp
 import com.google.firebase.firestore.SetOptions
 import com.google.firebase.firestore.Source
 import com.google.firebase.firestore.ktx.firestore
 import com.google.firebase.firestore.ktx.firestoreSettings
+import com.google.firebase.firestore.ktx.memoryCacheSettings
+import com.google.firebase.firestore.ktx.persistentCacheSettings
 import com.google.firebase.firestore.ktx.toObject
 import com.google.firebase.ktx.Firebase
 import java.util.ArrayList
@@ -108,7 +111,10 @@ abstract class DocSnippets(val db: FirebaseFirestore) {
 
         // [START set_firestore_settings]
         val settings = firestoreSettings {
-            isPersistenceEnabled = true
+            // Use memory cache
+            setLocalCacheSettings(memoryCacheSettings {})
+            // Use persistent disk cache (default)
+            setLocalCacheSettings(persistentCacheSettings {})
         }
         db.firestoreSettings = settings
         // [END set_firestore_settings]
@@ -117,7 +123,10 @@ abstract class DocSnippets(val db: FirebaseFirestore) {
     private fun setupCacheSize() {
         // [START fs_setup_cache]
         val settings = firestoreSettings {
-            cacheSizeBytes = FirebaseFirestoreSettings.CACHE_SIZE_UNLIMITED
+            setLocalCacheSettings(persistentCacheSettings {
+                // Set size to 1 MB
+                setSizeBytes(1000000)
+            })
         }
         db.firestoreSettings = settings
         // [END fs_setup_cache]
diff --git a/firestore/gradle/wrapper/gradle-wrapper.properties b/firestore/gradle/wrapper/gradle-wrapper.properties
@@ -1,3 +1,4 @@
+#Wed May 17 13:55:25 PDT 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#Wed May 17 13:55:25 PDT 2023`
`1`	`2`	`distributionBase=GRADLE_USER_HOME`
`2`	`3`	`distributionPath=wrapper/dists`
`3`	`4`	`distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip`