Update Java API

* Check type on as{*} functions * Add Context as argument for every callback * Add Pending job option into evalScript function * Move few create functions into child class * Update build files Signed-off-by: Seonghyun Kim <[email protected]>
Samsung · Oct 18, 2023 · 98133d2 · 98133d2
1 parent 463d730
commit 98133d2
Show file tree

Hide file tree

Showing 18 changed files with 333 additions and 144 deletions.
diff --git a/build/android/.idea/misc.xml b/build/android/.idea/misc.xml
diff --git a/build/android/app/src/main/java/com/samsung/lwe/escargot/shell/MainActivity.java b/build/android/app/src/main/java/com/samsung/lwe/escargot/shell/MainActivity.java
@@ -82,9 +82,9 @@ private void run()
 
             {
                 Context finalContext = context;
-                context.getGlobalObject().set(context, JavaScriptValue.create("print"), JavaScriptJavaCallbackFunctionObject.create(context, "print", 1, false, new JavaScriptJavaCallbackFunctionObject.Callback() {
+                context.getGlobalObject().set(context, JavaScriptString.create("print"), JavaScriptJavaCallbackFunctionObject.create(context, "print", 1, false, new JavaScriptJavaCallbackFunctionObject.Callback() {
                     @Override
-                    public Optional<JavaScriptValue> callback(JavaScriptValue javaScriptValue, JavaScriptValue[] javaScriptValues) {
+                    public Optional<JavaScriptValue> callback(Context context, JavaScriptValue javaScriptValue, JavaScriptValue[] javaScriptValues) {
                         StringBuffer sb = new StringBuffer();
                         sb.append(str);
                         sb.append('\n');
@@ -118,9 +118,9 @@ public void run() {
                     }
                 }));
 
-                context.getGlobalObject().set(context, JavaScriptValue.create("load"), JavaScriptJavaCallbackFunctionObject.create(context, "run", 1, false, new JavaScriptJavaCallbackFunctionObject.Callback() {
+                context.getGlobalObject().set(context, JavaScriptString.create("load"), JavaScriptJavaCallbackFunctionObject.create(context, "run", 1, false, new JavaScriptJavaCallbackFunctionObject.Callback() {
                     @Override
-                    public Optional<JavaScriptValue> callback(JavaScriptValue javaScriptValue, JavaScriptValue[] javaScriptValues) {
+                    public Optional<JavaScriptValue> callback(Context context, JavaScriptValue javaScriptValue, JavaScriptValue[] javaScriptValues) {
                         Optional<JavaScriptString> s = javaScriptValues[0].toString(finalContext);
                         if (s.isPresent()) {
                             try {
@@ -137,9 +137,9 @@ public Optional<JavaScriptValue> callback(JavaScriptValue javaScriptValue, JavaS
                     }
                 }));
 
-                context.getGlobalObject().set(context, JavaScriptValue.create("run"), JavaScriptJavaCallbackFunctionObject.create(context, "run", 1, false, new JavaScriptJavaCallbackFunctionObject.Callback() {
+                context.getGlobalObject().set(context, JavaScriptString.create("run"), JavaScriptJavaCallbackFunctionObject.create(context, "run", 1, false, new JavaScriptJavaCallbackFunctionObject.Callback() {
                     @Override
-                    public Optional<JavaScriptValue> callback(JavaScriptValue javaScriptValue, JavaScriptValue[] javaScriptValues) {
+                    public Optional<JavaScriptValue> callback(Context context, JavaScriptValue javaScriptValue, JavaScriptValue[] javaScriptValues) {
                         long sm = System.currentTimeMillis();
                         Optional<JavaScriptString> s = javaScriptValues[0].toString(finalContext);
                         if (s.isPresent()) {
@@ -149,16 +149,16 @@ public Optional<JavaScriptValue> callback(JavaScriptValue javaScriptValue, JavaS
                     }
                 }));
 
-                context.getGlobalObject().set(context, JavaScriptValue.create("read"), JavaScriptJavaCallbackFunctionObject.create(context, "read", 1, false, new JavaScriptJavaCallbackFunctionObject.Callback() {
+                context.getGlobalObject().set(context, JavaScriptString.create("read"), JavaScriptJavaCallbackFunctionObject.create(context, "read", 1, false, new JavaScriptJavaCallbackFunctionObject.Callback() {
                     @Override
-                    public Optional<JavaScriptValue> callback(JavaScriptValue javaScriptValue, JavaScriptValue[] javaScriptValues) {
+                    public Optional<JavaScriptValue> callback(Context context, JavaScriptValue javaScriptValue, JavaScriptValue[] javaScriptValues) {
                         Optional<JavaScriptString> s = javaScriptValues[0].toString(finalContext);
                         if (s.isPresent()) {
                             FileReader in = null;
                             try {
                                 byte[] chars = Files.readAllBytes(Paths.get(s.get().toJavaString()));
                                 String fileContent = new String(chars);
-                                return Optional.of(JavaScriptValue.create(fileContent));
+                                return Optional.of(JavaScriptString.create(fileContent));
                             }
                             catch (Exception ex) {
                                 return Optional.empty();

diff --git a/build/android/escargot/build.gradle b/build/android/escargot/build.gradle
@@ -178,7 +178,6 @@ task sourcesJar(type: Jar) {
 
 task javadoc(type: Javadoc) {
     source = android.sourceSets.main.java.sourceFiles
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
     android.libraryVariants.all { variant ->
         if (variant.name == 'release') {
             owner.classpath += variant.javaCompileProvider.get().classpath

diff --git a/build/android/escargot/consumer-rules.pro b/build/android/escargot/consumer-rules.pro
@@ -1 +1,2 @@
 -keep class com.samsung.lwe.escargot.* { *; }
+-keep enum com.samsung.lwe.escargot.* { *; }
diff --git a/build/android/escargot/proguard-rules.pro b/build/android/escargot/proguard-rules.pro
@@ -21,3 +21,4 @@
 #-renamesourcefileattribute SourceFile
 
 -keep class com.samsung.lwe.escargot.* { *; }
+-keep enum com.samsung.lwe.escargot.* { *; }