use new module loading

4 files changed, 16 insertions, 14 deletions

diff --git a/.idea/dictionaries/dold.xml b/.idea/dictionaries/dold.xml
index 1beba1b..d0e58bf 100644
--- a/.idea/dictionaries/dold.xml
+++ b/.idea/dictionaries/dold.xml
@@ -2,6 +2,7 @@
   <dictionary name="dold">
     <words>
       <w>aiddescription</w>
+      <w>akono</w>
       <w>apdu</w>
       <w>servicedesc</w>
       <w>taler</w>
diff --git a/app/build.gradle b/app/build.gradle
index c98ff94..613df20 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,13 +10,13 @@ android {
         applicationId "net.taler.wallet"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 2
-        versionName "0.6.0pre3"
+        versionCode 3
+        versionName "0.6.0pre4"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
diff --git a/app/src/main/java/net/taler/wallet/backend/WalletBackendService.kt b/app/src/main/java/net/taler/wallet/backend/WalletBackendService.kt
index d36435a..65cbeaf 100644
--- a/app/src/main/java/net/taler/wallet/backend/WalletBackendService.kt
+++ b/app/src/main/java/net/taler/wallet/backend/WalletBackendService.kt
@@ -1,20 +1,12 @@
 package net.taler.wallet.backend
 
 import akono.AkonoJni
-import akono.ModuleResult
 import android.app.Service
 import android.content.Intent
-import android.content.res.AssetManager
 import android.os.*
 import android.util.Log
-import android.util.SparseArray
-import android.widget.Toast
-import androidx.core.util.set
 import net.taler.wallet.HostCardEmulatorService
 import org.json.JSONObject
-import java.io.File
-import java.io.InputStream
-import java.lang.Process
 import java.lang.ref.WeakReference
 import java.util.*
 import java.util.concurrent.ConcurrentHashMap
@@ -42,8 +34,14 @@ class WalletBackendService : Service() {
     private val subscribers = LinkedList<Messenger>()
 
     override fun onCreate() {
+        val talerWalletAndroidCode = assets.open("taler-wallet-android.js").use {
+            it.readBytes().toString(Charsets.UTF_8)
+        }
+
+
         Log.i(TAG, "onCreate in wallet backend service")
         akono = AkonoJni()
+        akono.putModuleCode("taler-wallet-android", talerWalletAndroidCode)
         akono.setMessageHandler(object : AkonoJni.MessageHandler {
             override fun handleMessage(message: String) {
                 this@WalletBackendService.handleAkonoMessage(message)
@@ -51,6 +49,7 @@ class WalletBackendService : Service() {
         })
         akono.evalNodeCode("console.log('hello world from taler wallet-android')")
         //akono.evalNodeCode("require('source-map-support').install();")
+        akono.evalNodeCode("require('akono');")
         akono.evalNodeCode("tw = require('taler-wallet-android');")
         akono.evalNodeCode("tw.installAndroidWalletListener();")
         sendInitMessage()
@@ -104,7 +103,10 @@ class WalletBackendService : Service() {
                     request.put("id", serviceRequestID)
                     request.put("args", argsObj)
                     svc.akono.sendMessage(request.toString(2))
-                    Log.i(TAG, "mapping service request ID $serviceRequestID to client request ID $clientRequestID")
+                    Log.i(
+                        TAG,
+                        "mapping service request ID $serviceRequestID to client request ID $clientRequestID"
+                    )
                     svc.requests.put(
                         serviceRequestID,
                         RequestData(clientRequestID, msg.replyTo)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b57aadf..cfd2213 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">GNU Taler Wallet</string>
+    <string name="app_name">Taler Wallet</string>
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
     <string name="nav_header_title">GNU Taler</string>
@@ -9,7 +9,6 @@
 
     <string name="menu_home">Home</string>
     <string name="menu_gallery">Gallery</string>
-    <string name="menu_slideshow">Slideshow</string>
     <string name="menu_tools">Tools</string>
     <string name="menu_share">Share</string>
     <string name="menu_send">Send</string>