refac:Refactor Adjust.setEnabled(boolean) to Adjust.disable() and Adjust.enable()

MahdiZTD · MahdiZTD · commit f533f6cc0485 · 2024-05-30T11:54:29.000+02:00
diff --git a/Adjust/example-app-fbpixel/src/main/assets/AdjustExample-FbPixel.html b/Adjust/example-app-fbpixel/src/main/assets/AdjustExample-FbPixel.html
@@ -99,13 +99,13 @@ <h1 style="width:400px;height:35px;text-align:center;">Adjust Facebook Pixel Dem
                 var btnEnableSdk = document.getElementById('btnEnableSdk')
                 btnEnableSdk.onclick = function(e) {
                     e.preventDefault()
-                    Adjust.setEnabled(true)
+                    Adjust.enable()
                 }
 
                 var btnDisableSdk = document.getElementById('btnDisableSdk')
                 btnDisableSdk.onclick = function(e) {
                     e.preventDefault();
-                    Adjust.setEnabled(false);
+                    Adjust.disable();
                 }
 
                 var btnIsSdkEnabled = document.getElementById('btnIsSdkEnabled')
diff --git a/Adjust/example-app-java/src/main/java/com/adjust/examples/GlobalApplication.java b/Adjust/example-app-java/src/main/java/com/adjust/examples/GlobalApplication.java
@@ -198,7 +198,7 @@ public void onFail(String message) {
         // Adjust.switchToOfflineMode();
 
         // Disable the SDK
-        // Adjust.setEnabled(false);
+        // Adjust.disable();
 
         // Send push notification token.
         // Adjust.setPushToken("token");
diff --git a/Adjust/example-app-java/src/main/java/com/adjust/examples/MainActivity.java b/Adjust/example-app-java/src/main/java/com/adjust/examples/MainActivity.java
@@ -124,10 +124,10 @@ public void onEnableDisableSDKClick(View v) {
             @Override
             public void onIsEnabledRead(boolean isEnabled) {
                 if (isEnabled) {
-                    Adjust.setEnabled(false);
+                    Adjust.disable();
                     ((Button) v).setText(R.string.txt_enable_sdk);
                 } else {
-                    Adjust.setEnabled(true);
+                    Adjust.enable();
                     ((Button) v).setText(R.string.txt_disable_sdk);
                 }
             }
diff --git a/Adjust/example-app-java/src/main/java/com/adjust/examples/ServiceExample.java b/Adjust/example-app-java/src/main/java/com/adjust/examples/ServiceExample.java
@@ -42,10 +42,10 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         Log.d("example", "ServiceExample onStartCommand");
 
         if (flip) {
-            Adjust.setEnabled(false);
+            Adjust.disable();
             flip = false;
         } else {
-            Adjust.setEnabled(true);
+            Adjust.enable();
             flip = true;
         }
 
diff --git a/Adjust/example-app-keyboard/src/main/java/com/adjust/examples/keyboard/GlobalApplication.java b/Adjust/example-app-keyboard/src/main/java/com/adjust/examples/keyboard/GlobalApplication.java
@@ -144,7 +144,7 @@ public boolean launchReceivedDeeplink(Uri deeplink) {
         // Adjust.switchToOfflineMode();
 
         // Disable the SDK
-        // Adjust.setEnabled(false);
+        // Adjust.disable();
 
         // Send push notification token.
         // Adjust.setPushToken("token");
diff --git a/Adjust/example-app-kotlin/src/main/java/com/adjust/examples/GlobalApplication.kt b/Adjust/example-app-kotlin/src/main/java/com/adjust/examples/GlobalApplication.kt
@@ -113,7 +113,7 @@ class GlobalApplication : Application() {
         // Adjust.switchToOfflineMode();
 
         // Disable the SDK
-        // Adjust.setEnabled(false);
+        // Adjust.disable();
 
         // Send push notification token.
         // Adjust.setPushToken("token");
diff --git a/Adjust/example-app-kotlin/src/main/java/com/adjust/examples/MainActivity.kt b/Adjust/example-app-kotlin/src/main/java/com/adjust/examples/MainActivity.kt
@@ -108,10 +108,10 @@ class MainActivity : AppCompatActivity() {
     fun onEnableDisableSDKClick(v: View) {
         Adjust.isEnabled(this, OnIsEnabledListener {
             if (it) {
-                Adjust.setEnabled(false)
+                Adjust.disable()
                 (v as Button).setText(R.string.txt_enable_sdk)
             } else {
-                Adjust.setEnabled(true)
+                Adjust.enable()
                 (v as Button).setText(R.string.txt_disable_sdk)
             }
         })
diff --git a/Adjust/example-app-kotlin/src/main/java/com/adjust/examples/ServiceExample.kt b/Adjust/example-app-kotlin/src/main/java/com/adjust/examples/ServiceExample.kt
@@ -31,10 +31,10 @@ class ServiceExample : Service() {
         Log.d("example", "ServiceExample onStartCommand")
 
         if (flip) {
-            Adjust.setEnabled(false)
+            Adjust.disable()
             flip = false
         } else {
-            Adjust.setEnabled(true)
+            Adjust.enable()
             flip = true
         }
 
diff --git a/Adjust/example-app-tv/src/main/java/com/adjust/examples/GlobalApplication.java b/Adjust/example-app-tv/src/main/java/com/adjust/examples/GlobalApplication.java
@@ -131,7 +131,7 @@ public boolean launchReceivedDeeplink(Uri deeplink) {
         // Adjust.switchToOfflineMode();
 
         // Disable the SDK
-        // Adjust.setEnabled(false);
+        // Adjust.disable();
 
         // Send push notification token.
         // Adjust.setPushToken("token");
diff --git a/Adjust/example-app-tv/src/main/java/com/adjust/examples/MainActivity.java b/Adjust/example-app-tv/src/main/java/com/adjust/examples/MainActivity.java
@@ -100,10 +100,10 @@ public void onEnableDisableSDKClick(View v) {
             @Override
             public void onIsEnabledRead(boolean isEnabled) {
                 if (isEnabled) {
-                    Adjust.setEnabled(false);
+                    Adjust.disable();
                     ((Button) v).setText(R.string.txt_enable_sdk);
                 } else {
-                    Adjust.setEnabled(true);
+                    Adjust.enable();
                     ((Button) v).setText(R.string.txt_disable_sdk);
                 }
             }
diff --git a/Adjust/example-app-webbridge/src/main/assets/AdjustExample-WebView.html b/Adjust/example-app-webbridge/src/main/assets/AdjustExample-WebView.html
@@ -126,13 +126,13 @@ <h1 style="width:400px;height:35px;text-align:center;">Adjust Web View SDK Demo
                 var btnEnableSdk = document.getElementById('btnEnableSdk')
                 btnEnableSdk.onclick = function(e) {
                     e.preventDefault()
-                    Adjust.setEnabled(true)
+                    Adjust.enable();
                 }
 
                 var btnDisableSdk = document.getElementById('btnDisableSdk')
                 btnDisableSdk.onclick = function(e) {
                     e.preventDefault();
-                    Adjust.setEnabled(false);
+                    Adjust.disable();
                 }
 
                 var btnIsSdkEnabled = document.getElementById('btnIsSdkEnabled')
diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/Adjust.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/Adjust.java
@@ -77,13 +77,20 @@ public static void onPause() {
     }
 
     /**
-     * Called to disable/enable SDK.
+     * Called to enable SDK.
      *
-     * @param enabled boolean indicating whether SDK should be enabled or disabled
      */
-    public static void setEnabled(boolean enabled) {
+    public static void enable() {
         AdjustInstance adjustInstance = Adjust.getDefaultInstance();
-        adjustInstance.setEnabled(enabled);
+        adjustInstance.enable();
+    }
+    /**
+     * Called to disable SDK.
+     *
+     */
+    public static void disable() {
+        AdjustInstance adjustInstance = Adjust.getDefaultInstance();
+        adjustInstance.disable();
     }
 
     /**
diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/AdjustInstance.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/AdjustInstance.java
@@ -141,14 +141,23 @@ public void onPause() {
     }
 
     /**
-     * Called to disable/enable SDK.
+     * Called to enable SDK.
      *
-     * @param enabled boolean indicating whether SDK should be enabled or disabled
      */
-    public void setEnabled(final boolean enabled) {
-        this.startEnabled = enabled;
-        if (checkActivityHandler(enabled, "enabled mode", "disabled mode")) {
-            activityHandler.setEnabled(enabled);
+    public void enable() {
+        this.startEnabled = true;
+        if (checkActivityHandler(true, "enabled mode", "disabled mode")) {
+            activityHandler.setEnabled(true);
+        }
+    }
+    /**
+     * Called to disable SDK.
+     *
+     */
+    public void disable() {
+        this.startEnabled = false;
+        if (checkActivityHandler(false, "enabled mode", "disabled mode")) {
+            activityHandler.setEnabled(false);
         }
     }
 
diff --git a/Adjust/sdk-plugin-webbridge/src/main/assets/adjust.js b/Adjust/sdk-plugin-webbridge/src/main/assets/adjust.js
@@ -31,9 +31,15 @@ var Adjust = {
         }
     },
 
-    setEnabled: function (enabled) {
+    enable: function () {
         if (AdjustBridge) {
-            AdjustBridge.setEnabled(enabled);
+            AdjustBridge.enable();
+        }
+    },
+
+    disable: function () {
+        if (AdjustBridge) {
+            AdjustBridge.disable();
         }
     },
 
diff --git a/Adjust/sdk-plugin-webbridge/src/main/java/com/adjust/sdk/webbridge/AdjustBridgeInstance.java b/Adjust/sdk-plugin-webbridge/src/main/java/com/adjust/sdk/webbridge/AdjustBridgeInstance.java
@@ -462,14 +462,19 @@ public void onPause() {
     }
 
     @JavascriptInterface
-    public void setEnabled(String isEnabledString) {
+    public void enable() {
         if (!isInitialized()) {
             return;
         }
-        Boolean isEnabled = AdjustBridgeUtil.fieldToBoolean(isEnabledString);
-        if (isEnabled != null) {
-            Adjust.setEnabled(isEnabled);
+        Adjust.enable();
+    }
+
+    @JavascriptInterface
+    public void disable() {
+        if (!isInitialized()) {
+            return;
         }
+        Adjust.disable();
     }
 
     @JavascriptInterface
diff --git a/Adjust/test-app-core/src/main/java/com/adjust/testapp/AdjustCommandExecutor.java b/Adjust/test-app-core/src/main/java/com/adjust/testapp/AdjustCommandExecutor.java
@@ -559,7 +559,11 @@ private void resume() {
 
     private void setEnabled() {
         Boolean enabled = Boolean.valueOf(command.getFirstParameterValue("enabled"));
-        Adjust.setEnabled(enabled);
+        if (enabled){
+            Adjust.enable();
+        }else {
+            Adjust.disable();
+        }
     }
 
     private void setOfflineMode() {
diff --git a/Adjust/test-app-webbridge/src/main/assets/command_executor.js b/Adjust/test-app-webbridge/src/main/assets/command_executor.js
@@ -505,7 +505,11 @@ AdjustCommandExecutor.prototype.resume = function(params) {
 
 AdjustCommandExecutor.prototype.setEnabled = function(params) {
     var enabled = getFirstParameterValue(params, "enabled") == 'true';
-    Adjust.setEnabled(enabled);
+    if(enabled){
+        Adjust.enable();
+    }else{
+        Adjust.disable();
+    }
 };
 
 AdjustCommandExecutor.prototype.setOfflineMode = function(params) {

Original file line number	Diff line number	Diff line change
`@@ -99,13 +99,13 @@ <h1 style="width:400px;height:35px;text-align:center;">Adjust Facebook Pixel Dem`
`99`	`99`	`var btnEnableSdk = document.getElementById('btnEnableSdk')`
`100`	`100`	`btnEnableSdk.onclick = function(e) {`
`101`	`101`	`e.preventDefault()`
`102`		`- Adjust.setEnabled(true)`
	`102`	`+ Adjust.enable()`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`var btnDisableSdk = document.getElementById('btnDisableSdk')`
`106`	`106`	`btnDisableSdk.onclick = function(e) {`
`107`	`107`	`e.preventDefault();`
`108`		`- Adjust.setEnabled(false);`
	`108`	`+ Adjust.disable();`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`var btnIsSdkEnabled = document.getElementById('btnIsSdkEnabled')`
Original file line number	Diff line number	Diff line change
`@@ -124,10 +124,10 @@ public void onEnableDisableSDKClick(View v) {`
`124`	`124`	`@Override`
`125`	`125`	`public void onIsEnabledRead(boolean isEnabled) {`
`126`	`126`	`if (isEnabled) {`
`127`		`- Adjust.setEnabled(false);`
	`127`	`+ Adjust.disable();`
`128`	`128`	`((Button) v).setText(R.string.txt_enable_sdk);`
`129`	`129`	`} else {`
`130`		`- Adjust.setEnabled(true);`
	`130`	`+ Adjust.enable();`
`131`	`131`	`((Button) v).setText(R.string.txt_disable_sdk);`
`132`	`132`	`}`
`133`	`133`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,10 +100,10 @@ public void onEnableDisableSDKClick(View v) {`
`100`	`100`	`@Override`
`101`	`101`	`public void onIsEnabledRead(boolean isEnabled) {`
`102`	`102`	`if (isEnabled) {`
`103`		`- Adjust.setEnabled(false);`
	`103`	`+ Adjust.disable();`
`104`	`104`	`((Button) v).setText(R.string.txt_enable_sdk);`
`105`	`105`	`} else {`
`106`		`- Adjust.setEnabled(true);`
	`106`	`+ Adjust.enable();`
`107`	`107`	`((Button) v).setText(R.string.txt_disable_sdk);`
`108`	`108`	`}`
`109`	`109`	`}`