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

COVIDSafe code from version 2.2 (#42)

Browse source
This commit is contained in:
COVIDSafe Support 2021-02-02 11:04:43 +11:00 • committed by GitHub
parent 9e6e4604ef
commit f14aa60482
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
67 changed files with 3645 additions and 464 deletions
Download patch file Download diff file Expand all files Collapse all files

36
CovidSafe/UploadDataStep2VC.swift
View file

@ -36,7 +36,7 @@ class UploadDataStep2VC: UIViewController, CodeInputViewDelegate {
var currentKeyboardFrame: CGRect?
var uploadAnimatedView: AnimationView?
let uploadFailErrMsg = "UploadFailed".localizedString(comment: "Upload failed. Please try again later.")
var uploadDisplayErrorMsg = ""
let invalidPinErrMsg = "action_verify_invalid_pin".localizedString(comment: "Invalid PIN, please ask health official to send another PIN.")
let verifyEnabledColor = UIColor.covidSafeButtonDarkerColor
@ -66,11 +66,13 @@ class UploadDataStep2VC: UIViewController, CodeInputViewDelegate {
super.viewDidAppear(animated)
setIsLoading(false)
let uploadAnimation = AnimationView(name: "Spinner_upload")
uploadAnimation.loopMode = .loop
uploadAnimation.frame = CGRect(origin: CGPoint(x: 0, y: 0), size: self.uploadAnimatedviewContainer.frame.size)
self.uploadAnimatedviewContainer.addSubview(uploadAnimation)
uploadAnimatedView = uploadAnimation
if uploadAnimatedView == nil {
let uploadAnimation = AnimationView(name: "Spinner_upload")
uploadAnimation.loopMode = .loop
uploadAnimation.frame = CGRect(origin: CGPoint(x: 0, y: 0), size: self.uploadAnimatedviewContainer.frame.size)
self.uploadAnimatedviewContainer.addSubview(uploadAnimation)
uploadAnimatedView = uploadAnimation
}
}
override func viewWillAppear(_ animated: Bool) {
@ -159,7 +161,7 @@ class UploadDataStep2VC: UIViewController, CodeInputViewDelegate {
setIsLoading(true)
self.codeInputView.invalidCode = false
UploadHelper.uploadEncounterData(pin: code) { result in
UploadHelper.uploadEncounterData(pin: code) { result, errorMessage in
self.setIsLoading(false)
switch result{
case .InvalidCode:
@ -174,12 +176,10 @@ class UploadDataStep2VC: UIViewController, CodeInputViewDelegate {
}
Encounter.deleteAll()
self.performSegue(withIdentifier: "showSuccessVCSegue", sender: nil)
case .FailedUpload:
case .FailedUpload, .Failed:
self.uploadDisplayErrorMsg = errorMessage ?? "No error code/message available"
self.performSegue(withIdentifier: "uploadErrorSegue", sender: self)
sender.isEnabled = true
case .Failed:
self.performSegue(withIdentifier: "uploadErrorSegue", sender: self)
sender.isEnabled = true
case .SessionExpired:
NotificationCenter.default.post(name: .jwtExpired, object: nil)
sender.isEnabled = true
@ -187,14 +187,6 @@ class UploadDataStep2VC: UIViewController, CodeInputViewDelegate {
}
}
func displayUploadDataError() {
let errorAlert = UIAlertController(title: "upload_failed".localizedString(),
message: "UploadFailedErrorMessage".localizedString(),
preferredStyle: .alert)
errorAlert.addAction(UIAlertAction(title: "global_OK".localizedString(), style: .default, handler: nil))
self.present(errorAlert, animated: true)
}
private func setIsLoading(_ isLoading: Bool) {
if isLoading {
uploadAnimatedView?.play()
@ -206,5 +198,11 @@ class UploadDataStep2VC: UIViewController, CodeInputViewDelegate {
uploadingView.isHidden = true
}
}
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
if let errorViewController = segue.destination as? UploadDataErrorViewController {
errorViewController.uploadErrorMessage = self.uploadDisplayErrorMsg
}
}
}