SDK-1625 protect BNCDeviceInfo

Author: echo-branch

Branch-SDK/BranchPluginSupport.m

@@ -28,28 +28,29 @@ + (BranchPluginSupport *)instance {
 
 
 - (NSDictionary<NSString *, NSString *> *)deviceDescription {
-    BNCDeviceInfo *deviceInfo = [BNCDeviceInfo getInstance];
-    [deviceInfo checkAdvertisingIdentifier];
-    
     NSMutableDictionary<NSString *, NSString *> *dictionary = [NSMutableDictionary new];
-        
-    [dictionary bnc_safeSetObject:deviceInfo.osName forKey:@"os"];
-    [dictionary bnc_safeSetObject:deviceInfo.osVersion forKey:@"os_version"];
-    [dictionary bnc_safeSetObject:deviceInfo.environment forKey:@"environment"];
-    [dictionary bnc_safeSetObject:deviceInfo.vendorId forKey:@"idfv"];
-    [dictionary bnc_safeSetObject:deviceInfo.advertiserId forKey:@"idfa"];
-    [dictionary bnc_safeSetObject:deviceInfo.optedInStatus forKey:@"opted_in_status"];
-    [dictionary bnc_safeSetObject:[BNCPreferenceHelper sharedInstance].userIdentity forKey:@"developer_identity"];
-    [dictionary bnc_safeSetObject:deviceInfo.country forKey:@"country"];
-    [dictionary bnc_safeSetObject:deviceInfo.language forKey:@"language"];
-    [dictionary bnc_safeSetObject:deviceInfo.localIPAddress forKey:@"local_ip"];
-    [dictionary bnc_safeSetObject:deviceInfo.brandName forKey:@"brand"];
-    [dictionary bnc_safeSetObject:deviceInfo.applicationVersion forKey:@"app_version"];
-    [dictionary bnc_safeSetObject:deviceInfo.modelName forKey:@"model"];
-    [dictionary bnc_safeSetObject:deviceInfo.screenScale.stringValue forKey:@"screen_dpi"];
-    [dictionary bnc_safeSetObject:deviceInfo.screenHeight.stringValue forKey:@"screen_height"];
-    [dictionary bnc_safeSetObject:deviceInfo.screenWidth.stringValue forKey:@"screen_width"];
+    BNCDeviceInfo *deviceInfo = [BNCDeviceInfo getInstance];
 
+    @synchronized (deviceInfo) {
+        [deviceInfo checkAdvertisingIdentifier];
+            
+        [dictionary bnc_safeSetObject:deviceInfo.osName forKey:@"os"];
+        [dictionary bnc_safeSetObject:deviceInfo.osVersion forKey:@"os_version"];
+        [dictionary bnc_safeSetObject:deviceInfo.environment forKey:@"environment"];
+        [dictionary bnc_safeSetObject:deviceInfo.vendorId forKey:@"idfv"];
+        [dictionary bnc_safeSetObject:deviceInfo.advertiserId forKey:@"idfa"];
+        [dictionary bnc_safeSetObject:deviceInfo.optedInStatus forKey:@"opted_in_status"];
+        [dictionary bnc_safeSetObject:[BNCPreferenceHelper sharedInstance].userIdentity forKey:@"developer_identity"];
+        [dictionary bnc_safeSetObject:deviceInfo.country forKey:@"country"];
+        [dictionary bnc_safeSetObject:deviceInfo.language forKey:@"language"];
+        [dictionary bnc_safeSetObject:deviceInfo.localIPAddress forKey:@"local_ip"];
+        [dictionary bnc_safeSetObject:deviceInfo.brandName forKey:@"brand"];
+        [dictionary bnc_safeSetObject:deviceInfo.applicationVersion forKey:@"app_version"];
+        [dictionary bnc_safeSetObject:deviceInfo.modelName forKey:@"model"];
+        [dictionary bnc_safeSetObject:deviceInfo.screenScale.stringValue forKey:@"screen_dpi"];
+        [dictionary bnc_safeSetObject:deviceInfo.screenHeight.stringValue forKey:@"screen_height"];
+        [dictionary bnc_safeSetObject:deviceInfo.screenWidth.stringValue forKey:@"screen_width"];
+    }
     return dictionary;
 }