Release 3.4.3

sensorsdata · Oct 29, 2021 · 1e88d5a · 1e88d5a
1 parent fd2808f
commit 1e88d5a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/plugin/ext.gradle b/plugin/ext.gradle
@@ -1,5 +1,5 @@
 project.ext {
-    pluginVersion = '3.4.2'
+    pluginVersion = '3.4.3'
     Properties properties = new Properties()
     if (project.file('local.properties').exists()) {
         properties.load(project.file('local.properties').newDataInputStream())

diff --git a/.../main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsClassVisitor.groovy b/.../main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsClassVisitor.groovy
@@ -221,6 +221,7 @@ class SensorsAnalyticsClassVisitor extends ClassVisitor {
             boolean protectedAndNotStaticAccess
             ArrayList<Integer> localIds
             boolean shouldAddUCJS = false
+            boolean shouldAddXWalkJS = false
 
             @Override
             void visitEnd() {
@@ -235,6 +236,9 @@ class SensorsAnalyticsClassVisitor extends ClassVisitor {
                 if (shouldAddUCJS) {
                     visitAnnotation("Lcom/uc/webview/export/JavascriptInterface;", true)
                 }
+                if (shouldAddXWalkJS) {
+                    visitAnnotation("Lorg/xwalk/core/JavascriptInterface;", true)
+                }
             }
 
             @Override
@@ -824,8 +828,9 @@ class SensorsAnalyticsClassVisitor extends ClassVisitor {
                             }
                         }
                     }
-                } else if (classNameAnalytics.isAppWebViewInterface && transformHelper.extension.addUCJavaScriptInterface && s == "Landroid/webkit/JavascriptInterface;") {
-                    shouldAddUCJS = true
+                } else if (classNameAnalytics.isAppWebViewInterface && s == "Landroid/webkit/JavascriptInterface;") {
+                    shouldAddUCJS = transformHelper.extension.addUCJavaScriptInterface
+                    shouldAddXWalkJS =  transformHelper.extension.addXWalkJavaScriptInterface
                 }
 
                 return super.visitAnnotation(s, b)

diff --git a/...src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsExtension.groovy b/...src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsExtension.groovy
@@ -27,6 +27,7 @@ class SensorsAnalyticsExtension {
     public boolean lambdaEnabled = true
     public boolean autoHandleWebView = true
     public boolean addUCJavaScriptInterface = false
+    public boolean addXWalkJavaScriptInterface = false
     public boolean lambdaParamOptimize = false
     public boolean disableTrackPush = false
     public ArrayList<String> exclude = []
@@ -67,6 +68,7 @@ class SensorsAnalyticsExtension {
                 "\tdisableTrackPush=" + disableTrackPush + "\n" +
                 "\tautoHandleWebView=" + autoHandleWebView + "\n" +
                 "\taddUCJavaScriptInterface=" + addUCJavaScriptInterface + "\n" +
+                "\taddXWalkJavaScriptInterface=" + addXWalkJavaScriptInterface + "\n" +
                 "\tlambdaParamOptimize=" + lambdaParamOptimize + "\n" +
                 "\tlambdaEnabled=" + lambdaEnabled + "\n" +
                 "\texclude=[" + excludeBuilder.toString() + "]" + "\n" +

diff --git a/...src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsTransform.groovy b/...src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsTransform.groovy
@@ -48,7 +48,7 @@ import java.util.jar.JarOutputStream
 
 class SensorsAnalyticsTransform extends Transform {
     private SensorsAnalyticsTransformHelper transformHelper
-    public static final String VERSION = "3.4.2"
+    public static final String VERSION = "3.4.3"
     public static final String MIN_SDK_VERSION = "5.4.3"
     private WaitableExecutor waitableExecutor
     private URLClassLoader urlClassLoader

diff --git a/...in/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsTransformHelper.groovy b/...in/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsTransformHelper.groovy
@@ -121,7 +121,8 @@ class SensorsAnalyticsTransformHelper {
                         classNameAnalytics.methodCells.addAll(methodCellList)
                     }
             }
-            if (classNameAnalytics.methodCells.size() > 0 || classNameAnalytics.isSensorsDataAPI || (classNameAnalytics.isAppWebViewInterface && extension.addUCJavaScriptInterface)) {
+            if (classNameAnalytics.methodCells.size() > 0 || classNameAnalytics.isSensorsDataAPI
+                    || (classNameAnalytics.isAppWebViewInterface && (extension.addUCJavaScriptInterface || extension.addXWalkJavaScriptInterface))) {
                 classNameAnalytics.isShouldModify = true
             }
         } else if (!classNameAnalytics.isAndroidGenerated()) {