taler-android

commit 06f16a7477b337f07526285b65a7f3003b814d33
parent 19a34cbc584a2e7c7f6d65e6c98b9f9f99739a7b
Author: Jonathan Buchanan <jonathan.russ.buchanan@gmail.com>
Date:   Mon, 12 Jul 2021 22:13:23 -0400

use v0.8.1 of wallet-core

Diffstat:
M
wallet/build.gradle
 | 
12
++++++------
M
wallet/src/main/java/net/taler/wallet/backend/WalletBackendService.kt
 | 
8
++++----

2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/wallet/build.gradle b/wallet/build.gradle
@@ -23,8 +23,8 @@ plugins {
     id "de.undercouch.download"
 }
 
-def walletCoreVersion = "v0.8.0"
-def walletCoreSha256 = "46b0ec59e95f2621c8483f975dac9e288851c1e5809f386b49c491e52f41a190"
+def walletCoreVersion = "v0.8.1"
+def walletCoreSha256 = "23bf89b663f0fd0e84a3d7e54a19766766c7306e5704e43a25df57da72056fa7"
 
 static def versionCodeEpoch() {
     return (new Date().getTime() / 1000).toInteger()
@@ -48,7 +48,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 30
         versionCode 9
-        versionName "v0.8.0"
+        versionName "v0.8.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField "String", "WALLET_CORE_VERSION", "\"$walletCoreVersion\""
     }
@@ -151,9 +151,9 @@ dependencies {
 }
 
 def walletLibraryDir = "src/main/assets"
-def walletDestFile = "${walletLibraryDir}/taler-wallet-android-${walletCoreVersion}.js"
+def walletDestFile = "${walletLibraryDir}/taler-wallet-embedded-${walletCoreVersion}.js"
 task downloadWalletLibrary(type: Download, dependsOn: preBuild) {
-    src "https://git.taler.net/wallet-core.git/plain/${walletCoreVersion}/taler-wallet-android.js?h=prebuilt"
+    src "https://git.taler.net/wallet-core.git/plain/${walletCoreVersion}/taler-wallet-embedded.js?h=prebuilt"
     dest walletDestFile
     onlyIfModified true
     overwrite false
@@ -161,7 +161,7 @@ task downloadWalletLibrary(type: Download, dependsOn: preBuild) {
         new File(walletLibraryDir).mkdirs()
         if (!file(dest).exists()) {  // delete old versions before fetching new one
             delete fileTree(walletLibraryDir) {
-                include 'taler-wallet-android-*.js'
+                include 'taler-wallet-embedded-*.js'
             }
         }
     }
diff --git a/wallet/src/main/java/net/taler/wallet/backend/WalletBackendService.kt b/wallet/src/main/java/net/taler/wallet/backend/WalletBackendService.kt
@@ -57,14 +57,14 @@ class WalletBackendService : Service() {
 
     override fun onCreate() {
         val talerWalletAndroidCode =
-            assets.open("taler-wallet-android-$WALLET_CORE_VERSION.js").use {
+            assets.open("taler-wallet-embedded-$WALLET_CORE_VERSION.js").use {
                 it.readBytes().toString(Charsets.UTF_8)
             }
 
 
         Log.i(TAG, "onCreate in wallet backend service")
         akono = AkonoJni()
-        akono.putModuleCode("@gnu-taler/taler-wallet-android", talerWalletAndroidCode)
+        akono.putModuleCode("@gnu-taler/taler-wallet-embedded", talerWalletAndroidCode)
         akono.setMessageHandler(object : AkonoJni.MessageHandler {
             override fun handleMessage(message: String) {
                 this@WalletBackendService.handleAkonoMessage(message)
@@ -72,8 +72,8 @@ class WalletBackendService : Service() {
         })
         //akono.evalNodeCode("require('source-map-support').install();")
         akono.evalNodeCode("require('akono');")
-        akono.evalNodeCode("tw = require('@gnu-taler/taler-wallet-android');")
-        akono.evalNodeCode("tw.installAndroidWalletListener();")
+        akono.evalNodeCode("tw = require('@gnu-taler/taler-wallet-embedded');")
+        akono.evalNodeCode("tw.installNativeWalletListener();")
         sendInitMessage()
         initialized = true
         super.onCreate()