Merge pull request #314 from BranchMetrics/fix-duplicate-deep-link-data

Fix duplicate deep link data

Author: ethanneff

CONTRIBUTING.md

@@ -90,6 +90,6 @@
 
 ## Publish
 
-- Pull reques code review from a Branch team member
+- Pull request code review from a Branch team member
 
 - Merges will automatically add SDK to NPM

package.json

@@ -2,7 +2,7 @@
   "name": "branch-cordova-sdk",
   "description": "Branch Metrics Cordova SDK",
   "main": "www/branch.js",
-  "version": "2.5.13",
+  "version": "2.5.14",
   "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.5.13">
+  version="2.5.14">
 
   <!-- 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.5.13">
+  version="2.5.14">
 
   <!-- DO NOT EDIT THIS FILE. MAKE ALL CHANGES TO plugin.template.xml INSTEAD -->
 

src/branch.js

@@ -37,15 +37,21 @@ 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 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 isBranchLinkClick = deepLinkData.hasOwnProperty(isBranchLink) && deepLinkData[isBranchLink] === true
+    var isNonBranchLinkClick = deepLinkData.hasOwnProperty(isNonBranchLink)
 
-    // +clicked_branch_link' = true || +non_branch_link
-    if ((deepLinkData.hasOwnProperty(isBranchLink) && deepLinkData[isBranchLink] === true) || (deepLinkData.hasOwnProperty(isNonBranchLink))) {
+    // is +clicked_branch_link' = true || +non_branch_link
+    if (isNewData && (isBranchLinkClick || isNonBranchLinkClick)) {
       // to Branch.initSession(function(data) {})
       deepLinkDataListener(deepLinkData)
     }
+    previous = JSON.stringify(deepLinkData)
   }
 
   if (!disableGlobalListenersWarnings && !deepLinkDataListener && !window.DeepLinkHandler) {