iOs: NSDictionary protected from nil value

apache · Jul 29, 2022 · b8689d3 · b8689d3
1 parent b3a0d03
commit b8689d3
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/ios/CDVDevice.m b/src/ios/CDVDevice.m
@@ -98,12 +98,16 @@ - (NSDictionary*)deviceProperties
 {
     UIDevice* device = [UIDevice currentDevice];
 
+    NSString* modelVersion = [device modelVersion];
+    NSString* systemVersion = [device systemVersion];
+    NSString* uniqueId = [self uniqueAppInstanceIdentifier:device];
+
     return @{
              @"manufacturer": @"Apple",
-             @"model": [device modelVersion],
+             @"model": modelVersion ? modelVersion : @"",
              @"platform": @"iOS",
-             @"version": [device systemVersion],
-             @"uuid": [self uniqueAppInstanceIdentifier:device],
+             @"version": systemVersion ? systemVersion : @"",
+             @"uuid": uniqueId ? uniqueId : @"",
              @"cordova": [[self class] cordovaVersion],
              @"isVirtual": @([self isVirtual]),
              @"isiOSAppOnMac": @([self isiOSAppOnMac])