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

Author: diwu-arete

buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/measurement/coverage/GenerateMeasurementsTask.groovy

@@ -15,10 +15,12 @@
 
 package com.google.firebase.gradle.plugins.measurement.coverage
 
+import groovy.json.JsonOutput
+import java.text.SimpleDateFormat
 import org.gradle.api.DefaultTask
-import org.gradle.api.Project
 import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.TaskAction
+import com.google.firebase.gradle.plugins.FirebaseLibraryExtension
 import org.gradle.testing.jacoco.tasks.JacocoReport
 
 
@@ -38,6 +40,8 @@ public class GenerateMeasurementsTask extends DefaultTask {
 
         assert project.tasks.withType(JacocoReport).size() == 1 : 'Found multiple tasks which generate coverage reports.'
         coverageTaskName = project.tasks.withType(JacocoReport)[0].name
+
+        dependsOn(findAllProductCoverageTasks())
     }
 
     @TaskAction
@@ -50,7 +54,11 @@ public class GenerateMeasurementsTask extends DefaultTask {
         }
     }
 
-    private def getCoveragePercentFromReport(_project) {
+    // This method was called in a closure in `generateJson` method. At runtime,
+    // the closure is bound to a synthetic child class of this class generated
+    // by Gradle.
+    // Need to mark as protected or public to be callable within the closure.
+    protected def getCoverageForProject(_project) {
         def path = "${_project.jacoco.reportsDir}/${coverageTaskName}/${coverageTaskName}.xml"
         try {
             def report = parser.parse(path)
@@ -68,63 +76,34 @@ public class GenerateMeasurementsTask extends DefaultTask {
         }
     }
 
-    private def trimProjectPathLeadingColon(path) {
-        return path.startsWith(':') ? path.drop(1) : path
+    private def findAllFirebaseProductProjects() {
+        return project.rootProject.allprojects.findAll {
+            it.extensions.findByType(FirebaseLibraryExtension) != null
+        }
+    }
+
+    private def findAllProductCoverageTasks() {
+        return findAllFirebaseProductProjects().collect {
+            it.tasks.withType(JacocoReport)
+        }.flatten()
     }
 
     private def generateJson(pullRequestNumber) {
-        def coverages = [:]
-
-        // TODO(yifany@): Consolidate mappings with apksize and iOS.
-        def sdkMap = [
-                'firebase-common': 0,
-                'firebase-common-ktx': 1,
-                'firebase-database': 2,
-                'firebase-database-collection': 3,
-                'firebase-firestore': 4,
-                'firebase-firestore-ktx': 5,
-                'firebase-functions': 6,
-                'firebase-inappmessaging-display': 7,
-                'firebase-storage': 8,
-                'firebase-datatransport': 9,
-
-                // 'firebase-common-ktx' and 'firebase-firestore-ktx' has been
-                // made a subproject of their corresponding java projects in PR
-                // #409 and #426. Old mappings are kept for backward
-                // compatibility reason.
-                'firebase-common:ktx': 10,
-                'firebase-firestore:ktx': 11
-        ]
-
-        for (Project p: project.rootProject.subprojects) {
-            def name = trimProjectPathLeadingColon(p.path)
-            if (name.startsWith('firebase')) {
-                def percent = getCoveragePercentFromReport(p)
-                if (sdkMap.containsKey(name)) {
-                    coverages[sdkMap[name]] = percent
-                } else {
-                    project.logger.warn("Find SDK with name: $name not defined in the SDK to ID mapping.")
-                }
-            }
-        }
+        def now = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())
+        def projects = findAllFirebaseProductProjects()
 
-        def replacements = coverages.collect {
-            "[$pullRequestNumber, $it.key, $it.value]"
-        }.join(", ")
+        def replacements = projects.collect {
+            [ it.path, pullRequestNumber, getCoverageForProject(it), now ]
+        }
 
         // TODO(yifany@): Better way of formatting json. No hard code names.
         def json = """
             {
                 tables: [
                     {
-                        table_name: "PullRequests",
-                        column_names: ["pull_request_id"],
-                        replace_measurements: [[$pullRequestNumber]],
-                    },
-                    {
-                        table_name: "Coverage2",
-                        column_names: ["pull_request_id", "sdk_id", "coverage_percent"],
-                        replace_measurements: [$replacements],
+                        table_name: "AndroidCodeCoverage",
+                        column_names: ["product_name", "pull_request_id", "coverage_total", "collection_time"],
+                        replace_measurements: ${JsonOutput.toJson(replacements)},
                     },
                 ],
             }

buildSrc/src/test/groovy/com/google/firebase/gradle/plugins/measurement/apksize/ApkSizeTestProject.groovy

@@ -157,6 +157,7 @@ class ApkSizeTestProject extends ExternalResource {
 
         Files.createDirectories(dest)
         FileUtils.copyDirectory(src.toFile(), dest.toFile())
+        FileUtils.deleteDirectory(dest.resolve("coverage").toFile())
     }
 
     /** Creates the fake project files for the temporary project. */

firebase-firestore/CHANGELOG.md

@@ -1,13 +1,24 @@
 # Unreleased
+- [changed] Instead of failing silently, Firestore now crashes the client app
+  if it fails to load SSL Ciphers. To avoid these crashes, you must bundle 
+  Conscrypt to support non-GMSCore devices on Android KitKat or JellyBean (see
+  https://github.com/grpc/grpc-java/blob/master/SECURITY.md#tls-on-android).
+
+# 20.1.0
 - [changed] SSL and gRPC initialization now happens on a separate thread, which
   reduces the time taken to produce the first query result.
-- [fixed] Updated gRPC to 1.21.0. A bug in the prior version would occasionally
-  cause a crash if a network state change occurred concurrently with an RPC.
-  (#428)
 - [feature] Added `clearPersistence()`, which clears the persistent storage
   including pending writes and cached documents. This is intended to help
   write reliable tests (https://github.com/firebase/firebase-js-sdk/issues/449).
 
+# 20.0.0
+- [changed] Migrated from the Android Support Libraries to the Jetpack
+  (AndroidX) Libraries.
+
+# 19.0.2
+- [fixed] Updated gRPC to 1.21.0. A bug in the prior version would occasionally
+  cause a crash if a network state change occurred concurrently with an RPC.
+  (#428)
 
 # 19.0.1
 - [fixed] Fixed an issue that prevented schema migrations for clients with

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

@@ -24,9 +24,10 @@
 import com.google.firebase.firestore.model.DocumentKey;
 import com.google.firebase.firestore.model.value.ArrayValue;
 import com.google.firebase.firestore.model.value.FieldValue;
-import com.google.firebase.firestore.model.value.FieldValueOptions;
 import com.google.firebase.firestore.model.value.ObjectValue;
 import com.google.firebase.firestore.model.value.ReferenceValue;
+import com.google.firebase.firestore.model.value.ServerTimestampValue;
+import com.google.firebase.firestore.model.value.TimestampValue;
 import com.google.firebase.firestore.util.CustomClassMapper;
 import com.google.firebase.firestore.util.Logger;
 import java.util.ArrayList;
@@ -80,6 +81,18 @@ public enum ServerTimestampBehavior {
     static final ServerTimestampBehavior DEFAULT = ServerTimestampBehavior.NONE;
   }
 
+  /** Holds settings that define field value deserialization options. */
+  static class FieldValueOptions {
+    final ServerTimestampBehavior serverTimestampBehavior;
+    final boolean timestampsInSnapshotsEnabled;
+
+    private FieldValueOptions(
+        ServerTimestampBehavior serverTimestampBehavior, boolean timestampsInSnapshotsEnabled) {
+      this.serverTimestampBehavior = serverTimestampBehavior;
+      this.timestampsInSnapshotsEnabled = timestampsInSnapshotsEnabled;
+    }
+  }
+
   private final FirebaseFirestore firestore;
 
   private final DocumentKey key;
@@ -165,7 +178,7 @@ public Map<String, Object> getData(@NonNull ServerTimestampBehavior serverTimest
         ? null
         : convertObject(
             doc.getData(),
-            FieldValueOptions.create(
+            new FieldValueOptions(
                 serverTimestampBehavior,
                 firestore.getFirestoreSettings().areTimestampsInSnapshotsEnabled()));
   }
@@ -286,7 +299,7 @@ public Object get(
         serverTimestampBehavior, "Provided serverTimestampBehavior value must not be null.");
     return getInternal(
         fieldPath.getInternalPath(),
-        FieldValueOptions.create(
+        new FieldValueOptions(
             serverTimestampBehavior,
             firestore.getFirestoreSettings().areTimestampsInSnapshotsEnabled()));
   }
@@ -449,7 +462,7 @@ public Date getDate(
     Object maybeDate =
         getInternal(
             FieldPath.fromDotSeparatedPath(field).getInternalPath(),
-            FieldValueOptions.create(
+            new FieldValueOptions(
                 serverTimestampBehavior, /*timestampsInSnapshotsEnabled=*/ false));
     return castTypedValue(maybeDate, field, Date.class);
   }
@@ -492,8 +505,7 @@ public Timestamp getTimestamp(
     Object maybeTimestamp =
         getInternal(
             FieldPath.fromDotSeparatedPath(field).getInternalPath(),
-            FieldValueOptions.create(
-                serverTimestampBehavior, /*timestampsInSnapshotsEnabled=*/ true));
+            new FieldValueOptions(serverTimestampBehavior, /*timestampsInSnapshotsEnabled=*/ true));
     return castTypedValue(maybeTimestamp, field, Timestamp.class);
   }
 
@@ -571,29 +583,56 @@ private Object convertValue(FieldValue value, FieldValueOptions options) {
     } else if (value instanceof ArrayValue) {
       return convertArray((ArrayValue) value, options);
     } else if (value instanceof ReferenceValue) {
-      ReferenceValue referenceValue = (ReferenceValue) value;
-      DocumentKey key = (DocumentKey) referenceValue.value(options);
-      DatabaseId refDatabase = ((ReferenceValue) value).getDatabaseId();
-      DatabaseId database = this.firestore.getDatabaseId();
-      if (!refDatabase.equals(database)) {
-        // TODO: Somehow support foreign references.
-        Logger.warn(
-            "DocumentSnapshot",
-            "Document %s contains a document reference within a different database "
-                + "(%s/%s) which is not supported. It will be treated as a reference in "
-                + "the current database (%s/%s) instead.",
-            key.getPath(),
-            refDatabase.getProjectId(),
-            refDatabase.getDatabaseId(),
-            database.getProjectId(),
-            database.getDatabaseId());
-      }
-      return new DocumentReference(key, firestore);
+      return convertReference((ReferenceValue) value);
+    } else if (value instanceof TimestampValue) {
+      return convertTimestamp((TimestampValue) value, options);
+    } else if (value instanceof ServerTimestampValue) {
+      return convertServerTimestamp((ServerTimestampValue) value, options);
+    } else {
+      return value.value();
+    }
+  }
+
+  private Object convertServerTimestamp(ServerTimestampValue value, FieldValueOptions options) {
+    switch (options.serverTimestampBehavior) {
+      case PREVIOUS:
+        return value.getPreviousValue();
+      case ESTIMATE:
+        return value.getLocalWriteTime();
+      default:
+        return value.value();
+    }
+  }
+
+  private Object convertTimestamp(TimestampValue value, FieldValueOptions options) {
+    Timestamp timestamp = value.value();
+    if (options.timestampsInSnapshotsEnabled) {
+      return timestamp;
     } else {
-      return value.value(options);
+      return timestamp.toDate();
     }
   }
 
+  private Object convertReference(ReferenceValue value) {
+    DocumentKey key = value.value();
+    DatabaseId refDatabase = value.getDatabaseId();
+    DatabaseId database = this.firestore.getDatabaseId();
+    if (!refDatabase.equals(database)) {
+      // TODO: Somehow support foreign references.
+      Logger.warn(
+          "DocumentSnapshot",
+          "Document %s contains a document reference within a different database "
+              + "(%s/%s) which is not supported. It will be treated as a reference in "
+              + "the current database (%s/%s) instead.",
+          key.getPath(),
+          refDatabase.getProjectId(),
+          refDatabase.getDatabaseId(),
+          database.getProjectId(),
+          database.getDatabaseId());
+    }
+    return new DocumentReference(key, firestore);
+  }
+
   private Map<String, Object> convertObject(ObjectValue objectValue, FieldValueOptions options) {
     Map<String, Object> result = new HashMap<>();
     for (Map.Entry<String, FieldValue> entry : objectValue.getInternalValue()) {

firebase-firestore/src/main/java/com/google/firebase/firestore/model/value/ArrayValue.java

@@ -70,16 +70,6 @@ public List<Object> value() {
     return res;
   }
 
-  @Override
-  public List<Object> value(FieldValueOptions options) {
-    // Recursively convert the array into the value that users will see in document snapshots.
-    List<Object> res = new ArrayList<>(internalValue.size());
-    for (FieldValue v : internalValue) {
-      res.add(v.value(options));
-    }
-    return res;
-  }
-
   public List<FieldValue> getInternalValue() {
     return internalValue;
   }

firebase-firestore/src/main/java/com/google/firebase/firestore/model/value/FieldValue.java

@@ -63,15 +63,6 @@ public abstract class FieldValue implements Comparable<FieldValue> {
   @Nullable
   public abstract Object value();
 
-  /**
-   * Converts a FieldValue into the value that users will see in document snapshots using the
-   * provided deserialization options.
-   */
-  @Nullable
-  public Object value(FieldValueOptions options) {
-    return value();
-  }
-
   @Override
   public abstract boolean equals(Object o);