@@ -73,7 +73,7 @@ - (instancetype)initWithDatabaseInfo:(const DatabaseInfo &)databaseInfo
7373 credentialsProvider :
7474 (CredentialsProvider *)credentialsProvider // no passing ownership
7575 userExecutor : (std::unique_ptr<Executor>)userExecutor
76- workerQueue : (AsyncQueue * )queue NS_DESIGNATED_INITIALIZER;
76+ workerQueue : (std::unique_ptr< AsyncQueue> )queue NS_DESIGNATED_INITIALIZER;
7777
7878@property (nonatomic , assign , readonly ) const DatabaseInfo *databaseInfo;
7979@property (nonatomic , strong , readonly ) FSTEventManager *eventManager;
@@ -89,12 +89,12 @@ - (instancetype)initWithDatabaseInfo:(const DatabaseInfo &)databaseInfo
8989
9090@implementation FSTFirestoreClient {
9191 /* *
92- * Dispatch queue responsible for all of our internal processing. When we get incoming work from
92+ * Async queue responsible for all of our internal processing. When we get incoming work from
9393 * the user (via public API) or the network (incoming gRPC messages), we should always dispatch
9494 * onto this queue. This ensures our internal data structures are never accessed from multiple
9595 * threads simultaneously.
9696 */
97- AsyncQueue * _workerQueue;
97+ std::unique_ptr< AsyncQueue> _workerQueue;
9898
9999 std::unique_ptr<Executor> _userExecutor;
100100}
@@ -108,40 +108,39 @@ + (instancetype)clientWithDatabaseInfo:(const DatabaseInfo &)databaseInfo
108108 credentialsProvider :
109109 (CredentialsProvider *)credentialsProvider // no passing ownership
110110 userExecutor : (std::unique_ptr<Executor>)userExecutor
111- workerQueue : (AsyncQueue * )workerQueue {
111+ workerQueue : (std::unique_ptr< AsyncQueue> )workerQueue {
112112 return [[FSTFirestoreClient alloc ] initWithDatabaseInfo: databaseInfo
113113 usePersistence: usePersistence
114114 credentialsProvider: credentialsProvider
115115 userExecutor:std: :move (userExecutor)
116- workerQueue: workerQueue];
116+ workerQueue:std: : move ( workerQueue) ];
117117}
118118
119119- (instancetype )initWithDatabaseInfo : (const DatabaseInfo &)databaseInfo
120120 usePersistence : (BOOL )usePersistence
121121 credentialsProvider :
122122 (CredentialsProvider *)credentialsProvider // no passing ownership
123123 userExecutor : (std::unique_ptr<Executor>)userExecutor
124- workerQueue : (AsyncQueue * )workerQueue {
124+ workerQueue : (std::unique_ptr< AsyncQueue> )workerQueue {
125125 if (self = [super init ]) {
126126 _databaseInfo = databaseInfo;
127127 _credentialsProvider = credentialsProvider;
128128 _userExecutor = std::move (userExecutor);
129- _workerQueue = workerQueue;
129+ _workerQueue = std::move ( workerQueue) ;
130130
131131 auto userPromise = std::make_shared<std::promise<User>>();
132132 bool initialized = false ;
133133
134134 __weak __typeof__ (self) weakSelf = self;
135- auto credentialChangeListener = [self , initialized, userPromise, weakSelf,
136- workerQueue ](User user) mutable {
135+ auto credentialChangeListener = [initialized, userPromise, weakSelf](User user) mutable {
137136 __typeof__ (self) strongSelf = weakSelf;
138137 if (!strongSelf) return ;
139138
140139 if (!initialized) {
141140 initialized = true ;
142141 userPromise->set_value (user);
143142 } else {
144- _workerQueue->Enqueue ([=] { [strongSelf credentialDidChangeWithUser: user]; });
143+ strongSelf-> _workerQueue ->Enqueue ([=] { [strongSelf credentialDidChangeWithUser: user]; });
145144 }
146145 };
147146
@@ -193,12 +192,12 @@ - (void)initializeWithUser:(const User &)user usePersistence:(BOOL)usePersistenc
193192 _localStore = [[FSTLocalStore alloc ] initWithPersistence: _persistence initialUser: user];
194193
195194 FSTDatastore *datastore = [FSTDatastore datastoreWithDatabase: self .databaseInfo
196- workerQueue: _workerQueue
195+ workerQueue: _workerQueue. get ()
197196 credentials: _credentialsProvider];
198197
199198 _remoteStore = [[FSTRemoteStore alloc ] initWithLocalStore: _localStore
200199 datastore: datastore
201- workerQueue: _workerQueue];
200+ workerQueue: _workerQueue. get () ];
202201
203202 _syncEngine = [[FSTSyncEngine alloc ] initWithLocalStore: _localStore
204203 remoteStore: _remoteStore
@@ -366,7 +365,7 @@ - (void)transactionWithRetries:(int)retries
366365 _workerQueue->Enqueue ([=] {
367366 [self .syncEngine
368367 transactionWithRetries: retries
369- workerQueue: _workerQueue
368+ workerQueue: _workerQueue. get ()
370369 updateBlock: updateBlock
371370 completion: ^(id _Nullable result, NSError *_Nullable error) {
372371 // Dispatch the result back onto the user dispatch queue.
0 commit comments