Merge pull request #407 from BranchMetrics/android-7-support

Android 7 support

Author: ethanneff

package.json

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

src/scripts/android/updateAndroidManifest.js

@@ -11,20 +11,47 @@
 
   // injects config.xml preferences into AndroidManifest.xml file.
   function writePreferences (context, preferences) {
-    var pathToManifest = path.join(context.opts.projectRoot, 'platforms', 'android', 'AndroidManifest.xml')
-    var manifest = xmlHelper.readXmlAsJson(pathToManifest)
+    // read manifest
+    var manifest = getManifest(context)
+
+    // update manifest
+    manifest.file = updateBranchMetaData(manifest.file, preferences)
+    manifest.file = updateBranchReferrerTracking(manifest.file)
+    manifest.file = updateLaunchOptionToSingleTask(manifest.file, manifest.mainActivityIndex)
+    manifest.file = updateBranchURIScheme(manifest.file, manifest.mainActivityIndex, preferences)
+    manifest.file = updateBranchAppLinks(manifest.file, manifest.mainActivityIndex, preferences, manifest.targetSdk)
+
+    // save manifest
+    xmlHelper.writeJsonAsXml(manifest.path, manifest.file)
+  }
+
+  // get AndroidManifest.xml information
+  function getManifest (context) {
+    var pathToManifest
+    var manifest
+
+    try {
+      // cordova platform add [email protected]
+      pathToManifest = path.join(context.opts.projectRoot, 'platforms', 'android', 'AndroidManifest.xml')
+      manifest = xmlHelper.readXmlAsJson(pathToManifest)
+    } catch (e) {
+      try {
+        // cordova platform add [email protected]
+        pathToManifest = path.join(context.opts.projectRoot, 'platforms', 'android', 'app', 'src', 'main', 'AndroidManifest.xml')
+        manifest = xmlHelper.readXmlAsJson(pathToManifest)
+      } catch (e) {
+        throw new Error('BRANCH SDK: Cannot read AndroidManfiest.xml ' + e)
+      }
+    }
     var mainActivityIndex = getMainLaunchActivityIndex(manifest['manifest']['application'][0]['activity'])
     var targetSdk = manifest['manifest']['uses-sdk'][0]['$']['android:targetSdkVersion']
 
-    // update manifest
-    manifest = updateBranchMetaData(manifest, preferences)
-    manifest = updateBranchReferrerTracking(manifest)
-    manifest = updateLaunchOptionToSingleTask(manifest, mainActivityIndex)
-    manifest = updateBranchURIScheme(manifest, mainActivityIndex, preferences)
-    manifest = updateBranchAppLinks(manifest, mainActivityIndex, preferences, targetSdk)
-
-    // save new version of the AndroidManifest
-    xmlHelper.writeJsonAsXml(pathToManifest, manifest)
+    return {
+      file: manifest,
+      path: pathToManifest,
+      mainActivityIndex: mainActivityIndex,
+      targetSdk: targetSdk
+    }
   }
 
   // adds to <application> for Branch init and testmode:

src/scripts/lib/fileHelper.js

@@ -6,7 +6,17 @@
   // entry
   module.exports = {
     readFile: readFile,
-    writeFile: writeFile
+    writeFile: writeFile,
+    accessFile: accessFile
+  }
+
+  // access file
+  function accessFile (file) {
+    try {
+      return fs.accessSync(file)
+    } catch (err) {
+      throw new Error('BRANCH SDK: Cannot access file ' + file)
+    }
   }
 
   // read file