[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-ios] 17/54: for debugging time-outs
From: |
gnunet |
Subject: |
[taler-taler-ios] 17/54: for debugging time-outs |
Date: |
Fri, 30 Jun 2023 22:33:49 +0200 |
This is an automated email from the git hooks/post-receive script.
marc-stibane pushed a commit to branch master
in repository taler-ios.
commit 8c369143dd001f2a181f131bbe354c275f24d39e
Author: Marc Stibane <marc@taler.net>
AuthorDate: Thu Jun 22 17:07:14 2023 +0200
for debugging time-outs
---
TalerWallet1/Views/HelperViews/SelectDays.swift | 7 ++++---
TalerWallet1/Views/Peer2peer/SendNow.swift | 6 ++++--
taler-swift/Sources/taler-swift/Time.swift | 6 ++++++
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/TalerWallet1/Views/HelperViews/SelectDays.swift
b/TalerWallet1/Views/HelperViews/SelectDays.swift
index 8fb1905..933af3c 100644
--- a/TalerWallet1/Views/HelperViews/SelectDays.swift
+++ b/TalerWallet1/Views/HelperViews/SelectDays.swift
@@ -9,6 +9,7 @@ import SymLog
struct SelectDays: View {
private let symLog = SymLogV(0)
@Environment(\.isEnabled) private var isEnabled: Bool
+ @AppStorage("developerMode") var developerMode: Bool = false
@Binding var selected: UInt
let maxExpiration: UInt
@@ -31,17 +32,17 @@ struct SelectDays: View {
var body: some View {
HStack {
Button(action: oneDayAction) {
- Text("1 Day")
+ Text(developerMode ? "3 Min." : "1 Day")
}.buttonStyle(TalerButtonStyle(type: (selected == 1) ? .prominent
: .bordered, dimmed: true))
.disabled(!isEnabled)
Button(action: sevenDayAction) {
- Text("7 Days")
+ Text(developerMode ? "1 Hour" : "7 Days")
}.buttonStyle(TalerButtonStyle(type: (selected == 7) ? .prominent
: .bordered, dimmed: true))
.disabled(!isEnabled || maxExpiration < 7)
Button(action: thirtyDayAction) {
- Text("30 Days")
+ Text(developerMode ? "1 Day" : "30 Days")
}.buttonStyle(TalerButtonStyle(type: (selected == 30) ? .prominent
: .bordered, dimmed: true))
.disabled(!isEnabled || maxExpiration < 30)
} // 3 buttons
diff --git a/TalerWallet1/Views/Peer2peer/SendNow.swift
b/TalerWallet1/Views/Peer2peer/SendNow.swift
index 811c22b..d15eb77 100644
--- a/TalerWallet1/Views/Peer2peer/SendNow.swift
+++ b/TalerWallet1/Views/Peer2peer/SendNow.swift
@@ -6,9 +6,9 @@ import SwiftUI
import taler_swift
import SymLog
-
struct SendNow: View {
private let symLog = SymLogV()
+ @AppStorage("developerMode") var developerMode: Bool = false
let amountToSend: Amount?
let amountToReceive: Amount?
@@ -50,7 +50,9 @@ struct SendNow: View {
symLog.log(".task")
do {
// generate talerURI
- let timestamp = Timestamp.inSomeDays(expireDays)
+ var timestamp = developerMode ?
Timestamp.inSomeMinutes(expireDays > 20 ? (24*60)
+ :
expireDays > 5 ? 60 : 3)
+ :
Timestamp.inSomeDays(expireDays)
if let amountToSend {
let terms = PeerContractTerms(amount: amountToSend,
summary: summary,
diff --git a/taler-swift/Sources/taler-swift/Time.swift
b/taler-swift/Sources/taler-swift/Time.swift
index dffb53d..43ada5d 100644
--- a/taler-swift/Sources/taler-swift/Time.swift
+++ b/taler-swift/Sources/taler-swift/Time.swift
@@ -78,6 +78,12 @@ extension Timestamp {
return Timestamp.milliseconds(now + (UInt64(days) * seconds * 1000))
}
+ public static func inSomeMinutes(_ minutes: UInt) -> Timestamp {
+ let now = Date().millisecondsSince1970
+ let seconds: UInt64 = 60
+ return Timestamp.milliseconds(now + (UInt64(minutes) * seconds * 1000))
+ }
+
/// convenience initializer from UInt64 (milliseconds from January 1, 1970)
public init(from: UInt64) {
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-ios] branch master updated (7ce9180 -> f7f01e5), gnunet, 2023/06/30
- [taler-taler-ios] 02/54: Moved AgePicker in its own file, gnunet, 2023/06/30
- [taler-taler-ios] 05/54: cleanup, back to Swift 5.8 (for now until Xcode 15 is usable), gnunet, 2023/06/30
- [taler-taler-ios] 04/54: PopToRoot instead of dismiss sheet, gnunet, 2023/06/30
- [taler-taler-ios] 03/54: Cleaned up buttons, gnunet, 2023/06/30
- [taler-taler-ios] 11/54: Accessibility, gnunet, 2023/06/30
- [taler-taler-ios] 18/54: remove loaded, gnunet, 2023/06/30
- [taler-taler-ios] 09/54: Launch animation, SideBarView, gnunet, 2023/06/30
- [taler-taler-ios] 01/54: Big update after DD37, gnunet, 2023/06/30
- [taler-taler-ios] 13/54: Overhaul withdraw + p2p, gnunet, 2023/06/30
- [taler-taler-ios] 17/54: for debugging time-outs,
gnunet <=
- [taler-taler-ios] 10/54: Reduce Logging, gnunet, 2023/06/30
- [taler-taler-ios] 12/54: Localization, gnunet, 2023/06/30
- [taler-taler-ios] 08/54: Preparations for localization + accessability, gnunet, 2023/06/30
- [taler-taler-ios] 19/54: remove dismissFirst, gnunet, 2023/06/30
- [taler-taler-ios] 14/54: Made Model a Singleton, gnunet, 2023/06/30
- [taler-taler-ios] 40/54: TransactionType, gnunet, 2023/06/30
- [taler-taler-ios] 26/54: PeerPullDebit, gnunet, 2023/06/30
- [taler-taler-ios] 16/54: Dummy, gnunet, 2023/06/30
- [taler-taler-ios] 34/54: sizeCategory, task, gnunet, 2023/06/30
- [taler-taler-ios] 06/54: Notifications, gnunet, 2023/06/30