Merge branch 'master' into mrschmidt-crash

14 files changed, 110 insertions, 103 deletions

diff --git a/Firestore/Source/Remote/FSTBufferedWriter.m b/Firestore/Source/Remote/FSTBufferedWriter.m
index d86e03a..47dbb21 100644
--- a/Firestore/Source/Remote/FSTBufferedWriter.m
+++ b/Firestore/Source/Remote/FSTBufferedWriter.m
@@ -16,7 +16,7 @@
 
 #import <Protobuf/GPBProtocolBuffers.h>
 
-#import "FSTBufferedWriter.h"
+#import "Firestore/Source/Remote/FSTBufferedWriter.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/Remote/FSTDatastore.h b/Firestore/Source/Remote/FSTDatastore.h
index 08aa570..13d9eda 100644
--- a/Firestore/Source/Remote/FSTDatastore.h
+++ b/Firestore/Source/Remote/FSTDatastore.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FSTTypes.h"
+#import "Firestore/Source/Core/FSTTypes.h"
 
 @class FSTDatabaseInfo;
 @class FSTDocumentKey;
diff --git a/Firestore/Source/Remote/FSTDatastore.m b/Firestore/Source/Remote/FSTDatastore.m
index a26a5a2..02d868c 100644
--- a/Firestore/Source/Remote/FSTDatastore.m
+++ b/Firestore/Source/Remote/FSTDatastore.m
@@ -14,28 +14,28 @@
  * limitations under the License.
  */
 
-#import "FSTDatastore.h"
+#import "Firestore/Source/Remote/FSTDatastore.h"
 
 #import <GRPCClient/GRPCCall+OAuth2.h>
 #import <ProtoRPC/ProtoRPC.h>
 
-#import "FIRFirestore+Internal.h"
 #import "FIRFirestoreErrors.h"
-#import "FIRFirestoreVersion.h"
-#import "FSTAssert.h"
-#import "FSTCredentialsProvider.h"
-#import "FSTDatabaseID.h"
-#import "FSTDatabaseInfo.h"
-#import "FSTDispatchQueue.h"
-#import "FSTDocument.h"
-#import "FSTDocumentKey.h"
-#import "FSTLocalStore.h"
-#import "FSTLogger.h"
-#import "FSTMutation.h"
-#import "FSTSerializerBeta.h"
-#import "FSTStream.h"
-
-#import "Firestore.pbrpc.h"
+#import "Firestore/Source/API/FIRFirestore+Internal.h"
+#import "Firestore/Source/API/FIRFirestoreVersion.h"
+#import "Firestore/Source/Auth/FSTCredentialsProvider.h"
+#import "Firestore/Source/Core/FSTDatabaseInfo.h"
+#import "Firestore/Source/Local/FSTLocalStore.h"
+#import "Firestore/Source/Model/FSTDatabaseID.h"
+#import "Firestore/Source/Model/FSTDocument.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTMutation.h"
+#import "Firestore/Source/Remote/FSTSerializerBeta.h"
+#import "Firestore/Source/Remote/FSTStream.h"
+#import "Firestore/Source/Util/FSTAssert.h"
+#import "Firestore/Source/Util/FSTDispatchQueue.h"
+#import "Firestore/Source/Util/FSTLogger.h"
+
+#import "Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbrpc.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/Remote/FSTExistenceFilter.m b/Firestore/Source/Remote/FSTExistenceFilter.m
index 7c0ded2..d5ec7b3 100644
--- a/Firestore/Source/Remote/FSTExistenceFilter.m
+++ b/Firestore/Source/Remote/FSTExistenceFilter.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FSTExistenceFilter.h"
+#import "Firestore/Source/Remote/FSTExistenceFilter.h"
 
 @interface FSTExistenceFilter ()
 
diff --git a/Firestore/Source/Remote/FSTExponentialBackoff.m b/Firestore/Source/Remote/FSTExponentialBackoff.mm
index dc589b5..ad27c25 100644
--- a/Firestore/Source/Remote/FSTExponentialBackoff.m
+++ b/Firestore/Source/Remote/FSTExponentialBackoff.mm
@@ -14,11 +14,14 @@
  * limitations under the License.
  */
 
-#import "FSTExponentialBackoff.h"
+#import "Firestore/Source/Remote/FSTExponentialBackoff.h"
 
