Merge pull request #569 from sf-insuretech/bug/fix-nil-service-data

Fixed nil service data when broadcast by device
innoveit · Dec 26, 2019 · 1d2546a · 1d2546a
2 parents 1ff4e9b + d3edb15
commit 1d2546a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/ios/CBPeripheral+Extensions.m b/ios/CBPeripheral+Extensions.m
@@ -111,8 +111,10 @@ - (NSDictionary *) serializableAdvertisementData: (NSDictionary *) advertisement
     NSLog(@"%@", serviceData);
 
     for (CBUUID *key in [serviceData allKeys]) {
-      [serviceData setObject:dataToArrayBuffer([serviceData objectForKey:key]) forKey:[key UUIDString]];
-      [serviceData removeObjectForKey:key];
+        if ([serviceData objectForKey:key]) {
+            [serviceData setObject:dataToArrayBuffer([serviceData objectForKey:key]) forKey:[key UUIDString]];
+            [serviceData removeObjectForKey:key];
+        }
     }
 
     // replace the Service Data object