diff --git a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt index bff8b0427..889cd424d 100644 --- a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt +++ b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt @@ -123,7 +123,7 @@ class AnalyzeUrl( } } } - result = evalJS(jsMatcher.group(2) ?: jsMatcher.group(1), result) as String + result = evalJS(jsMatcher.group(2) ?: jsMatcher.group(1), result).toString() start = jsMatcher.end() } if (ruleUrl.length > start) { diff --git a/rhino/src/main/java/com/script/rhino/RhinoScriptEngine.kt b/rhino/src/main/java/com/script/rhino/RhinoScriptEngine.kt index b450551d4..cb3b86d7b 100644 --- a/rhino/src/main/java/com/script/rhino/RhinoScriptEngine.kt +++ b/rhino/src/main/java/com/script/rhino/RhinoScriptEngine.kt @@ -342,7 +342,7 @@ class RhinoScriptEngine : AbstractScriptEngine(), Invocable, Compilable { scope: Scriptable, thisObj: Scriptable, args: Array - ): Any { + ): Any? { var accCtxt: AccessControlContext? = null val global = ScriptableObject.getTopLevelScope(scope) val globalProto = global.prototype @@ -358,7 +358,7 @@ class RhinoScriptEngine : AbstractScriptEngine(), Invocable, Compilable { thisObj, args ) - } as PrivilegedAction, accCtxt) else superDoTopCall( + } as PrivilegedAction<*>, accCtxt) else superDoTopCall( callable, cx, scope, @@ -373,7 +373,7 @@ class RhinoScriptEngine : AbstractScriptEngine(), Invocable, Compilable { scope: Scriptable, thisObj: Scriptable, args: Array - ): Any { + ): Any? { return super.doTopCall(callable, cx, scope, thisObj, args) } })