fix(firestore, ios): fix an issue when removing a value that didn't e…

…xist in ServerTimestampBehavior map (#10391)
firebase · Feb 7, 2023 · 2929ac9 · 2929ac9
1 parent db67962
commit 2929ac9
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTFirebaseFirestoreWriter.m b/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTFirebaseFirestoreWriter.m
@@ -149,11 +149,15 @@ - (FIRServerTimestampBehavior)toServerTimestampBehavior:(NSString *)serverTimest
 }
 
 - (NSDictionary *)FIRDocumentSnapshot:(FIRDocumentSnapshot *)documentSnapshot {
+  NSString *timestampBehaviorString =
+      FLTFirebaseFirestorePlugin.serverTimestampMap[@([documentSnapshot hash])];
+
   FIRServerTimestampBehavior serverTimestampBehavior =
-      [self toServerTimestampBehavior:FLTFirebaseFirestorePlugin
-                                          .serverTimestampMap[@([documentSnapshot hash])]];
+      [self toServerTimestampBehavior:timestampBehaviorString];
 
-  [FLTFirebaseFirestorePlugin.serverTimestampMap removeObjectForKey:@([documentSnapshot hash])];
+  if (timestampBehaviorString != nil) {
+    [FLTFirebaseFirestorePlugin.serverTimestampMap removeObjectForKey:@([documentSnapshot hash])];
+  }
 
   return @{
     @"path" : documentSnapshot.reference.path,