Merge pull request #417 from BranchMetrics/update-dependencies

Update dependencies

Author: ethanneff

README.md

@@ -328,9 +328,7 @@
       $match_duration: 2000,
       custom_string: 'data',
       custom_integer: Date.now(),
-      custom_boolean: true,
-      custom_array: [1, 2, 3, 4, 5],
-      custom_object: { 'random': 'dictionary' }
+      custom_boolean: true
     }
 
     branchUniversalObj.generateShortUrl(analytics, properties).then(function (res) {
@@ -363,9 +361,7 @@
       $desktop_url: 'http://www.example.com/desktop',
       custom_string: 'data',
       custom_integer: Date.now(),
-      custom_boolean: true,
-      custom_array: [1, 2, 3, 4, 5],
-      custom_object: { 'random': 'dictionary' }
+      custom_boolean: true
     }
 
     var message = 'Check out this link'
@@ -1261,6 +1257,6 @@
     Error: Error code 1 for command: /gradlew with args: cdvBuildDebug,-b,/build.gradle,-Dorg.gradle.daemon=true,-Pandroid.useDeprecatedNdk=true
     ```
 
-      - Add `<preference name="android-minSdkVersion" value="15" />` to your `config.xml`
+      - Add `<preference name="android-minSdkVersion" value="16" />` to your `config.xml`
 
 

package.json

@@ -2,7 +2,7 @@
   "name": "branch-cordova-sdk",
   "description": "Branch Metrics Cordova SDK",
   "main": "src/branch.js",
-  "version": "2.6.21",
+  "version": "2.6.22",
   "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="2.6.21">
+  version="2.6.22">
 
   <!-- 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="2.6.21">
+  version="2.6.22">
 
   <!-- DO NOT EDIT THIS FILE. MAKE ALL CHANGES TO plugin.template.xml INSTEAD -->
 
@@ -166,6 +166,8 @@ SOFTWARE.
     <source-file src="src/ios/dependencies/Branch-SDK/NSMutableDictionary+Branch.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/NSString+Branch.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/NSString+Branch.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/UIViewController+Branch.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/UIViewController+Branch.m" />
 
     <header-file src="src/ios/dependencies/Branch-SDK/Networking/BNCNetworkService.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/Networking/BNCNetworkService.m" />

src/android/dependencies/Branch.jar

@@ -62,6 +62,7 @@ protected void pluginInitialize() {
 
         this.activity = this.cordova.getActivity();
 
+        Branch.disableInstantDeepLinking(true);
         Branch.getAutoInstance(this.activity.getApplicationContext());
 
     }

src/android/io/branch/BranchSDK.java

@@ -23,8 +23,3 @@ typedef NSString * UIApplicationOpenURLOptionsKey;
 #ifndef NS_STRING_ENUM
 #define NS_STRING_ENUM
 #endif
-
-@interface NSLocale (BranchAvailability)
-- (NSString*) countryCode;
-- (NSString*) languageCode;
-@end

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

@@ -354,6 +354,8 @@ - (void)makeRequest:(BNCServerInterface *)serverInterface
 		params[@"metadata"] = self.metadata;
 	if (self.commerceDictionary)
 		params[@"commerce_data"] = self.commerceDictionary;
+    if (preferenceHelper.limitFacebookTracking)
+        params[@"limit_facebook_tracking"] = CFBridgingRelease(kCFBooleanTrue);
 
 	NSString *URL = [preferenceHelper getAPIURL:BRANCH_REQUEST_ENDPOINT_USER_COMPLETED_ACTION];
     [serverInterface postRequest:params

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

@@ -12,4 +12,4 @@
 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.21.13";
+NSString * const BNC_SDK_VERSION     = @"0.22.4";

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

@@ -25,6 +25,12 @@
 #import <arpa/inet.h>
 #import <netinet/in.h>
 
+// Forward declare this for older versions of iOS
+@interface NSLocale (BranchAvailability)
+- (NSString*) countryCode;
+- (NSString*) languageCode;
+@end
+
 #pragma mark BRNNetworkInfo
 
 typedef NS_ENUM(NSInteger, BNCNetworkAddressType) {
@@ -436,7 +442,7 @@ - (NSDictionary*) v2dictionary {
     addNumber(screenWidth,          screen_width);
     addBoolean(unidentifiedDevice,  unidentified_device);
     addString(localIPAddress,       local_ip);
-    
+
     #include "BNCFieldDefines.h"
 
     if (!self.isAdTrackingEnabled)
@@ -451,6 +457,9 @@ - (NSDictionary*) v2dictionary {
     s = preferences.deviceFingerprintID;
     if (s.length) dictionary[@"device_fingerprint_id"] = s;
 
+    if (preferences.limitFacebookTracking)
+        dictionary[@"limit_facebook_tracking"] = CFBridgingRelease(kCFBooleanTrue);
+
     dictionary[@"sdk"] = @"ios";
     dictionary[@"sdk_version"] = BNC_SDK_VERSION;