ch/Sesame-iOS
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Allow compensation of DST

Browse Source
This commit is contained in:
Christoph Hagen 2022-05-02 17:27:56 +02:00
parent 5205f75f8d
commit e04447a140
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Sesame/ContentView.swift
View File

@ -8,6 +8,9 @@ struct ContentView: View {
@AppStorage("counter") @AppStorage("counter")
var nextMessageCounter: Int = 0 var nextMessageCounter: Int = 0
@AppStorage("compensate")
var isCompensatingDaylightTime: Bool = false
@State @State
var keyManager = KeyManagement() var keyManager = KeyManagement()
@ -31,6 +34,10 @@ struct ContentView: View {
@State @State
private var showHistorySheet = false private var showHistorySheet = false
var compensationTime: UInt32 {
isCompensatingDaylightTime ? 3600 : 0
}
var isPerformingRequests: Bool { var isPerformingRequests: Bool {
hasActiveRequest || hasActiveRequest ||
state == .waitingForResponse state == .waitingForResponse
@ -109,7 +116,7 @@ struct ContentView: View {
.frame(width: geo.size.width, height: geo.size.height) .frame(width: geo.size.width, height: geo.size.height)
.animation(.easeInOut, value: state.color) .animation(.easeInOut, value: state.color)
.sheet(isPresented: $showKeySheet) { .sheet(isPresented: $showKeySheet) {
KeyView(keyManager: $keyManager) KeyView(keyManager: $keyManager, isCompensatingDaylightTime: $isCompensatingDaylightTime)
} }
.sheet(isPresented: $showHistorySheet) { .sheet(isPresented: $showHistorySheet) {
HistoryView(manager: history) HistoryView(manager: history)
@ -126,8 +133,9 @@ struct ContentView: View {
let count = UInt32(nextMessageCounter) let count = UInt32(nextMessageCounter)
let sentTime = Date() let sentTime = Date()
// Add time to compensate that the device is using daylight savings time
let content = Message.Content( let content = Message.Content(
time: sentTime.timestamp, time: sentTime.timestamp + compensationTime,
id: count) id: count)
let message = content.authenticate(using: key) let message = content.authenticate(using: key)
let historyItem = HistoryItem(sent: message, date: sentTime) let historyItem = HistoryItem(sent: message, date: sentTime)
@ -139,7 +147,6 @@ struct ContentView: View {
responseTime = receivedTime responseTime = receivedTime
state = newState state = newState
let finishedItem = historyItem.didReceive(response: newState, date: receivedTime, message: message) let finishedItem = historyItem.didReceive(response: newState, date: receivedTime, message: message)
print("Interval: \(receivedTime.timeIntervalSince(sentTime))", "\(finishedItem.roundTripTime ?? -1)")
process(item: finishedItem) process(item: finishedItem)
} }
} }

12
Sesame/KeyView.swift
View File

@ -5,6 +5,9 @@ struct KeyView: View {
@Binding @Binding
var keyManager: KeyManagement var keyManager: KeyManagement
@Binding
var isCompensatingDaylightTime: Bool
var body: some View { var body: some View {
GeometryReader { geo in GeometryReader { geo in
VStack(alignment: .leading, spacing: 16) { VStack(alignment: .leading, spacing: 16) {
@ -13,6 +16,11 @@ struct KeyView: View {
keyManager: $keyManager, keyManager: $keyManager,
type: keyType) type: keyType)
} }
Toggle(isOn: $isCompensatingDaylightTime) {
Text("Compensate daylight savings time")
}
Text("If the remote has daylight savings time wrongly set, then the time validation will fail. Use this option to send messages with adjusted timestamps. Warning: Incorrect use of this option will allow replay attacks.")
.font(.caption)
}.padding() }.padding()
} }
} }
@ -20,6 +28,8 @@ struct KeyView: View {
struct KeyView_Previews: PreviewProvider { struct KeyView_Previews: PreviewProvider {
static var previews: some View { static var previews: some View {
KeyView(keyManager: .constant(KeyManagement())) KeyView(
keyManager: .constant(KeyManagement()),
isCompensatingDaylightTime: .constant(true))
} }
} }