taler-android

commit 3ab1c7dad6e0a6a42c05c2a5c506c9807ac48b2c
parent 1c979ef1d0efd8bdaed7dda292825c41f1d48893
Author: Torsten Grote <t@grobox.de>
Date:   Tue, 21 Mar 2023 12:10:25 -0300

[wallet] use a default expiry constant

to fix bug that defaulted to 1 hour expiry although 1 day was selected

Diffstat:
M
wallet/src/main/java/net/taler/wallet/peer/OutgoingPullIntroComposable.kt
 | 
5
++---
M
wallet/src/main/java/net/taler/wallet/peer/OutgoingPushIntroComposable.kt
 | 
5
++---
M
wallet/src/main/java/net/taler/wallet/peer/PeerManager.kt
 | 
1
+

3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullIntroComposable.kt b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullIntroComposable.kt
@@ -50,7 +50,6 @@ import net.taler.wallet.exchanges.ExchangeItem
 import net.taler.wallet.transactions.AmountType
 import net.taler.wallet.transactions.TransactionAmountComposable
 import net.taler.wallet.transactions.TransactionInfoComposable
-import net.taler.wallet.peer.ExpirationOption.DAYS_1
 import kotlin.random.Random
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -124,8 +123,8 @@ fun OutgoingPullIntroComposable(
             text = stringResource(R.string.send_peer_expiration_period),
             style = MaterialTheme.typography.bodyMedium,
         )
-        var option by rememberSaveable { mutableStateOf(DAYS_1) }
-        var hours by rememberSaveable { mutableStateOf(1L) }
+        var option by rememberSaveable { mutableStateOf(DEFAULT_EXPIRY) }
+        var hours by rememberSaveable { mutableStateOf(DEFAULT_EXPIRY.hours) }
         ExpirationComposable(
             modifier = Modifier.padding(top = 8.dp, bottom = 16.dp),
             option = option,
diff --git a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushIntroComposable.kt b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushIntroComposable.kt
@@ -45,7 +45,6 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import net.taler.common.Amount
 import net.taler.wallet.R
-import net.taler.wallet.peer.ExpirationOption.DAYS_1
 import kotlin.random.Random
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -117,8 +116,8 @@ fun OutgoingPushIntroComposable(
             text = stringResource(R.string.send_peer_expiration_period),
             style = MaterialTheme.typography.bodyMedium,
         )
-        var option by rememberSaveable { mutableStateOf(DAYS_1) }
-        var hours by rememberSaveable { mutableStateOf(DAYS_1.hours) }
+        var option by rememberSaveable { mutableStateOf(DEFAULT_EXPIRY) }
+        var hours by rememberSaveable { mutableStateOf(DEFAULT_EXPIRY.hours) }
         ExpirationComposable(
             modifier = Modifier.padding(top = 8.dp, bottom = 16.dp),
             option = option,
diff --git a/wallet/src/main/java/net/taler/wallet/peer/PeerManager.kt b/wallet/src/main/java/net/taler/wallet/peer/PeerManager.kt
@@ -37,6 +37,7 @@ import org.json.JSONObject
 import java.util.concurrent.TimeUnit.HOURS
 
 const val MAX_LENGTH_SUBJECT = 100
+val DEFAULT_EXPIRY = ExpirationOption.DAYS_1
 
 class PeerManager(
     private val api: WalletBackendApi,