Merge pull request #985 from BranchMetrics/SDK-717-fix-for-0.31.x-breaking-on-server-update

SDK-717 convert cpu type to a string

Author: echo-branch

Branch-SDK-Tests/BNCDeviceInfoTests.m

@@ -59,13 +59,13 @@ - (void)testExtensionType {
 }
 
 - (void)testCpuType_Simulator {
-    NSNumber *expected = @(7);
-    XCTAssert([expected isEqualToNumber:self.deviceInfo.cpuType]);
+    NSString *expected = @"7";
+    XCTAssert([expected isEqualToString:self.deviceInfo.cpuType]);
 }
 
 //- (void)testCpuType_iPhone7 {
-//    NSNumber *expected = @(16777228);
-//    XCTAssert([expected isEqualToNumber:self.deviceInfo.cpuType]);
+//    NSString *expected = @"16777228";
+//    XCTAssert([expected isEqualToString:self.deviceInfo.cpuType]);
 //}
 
 - (void)testScreenWidth {

Branch-SDK/Branch-SDK/BNCDeviceInfo.h

@@ -45,7 +45,7 @@
 @property (nonatomic, copy, readwrite) NSString *osVersion;
 @property (nonatomic, copy, readwrite) NSString *osBuildVersion;
 @property (nonatomic, copy, readwrite) NSString *extensionType;
-@property (nonatomic, copy, readwrite) NSNumber *cpuType;
+@property (nonatomic, copy, readwrite) NSString *cpuType;
 @property (nonatomic, copy, readwrite) NSNumber *screenWidth;
 @property (nonatomic, copy, readwrite) NSNumber *screenHeight;
 @property (nonatomic, copy, readwrite) NSNumber *screenScale;

Branch-SDK/Branch-SDK/BNCDeviceInfo.m

@@ -79,7 +79,11 @@ - (void)loadDeviceInfo {
     self.osName = [BNCSystemObserver getOS];
     self.osVersion = [BNCSystemObserver getOSVersion];
     self.osBuildVersion = deviceSystem.systemBuildVersion;
-    self.cpuType = deviceSystem.cpuType;
+    
+    if (deviceSystem.cpuType) {
+        self.cpuType = [deviceSystem.cpuType stringValue];
+    }
+    
     self.screenWidth = [BNCSystemObserver getScreenWidth];
     self.screenHeight = [BNCSystemObserver getScreenHeight];
     self.screenScale = @([UIScreen mainScreen].scale);