From e19ba096d57353db6b1f141da4bf170ef2d2d534 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Wed, 29 Jul 2020 14:12:50 -0300 Subject: [wallet] update to new wallet-core with v8 exchange API (except payments which are still buggy) --- .../src/main/java/net/taler/wallet/backend/WalletBackendApi.kt | 4 ++-- .../main/java/net/taler/wallet/backend/WalletBackendService.kt | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'wallet/src/main/java/net/taler/wallet/backend') diff --git a/wallet/src/main/java/net/taler/wallet/backend/WalletBackendApi.kt b/wallet/src/main/java/net/taler/wallet/backend/WalletBackendApi.kt index 3ffcd7b..51b3419 100644 --- a/wallet/src/main/java/net/taler/wallet/backend/WalletBackendApi.kt +++ b/wallet/src/main/java/net/taler/wallet/backend/WalletBackendApi.kt @@ -30,7 +30,7 @@ import android.util.Log import android.util.SparseArray import org.json.JSONObject import java.lang.ref.WeakReference -import java.util.* +import java.util.LinkedList class WalletBackendApi( private val app: Application, @@ -115,7 +115,7 @@ class WalletBackendApi( fun sendRequest( operation: String, - args: JSONObject?, + args: JSONObject? = null, onResponse: (isError: Boolean, message: JSONObject) -> Unit = { _, _ -> } ) { val requestID = nextRequestID++ diff --git a/wallet/src/main/java/net/taler/wallet/backend/WalletBackendService.kt b/wallet/src/main/java/net/taler/wallet/backend/WalletBackendService.kt index c810054..f39a3e7 100644 --- a/wallet/src/main/java/net/taler/wallet/backend/WalletBackendService.kt +++ b/wallet/src/main/java/net/taler/wallet/backend/WalletBackendService.kt @@ -30,7 +30,7 @@ import net.taler.wallet.BuildConfig.WALLET_CORE_VERSION import net.taler.wallet.HostCardEmulatorService import org.json.JSONObject import java.lang.ref.WeakReference -import java.util.* +import java.util.LinkedList import java.util.concurrent.ConcurrentHashMap import kotlin.system.exitProcess @@ -56,9 +56,10 @@ class WalletBackendService : Service() { private val subscribers = LinkedList() override fun onCreate() { - val talerWalletAndroidCode = assets.open("taler-wallet-android-$WALLET_CORE_VERSION.js").use { - it.readBytes().toString(Charsets.UTF_8) - } + val talerWalletAndroidCode = + assets.open("taler-wallet-android-$WALLET_CORE_VERSION.js").use { + it.readBytes().toString(Charsets.UTF_8) + } Log.i(TAG, "onCreate in wallet backend service") -- cgit v1.2.3