taler-android

commit 3d4f7f902a12df2523691d60f3414f4657b22d48
parent 0b91663b223688b92d5128e7969a5453ce6618d5
Author: Iván Ávalos <avalos@disroot.org>
Date:   Tue, 26 Mar 2024 08:11:16 -0600

[wallet] Use Backend.json instead of Json

(cherry picked from commit 3a23a8a2c0f80ca96628ba5d9476090ce0a0a9c4)

Diffstat:
M
wallet/src/main/java/net/taler/wallet/ReceiveFundsFragment.kt
 | 
4
++--
M
wallet/src/main/java/net/taler/wallet/SendFundsFragment.kt
 | 
6
+++---
M
wallet/src/main/java/net/taler/wallet/deposit/DepositFragment.kt
 | 
4
++--
M
wallet/src/main/java/net/taler/wallet/peer/OutgoingPullFragment.kt
 | 
4
++--
M
wallet/src/main/java/net/taler/wallet/peer/OutgoingPushFragment.kt
 | 
4
++--

5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/wallet/src/main/java/net/taler/wallet/ReceiveFundsFragment.kt b/wallet/src/main/java/net/taler/wallet/ReceiveFundsFragment.kt
@@ -51,9 +51,9 @@ import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
 import net.taler.common.Amount
 import net.taler.common.CurrencySpecification
+import net.taler.wallet.backend.BackendManager
 import net.taler.wallet.compose.AmountInputField
 import net.taler.wallet.compose.DEFAULT_INPUT_DECIMALS
 import net.taler.wallet.compose.TalerSurface
@@ -113,7 +113,7 @@ class ReceiveFundsFragment : Fragment() {
     private fun onPeerPull(amount: Amount) {
         val bundle = bundleOf(
             "amount" to amount.toJSONString(),
-            "scopeInfo" to Json.encodeToString(scopeInfo),
+            "scopeInfo" to BackendManager.json.encodeToString(scopeInfo),
         )
         peerManager.checkPeerPullCredit(amount)
         findNavController().navigate(R.id.action_receiveFunds_to_nav_peer_pull, bundle)
diff --git a/wallet/src/main/java/net/taler/wallet/SendFundsFragment.kt b/wallet/src/main/java/net/taler/wallet/SendFundsFragment.kt
@@ -48,9 +48,9 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
 import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
 import net.taler.common.Amount
 import net.taler.common.CurrencySpecification
+import net.taler.wallet.backend.BackendManager
 import net.taler.wallet.compose.AmountInputField
 import net.taler.wallet.compose.DEFAULT_INPUT_DECIMALS
 import net.taler.wallet.compose.TalerSurface
@@ -87,7 +87,7 @@ class SendFundsFragment : Fragment() {
     private fun onDeposit(amount: Amount) {
         val bundle = bundleOf(
             "amount" to amount.toJSONString(),
-            "scopeInfo" to Json.encodeToString(scopeInfo),
+            "scopeInfo" to BackendManager.json.encodeToString(scopeInfo),
         )
         findNavController().navigate(R.id.action_sendFunds_to_nav_deposit, bundle)
     }
@@ -95,7 +95,7 @@ class SendFundsFragment : Fragment() {
     private fun onPeerPush(amount: Amount) {
         val bundle = bundleOf(
             "amount" to amount.toJSONString(),
-            "scopeInfo" to Json.encodeToString(scopeInfo),
+            "scopeInfo" to BackendManager.json.encodeToString(scopeInfo),
         )
         peerManager.checkPeerPushDebit(amount)
         findNavController().navigate(R.id.action_sendFunds_to_nav_peer_push, bundle)
diff --git a/wallet/src/main/java/net/taler/wallet/deposit/DepositFragment.kt b/wallet/src/main/java/net/taler/wallet/deposit/DepositFragment.kt
@@ -25,12 +25,12 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
-import kotlinx.serialization.json.Json
 import net.taler.common.Amount
 import net.taler.common.showError
 import net.taler.wallet.CURRENCY_BTC
 import net.taler.wallet.MainViewModel
 import net.taler.wallet.R
+import net.taler.wallet.backend.BackendManager
 import net.taler.wallet.balances.ScopeInfo
 import net.taler.wallet.compose.TalerSurface
 import net.taler.wallet.compose.collectAsStateLifecycleAware
@@ -50,7 +50,7 @@ class DepositFragment : Fragment() {
             Amount.fromJSONString(it)
         } ?: error("no amount passed")
         val scopeInfo: ScopeInfo? = arguments?.getString("scopeInfo")?.let {
-            Json.decodeFromString(it)
+            BackendManager.json.decodeFromString(it)
         }
         val spec = scopeInfo?.let { balanceManager.getSpecForScopeInfo(it) }
         val receiverName = arguments?.getString("receiverName")
diff --git a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullFragment.kt b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullFragment.kt
@@ -28,10 +28,10 @@ import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.fragment.findNavController
 import kotlinx.coroutines.launch
-import kotlinx.serialization.json.Json
 import net.taler.common.Amount
 import net.taler.wallet.MainViewModel
 import net.taler.wallet.R
+import net.taler.wallet.backend.BackendManager
 import net.taler.wallet.balances.ScopeInfo
 import net.taler.wallet.compose.TalerSurface
 import net.taler.wallet.compose.collectAsStateLifecycleAware
@@ -53,7 +53,7 @@ class OutgoingPullFragment : Fragment() {
             Amount.fromJSONString(it)
         } ?: error("no amount passed")
         val scopeInfo: ScopeInfo? = arguments?.getString("scopeInfo")?.let {
-            Json.decodeFromString(it)
+            BackendManager.json.decodeFromString(it)
         }
         val spec = scopeInfo?.let { balanceManager.getSpecForScopeInfo(it) }
 
diff --git a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushFragment.kt b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushFragment.kt
@@ -30,10 +30,10 @@ import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.findNavController
 import androidx.navigation.fragment.findNavController
 import kotlinx.coroutines.launch
-import kotlinx.serialization.json.Json
 import net.taler.common.Amount
 import net.taler.wallet.MainViewModel
 import net.taler.wallet.R
+import net.taler.wallet.backend.BackendManager
 import net.taler.wallet.balances.ScopeInfo
 import net.taler.wallet.compose.TalerSurface
 import net.taler.wallet.compose.collectAsStateLifecycleAware
@@ -61,7 +61,7 @@ class OutgoingPushFragment : Fragment() {
             Amount.fromJSONString(it)
         } ?: error("no amount passed")
         val scopeInfo: ScopeInfo? = arguments?.getString("scopeInfo")?.let {
-            Json.decodeFromString(it)
+            BackendManager.json.decodeFromString(it)
         }
         val spec = scopeInfo?.let { balanceManager.getSpecForScopeInfo(it) }