chore: INTENG-4503 update the iOS native plugin

Author: echo-branch

src/ios/dependencies/Branch-SDK/BNCCommerceEvent.h

@@ -263,7 +263,7 @@ NSArray<BNCCurrency>*_Nonnull BNCCurrencyAllCurrencies(void);
 @end
 
 
-@interface BranchCommerceEventRequest : BNCServerRequest <NSCoding>
+@interface BranchCommerceEventRequest : BNCServerRequest <NSSecureCoding>
 
 - (instancetype _Nonnull) initWithCommerceEvent:(BNCCommerceEvent*_Nonnull)commerceEvent
 							           metadata:(NSDictionary*_Nullable)dictionary

src/ios/dependencies/Branch-SDK/BNCCommerceEvent.m

@@ -599,14 +599,13 @@ - (void)processResponse:(BNCServerResponse*)response
 		self.completion(dictionary, error);
 }
 
-#pragma mark BranchCommerceEventRequest NSCoding
+#pragma mark BranchCommerceEventRequest NSSecureCoding
 
 - (instancetype)initWithCoder:(NSCoder *)decoder {
     self = [super initWithCoder:decoder];
 	if (!self) return self;
-
-	self.commerceDictionary = [decoder decodeObjectForKey:@"commerceDictionary"];
-	self.metadata = [decoder decodeObjectForKey:@"metaData"];
+	self.commerceDictionary = [decoder decodeObjectOfClass:NSDictionary.class forKey:@"commerceDictionary"];
+	self.metadata = [decoder decodeObjectOfClass:NSDictionary.class forKey:@"metaData"];
     return self;
 }
 
@@ -616,4 +615,8 @@ - (void)encodeWithCoder:(NSCoder *)coder {
     [coder encodeObject:self.metadata forKey:@"metadata"];
 }
 
++ (BOOL) supportsSecureCoding {
+    return YES;
+}
+
 @end

src/ios/dependencies/Branch-SDK/BNCConfig.m

@@ -8,8 +8,8 @@
 
 #include "BNCConfig.h"
 
-NSString * const BNC_API_BASE_URL    = @"https://api.branch.io";
+NSString * const BNC_API_BASE_URL    = @"https://api2.branch.io";
 BOOL       const BNC_API_PINNED      = YES;
 NSString * const BNC_API_VERSION     = @"v1";
 NSString * const BNC_LINK_URL        = @"https://bnc.lt";
-NSString * const BNC_SDK_VERSION     = @"0.25.5";
+NSString * const BNC_SDK_VERSION     = @"0.25.10";

src/ios/dependencies/Branch-SDK/BNCEncodingUtils.h

@@ -52,8 +52,10 @@ extern NSString* BNCWireFormatFromString(NSString *string);
 + (NSString*) stringByPercentDecodingString:(NSString*)string;
 + (NSString*) stringByPercentEncodingStringForQuery:(NSString *)string;
 
++ (NSString *)sanitizedStringFromString:(NSString *)dirtyString;
 + (NSDictionary *)decodeJsonDataToDictionary:(NSData *)jsonData;
 + (NSDictionary *)decodeJsonStringToDictionary:(NSString *)jsonString;
+
 + (NSDictionary *)decodeQueryStringToDictionary:(NSString *)queryString;
 + (NSString *)encodeDictionaryToQueryString:(NSDictionary *)dictionary;
 

src/ios/dependencies/Branch-SDK/BNCEncodingUtils.m

