Merge pull request #7 from BranchMetrics/staging

Fix for missing idfa

Branch.xcodeproj/project.pbxproj

@@ -1184,6 +1184,7 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = "";
+				MARKETING_VERSION = 1.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.sdk.mac;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 			};
@@ -1195,6 +1196,7 @@
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = "";
+				MARKETING_VERSION = 1.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.sdk.mac;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 			};
@@ -1298,6 +1300,7 @@
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = "";
+				MARKETING_VERSION = 1.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.sdk.mac;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 			};

Branch/BNCDevice.m

@@ -286,8 +286,9 @@ - (NSString *)vendorID {
 
 #endif
 
-- (NSString*) hardwareID {
-    NSString*s;
+- (NSString *)hardwareID {
+    // INTENG-8458 server only wants hardware id and hardware id type for idfa and idfv.
+    NSString *s = nil;
     s = [self advertisingID];
     if (s) {
         _hardwareIDType = @"idfa";
@@ -298,13 +299,6 @@ - (NSString*) hardwareID {
         _hardwareIDType = @"vendor_id";
         return s;
     }
-    s = [self netAddress];
-    if (s) {
-        _hardwareIDType = @"mac_address";
-        return s;
-    }
-    s = [[NSUUID UUID] UUIDString];
-    _hardwareIDType = @"random";
     return s;
 }
 

Branch/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSHumanReadableCopyright</key>

CHANGELOG.md

@@ -1,5 +1,8 @@
 Branch Mac SDK Change Log
 
+## v1.2.1 - December 13, 2019
+* Fix crash when idfa is not available
+
 ## v1.2.0 - October 7, 2019
 * Add user agent
 * Attribution fixes

Frameworks/macOS/Branch.framework/Versions/A/Resources/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>18G95</string>
+	<string>18G1012</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.0</string>
+	<string>1.2.1</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>
@@ -27,17 +27,17 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>11A1027</string>
+	<string>11C29</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>19A547</string>
+	<string>19B90</string>
 	<key>DTSDKName</key>
 	<string>macosx10.15</string>
 	<key>DTXcode</key>
-	<string>1110</string>
+	<string>1130</string>
 	<key>DTXcodeBuild</key>
-	<string>11A1027</string>
+	<string>11C29</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.10</string>
 	<key>NSHumanReadableCopyright</key>