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

COVIDSafe code from version 1.9 (#18)

Browse source
This commit is contained in:
COVIDSafe Support 2020-08-03 16:01:39 +10:00 • committed by GitHub
parent 2257c542ed
commit 3b1d8fa3f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
41 changed files with 4217 additions and 3998 deletions
Download patch file Download diff file Expand all files Collapse all files

10
CovidSafe/InitialScreenViewController.swift
View file

@ -36,7 +36,7 @@ class InitialScreenViewController: UIViewController, EncounterDBMigrationProgres
continueAfterDelay(delay: displayTimeSeconds)
// add give up action in case the keychain notification in not received after 8 seconds
giveupTimer = Timer.scheduledTimer(withTimeInterval: giveupTimeSeconds, repeats: false) { timer in
self.performSegue(withIdentifier: "initialPersonalDetailsSegue", sender: self)
self.performSegue(withIdentifier: "initialScreenToIWantToHelpSegue", sender: self)
}
EncounterDB.shared.setup(migrationDelegate: self)
}
@ -72,13 +72,11 @@ class InitialScreenViewController: UIViewController, EncounterDBMigrationProgres
migrationVc.dismiss(animated: true, completion: nil)
}
let isLoggedIn: Bool = (keychain.get("JWT_TOKEN") != nil)
if !UserDefaults.standard.bool(forKey: "completedIWantToHelp") {
if !UserDefaults.standard.bool(forKey: "completedIWantToHelp") ||
!UserDefaults.standard.bool(forKey: "hasConsented") ||
!isLoggedIn {
keychain.delete("JWT_TOKEN")
self.performSegue(withIdentifier: "initialScreenToIWantToHelpSegue", sender: self)
} else if !UserDefaults.standard.bool(forKey: "hasConsented") {
self.performSegue(withIdentifier: "initialScreenToConsentSegue", sender: self)
} else if !isLoggedIn {
self.performSegue(withIdentifier: "initialPersonalDetailsSegue", sender: self)
} else if !UserDefaults.standard.bool(forKey: "allowedPermissions") {
self.performSegue(withIdentifier: "initialScreenToAllowPermissionsSegue", sender: self)
} else {