Skip to content

Commit

Permalink
SDK-1570 prep 1.43.2 release
Browse files Browse the repository at this point in the history
  • Loading branch information
echo-branch committed Sep 14, 2022
1 parent 6f3169e commit 2a430f2
Show file tree
Hide file tree
Showing 16 changed files with 67 additions and 43 deletions.
2 changes: 1 addition & 1 deletion Branch-SDK/BNCConfig.m
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
NSString * const BNC_API_BASE_URL = @"https://api2.branch.io";
NSString * const BNC_API_VERSION = @"v1";
NSString * const BNC_LINK_URL = @"https://bnc.lt";
NSString * const BNC_SDK_VERSION = @"1.43.1";
NSString * const BNC_SDK_VERSION = @"1.43.2";
5 changes: 1 addition & 4 deletions Branch-SDK/BNCNetworkService.m
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,7 @@ - (NSURLSession*) session {
self.sessionQueue = [NSOperationQueue new];
self.sessionQueue.name = @"io.branch.sdk.network.queue";
self.sessionQueue.maxConcurrentOperationCount = self.maximumConcurrentOperations;
if ([self.sessionQueue respondsToSelector:@selector(setQualityOfService:)]) {
// qualityOfService is iOS 8 and above.
self.sessionQueue.qualityOfService = NSQualityOfServiceUserInteractive;
}
self.sessionQueue.qualityOfService = NSQualityOfServiceBackground;

_session =
[NSURLSession sessionWithConfiguration:configuration
Expand Down
2 changes: 1 addition & 1 deletion Branch-SDK/BNCPreferenceHelper.m
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,6 @@ - (void) clearTrackingInformation {
// Don't clear these
self.randomizedDeviceToken = nil;
self.randomizedBundleToken = nil;
self.userIdentity = nil;
*/
self.sessionID = nil;
self.linkClickIdentifier = nil;
Expand All @@ -726,6 +725,7 @@ - (void) clearTrackingInformation {
self.previousAppBuildDate = nil;
self.requestMetadataDictionary = nil;
self.lastStrongMatchDate = nil;
self.userIdentity = nil;
}
}

Expand Down
5 changes: 5 additions & 0 deletions Branch-SDK/BNCServerInterface.m
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,11 @@ - (NSMutableDictionary *)prepareParamDict:(NSDictionary *)params
}
}
}

if ([self.requestEndpoint containsString:@"/v1/open"]) {
[fullParamDict bnc_safeSetObject:[BNCPreferenceHelper sharedInstance].userIdentity forKey:@"identity"];
}

return fullParamDict;
}

Expand Down
41 changes: 21 additions & 20 deletions Branch-SDK/BranchPluginSupport.m
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
Binary file modified Branch-TestBed/Framework-Info.plist
Binary file not shown.
2 changes: 1 addition & 1 deletion Branch.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "Branch"
s.version = "1.43.1"
s.version = "1.43.2"
s.summary = "Create an HTTP URL for any piece of content in your app"
s.description = <<-DESC
- Want the highest possible conversions on your sharing feature?
Expand Down
4 changes: 4 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
Branch iOS SDK Change Log

v.1.43.2
- SDK-1625 Fix rare crash when used with Adobe Launch
- Update developer id handling logic

v.1.43.1
- SDK-1461 Updates to GBRAID handling
- Updated podspec to include LinkPresentation.framework
Expand Down
12 changes: 11 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
## Branch SDK Documentation for iOS
# Branch SDK Documentation for iOS

The Branch iOS SDK for deep linking and attribution.

