mirror-AU-COVIDSafe/mobile-ios
1
0
Fork 0
mirror of https://github.com/AU-COVIDSafe/mobile-ios.git synced 2025-04-19 13:05:21 +00:00
Code Issues Projects Releases Wiki Activity

COVIDSafe code from version 1.4 (#3)

Browse source
This commit is contained in:
COVIDSafe Support 2020-05-26 17:13:26 +10:00 • committed by GitHub
parent 56c93f2079
commit b2e0c5b34c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
33 changed files with 6865 additions and 481 deletions
Download patch file Download diff file Expand all files Collapse all files

33
CovidSafe/EncounterMessageManager.swift
View file

@ -12,7 +12,19 @@ class EncounterMessageManager {
}
var advertisedPayload: Data? {
return UserDefaults.standard.data(forKey: userDefaultsAdvtKey)
do {
let broadcastPayload = EncounterBlob(modelC: nil,
rssi: nil,
txPower: nil,
modelP: DeviceIdentifier.getModel(),
msg: tempId)
let jsonMsg = try JSONEncoder().encode(broadcastPayload)
let encryptedJsonMsg = try Crypto.encrypt(dataToEncrypt: jsonMsg)
let peripheralCharStruct = PeripheralCharacteristicsData(modelP: BluetraceConfig.DummyModel, msg: encryptedJsonMsg, org: BluetraceConfig.OrgID, v: BluetraceConfig.ProtocolVersion)
return try JSONEncoder().encode(peripheralCharStruct)
} catch {
return nil
}
}
// This variable stores the expiry date of the broadcast message. At the same time, we will use this expiry date as the expiry date for the encryted advertisement payload
@ -29,7 +41,6 @@ class EncounterMessageManager {
DLog("No response, Error: \(String(describing: error))")
return
}
_ = self.setAdvertisementPayloadIntoUserDefaults(response)
UserDefaults.standard.set(response.tempId, forKey: self.userDefaultsTempIdKey)
}
}
@ -72,8 +83,10 @@ class EncounterMessageManager {
onComplete(nil)
return
}
UserDefaults.standard.set(response.tempId, forKey: self.userDefaultsTempIdKey)
UserDefaults.standard.set(response.expiry, forKey: self.userDefaultsAdvtExpiryKey)
if let newPayload = self.setAdvertisementPayloadIntoUserDefaults(response) {
if let newPayload = self.advertisedPayload {
onComplete(newPayload)
}
onComplete(nil)
@ -122,18 +135,4 @@ class EncounterMessageManager {
onComplete?(nil, (tempId, date))
}
}
private func setAdvertisementPayloadIntoUserDefaults(_ response: (tempId: String, expiry: Date)) -> Data? {
let peripheralCharStruct = PeripheralCharacteristicsData(modelP: DeviceIdentifier.getModel(), msg: response.tempId, org: BluetraceConfig.OrgID, v: BluetraceConfig.ProtocolVersion)
do {
let encodedPeriCharStruct = try JSONEncoder().encode(peripheralCharStruct)
UserDefaults.standard.set(encodedPeriCharStruct, forKey: self.userDefaultsAdvtKey)
UserDefaults.standard.set(response.expiry, forKey: self.userDefaultsAdvtExpiryKey)
return encodedPeriCharStruct
} catch {
DLog("Error: \(error)")
}
return nil
}
}