Rename isEnabled to canHandleMessaging

Author: CrisBarreiro

content-scope-scripts/content-scope-scripts-impl/src/main/java/com/duckduckgo/contentscopescripts/impl/messaging/ContentScopeScriptsWebMessagingPlugin.kt

@@ -47,7 +47,7 @@ class ContentScopeScriptsWebMessagingPlugin @Inject constructor(
         override val objectName: String
             get() = "contentScopeAdsjs"
 
-        override suspend fun isEnabled(): Boolean {
+        override suspend fun canHandleMessaging(): Boolean {
             return webViewCompatContentScopeScripts.isEnabled()
         }
 

js-messaging/js-messaging-api/src/main/java/com/duckduckgo/js/messaging/api/WebMessagingPlugin.kt

@@ -54,10 +54,10 @@ interface WebMessagingPluginStrategy {
     val objectName: String
 
     /**
-     * Determines whether messaging actions should proceed (i.e. by checking feature flags).
-     * @return true if messaging is allowed, false otherwise
+     * Determines whether messaging can be handled (i.e. by checking feature flags).
+     * @return true if messaging can be handled for this plugin, false otherwise
      */
-    suspend fun isEnabled(): Boolean
+    suspend fun canHandleMessaging(): Boolean
 
     /**
      * Provides the list of message handlers to process incoming messages.

js-messaging/js-messaging-impl/src/main/java/com/duckduckgo/js/messaging/impl/RealWebMessagingDelegate.kt

@@ -46,26 +46,6 @@ import logcat.asLog
 import logcat.logcat
 import org.json.JSONObject
 
-
-/*
-
-
-
-
-
-    override suspend fun unregister(webView: WebView) {
-        if (!webViewCompatContentScopeScripts.isEnabled()) return
-        runCatching {
-            return@runCatching webViewCompatWrapper.removeWebMessageListener(webView, JS_OBJECT_NAME)
-        }.getOrElse { exception ->
-            logcat(ERROR) {
-                "Error removing WebMessageListener for contentScopeAdsjs: ${exception.asLog()}"
-            }
-        }
-    }
-
- */
-
 @ContributesBinding(FragmentScope::class)
 class RealWebMessagingDelegate @Inject constructor(
     private val webViewCompatWrapper: WebViewCompatWrapper,
@@ -178,7 +158,8 @@ class RealWebMessagingDelegate @Inject constructor(
             override suspend fun register(
                 jsMessageCallback: WebViewCompatMessageCallback,
                 webView: WebView,
-            ) {if (!strategy.isEnabled()) {
+            ) {
+                if (!strategy.canHandleMessaging()) {
                 return
             }
 
@@ -204,7 +185,7 @@ class RealWebMessagingDelegate @Inject constructor(
             override suspend fun unregister(
                 webView: WebView,
             ) {
-                if (!strategy.isEnabled()) return
+                if (!strategy.canHandleMessaging()) return
                 runCatching {
                     return@runCatching webViewCompatWrapper.removeWebMessageListener(webView, strategy.objectName)
                 }.getOrElse { exception ->
@@ -231,11 +212,10 @@ class RealWebMessagingDelegate @Inject constructor(
                 }
             }
 
-
             @SuppressLint("RequiresFeature")
             override suspend fun postMessage(webView: WebView, subscriptionEventData: SubscriptionEventData) {
                 runCatching {
-                    if (!strategy.isEnabled()) {
+                    if (!strategy.canHandleMessaging()) {
                         return
                     }