> ## Branch Sandbox Program
>
> As part of this [sandbox program](https://help.branch.io/developers-hub/docs/branch-sandbox-program), you will be able to partner directly with Branch’s Product and Engineering team for exclusive access to test drive our innovative products before the market and proactively exchange valuable feedback. With your support, we will create the winning measurement and linking solutions of the future together.
>
> **If you would like to join, please reach out to us today at [[email protected]](mailto:[email protected] "mailto:[email protected]") or by filling out this [form](https://branch.link/sandbox?~channel=ios-repo).**
Branch helps mobile apps grow with deep links / deeplinks that power paid acquisition and re-engagement campaigns, referral programs, content sharing, deep linked emails, smart banners, custom user onboarding, and more.

View [Branch's SDK documentation for iOS](https://help.branch.io/developers-hub/docs/ios-sdk-overview)
5 changes: 5 additions & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Security Policy

## Reporting a Vulnerability
If you discover a potential security issue in this project we ask that you notify Branch Security directly via email to [email protected]
Please do not open GitHub issues or pull requests - this makes the problem immediately visible to everyone, including malicious actors.
22 changes: 12 additions & 10 deletions carthage-files/BranchSDK.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1700,6 +1700,7 @@
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 0;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
Expand All @@ -1710,7 +1711,7 @@
INFOPLIST_FILE = "Branch-tvOS/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 1.43.1;
MARKETING_VERSION = 1.43.2;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
Expand All @@ -1736,6 +1737,7 @@
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 0;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
Expand All @@ -1746,7 +1748,7 @@
INFOPLIST_FILE = "Branch-tvOS/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 1.43.1;
MARKETING_VERSION = 1.43.2;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = NO;
PRODUCT_BUNDLE_IDENTIFIER = io.branch.Branch;
Expand All @@ -1766,7 +1768,7 @@
APPLICATION_EXTENSION_API_ONLY = YES;
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 0;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 3;
Expand All @@ -1778,7 +1780,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MACH_O_TYPE = staticlib;
MACOSX_DEPLOYMENT_TARGET = 10.15;
MARKETING_VERSION = 1.43.1;
MARKETING_VERSION = 1.43.2;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_BUNDLE_IDENTIFIER = io.branch.Branch;
Expand All @@ -1795,7 +1797,7 @@
APPLICATION_EXTENSION_API_ONLY = YES;
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 0;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 3;
Expand All @@ -1807,7 +1809,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MACH_O_TYPE = staticlib;
MACOSX_DEPLOYMENT_TARGET = 10.15;
MARKETING_VERSION = 1.43.1;
MARKETING_VERSION = 1.43.2;
ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_BUNDLE_IDENTIFIER = io.branch.Branch;
Expand Down Expand Up @@ -1952,7 +1954,7 @@
APPLICATION_EXTENSION_API_ONLY = YES;
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 0;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 3;
Expand All @@ -1962,7 +1964,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.15;
MARKETING_VERSION = 1.43.1;
MARKETING_VERSION = 1.43.2;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_BUNDLE_IDENTIFIER = io.branch.Branch;
Expand All @@ -1979,7 +1981,7 @@
APPLICATION_EXTENSION_API_ONLY = YES;
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 0;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 3;
Expand All @@ -1989,7 +1991,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.15;
MARKETING_VERSION = 1.43.1;
MARKETING_VERSION = 1.43.2;
ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_BUNDLE_IDENTIFIER = io.branch.Branch;
Expand Down
2 changes: 1 addition & 1 deletion carthage-files/checksum.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#checksum for Branch on Github
03e74d6076c777217808572da5074f357fa119f5 Branch.zip
d21dfdbc177d4351b65b2d9b81eade8e0971a34c Branch.zip
2 changes: 1 addition & 1 deletion carthage-files/checksum_noidfa.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#checksum for Branch on Github
47d2a6459ab74dd011a5a4991995a51df7224dce Branch_noidfa.zip
82f3671f396e6b476b4f363a80eb1208e685e4c6 Branch_noidfa.zip
2 changes: 1 addition & 1 deletion carthage-files/checksum_static.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#checksum for Branch on Github
78821eef9f0a841f4b4dcd8f7fb8a6cc6fa65656 Branch_static.zip
2247d66843c4a7458fcd3ca51d8c99a10954382c Branch_static.zip
2 changes: 1 addition & 1 deletion carthage-files/checksum_static_noidfa.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#checksum for Branch on Github
ef983060b38928408de2342b912fec688bd38d50 Branch_static_noidfa.zip
a071a39d43b60b04756c18de5c59e03c7b39ee4e Branch_static_noidfa.zip
2 changes: 1 addition & 1 deletion scripts/version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Options:
USAGE
}

version=1.43.1
version=1.43.2

if (( $# == 0 )); then
echo $version
Expand Down

0 comments on commit 2a430f2

Please sign in to comment.