Merge branch 'master' into migrate-set-output-to-GITHUB_OUTPUT

firebase · Jul 24, 2023 · 68eb014 · 68eb014
2 parents a969e9c + d86eb6f
commit 68eb014
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 18 deletions.
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/QueryTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/QueryTest.java
@@ -1077,17 +1077,18 @@ public void resumingAQueryShouldUseBloomFilterToAvoidFullRequery() throws Except
       }
       assertWithMessage("createdDocuments").that(createdDocuments).hasSize(100);
 
-      // Delete 50 of the 100 documents. Use a WriteBatch, rather than DocumentReference.delete(),
-      // to avoid affecting the local cache.
+      // Delete 50 of the 100 documents. Use a different Firestore instance to avoid affecting the
+      // local cache.
       HashSet<String> deletedDocumentIds = new HashSet<>();
       {
-        WriteBatch writeBatchForDocumentDeletes = collection.getFirestore().batch();
+        FirebaseFirestore db2 = testFirestore();
+        WriteBatch batch = db2.batch();
         for (int i = 0; i < createdDocuments.size(); i += 2) {
-          DocumentReference documentToDelete = createdDocuments.get(i);
-          writeBatchForDocumentDeletes.delete(documentToDelete);
+          DocumentReference documentToDelete = db2.document(createdDocuments.get(i).getPath());
+          batch.delete(documentToDelete);
           deletedDocumentIds.add(documentToDelete.getId());
         }
-        waitFor(writeBatchForDocumentDeletes.commit());
+        waitFor(batch.commit());
       }
       assertWithMessage("deletedDocumentIds").that(deletedDocumentIds).hasSize(50);
 
@@ -1236,14 +1237,10 @@ public void bloomFilterShouldCorrectlyEncodeComplexUnicodeCharacters() throws Ex
     }
 
     // Delete one of the documents so that the next call to collection.get() will experience an
-    // existence filter mismatch. Use a WriteBatch, rather than DocumentReference.delete(), to avoid
-    // affecting the local cache.
+    // existence filter mismatch. Use a different Firestore instance to avoid affecting the local
+    // cache.
     DocumentReference documentToDelete = collection.document("DocumentToDelete");
-    {
-      WriteBatch writeBatchForDocumentDeletes = collection.getFirestore().batch();
-      writeBatchForDocumentDeletes.delete(documentToDelete);
-      waitFor(writeBatchForDocumentDeletes.commit());
-    }
+    waitFor(testFirestore().document(documentToDelete.getPath()).delete());
 
     // Wait for 10 seconds, during which Watch will stop tracking the query and will send an
     // existence filter rather than "delete" events when the query is resumed.

diff --git a/...e-sessions/src/main/kotlin/com/google/firebase/sessions/settings/RemoteSettingsFetcher.kt b/...e-sessions/src/main/kotlin/com/google/firebase/sessions/settings/RemoteSettingsFetcher.kt
@@ -46,12 +46,12 @@ internal class RemoteSettingsFetcher(
     onFailure: suspend (String) -> Unit
   ) =
     withContext(blockingDispatcher) {
-      val connection = settingsUrl().openConnection() as HttpsURLConnection
-      connection.requestMethod = "GET"
-      connection.setRequestProperty("Accept", "application/json")
-      headerOptions.forEach { connection.setRequestProperty(it.key, it.value) }
-
       try {
+        val connection = settingsUrl().openConnection() as HttpsURLConnection
+        connection.requestMethod = "GET"
+        connection.setRequestProperty("Accept", "application/json")
+        headerOptions.forEach { connection.setRequestProperty(it.key, it.value) }
+
         val responseCode = connection.responseCode
         if (responseCode == HttpsURLConnection.HTTP_OK) {
           val inputStream = connection.inputStream