From f9bd6d3c9491dddbfc9cbe0fcc633030a66fe9da Mon Sep 17 00:00:00 2001 From: zxu Date: Wed, 25 Apr 2018 14:05:36 -0400 Subject: Port `SnapshotVersion` for `Local` (#1182) * no-brainer replace `FSTSnapshotVersion` with `SnapshotVersion` * refresh code * fix LocalStore * fix LocalStore (partial revert 78e6c38) * address changes --- Firestore/Source/Local/FSTQueryData.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'Firestore/Source/Local/FSTQueryData.h') diff --git a/Firestore/Source/Local/FSTQueryData.h b/Firestore/Source/Local/FSTQueryData.h index 5db2de6..d2dacd6 100644 --- a/Firestore/Source/Local/FSTQueryData.h +++ b/Firestore/Source/Local/FSTQueryData.h @@ -18,8 +18,9 @@ #import "Firestore/Source/Core/FSTTypes.h" +#include "Firestore/core/src/firebase/firestore/model/snapshot_version.h" + @class FSTQuery; -@class FSTSnapshotVersion; NS_ASSUME_NONNULL_BEGIN @@ -42,7 +43,7 @@ typedef NS_ENUM(NSInteger, FSTQueryPurpose) { targetID:(FSTTargetID)targetID listenSequenceNumber:(FSTListenSequenceNumber)sequenceNumber purpose:(FSTQueryPurpose)purpose - snapshotVersion:(FSTSnapshotVersion *)snapshotVersion + snapshotVersion:(firebase::firestore::model::SnapshotVersion)snapshotVersion resumeToken:(NSData *)resumeToken NS_DESIGNATED_INITIALIZER; /** Convenience initializer for use when creating an FSTQueryData for the first time. */ @@ -54,9 +55,13 @@ typedef NS_ENUM(NSInteger, FSTQueryPurpose) { - (instancetype)init NS_UNAVAILABLE; /** Creates a new query data instance with an updated snapshot version and resume token. */ -- (instancetype)queryDataByReplacingSnapshotVersion:(FSTSnapshotVersion *)snapshotVersion +- (instancetype)queryDataByReplacingSnapshotVersion: + (firebase::firestore::model::SnapshotVersion)snapshotVersion resumeToken:(NSData *)resumeToken; +/** The latest snapshot version seen for this target. */ +- (const firebase::firestore::model::SnapshotVersion &)snapshotVersion; + /** The query being listened to. */ @property(nonatomic, strong, readonly) FSTQuery *query; @@ -71,9 +76,6 @@ typedef NS_ENUM(NSInteger, FSTQueryPurpose) { /** The purpose of the query. */ @property(nonatomic, assign, readonly) FSTQueryPurpose purpose; -/** The latest snapshot version seen for this target. */ -@property(nonatomic, strong, readonly) FSTSnapshotVersion *snapshotVersion; - /** * An opaque, server-assigned token that allows watching a query to be resumed after disconnecting * without retransmitting all the data that matches the query. The resume token essentially -- cgit v1.2.3