summaryrefslogtreecommitdiff
path: root/akono/src/main/java/akono
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2019-08-16 08:58:53 +0200
committerFlorian Dold <florian.dold@gmail.com>2019-08-16 08:58:53 +0200
commit5cd9d42b4a152eb8f5a5edac23ef7501584d4f91 (patch)
treec0b6b8ff75dd8be392e372a15e62362ee80af4df /akono/src/main/java/akono
parent34904b103622754d85dac2f0ad2746a79dd06d1a (diff)
downloadakono-5cd9d42b4a152eb8f5a5edac23ef7501584d4f91.tar.gz
akono-5cd9d42b4a152eb8f5a5edac23ef7501584d4f91.tar.bz2
akono-5cd9d42b4a152eb8f5a5edac23ef7501584d4f91.zip
allow json loading
Diffstat (limited to 'akono/src/main/java/akono')
-rw-r--r--akono/src/main/java/akono/AkonoJni.kt11
-rw-r--r--akono/src/main/java/akono/Library.kt10
2 files changed, 10 insertions, 11 deletions
diff --git a/akono/src/main/java/akono/AkonoJni.kt b/akono/src/main/java/akono/AkonoJni.kt
index 4a89a3f6..b3636031 100644
--- a/akono/src/main/java/akono/AkonoJni.kt
+++ b/akono/src/main/java/akono/AkonoJni.kt
@@ -67,9 +67,18 @@ class AkonoJni(vararg nodeArgv: String) {
val loadInfo = JSONObject(loadInfoStr)
val request: String = loadInfo.getString("request")
Log.i("myapp", "request is $request")
+ val paths = ArrayList<String>()
+ val pathsJson = loadInfo.getJSONArray("paths")
+ for (i in 0 until pathsJson.length()) {
+ val path = pathsJson.getString(i)
+ if (path.startsWith("/vmodroot/")) {
+ paths.add(path)
+ }
+ }
+ paths.add("/vmodroot")
val handler = loadModuleHandler
if (handler != null) {
- val modResult = handler.loadModule(request, arrayOf()) ?: return "null"
+ val modResult = handler.loadModule(request, paths.toTypedArray()) ?: return "null"
val result = JSONObject()
result.put("path", modResult.path)
result.put("content", modResult.contents)
diff --git a/akono/src/main/java/akono/Library.kt b/akono/src/main/java/akono/Library.kt
deleted file mode 100644
index 920648fd..00000000
--- a/akono/src/main/java/akono/Library.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * This Kotlin source file was generated by the Gradle 'init' task.
- */
-package akono
-
-class Library {
- fun someLibraryMethod(): Boolean {
- return true
- }
-}