Skip to content

Commit b65e230

Browse files
committed
Null safety and small changes
1 parent 8938a4d commit b65e230

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

Parse/Platform/LiveQueries/ParseLiveQueryController.cs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,10 @@ void ProcessDeleteEventMessage(IDictionary<string, object> message)
196196
if (!ValidateClientMessage(message, out int requestId))
197197
return;
198198

199-
if (!Subscriptions.TryGetValue(requestId, out IParseLiveQuerySubscription subscription))
199+
if (!GetDictEntry(message, "object", out IDictionary<string, object> objectDict))
200200
return;
201201

202-
if (!GetDictEntry(message, "object", out IDictionary<string, object> objectDict))
202+
if (!Subscriptions.TryGetValue(requestId, out IParseLiveQuerySubscription subscription))
203203
return;
204204

205205
subscription.OnDelete(ParseObjectCoder.Instance.Decode(objectDict, Decoder, ParseClient.Instance.Services));
@@ -210,15 +210,15 @@ void ProcessLeaveEventMessage(IDictionary<string, object> message)
210210
if (!ValidateClientMessage(message, out int requestId))
211211
return;
212212

213-
if (!Subscriptions.TryGetValue(requestId, out IParseLiveQuerySubscription subscription))
214-
return;
215-
216213
if (!GetDictEntry(message, "object", out IDictionary<string, object> objectDict))
217214
return;
218215

219216
if (!GetDictEntry(message, "original", out IDictionary<string, object> originalDict))
220217
return;
221218

219+
if (!Subscriptions.TryGetValue(requestId, out IParseLiveQuerySubscription subscription))
220+
return;
221+
222222
subscription.OnLeave(
223223
ParseObjectCoder.Instance.Decode(objectDict, Decoder, ParseClient.Instance.Services),
224224
ParseObjectCoder.Instance.Decode(originalDict, Decoder, ParseClient.Instance.Services));
@@ -229,15 +229,15 @@ void ProcessUpdateEventMessage(IDictionary<string, object> message)
229229
if (!ValidateClientMessage(message, out int requestId))
230230
return;
231231

232-
if (!Subscriptions.TryGetValue(requestId, out IParseLiveQuerySubscription subscription))
233-
return;
234-
235232
if (!GetDictEntry(message, "object", out IDictionary<string, object> objectDict))
236233
return;
237234

238235
if (!GetDictEntry(message, "original", out IDictionary<string, object> originalDict))
239236
return;
240237

238+
if (!Subscriptions.TryGetValue(requestId, out IParseLiveQuerySubscription subscription))
239+
return;
240+
241241
subscription.OnUpdate(
242242
ParseObjectCoder.Instance.Decode(objectDict, Decoder, ParseClient.Instance.Services),
243243
ParseObjectCoder.Instance.Decode(originalDict, Decoder, ParseClient.Instance.Services));
@@ -248,15 +248,15 @@ void ProcessEnterEventMessage(IDictionary<string, object> message)
248248
if (!ValidateClientMessage(message, out int requestId))
249249
return;
250250

251-
if (!Subscriptions.TryGetValue(requestId, out IParseLiveQuerySubscription subscription))
252-
return;
253-
254251
if (!GetDictEntry(message, "object", out IDictionary<string, object> objectDict))
255252
return;
256253

257254
if (!GetDictEntry(message, "original", out IDictionary<string, object> originalDict))
258255
return;
259256

257+
if (!Subscriptions.TryGetValue(requestId, out IParseLiveQuerySubscription subscription))
258+
return;
259+
260260
subscription.OnEnter(
261261
ParseObjectCoder.Instance.Decode(objectDict, Decoder, ParseClient.Instance.Services),
262262
ParseObjectCoder.Instance.Decode(originalDict, Decoder, ParseClient.Instance.Services));
@@ -267,10 +267,10 @@ void ProcessCreateEventMessage(IDictionary<string, object> message)
267267
if (!ValidateClientMessage(message, out int requestId))
268268
return;
269269

270-
if (!Subscriptions.TryGetValue(requestId, out IParseLiveQuerySubscription subscription))
270+
if (!GetDictEntry(message, "object", out IDictionary<string, object> objectDict))
271271
return;
272272

273-
if (!GetDictEntry(message, "object", out IDictionary<string, object> objectDict))
273+
if (!Subscriptions.TryGetValue(requestId, out IParseLiveQuerySubscription subscription))
274274
return;
275275

276276
subscription.OnCreate(ParseObjectCoder.Instance.Decode(objectDict, Decoder, ParseClient.Instance.Services));
@@ -323,7 +323,7 @@ void ProcessConnectionMessage(IDictionary<string, object> message)
323323

324324
ClientId = clientId;
325325
_state = ParseLiveQueryState.Connected;
326-
ConnectionSignal.TrySetResult();
326+
ConnectionSignal?.TrySetResult();
327327
}
328328

329329
private async Task<IDictionary<string, object>> AppendSessionToken(IDictionary<string, object> message)

0 commit comments

Comments
 (0)