-#import "FSTDispatchQueue.h"
-#import "FSTLogger.h"
-#import "FSTUtil.h"
+#include <random>
+
+#include "Firestore/src/support/secure_random.h"
+
+#import "Firestore/Source/Util/FSTDispatchQueue.h"
+#import "Firestore/Source/Util/FSTLogger.h"
 
 @interface FSTExponentialBackoff ()
 - (instancetype)initWithDispatchQueue:(FSTDispatchQueue *)dispatchQueue
@@ -33,7 +36,9 @@
 @property(nonatomic) NSTimeInterval currentBase;
 @end
 
-@implementation FSTExponentialBackoff
+@implementation FSTExponentialBackoff {
+  firestore::SecureRandom _secureRandom;
+}
 
 - (instancetype)initWithDispatchQueue:(FSTDispatchQueue *)dispatchQueue
                          initialDelay:(NSTimeInterval)initialDelay
@@ -90,7 +95,9 @@
 
 /** Returns a random value in the range [-currentBase/2, currentBase/2] */
 - (NSTimeInterval)jitterDelay {
-  return ([FSTUtil randomDouble] - 0.5) * _currentBase;
+  std::uniform_real_distribution<double> dist;
+  double random_double = dist(_secureRandom);
+  return (random_double - 0.5) * _currentBase;
 }
 
 @end
diff --git a/Firestore/Source/Remote/FSTRemoteEvent.h b/Firestore/Source/Remote/FSTRemoteEvent.h
index 939a027..72f71a5 100644
--- a/Firestore/Source/Remote/FSTRemoteEvent.h
+++ b/Firestore/Source/Remote/FSTRemoteEvent.h
@@ -16,9 +16,9 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FSTDocumentDictionary.h"
-#import "FSTDocumentKeySet.h"
-#import "FSTTypes.h"
+#import "Firestore/Source/Core/FSTTypes.h"
+#import "Firestore/Source/Model/FSTDocumentDictionary.h"
+#import "Firestore/Source/Model/FSTDocumentKeySet.h"
 
 @class FSTDocument;
 @class FSTDocumentKey;
diff --git a/Firestore/Source/Remote/FSTRemoteEvent.m b/Firestore/Source/Remote/FSTRemoteEvent.m
index 5c75998..a97eb86 100644
--- a/Firestore/Source/Remote/FSTRemoteEvent.m
+++ b/Firestore/Source/Remote/FSTRemoteEvent.m
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-#import "FSTRemoteEvent.h"
-
-#import "FSTAssert.h"
-#import "FSTClasses.h"
-#import "FSTDocument.h"
-#import "FSTDocumentKey.h"
-#import "FSTLogger.h"
-#import "FSTSnapshotVersion.h"
-#import "FSTWatchChange.h"
+#import "Firestore/Source/Remote/FSTRemoteEvent.h"
+
+#import "Firestore/Source/Core/FSTSnapshotVersion.h"
+#import "Firestore/Source/Model/FSTDocument.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Remote/FSTWatchChange.h"
+#import "Firestore/Source/Util/FSTAssert.h"
+#import "Firestore/Source/Util/FSTClasses.h"
+#import "Firestore/Source/Util/FSTLogger.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/Remote/FSTRemoteStore.h b/Firestore/Source/Remote/FSTRemoteStore.h
index 0948cfa..313ddb7 100644
--- a/Firestore/Source/Remote/FSTRemoteStore.h
+++ b/Firestore/Source/Remote/FSTRemoteStore.h
@@ -16,8 +16,8 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FSTDocumentVersionDictionary.h"
-#import "FSTTypes.h"
+#import "Firestore/Source/Core/FSTTypes.h"
+#import "Firestore/Source/Model/FSTDocumentVersionDictionary.h"
 
 @class FSTDatabaseInfo;
 @class FSTDatastore;
diff --git a/Firestore/Source/Remote/FSTRemoteStore.m b/Firestore/Source/Remote/FSTRemoteStore.m
index 45a8aca..f7c3e57 100644
--- a/Firestore/Source/Remote/FSTRemoteStore.m
+++ b/Firestore/Source/Remote/FSTRemoteStore.m
@@ -14,24 +14,24 @@
  * limitations under the License.
  */
 
