fix: override singleTop to singleTask on android

BranchMetrics · Sep 6, 2017 · 7ae78dd · 7ae78dd
1 parent d50d48b
commit 7ae78dd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/scripts/android/updateAndroidManifest.js b/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
   }

diff --git a/src/scripts/hooks/afterPrepare.js b/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)
       }

diff --git a/src/scripts/hooks/beforePrepare.js b/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)