Merge pull request #646 from adrianyg7/sdk849

Change Android API, report plugin version programmatically

Author: echo-branch

plugin.xml

@@ -40,6 +40,7 @@ SOFTWARE.
   </engines>
 
   <!-- Hooks -->
+  <hook src="src/scripts/hooks/beforePluginInstall.js" type="before_plugin_install" />
   <hook src="src/scripts/hooks/beforePrepare.js" type="after_plugin_install" />
   <hook src="src/scripts/hooks/afterPrepare.js" type="after_plugin_add" />
   <hook src="src/scripts/hooks/beforePrepare.js" type="before_prepare" />
@@ -62,7 +63,7 @@ SOFTWARE.
     <!-- Manifest configuration is done via a js script.  We should move it to this config in the future. -->
 
     <source-file src="src/android/io/branch/BranchSDK.java" target-dir="src/io/branch" />
-    <framework src="io.branch.sdk.android:library:4.3.2"/>
+    <framework src="io.branch.sdk.android:library:4.4.0"/>
   </platform>
 
   <!-- iOS -->

src/android/io/branch/BranchSDK.java

@@ -20,7 +20,6 @@
 
 import io.branch.indexing.BranchUniversalObject;
 import io.branch.referral.Branch;
-import io.branch.referral.BranchUtil;
 import io.branch.referral.PrefHelper;
 import io.branch.referral.BranchError;
 import io.branch.referral.BranchViewHandler;
@@ -44,8 +43,9 @@ static class BranchLinkProperties extends io.branch.referral.util.LinkProperties
 
     // Standard Debugging Variables
     private static final String LCAT = "CordovaBranchSDK";
-    // todo pick up plugin version dynamically
-    private static final String BRANCH_PLUGIN_VERSION = "4.1.3";
+
+    private static final String BRANCH_PLUGIN_TYPE = "CordovaIonic";
+    private static final String BRANCH_PLUGIN_VERSION = "%BRANCH_PLUGIN_VERSION%";
 
     // Private Method Properties
     private ArrayList<BranchUniversalObjectWrapper> branchObjectWrappers;
@@ -72,8 +72,7 @@ protected void pluginInitialize() {
 
         this.activity = this.cordova.getActivity();
         Branch.disableInstantDeepLinking(true);
-        BranchUtil.setPluginType(BranchUtil.PluginType.CordovaIonic);
-        BranchUtil.setPluginVersion(BRANCH_PLUGIN_VERSION);
+        Branch.registerPlugin(BRANCH_PLUGIN_TYPE, BRANCH_PLUGIN_VERSION);
         if (this.instance == null) {
             this.instance = Branch.getAutoInstance(this.activity.getApplicationContext());
         }

src/ios/BranchSDK.m

@@ -1,6 +1,6 @@
 #import "BranchSDK.h"
 
-NSString * const pluginVersion = @"4.1.3";
+NSString * const pluginVersion = @"%BRANCH_PLUGIN_VERSION%";
 
 @interface BranchSDK()
 

src/scripts/hooks/beforePluginInstall.js

@@ -0,0 +1,25 @@
+(function () {
+  // properties
+
+  const setPluginVersion = require("../npm/setPluginVersion.js");
+  const IOS = "ios";
+  const ANDROID = "android";
+
+  // entry
+  module.exports = run;
+
+  // runs before plugin installs
+  function run(context) {
+    const platforms = context.opts.cordova.platforms;
+
+    platforms.forEach(platform => {
+      if (platform === IOS) {
+        setPluginVersion.setIosPluginVersion(context);
+      }
+
+      if (platform === ANDROID) {
+        setPluginVersion.setAndroidPluginVersion(context);
+      }
+    });
+  }
+})();

src/scripts/npm/setPluginVersion.js

@@ -0,0 +1,54 @@
+(function() {
+  // properties
+
+  const fs = require("fs");
+  const path = require("path");
+
+  // entry
+  module.exports = {
+    setAndroidPluginVersion: setAndroidPluginVersion,
+    setIosPluginVersion: setIosPluginVersion
+  };
+
+  // set plugin version to BranchSDK.java
+  function setAndroidPluginVersion(context) {
+    const filePath = getAndroidSdkPath(context);
+    updatePluginVersion(context, filePath);
+  }
+
+  // set plugin version to BranchSDK.m
+  function setIosPluginVersion(context) {
+    const filePath = getIosSdkPath(context);
+    updatePluginVersion(context, filePath);
+  }
+
+  function getAndroidSdkPath(context) {
+    return path.join(
+      context.opts.projectRoot,
+      'plugins',
+      context.opts.plugin.pluginInfo.id,
+      'src',
+      'android',
+      'io',
+      'branch',
+      'BranchSDK.java'
+    );
+  }
+
+  function getIosSdkPath(context) {
+    return path.join(
+      context.opts.projectRoot,
+      'plugins',
+      context.opts.plugin.pluginInfo.id,
+      'src',
+      'ios',
+      'BranchSDK.m'
+    );
+  }
+
+  function updatePluginVersion(context, filePath) {
+    let content = fs.readFileSync(filePath, "utf8");
+    content = content.replace("%BRANCH_PLUGIN_VERSION%", context.opts.plugin.pluginInfo.version);
+    fs.writeFileSync(filePath, content, "utf8");
+  }
+})();