-#import "FSTRemoteStore.h"
-
-#import "FSTAssert.h"
-#import "FSTDatastore.h"
-#import "FSTDocument.h"
-#import "FSTDocumentKey.h"
-#import "FSTExistenceFilter.h"
-#import "FSTLocalStore.h"
-#import "FSTLogger.h"
-#import "FSTMutation.h"
-#import "FSTMutationBatch.h"
-#import "FSTQuery.h"
-#import "FSTQueryData.h"
-#import "FSTRemoteEvent.h"
-#import "FSTSnapshotVersion.h"
-#import "FSTStream.h"
-#import "FSTTransaction.h"
-#import "FSTWatchChange.h"
+#import "Firestore/Source/Remote/FSTRemoteStore.h"
+
+#import "Firestore/Source/Core/FSTQuery.h"
+#import "Firestore/Source/Core/FSTSnapshotVersion.h"
+#import "Firestore/Source/Core/FSTTransaction.h"
+#import "Firestore/Source/Local/FSTLocalStore.h"
+#import "Firestore/Source/Local/FSTQueryData.h"
+#import "Firestore/Source/Model/FSTDocument.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTMutation.h"
+#import "Firestore/Source/Model/FSTMutationBatch.h"
+#import "Firestore/Source/Remote/FSTDatastore.h"
+#import "Firestore/Source/Remote/FSTExistenceFilter.h"
+#import "Firestore/Source/Remote/FSTRemoteEvent.h"
+#import "Firestore/Source/Remote/FSTStream.h"
+#import "Firestore/Source/Remote/FSTWatchChange.h"
+#import "Firestore/Source/Util/FSTAssert.h"
+#import "Firestore/Source/Util/FSTLogger.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/Remote/FSTSerializerBeta.m b/Firestore/Source/Remote/FSTSerializerBeta.m
index 418dabd..04785c2 100644
--- a/Firestore/Source/Remote/FSTSerializerBeta.m
+++ b/Firestore/Source/Remote/FSTSerializerBeta.m
@@ -14,34 +14,34 @@
  * limitations under the License.
  */
 
-#import "FSTSerializerBeta.h"
+#import "Firestore/Source/Remote/FSTSerializerBeta.h"
 
 #import <GRPCClient/GRPCCall.h>
 
-#import "Common.pbobjc.h"
-#import "Document.pbobjc.h"
-#import "Firestore.pbobjc.h"
-#import "Latlng.pbobjc.h"
-#import "Query.pbobjc.h"
-#import "Status.pbobjc.h"
-#import "Write.pbobjc.h"
+#import "Firestore/Protos/objc/google/firestore/v1beta1/Common.pbobjc.h"
+#import "Firestore/Protos/objc/google/firestore/v1beta1/Document.pbobjc.h"
+#import "Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbobjc.h"
+#import "Firestore/Protos/objc/google/firestore/v1beta1/Query.pbobjc.h"
+#import "Firestore/Protos/objc/google/firestore/v1beta1/Write.pbobjc.h"
+#import "Firestore/Protos/objc/google/rpc/Status.pbobjc.h"
+#import "Firestore/Protos/objc/google/type/Latlng.pbobjc.h"
 
 #import "FIRFirestoreErrors.h"
 #import "FIRGeoPoint.h"
-#import "FSTAssert.h"
-#import "FSTDatabaseID.h"
-#import "FSTDocument.h"
-#import "FSTDocumentKey.h"
-#import "FSTExistenceFilter.h"
-#import "FSTFieldValue.h"
-#import "FSTMutation.h"
-#import "FSTMutationBatch.h"
-#import "FSTPath.h"
-#import "FSTQuery.h"
-#import "FSTQueryData.h"
-#import "FSTSnapshotVersion.h"
-#import "FSTTimestamp.h"
-#import "FSTWatchChange.h"
+#import "Firestore/Source/Core/FSTQuery.h"
+#import "Firestore/Source/Core/FSTSnapshotVersion.h"
+#import "Firestore/Source/Core/FSTTimestamp.h"
+#import "Firestore/Source/Local/FSTQueryData.h"
+#import "Firestore/Source/Model/FSTDatabaseID.h"
+#import "Firestore/Source/Model/FSTDocument.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTFieldValue.h"
+#import "Firestore/Source/Model/FSTMutation.h"
+#import "Firestore/Source/Model/FSTMutationBatch.h"
+#import "Firestore/Source/Model/FSTPath.h"
+#import "Firestore/Source/Remote/FSTExistenceFilter.h"
+#import "Firestore/Source/Remote/FSTWatchChange.h"
+#import "Firestore/Source/Util/FSTAssert.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/Remote/FSTStream.h b/Firestore/Source/Remote/FSTStream.h
index a3ca8a4..546aa3d 100644
--- a/Firestore/Source/Remote/FSTStream.h
+++ b/Firestore/Source/Remote/FSTStream.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FSTTypes.h"
+#import "Firestore/Source/Core/FSTTypes.h"
 
 @class FSTDatabaseInfo;
 @class FSTDocumentKey;
