Merge branch 'master' of github.com:firebase/firebase-android-sdk into fis_sdk

Author: ankitaj224

firebase-config/src/main/java/com/google/firebase/remoteconfig/RemoteConfigComponent.java

@@ -60,7 +60,7 @@ public class RemoteConfigComponent {
   /** Name of the file where defaults configs are stored. */
   public static final String DEFAULTS_FILE_NAME = "defaults";
   /** Timeout for the call to the Firebase Remote Config servers in second. */
-  public static final long NETWORK_CONNECTION_TIMEOUT_IN_SECONDS = 5;
+  public static final long NETWORK_CONNECTION_TIMEOUT_IN_SECONDS = 60;
 
   private static final String FIREBASE_REMOTE_CONFIG_FILE_NAME_PREFIX = "frc";
   private static final String PREFERENCES_FILE_NAME = "settings";

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

@@ -38,7 +38,7 @@
 
 /**
  * A {@code DocumentSnapshot} contains data read from a document in your Cloud Firestore database.
- * The data can be extracted with the {@link #getData()} or {@link #get()} methods.
+ * The data can be extracted with the {@link #getData()} or {@link #get(String)} methods.
  *
  * <p>If the {@code DocumentSnapshot} points to a non-existing document, {@link #getData()} and its
  * corresponding methods will return {@code null}. You can always explicitly check for a document's

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

@@ -82,7 +82,7 @@ public Query getQuery() {
     return originalQuery;
   }
 
-  /** @return The metadata for this document snapshot. */
+  /** @return The metadata for this query snapshot. */
   @NonNull
   public SnapshotMetadata getMetadata() {
     return metadata;

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

@@ -67,8 +67,8 @@ public static SetOptions merge() {
   }
 
   /**
-   * Changes the behavior of {@code set()} calls to only replace the fields under fieldPaths. Any
-   * field that is not specified in fieldPaths is ignored and remains untouched.
+   * Changes the behavior of {@code set()} calls to only replace the given fields. Any field that is
+   * not specified in {@code fields} is ignored and remains untouched.
    *
    * <p>It is an error to pass a {@code SetOptions} object to a {@code set()} call that is missing a
    * value for any of the fields specified here.
@@ -88,8 +88,8 @@ public static SetOptions mergeFields(@NonNull List<String> fields) {
   }
 
   /**
-   * Changes the behavior of {@code set()} calls to only replace the fields under fieldPaths. Any
-   * field that is not specified in fieldPaths is ignored and remains untouched.
+   * Changes the behavior of {@code set()} calls to only replace the given fields. Any field that is
+   * not specified in {@code fields} is ignored and remains untouched.
    *
    * <p>It is an error to pass a {@code SetOptions} object to a {@code set()} call that is missing a
    * value for any of the fields specified here.
@@ -109,8 +109,8 @@ public static SetOptions mergeFields(String... fields) {
   }
 
   /**
-   * Changes the behavior of {@code set()} calls to only replace the fields under fieldPaths. Any
-   * field that is not specified in fieldPaths is ignored and remains untouched.
+   * Changes the behavior of {@code set()} calls to only replace the given fields. Any field that is
+   * not specified in {@code fields} is ignored and remains untouched.
    *
    * <p>It is an error to pass a {@code SetOptions} object to a {@code set()} call that is missing a
    * value for any of the fields specified here in its to data argument.

firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLiteRemoteDocumentCache.java

@@ -18,7 +18,6 @@
 import static com.google.firebase.firestore.util.Assert.hardAssert;
 
 import androidx.annotation.Nullable;
-import com.google.firebase.Timestamp;
 import com.google.firebase.database.collection.ImmutableSortedMap;
 import com.google.firebase.firestore.core.Query;
 import com.google.firebase.firestore.model.Document;
@@ -52,18 +51,13 @@ final class SQLiteRemoteDocumentCache implements RemoteDocumentCache {
   @Override
   public void add(MaybeDocument maybeDocument) {
     String path = pathForKey(maybeDocument.getKey());
-    Timestamp timestamp = maybeDocument.getVersion().getTimestamp();
     MessageLite message = serializer.encodeMaybeDocument(maybeDocument);
 
     statsCollector.recordRowsWritten(STATS_TAG, 1);
 
     db.execute(
-        "INSERT OR REPLACE INTO remote_documents "
-            + "(path, update_time_seconds, update_time_nanos, contents) "
-            + "VALUES (?, ?, ?, ?)",
+        "INSERT OR REPLACE INTO remote_documents (path, contents) VALUES (?, ?)",
         path,
-        timestamp.getSeconds(),
-        timestamp.getNanoseconds(),
         message.toByteArray());
 
     db.getIndexManager().addToCollectionParentIndex(maybeDocument.getKey().getPath().popLast());

firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLiteSchema.java

@@ -45,16 +45,8 @@ class SQLiteSchema {
   /**
    * The version of the schema. Increase this by one for each migration added to runMigrations
    * below.
-   *
-   * <p>TODO(index-free): The migration to schema version 9 doesn't backfill `update_time` as this
-   * requires rewriting the RemoteDocumentCache. For index-free queries to efficiently handle
-   * existing documents, we still need to populate update_time for all existing entries, drop the
-   * RemoteDocumentCache or ask users to invoke `clearPersistence()` manually. If we decide to
-   * backfill or drop the contents of the RemoteDocumentCache, we need to perform an additional
-   * schema migration.
    */
-  static final int VERSION = 9;
-
+  static final int VERSION = 8;
   // Remove this constant and increment VERSION to enable indexing support
   static final int INDEXING_SUPPORT_VERSION = VERSION + 1;
 
@@ -135,10 +127,6 @@ void runMigrations(int fromVersion, int toVersion) {
       createV8CollectionParentsIndex();
     }
 
-    if (fromVersion < 9 && toVersion >= 9) {
-      addUpdateTime();
-    }
-
     /*
      * Adding a new migration? READ THIS FIRST!
      *
@@ -363,16 +351,6 @@ private void addSequenceNumber() {
     }
   }
 
-  private void addUpdateTime() {
-    if (!tableContainsColumn("remote_documents", "update_time_seconds")) {
-      hardAssert(
-          !tableContainsColumn("remote_documents", "update_time_nanos"),
-          "Table contained update_time_seconds, but is missing update_time_nanos");
-      db.execSQL("ALTER TABLE remote_documents ADD COLUMN update_time_seconds INTEGER");
-      db.execSQL("ALTER TABLE remote_documents ADD COLUMN update_time_nanos INTEGER");
-    }
-  }
-
   /**
    * Ensures that each entry in the remote document cache has a corresponding sentinel row. Any
    * entries that lack a sentinel row are given one with the sequence number set to the highest