Merge pull request #366 from BranchMetrics/android-single-task

Android single task

Author: ethanneff

package.json

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

src/scripts/android/updateAndroidManifest.js

@@ -19,7 +19,7 @@
     manifest = updateMultidex(manifest)
     manifest = updateBranchMetaData(manifest, preferences)
     manifest = updateBranchReferrerTracking(manifest)
-    manifest = updateLaunchOptionToSingleTask(manifest, mainActivityIndex, preferences)
+    manifest = updateLaunchOptionToSingleTask(manifest, mainActivityIndex)
     manifest = updateBranchURIScheme(manifest, mainActivityIndex, preferences)
     manifest = updateBranchAppLinks(manifest, mainActivityIndex, preferences)
 
@@ -98,7 +98,7 @@
 
   // adds to main <activity>:
   //    android:launchMode="singleTask"
-  function updateLaunchOptionToSingleTask (manifest, mainActivityIndex, preferences) {
+  function updateLaunchOptionToSingleTask (manifest, mainActivityIndex) {
     manifest['manifest']['application'][0]['activity'][mainActivityIndex]['$']['android:launchMode'] = 'singleTask'
     return manifest
   }

src/scripts/hooks/afterPrepare.js

@@ -3,6 +3,8 @@
   'use strict'
   var configPreferences = require('../npm/processConfigXml.js')
   var iosDevelopmentTeam = require('../ios/updateDevelopmentTeam.js')
+  var androidManifest = require('../android/updateAndroidManifest.js')
+  var ANDROID = 'android'
   var IOS = 'ios'
 
   // entry
@@ -14,6 +16,9 @@
     var platforms = context.opts.cordova.platforms
 
     platforms.forEach(function (platform) {
+      if (platform === ANDROID) {
+        androidManifest.writePreferences(context, preferences)
+      }
       if (platform === IOS) {
         iosDevelopmentTeam.addDevelopmentTeam(preferences)
       }

src/scripts/hooks/beforePrepare.js

@@ -5,9 +5,7 @@
   var iosPlist = require('../ios/updatePlist.js')
   var iosCapabilities = require('../ios/enableEntitlements.js')
   var iosAssociatedDomains = require('../ios/updateAssociatedDomains.js')
-  var androidManifest = require('../android/updateAndroidManifest.js')
   var IOS = 'ios'
-  var ANDROID = 'android'
 
   // entry
   module.exports = run
@@ -18,9 +16,6 @@
     var platforms = context.opts.cordova.platforms
 
     platforms.forEach(function (platform) {
-      if (platform === ANDROID) {
-        androidManifest.writePreferences(context, preferences)
-      }
       if (platform === IOS) {
         iosPlist.addBranchSettings(preferences)
         iosCapabilities.enableAssociatedDomains(preferences)