Merge pull request #363 from BranchMetrics/fix-double-open-on-ios-background

Fix double open on iOS background

Author: ethanneff

package.json

@@ -2,7 +2,7 @@
   "name": "branch-cordova-sdk",
   "description": "Branch Metrics Cordova SDK",
   "main": "src/branch.js",
-  "version": "2.6.9",
+  "version": "2.6.10",
   "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.9">
+  version="2.6.10">
 
   <!-- DO NOT EDIT THIS FILE. MAKE ALL CHANGES TO plugin.template.xml INSTEAD -->
 
@@ -78,7 +78,6 @@ SOFTWARE.
     <framework src="iAd.framework" />
     <framework src="SafariServices.framework" />
     <framework src="AdSupport.framework" />
-    <framework src="CoreTelephony.framework" />
     <framework src="CoreSpotlight.framework" />
     <framework src="MobileCoreServices.framework" />
 

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.9">
+  version="2.6.10">
 
   <!-- DO NOT EDIT THIS FILE. MAKE ALL CHANGES TO plugin.template.xml INSTEAD -->
 
@@ -78,7 +78,6 @@ SOFTWARE.
     <framework src="iAd.framework" />
     <framework src="SafariServices.framework" />
     <framework src="AdSupport.framework" />
-    <framework src="CoreTelephony.framework" />
     <framework src="CoreSpotlight.framework" />
     <framework src="MobileCoreServices.framework" />
 

src/branch.js

@@ -35,24 +35,23 @@ Branch.prototype.disableGlobalListenersWarnings = function () {
   disableGlobalListenersWarnings = true
 }
 
+var runOnce = true
 Branch.prototype.initSession = function (deepLinkDataListener) {
+  // handle double init from onResume on iOS
+  if (!runOnce) return
+  runOnce = (deviceVendor.indexOf('Apple') < 0)
+
   // private method to filter out +clicked_branch_link = false in deep link callback
-  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 dataLength = JSON.stringify(deepLinkData).length
-    var isNewData = dataLength !== previous
     var isBranchLinkClick = deepLinkData.hasOwnProperty(isBranchLink) && deepLinkData[isBranchLink] === true
     var isNonBranchLinkClick = deepLinkData.hasOwnProperty(isNonBranchLink)
 
     // is +clicked_branch_link' = true || +non_branch_link
-    if (isNewData && (isBranchLinkClick || isNonBranchLinkClick)) {
-      // to Branch.initSession(function(data) {})
+    if (isBranchLinkClick || isNonBranchLinkClick) {
       deepLinkDataListener(deepLinkData)
     }
-    previous = dataLength
   }
 
   if (!disableGlobalListenersWarnings && !deepLinkDataListener && !window.DeepLinkHandler) {