Merge pull request #359 from BranchMetrics/fix-stuff

Fix stuff
BranchMetrics · Aug 17, 2017 · 9a58cb3 · 9a58cb3
2 parents 487133a + 146974f
commit 9a58cb3
Show file tree

Hide file tree

Showing 79 changed files with 4,182 additions and 1,587 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,7 +13,7 @@ before_script:
   - curl -Lo travis_after_all.py https://git.io/vLSON
   - npm prune
 script:
-  - npm run prerelease
+  - npm run validate
 after_success:
   - python travis_after_all.py
   - npm run semantic-release

diff --git a/gulpfile.js b/gulpfile.js
@@ -62,7 +62,8 @@ function genNpmPluginXML () {
 
   files = files.concat(emitFiles(head + 'Fabric/'))
   files = files.concat(emitFiles(head + 'Branch-SDK/'))
-  files = files.concat(emitFiles(head + 'Branch-SDK/Requests/'))
+  files = files.concat(emitFiles(head + 'Branch-SDK/Networking/'))
+  files = files.concat(emitFiles(head + 'Branch-SDK/Networking/Requests/'))
 
   xml = xml.replace('<!--[Branch Framework Reference]-->', newLineIndent + files.join(newLineIndent))
 

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "branch-cordova-sdk",
   "description": "Branch Metrics Cordova SDK",
   "main": "src/branch.js",
-  "version": "2.6.7",
+  "version": "2.6.8",
   "homepage": "https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking",
   "repository": {
     "type": "git",
@@ -38,30 +38,30 @@
   "scripts": {
     "changelog": "node ./src/scripts/npm/updateChangeLog -reset=true",
     "commitmsg": "validate-commit-msg",
-    "precommit": "npm-check --skip-unused && gulp prod",
+    "validate": "gulp prod",
+    "dependencies": "ncu -u",
+    "precommit": "gulp prod",
     "postcommit": "semantic-release pre --verifyRelease='./src/scripts/npm/updateNpmVersion' || true",
-    "prerelease": "gulp prod",
-    "dependencies": "npm-check -u",
     "semantic-release": "semantic-release pre && npm publish && semantic-release post"
   },
   "dependencies": {
     "mkpath": "^1.0.0",
     "node-version-compare": "^1.0.1",
     "plist": "^2.1.0",
     "request": "^2.81.0",
-    "xml2js": "^0.4.17"
+    "xml2js": "^0.4.18"
   },
   "devDependencies": {
     "cordova": "^7.0.1",
     "gulp": "^3.9.1",
-    "gulp-standard": "^10.0.0",
+    "gulp-standard": "^10.1.0",
     "husky": "^0.14.3",
     "mkpath": "^1.0.0",
     "node-version-compare": "^1.0.1",
-    "npm-check": "^5.4.5",
+    "npm-check-updates": "^2.12.1",
     "plist": "^2.1.0",
-    "semantic-release": "^6.3.6",
+    "semantic-release": "^7.0.1",
     "validate-commit-msg": "^2.14.0",
-    "xml2js": "^0.4.17"
+    "xml2js": "^0.4.18"
   }
 }
diff --git a/plugin.template.xml b/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.7">
+  version="2.6.8">
 
   <!-- DO NOT EDIT THIS FILE. MAKE ALL CHANGES TO plugin.template.xml INSTEAD -->
 

diff --git a/plugin.xml b/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.7">
+  version="2.6.8">
 
   <!-- DO NOT EDIT THIS FILE. MAKE ALL CHANGES TO plugin.template.xml INSTEAD -->
 
@@ -99,6 +99,8 @@ SOFTWARE.
     <source-file src="src/ios/dependencies/Branch-SDK/BNCConfig.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BNCContentDiscoveryManager.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/BNCContentDiscoveryManager.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/BNCCrashlyticsWrapper.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/BNCCrashlyticsWrapper.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BNCDebug.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/BNCDebug.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BNCDeepLinkViewControllerInstance.h" />
@@ -115,16 +117,12 @@ SOFTWARE.
     <source-file src="src/ios/dependencies/Branch-SDK/BNCLinkCache.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BNCLinkData.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/BNCLinkData.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/BNCLocalization.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/BNCLocalization.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BNCLog.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/BNCLog.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BNCPreferenceHelper.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/BNCPreferenceHelper.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/BNCServerInterface.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/BNCServerInterface.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/BNCServerRequestQueue.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/BNCServerRequestQueue.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/BNCServerResponse.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/BNCServerResponse.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BNCStrongMatchHelper.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/BNCStrongMatchHelper.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BNCSystemObserver.h" />
@@ -162,35 +160,44 @@ SOFTWARE.
     <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/Requests/BNCServerRequest.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/Requests/BNCServerRequest.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/Requests/BranchCloseRequest.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/Requests/BranchCloseRequest.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/Requests/BranchCreditHistoryRequest.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/Requests/BranchCreditHistoryRequest.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/Requests/BranchInstallRequest.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/Requests/BranchInstallRequest.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/Requests/BranchLoadRewardsRequest.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/Requests/BranchLoadRewardsRequest.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/Requests/BranchLogoutRequest.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/Requests/BranchLogoutRequest.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/Requests/BranchOpenRequest.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/Requests/BranchOpenRequest.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/Requests/BranchRedeemRewardsRequest.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/Requests/BranchRedeemRewardsRequest.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/Requests/BranchRegisterViewRequest.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/Requests/BranchRegisterViewRequest.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/Requests/BranchSetIdentityRequest.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/Requests/BranchSetIdentityRequest.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/Requests/BranchShortUrlRequest.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/Requests/BranchShortUrlRequest.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/Requests/BranchShortUrlSyncRequest.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/Requests/BranchShortUrlSyncRequest.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/Requests/BranchSpotlightUrlRequest.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/Requests/BranchSpotlightUrlRequest.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/Requests/BranchUserCompletedActionRequest.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/Requests/BranchUserCompletedActionRequest.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/Requests/PromoViewHandler.h" />
+    <header-file src="src/ios/dependencies/Branch-SDK/Networking/BNCNetworkService.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/Networking/BNCNetworkService.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/Networking/BNCNetworkServiceProtocol.h" />
+    <header-file src="src/ios/dependencies/Branch-SDK/Networking/BNCServerInterface.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/Networking/BNCServerInterface.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/Networking/BNCServerRequest.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/Networking/BNCServerRequest.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/Networking/BNCServerRequestQueue.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/Networking/BNCServerRequestQueue.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/Networking/BNCServerResponse.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/Networking/BNCServerResponse.m" />
+
+    <header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchCloseRequest.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchCloseRequest.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchCreditHistoryRequest.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchCreditHistoryRequest.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchInstallRequest.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchInstallRequest.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchLoadRewardsRequest.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchLoadRewardsRequest.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchLogoutRequest.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchLogoutRequest.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchOpenRequest.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchOpenRequest.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchRedeemRewardsRequest.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchRedeemRewardsRequest.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchRegisterViewRequest.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchRegisterViewRequest.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchSetIdentityRequest.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchSetIdentityRequest.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchShortUrlRequest.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchShortUrlRequest.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchShortUrlSyncRequest.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchShortUrlSyncRequest.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchSpotlightUrlRequest.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchSpotlightUrlRequest.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchUserCompletedActionRequest.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchUserCompletedActionRequest.m" />
 
   </platform>
 </plugin>
diff --git a/src/android/dependencies/Branch-2.10.3.jar → src/android/dependencies/Branch-2.11.1.jar b/src/android/dependencies/Branch-2.10.3.jar → src/android/dependencies/Branch-2.11.1.jar
diff --git a/src/branch.js b/src/branch.js
@@ -37,12 +37,13 @@ Branch.prototype.disableGlobalListenersWarnings = function () {
 
 Branch.prototype.initSession = function (deepLinkDataListener) {
   // private method to filter out +clicked_branch_link = false in deep link callback
-  var previous = ''
+  var previous = 0
   var deepLinkDataParser = function (deepLinkData) {
     var isBranchLink = '+clicked_branch_link'
     var isNonBranchLink = '+non_branch_link'
     // TODO: figure out why iOS SDK passes data twice on Ionic 2 terminated and no network connection
-    var isNewData = JSON.stringify(deepLinkData) !== previous
+    var dataLength = JSON.stringify(deepLinkData).length
+    var isNewData = dataLength !== previous
     var isBranchLinkClick = deepLinkData.hasOwnProperty(isBranchLink) && deepLinkData[isBranchLink] === true
     var isNonBranchLinkClick = deepLinkData.hasOwnProperty(isNonBranchLink)
 
@@ -51,7 +52,7 @@ Branch.prototype.initSession = function (deepLinkDataListener) {
       // to Branch.initSession(function(data) {})
       deepLinkDataListener(deepLinkData)
     }
-    previous = JSON.stringify(deepLinkData)
+    previous = dataLength
   }
 
   if (!disableGlobalListenersWarnings && !deepLinkDataListener && !window.DeepLinkHandler) {

diff --git a/src/ios/AppDelegate+BranchSdk.m b/src/ios/AppDelegate+BranchSdk.m
@@ -16,13 +16,13 @@
     #import <Branch/Branch.h>
 #endif
 
-@interface AppDelegate (BranchSdk)
+@interface AppDelegate (BranchSDK)
 
 - (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void (^)(NSArray * _Nullable))restorationHandler;
 
 @end
 
-@implementation AppDelegate (BranchSdk)
+@implementation AppDelegate (BranchSDK)
 
 // Respond to URI scheme links
 - (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options {

diff --git a/src/ios/dependencies/Branch-SDK/BNCConfig.m b/src/ios/dependencies/Branch-SDK/BNCConfig.m
@@ -11,4 +11,4 @@
 NSString * const BNC_API_BASE_URL    = @"https://api.branch.io";
 NSString * const BNC_API_VERSION     = @"v1";
 NSString * const BNC_LINK_URL        = @"https://bnc.lt";
-NSString * const BNC_SDK_VERSION     = @"0.16.2";
+NSString * const BNC_SDK_VERSION     = @"0.17.9";
diff --git a/src/ios/dependencies/Branch-SDK/BNCContentDiscoveryManager.h b/src/ios/dependencies/Branch-SDK/BNCContentDiscoveryManager.h
@@ -37,11 +37,12 @@
 
 - (void)indexContentWithTitle:(NSString *)title description:(NSString *)description publiclyIndexable:(BOOL)publiclyIndexable type:(NSString *)type thumbnailUrl:(NSURL *)thumbnailUrl keywords:(NSSet *)keywords userInfo:(NSDictionary *)userInfo expirationDate:(NSDate *)expirationDate callback:(callbackWithUrl)callback;
 
+- (void)indexContentWithTitle:(NSString *)title description:(NSString *)description canonicalId:(NSString *)canonicalId publiclyIndexable:(BOOL)publiclyIndexable type:(NSString *)type thumbnailUrl:(NSURL *)thumbnailUrl keywords:(NSSet *)keywords userInfo:(NSDictionary *)userInfo expirationDate:(NSDate *)expirationDate callback:(callbackWithUrl)callback;
 
 
 /* This one has a different callback, which includes the spotlightIdentifier, and requires a different signature
     It cannot be part of the stack of method signatures above, because of the different callback type.*/
-- (void)indexContentWithTitle:(NSString *)title description:(NSString *)description publiclyIndexable:(BOOL)publiclyIndexable type:(NSString *)type thumbnailUrl:(NSURL *)thumbnailUrl keywords:(NSSet *)keywords userInfo:(NSDictionary *)userInfo expirationDate:(NSDate *)expirationDate callback:(callbackWithUrl)callback spotlightCallback:(callbackWithUrlAndSpotlightIdentifier)spotlightCallback;
+- (void)indexContentWithTitle:(NSString *)title description:(NSString *)description canonicalId:(NSString *)canonicalId publiclyIndexable:(BOOL)publiclyIndexable type:(NSString *)type thumbnailUrl:(NSURL *)thumbnailUrl keywords:(NSSet *)keywords userInfo:(NSDictionary *)userInfo expirationDate:(NSDate *)expirationDate callback:(callbackWithUrl)callback spotlightCallback:(callbackWithUrlAndSpotlightIdentifier)spotlightCallback;
 
 
 @end