[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-android] 14/15: [wallet] Use Backend.json instead of Json
From: |
gnunet |
Subject: |
[taler-taler-android] 14/15: [wallet] Use Backend.json instead of Json |
Date: |
Wed, 27 Mar 2024 18:27:17 +0100 |
This is an automated email from the git hooks/post-receive script.
torsten-grote pushed a commit to branch master
in repository taler-android.
commit 3d4f7f902a12df2523691d60f3414f4657b22d48
Author: Iván Ávalos <avalos@disroot.org>
AuthorDate: Tue Mar 26 08:11:16 2024 -0600
[wallet] Use Backend.json instead of Json
(cherry picked from commit 3a23a8a2c0f80ca96628ba5d9476090ce0a0a9c4)
---
wallet/src/main/java/net/taler/wallet/ReceiveFundsFragment.kt | 4 ++--
wallet/src/main/java/net/taler/wallet/SendFundsFragment.kt | 6 +++---
wallet/src/main/java/net/taler/wallet/deposit/DepositFragment.kt | 4 ++--
wallet/src/main/java/net/taler/wallet/peer/OutgoingPullFragment.kt | 4 ++--
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
index 4da06e2..85e2340 100644
--- 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
index d6d2034..a26361b 100644
--- 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
index 08e4180..846afb9 100644
--- 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
index b61707e..79ab542 100644
--- 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
index ebf10db..fa3c79a 100644
--- 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) }
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-android] branch master updated (39b6926 -> 4af27e7), gnunet, 2024/03/27
- [taler-taler-android] 04/15: [wallet] Balance layout improvements, gnunet, 2024/03/27
- [taler-taler-android] 05/15: [wallet] Display transactions by scopeInfo instead of currency, gnunet, 2024/03/27
- [taler-taler-android] 02/15: [wallet] DD51: enrich some tx amounts with currencySpecification, gnunet, 2024/03/27
- [taler-taler-android] 14/15: [wallet] Use Backend.json instead of Json,
gnunet <=
- [taler-taler-android] 07/15: [wallet] Set input digits of some amount inputs, gnunet, 2024/03/27
- [taler-taler-android] 01/15: [wallet] DD51: initial rendering based on currency spec, gnunet, 2024/03/27
- [taler-taler-android] 03/15: [wallet] DD51: enrich manual withdrawal amounts with currencySpecification, gnunet, 2024/03/27
- [taler-taler-android] 15/15: [wallet] Use TransactionManager.selectedScope instead of passing around scopeInfo, gnunet, 2024/03/27
- [taler-taler-android] 08/15: [wallet] Cache currencySpec in loadBalances(), gnunet, 2024/03/27
- [taler-taler-android] 10/15: [taler-android] Improve handling of currencies with no symbol, gnunet, 2024/03/27
- [taler-taler-android] 12/15: [wallet] Fix call to loadBalances() from non-UI thread, gnunet, 2024/03/27
- [taler-taler-android] 06/15: [wallet] Improve DD51 unit rendering and adapt tests accordingly, gnunet, 2024/03/27
- [taler-taler-android] 11/15: [wallet] Cache currency spec per scope info, gnunet, 2024/03/27
- [taler-taler-android] 13/15: [wallet] DD51'd more views, UX improvements and some fixes, gnunet, 2024/03/27