Merge remote-tracking branch 'upstream/master'

BranchMetrics · Aug 8, 2016 · ef4cdbf · ef4cdbf
2 parents 17d8725 + 836ddaf
commit ef4cdbf
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -167,6 +167,7 @@ Branch.getFirstReferringParams().then(function (res) {
 1. Branch Session
   + [setDebug](#setDebug)
   + [initSession](#initSession)
+  + [setMixpanelToken](#setMixpanelToken)
   + [getLatestReferringParams](#getLatestReferringParams)
   + [getFirstReferringParams](#getFirstReferringParams)
   + [setIdentity](#setIdentity)
@@ -235,6 +236,17 @@ function DeepLinkHandler(data) {
 }
 ```
 
+### <a id="setMixpanelToken"></a>setMixpanelToken()
+
+Allow Branch SDK to pass the user's Mixpanel distinct id to our servers. Branch will then pass that Distinct ID to Mixpanel when logging any event.
+**Note:** This should be initialized first before `initSession()` or else Mixpanel integration won't work.
+
+##### Usage
+
+```js
+Branch.setMixpanelToken('<your-mixpanel-token-here>');
+```
+
 ### <a id="getFirstReferringParams"></a>getFirstReferringParams()
 
 Retrieves the install session parameters.

diff --git a/plugin.xml b/plugin.xml
@@ -75,8 +75,6 @@ SOFTWARE.
             </intent-filter>
         </config-file>
         <source-file src="src/android/io/branch/BranchSDK.java" target-dir="src/io/branch" />
-        <framework src="com.mixpanel.android:mixpanel-android:4.+" type="gradleReference" />
-        <framework src="com.google.android.gms:play-services:3.1+" type="gradleReference" />
         <framework src="io.branch.sdk.android:library:1+" />
     </platform>
 

diff --git a/src/android/io/branch/BranchSDK.java b/src/android/io/branch/BranchSDK.java
@@ -22,8 +22,6 @@
 import io.branch.referral.SharingHelper;
 import io.branch.referral.util.ShareSheetStyle;
 
-import com.mixpanel.android.mpmetrics.MixpanelAPI; 
-
 public class BranchSDK extends CordovaPlugin
 {
 
@@ -108,7 +106,7 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo
         } else if (action.equals("initSession")) {
             cordova.getThreadPool().execute(r);
             return true;
-        }  else if (action.equals("getMixpanelInstance")) {
+        }  else if (action.equals("setMixpanelToken")) {
             cordova.getThreadPool().execute(r);
             return true;
         } else {
@@ -597,14 +595,10 @@ private void setIdentity(String newIdentity, CallbackContext callbackContext)
      * @param token A {@link String} value containing the unique identifier of the Mixpanel user.
      * @param callbackContext   A callback to execute at the end of this method
      */
-    private void getMixpanelInstance(String token, CallbackContext callbackContext)
+    private void setMixpanelToken(String token, CallbackContext callbackContext)
     {
 
-        Log.d(LCAT, "Getting Mixpanel instance");
-
-        MixpanelAPI mp = MixpanelAPI.getInstance(this.activity.getApplicationContext(), token);
-
-        Branch.getInstance().setRequestMetadata("$mixpanel_distinct_id", mp.getDistinctId());
+        Branch.getInstance().setRequestMetadata("$mixpanel_distinct_id", token);
 
         callbackContext.success("Success");
 
@@ -1167,8 +1161,8 @@ public void run() {
                     setDebug(this.args.getBoolean(0), this.callbackContext);
                 } else if (this.action.equals("initSession")) {
                     initSession(this.callbackContext);
-                }  else if (this.action.equals("getMixpanelInstance")) {
-                    getMixpanelInstance(this.args.getString(0), this.callbackContext);
+                }  else if (this.action.equals("setMixpanelToken")) {
+                    setMixpanelToken(this.args.getString(0), this.callbackContext);
                 } else {
                     if (this.action.equals("setIdentity")) {
                         setIdentity(this.args.getString(0), this.callbackContext);

diff --git a/src/ios/BranchSDK.h b/src/ios/BranchSDK.h
@@ -25,6 +25,7 @@
 
 // BranchSDK Basic Methods
 - (void)initSession:(CDVInvokedUrlCommand*)command;
+- (void)setMixpanelToken:(CDVInvokedUrlCommand*)command;
 - (void)setDebug:(CDVInvokedUrlCommand*)command;
 - (void)getAutoInstance:(CDVInvokedUrlCommand*)command;
 - (void)getLatestReferringParams:(CDVInvokedUrlCommand*)command;

diff --git a/src/ios/BranchSDK.m b/src/ios/BranchSDK.m
@@ -143,6 +143,13 @@ - (void)initSession:(CDVInvokedUrlCommand*)command
     }];
 }
 
+- (void)setMixpanelToken:(CDVInvokedUrlCommand*)command
+{
+
+    [[Branch getInstance] setRequestMetadataKey:@"$mixpanel_distinct_id" value:[command.arguments objectAtIndex:0]];
+
+}
+
 - (void)setDebug:(CDVInvokedUrlCommand*)command
 {
     bool enableDebug = [[command.arguments objectAtIndex:0] boolValue] == YES;

diff --git a/testbed/www/js/index.js b/testbed/www/js/index.js
@@ -82,7 +82,7 @@ function InitSession()
 {
     console.log('Trigger InitSession()');
 
-    Branch.getMixpanelInstance('<your-mixpanel-token>');
+    Branch.setMixpanelToken('<your-mixpanel-token-here>');
     Branch.initSession().then(function (res) {
         console.log(res);
         alert('Response: ' + JSON.stringify(res));

diff --git a/www/branch.js b/www/branch.js
@@ -79,9 +79,9 @@ Branch.prototype.initSession = function () {
  *
  * @return (Promise)
  */
-Branch.prototype.getMixpanelInstance = function (token) {
+Branch.prototype.setMixpanelToken = function (token) {
 
-    return execute('getMixpanelInstance', [token]);
+    return execute('setMixpanelToken', [token]);
 
 };