diff --git a/Firestore/Source/Remote/FSTStream.m b/Firestore/Source/Remote/FSTStream.m
index bf54a6b..0790d81 100644
--- a/Firestore/Source/Remote/FSTStream.m
+++ b/Firestore/Source/Remote/FSTStream.m
@@ -14,28 +14,28 @@
  * limitations under the License.
  */
 
-#import "FSTDatastore.h"
+#import "Firestore/Source/Remote/FSTDatastore.h"
 
 #import <GRPCClient/GRPCCall+OAuth2.h>
 #import <GRPCClient/GRPCCall.h>
 
-#import "FIRFirestore+Internal.h"
 #import "FIRFirestoreErrors.h"
-#import "FSTAssert.h"
-#import "FSTBufferedWriter.h"
-#import "FSTClasses.h"
-#import "FSTCredentialsProvider.h"
-#import "FSTDatabaseID.h"
-#import "FSTDatabaseInfo.h"
-#import "FSTDispatchQueue.h"
-#import "FSTExponentialBackoff.h"
-#import "FSTLogger.h"
-#import "FSTMutation.h"
-#import "FSTQueryData.h"
-#import "FSTSerializerBeta.h"
-#import "FSTStream.h"
-
-#import "Firestore.pbrpc.h"
+#import "Firestore/Source/API/FIRFirestore+Internal.h"
+#import "Firestore/Source/Auth/FSTCredentialsProvider.h"
+#import "Firestore/Source/Core/FSTDatabaseInfo.h"
+#import "Firestore/Source/Local/FSTQueryData.h"
+#import "Firestore/Source/Model/FSTDatabaseID.h"
+#import "Firestore/Source/Model/FSTMutation.h"
+#import "Firestore/Source/Remote/FSTBufferedWriter.h"
+#import "Firestore/Source/Remote/FSTExponentialBackoff.h"
+#import "Firestore/Source/Remote/FSTSerializerBeta.h"
+#import "Firestore/Source/Remote/FSTStream.h"
+#import "Firestore/Source/Util/FSTAssert.h"
+#import "Firestore/Source/Util/FSTClasses.h"
+#import "Firestore/Source/Util/FSTDispatchQueue.h"
+#import "Firestore/Source/Util/FSTLogger.h"
+
+#import "Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbrpc.h"
 
 /**
  * Initial backoff time in seconds after an error.
diff --git a/Firestore/Source/Remote/FSTWatchChange.h b/Firestore/Source/Remote/FSTWatchChange.h
index 6b65279..8ce24fa 100644
--- a/Firestore/Source/Remote/FSTWatchChange.h
+++ b/Firestore/Source/Remote/FSTWatchChange.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FSTTypes.h"
+#import "Firestore/Source/Core/FSTTypes.h"
 
 @class FSTDocumentKey;
 @class FSTExistenceFilter;
diff --git a/Firestore/Source/Remote/FSTWatchChange.m b/Firestore/Source/Remote/FSTWatchChange.m
index 1ace26e..926d027 100644
--- a/Firestore/Source/Remote/FSTWatchChange.m
+++ b/Firestore/Source/Remote/FSTWatchChange.m
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#import "FSTWatchChange.h"
+#import "Firestore/Source/Remote/FSTWatchChange.h"
 
-#import "FSTDocument.h"
-#import "FSTDocumentKey.h"
-#import "FSTExistenceFilter.h"
+#import "Firestore/Source/Model/FSTDocument.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Remote/FSTExistenceFilter.h"
 
 NS_ASSUME_NONNULL_BEGIN