Merge pull request #543 from sequoiaat/Issue538

Added function handlers in execute and run for setCookieBasedMatching

Author: echo-branch

examples/cordova1/platforms/android/app/src/main/java/io/branch/BranchSDK.java

@@ -116,7 +116,10 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo
         } else if (action.equals("disableTracking")) {
             cordova.getActivity().runOnUiThread(r);
             return true;
-        } else if (action.equals("initSession")) {
+        } else if (action.equals("setCookieBasedMatching")) {
+            cordova.getActivity().runOnUiThread(r);
+            return true;
+       } else if (action.equals("initSession")) {
             cordova.getActivity().runOnUiThread(r);
             return true;
         } else if (action.equals("setRequestMetadata")) {
@@ -1317,7 +1320,9 @@ public void run() {
             try {
                 if (this.action.equals("setDebug")) {
                     setDebug(this.args.getBoolean(0), this.callbackContext);
-                } else if (this.action.equals("disableTracking")) {
+                } else if (this.action.equals("setCookieBasedMatching")) {
+                    setCookieBasedMatching(this.args.getString(0), this.callbackContext);
+                }  else if (this.action.equals("disableTracking")) {
                     disableTracking(this.args.getBoolean(0), this.callbackContext);
                 } else if (this.action.equals("initSession")) {
                     initSession(this.callbackContext);

examples/cordova1/plugins/branch-cordova-sdk/src/android/io/branch/BranchSDK.java

@@ -116,7 +116,10 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo
         } else if (action.equals("disableTracking")) {
             cordova.getActivity().runOnUiThread(r);
             return true;
-        } else if (action.equals("initSession")) {
+        } else if (action.equals("setCookieBasedMatching")) {
+            cordova.getActivity().runOnUiThread(r);
+            return true;
+       } else if (action.equals("initSession")) {
             cordova.getActivity().runOnUiThread(r);
             return true;
         } else if (action.equals("setRequestMetadata")) {
@@ -1317,7 +1320,9 @@ public void run() {
             try {
                 if (this.action.equals("setDebug")) {
                     setDebug(this.args.getBoolean(0), this.callbackContext);
-                } else if (this.action.equals("disableTracking")) {
+                } else if (this.action.equals("setCookieBasedMatching")) {
+                    setCookieBasedMatching(this.args.getString(0), this.callbackContext);
+                }  else if (this.action.equals("disableTracking")) {
                     disableTracking(this.args.getBoolean(0), this.callbackContext);
                 } else if (this.action.equals("initSession")) {
                     initSession(this.callbackContext);

src/android/io/branch/BranchSDK.java

@@ -113,7 +113,10 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo
         if (action.equals("setDebug")) {
             cordova.getActivity().runOnUiThread(r);
             return true;
-        } else if (action.equals("disableTracking")) {
+        } else if (action.equals("setCookieBasedMatching")) {
+            cordova.getActivity().runOnUiThread(r);
+            return true;
+       } else if (action.equals("disableTracking")) {
             cordova.getActivity().runOnUiThread(r);
             return true;
         } else if (action.equals("initSession")) {
@@ -1317,6 +1320,8 @@ public void run() {
             try {
                 if (this.action.equals("setDebug")) {
                     setDebug(this.args.getBoolean(0), this.callbackContext);
+                } else if (this.action.equals("setCookieBasedMatching")) {
+                    setCookieBasedMatching(this.args.getString(0), this.callbackContext);
                 } else if (this.action.equals("disableTracking")) {
                     disableTracking(this.args.getBoolean(0), this.callbackContext);
                 } else if (this.action.equals("initSession")) {