@@ -143,10 +143,15 @@ + (NSString *)iso8601StringFromDate:(NSDate *)date {
 
 + (NSString *)sanitizedStringFromString:(NSString *)dirtyString {
     NSString *dirtyCopy = [dirtyString copy]; // dirtyString seems to get dealloc'ed sometimes. Make a copy.
-    NSString *cleanString = [[[[dirtyCopy stringByReplacingOccurrencesOfString:@"\"" withString:@"\\\""]
-                                          stringByReplacingOccurrencesOfString:@"\n" withString:@"\\n"]
-                                          stringByReplacingOccurrencesOfString:@"’" withString:@"'"]
-                                          stringByReplacingOccurrencesOfString:@"\r" withString:@"\\r"];
+    NSString *cleanString = [[[[[[[[dirtyCopy
+        stringByReplacingOccurrencesOfString:@"\\" withString:@"\\\\"]
+        stringByReplacingOccurrencesOfString:@"\b" withString:@"\\b"]
+        stringByReplacingOccurrencesOfString:@"\f" withString:@"\\f"]
+        stringByReplacingOccurrencesOfString:@"\n" withString:@"\\n"]
+        stringByReplacingOccurrencesOfString:@"\r" withString:@"\\r"]
+        stringByReplacingOccurrencesOfString:@"\t" withString:@"\\t"]
+        stringByReplacingOccurrencesOfString:@"\"" withString:@"\\\""]
+        stringByReplacingOccurrencesOfString:@"`"  withString:@"'"];
     return cleanString;
 }
 

src/ios/dependencies/Branch-SDK/BNCKeyChain.m

@@ -124,7 +124,7 @@ + (id) retrieveValueForService:(NSString*)service key:(NSString*)key error:(NSEr
     };
     CFDataRef valueData = NULL;
     OSStatus status = SecItemCopyMatching((__bridge CFDictionaryRef)dictionary, (CFTypeRef *)&valueData);
-    if (status) {
+    if (status != errSecSuccess) {
         NSError *localError = [self errorWithKey:key OSStatus:status];
         BNCLogDebugSDK(@"Can't retrieve key: %@.", localError);
         if (error) *error = localError;

src/ios/dependencies/Branch-SDK/BNCLinkData.h

@@ -17,7 +17,7 @@ typedef NS_ENUM(NSUInteger, BranchLinkType) {
     BranchLinkTypeOneTimeUse = 1
 };
 
-@interface BNCLinkData : NSObject
+@interface BNCLinkData : NSObject <NSSecureCoding>
 
 @property (strong, nonatomic) NSMutableDictionary *data;
 

src/ios/dependencies/Branch-SDK/BNCLinkData.m

@@ -170,20 +170,24 @@ - (void)encodeWithCoder:(NSCoder *)coder {
 
 - (id)initWithCoder:(NSCoder *)coder {
     if ((self = [super init])) {
-        self.tags = [coder decodeObjectForKey:BRANCH_REQUEST_KEY_URL_TAGS];
-        self.alias = [coder decodeObjectForKey:BRANCH_REQUEST_KEY_URL_ALIAS];
-        self.type = [[coder decodeObjectForKey:BRANCH_REQUEST_KEY_URL_LINK_TYPE] integerValue];
-        self.channel = [coder decodeObjectForKey:BRANCH_REQUEST_KEY_URL_CHANNEL];
-        self.feature = [coder decodeObjectForKey:BRANCH_REQUEST_KEY_URL_FEATURE];
-        self.stage = [coder decodeObjectForKey:BRANCH_REQUEST_KEY_URL_STAGE];
-        self.campaign = [coder decodeObjectForKey:BRANCH_REQUEST_KEY_URL_CAMPAIGN];
-        self.duration = [[coder decodeObjectForKey:BRANCH_REQUEST_KEY_URL_DURATION] integerValue];
+        self.tags = [coder decodeObjectOfClass:NSArray.class forKey:BRANCH_REQUEST_KEY_URL_TAGS];
+        self.alias = [coder decodeObjectOfClass:NSString.class forKey:BRANCH_REQUEST_KEY_URL_ALIAS];
+        self.type = [[coder decodeObjectOfClass:NSNumber.class forKey:BRANCH_REQUEST_KEY_URL_LINK_TYPE] integerValue];
+        self.channel = [coder decodeObjectOfClass:NSString.class forKey:BRANCH_REQUEST_KEY_URL_CHANNEL];
+        self.feature = [coder decodeObjectOfClass:NSString.class forKey:BRANCH_REQUEST_KEY_URL_FEATURE];
+        self.stage = [coder decodeObjectOfClass:NSString.class forKey:BRANCH_REQUEST_KEY_URL_STAGE];
+        self.campaign = [coder decodeObjectOfClass:NSString.class forKey:BRANCH_REQUEST_KEY_URL_CAMPAIGN];
+        self.duration = [[coder decodeObjectOfClass:NSNumber.class forKey:BRANCH_REQUEST_KEY_URL_DURATION] integerValue];
 
-        NSString *encodedParams = [coder decodeObjectForKey:BRANCH_REQUEST_KEY_URL_DATA];
+        NSString *encodedParams = [coder decodeObjectOfClass:NSString.class forKey:BRANCH_REQUEST_KEY_URL_DATA];
         self.params = [BNCEncodingUtils decodeJsonStringToDictionary:encodedParams];
     }
 
     return self;
 }
 
++ (BOOL) supportsSecureCoding {
+    return YES;
+}
+
 @end

src/ios/dependencies/Branch-SDK/BNCLog.m

@@ -42,6 +42,7 @@ void BNCLogInternalErrorFunction(int linenumber, NSString*format, ...) {
 
 
 inline static void BNCLogInitializeClient_Internal() {
+    BNCLogInitialize();
     BNCLogClientInitializeFunctionPtr initFunction = BNCLogSetClientInitializeFunction(NULL);
     if (initFunction) {
         initFunction();
@@ -470,6 +471,7 @@ void BNCLogSetOutputToURLByteWrap(NSURL *_Nullable URL, long maxBytes) {
 static BNCLogLevel bnc_LogDisplayLevel = BNCLogLevelWarning;
 
 BNCLogLevel BNCLogDisplayLevel() {
+    BNCLogInitializeClient_Internal();
     __block BNCLogLevel level = BNCLogLevelAll;
     dispatch_sync(bnc_LogQueue, ^{
         level = bnc_LogDisplayLevel;

src/ios/dependencies/Branch-SDK/BNCPreferenceHelper.h

@@ -94,5 +94,6 @@ NSURL* /* _Nonnull */ BNCURLForBranchDirectory(void);
 
 - (NSMutableString*) sanitizedMutableBaseURL:(NSString*)baseUrl;
 - (void) synchronize;  //  Flushes preference queue to persistence.
++ (void) clearAll;
 
 @end