Merge pull request #547 from BranchMetrics/INTENG-4503-update-native-sdk

SDK-173 update native sdks

Author: echo-branch

package.json

@@ -2,7 +2,7 @@
   "name": "branch-cordova-sdk",
   "description": "Branch Metrics Cordova SDK",
   "main": "src/index.js",
-  "version": "3.1.5",
+  "version": "3.1.6",
   "homepage": "https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking",
   "repository": {
     "type": "git",

plugin.template.xml

@@ -24,7 +24,7 @@ SOFTWARE.
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
   xmlns:android="http://schemas.android.com/apk/res/android"
   id="branch-cordova-sdk"
-  version="3.1.5">
+  version="3.1.6">
 
   <!-- DO NOT EDIT THIS FILE. MAKE ALL CHANGES TO plugin.template.xml INSTEAD -->
 

plugin.xml

@@ -24,7 +24,7 @@ SOFTWARE.
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
   xmlns:android="http://schemas.android.com/apk/res/android"
   id="branch-cordova-sdk"
-  version="3.1.5">
+  version="3.1.6">
 
   <!-- DO NOT EDIT THIS FILE. MAKE ALL CHANGES TO plugin.template.xml INSTEAD -->
 
@@ -63,7 +63,8 @@ SOFTWARE.
     </config-file>
 
     <source-file src="src/android/io/branch/BranchSDK.java" target-dir="src/io/branch" />
-    <lib-file src="src/android/dependencies/Branch.jar" />
+    <source-file src="src/android/dependencies/Branch.aar" target-dir="app/libs" />
+    <framework src="src/android/dependencies/rules.gradle" custom="true" type="gradleReference" />
   </platform>
 
   <!-- iOS -->

src/android/dependencies/Branch.aar

@@ -0,0 +1,4 @@
+dependencies {
+    implementation fileTree(dir: 'libs', include: '*.aar')
+}
+

src/android/dependencies/Branch.jar

@@ -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/android/dependencies/rules.gradle

@@ -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/BNCCommerceEvent.h

@@ -8,8 +8,8 @@
 
 #include "BNCConfig.h"
 
-NSString * const BNC_API_BASE_URL    = @"https://api.branch.io";
-BOOL       const BNC_API_PINNED      = YES;
+NSString * const BNC_API_BASE_URL    = @"https://api2.branch.io";
+BOOL       const BNC_API_PINNED      = NO;
 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.11";

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

@@ -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;