Merge pull request #715 from BranchMetrics/gdeluna-branch/QSS-265

Fix setLogging to enable logging in native layer

Author: gdeluna-branch

CHANGELOG.md

@@ -1,3 +1,8 @@
+5.2.1 Jan 4, 2023
+* Fix Javascript method setLogging to enable logging in the native layer.
+* Update Android SDK to 5.2.7
+* Update iOS SDK to 1.45.2
+
 5.2.0 August 8th, 2022
 * Update iOS SDK to 1.43.1
 * Update Android SDK to 5.2.0

package.json

@@ -2,7 +2,7 @@
   "name": "branch-cordova-sdk",
   "description": "Branch Metrics Cordova SDK",
   "main": "src/index.js",
-  "version": "5.2.0",
+  "version": "5.2.1",
   "homepage": "https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking",
   "repository": {
     "type": "git",

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="5.1.0">
+  version="5.2.1">
 
   <!-- Description -->
   <name>branch-cordova-sdk</name>
@@ -63,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:5.2.0"/>
+    <framework src="io.branch.sdk.android:library:5.2.7"/>
   </platform>
 
   <!-- iOS -->
@@ -87,7 +87,7 @@ SOFTWARE.
               <source url="https://cdn.cocoapods.org/"/>
           </config>
           <pods>
-              <pod name="Branch" spec="~> 1.43.1" />
+              <pod name="Branch" spec="~> 1.45.2" />
           </pods>
       </podspec>
   </platform>

src/android/io/branch/BranchSDK.java

@@ -119,7 +119,7 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo
 
         Runnable r = new RunnableThread(action, args, callbackContext);
 
-        if (action.equals("setLogging")) {
+        if (action.equals("enableLogging")) {
             cordova.getActivity().runOnUiThread(r);
             return true;
         } else if (action.equals("setCookieBasedMatching")) {
@@ -607,7 +607,7 @@ private void setCookieBasedMatching(String linkDomain, CallbackContext callbackC
      * @param isEnable        A {@link Boolean} value to enable/disable logging
      * @param callbackContext A callback to execute at the end of this method
      */
-    private void setLogging(boolean isEnable, CallbackContext callbackContext) {
+    private void enableLogging(boolean isEnable, CallbackContext callbackContext) {
         this.activity = this.cordova.getActivity();
         if (isEnable == true) {
             Branch.enableLogging();
@@ -1233,8 +1233,8 @@ public void run() {
             try {
                 Log.d(LCAT, "Runnable: " + this.action);
 
-                if (this.action.equals("setLogging")) {
-                    setLogging(this.args.getBoolean(0), this.callbackContext);
+                if (this.action.equals("enableLogging")) {
+                    enableLogging(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")) {