lysann/passforios
1
0
Fork 0
Code Issues Pull requests Activity

Show error in alert instead of HUD

Browse source
This commit is contained in:
Bob Sun 2017-03-16 23:12:31 -07:00
parent d2cff20131
commit 0ad9713fc0
No known key found for this signature in database
GPG key ID: 1F86BA2052FED3B4
5 changed files with 10 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pass/Controllers/AdvancedSettingsTableViewController.swift
View file

@ -57,8 +57,7 @@ class AdvancedSettingsTableViewController: UITableViewController {
SVProgressHUD.dismiss(withDelay: 1)
} catch {
DispatchQueue.main.async {
SVProgressHUD.showError(withStatus: error.localizedDescription)
SVProgressHUD.dismiss(withDelay: 1)
Utils.alert(title: "Error", message: error.localizedDescription, controller: self, completion: nil)
}
}
}

9
pass/Controllers/PasswordsViewController.swift
View file

@ -96,8 +96,7 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
}
} catch {
DispatchQueue.main.async {
SVProgressHUD.showError(withStatus: error.localizedDescription)
SVProgressHUD.dismiss(withDelay: 1)
Utils.alert(title: "Error", message: error.localizedDescription, controller: self, completion: nil)
}
}
}
@ -136,8 +135,7 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
}
} catch {
DispatchQueue.main.async {
SVProgressHUD.showError(withStatus: error.localizedDescription)
SVProgressHUD.dismiss(withDelay: 1)
Utils.alert(title: "Error", message: error.localizedDescription, controller: self, completion: nil)
}
}
}
@ -325,8 +323,7 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
} catch {
print(error)
DispatchQueue.main.async {
SVProgressHUD.showError(withStatus: error.localizedDescription)
SVProgressHUD.dismiss(withDelay: 1)
Utils.alert(title: "Error", message: error.localizedDescription, controller: self, completion: nil)
}
}
}

4
pass/Controllers/SSHKeySettingTableViewController.swift
View file

@ -49,9 +49,7 @@ class SSHKeySettingTableViewController: UITableViewController {
try Data(contentsOf: Defaults[.gitRepositorySSHPublicKeyURL]!).write(to: Globals.sshPublicKeyURL, options: .atomic)
try Data(contentsOf: Defaults[.gitRepositorySSHPrivateKeyURL]!).write(to: Globals.sshPrivateKeyURL, options: .atomic)
} catch {
SVProgressHUD.showError(withStatus: error.localizedDescription)
SVProgressHUD.dismiss(withDelay: 1)
print(error)
Utils.alert(title: "Error", message: error.localizedDescription, controller: self, completion: nil)
}
navigationController!.popViewController(animated: true)

10
pass/Controllers/SettingsTableViewController.swift
View file

@ -53,8 +53,7 @@ class SettingsTableViewController: UITableViewController {
} catch {
DispatchQueue.main.async {
self.pgpKeyTableViewCell.detailTextLabel?.text = "Not Set"
SVProgressHUD.showError(withStatus: error.localizedDescription)
SVProgressHUD.dismiss(withDelay: 1)
Utils.alert(title: "Error", message: error.localizedDescription, controller: self, completion: nil)
}
}
}
@ -84,8 +83,7 @@ class SettingsTableViewController: UITableViewController {
} catch {
DispatchQueue.main.async {
self.pgpKeyTableViewCell.detailTextLabel?.text = "Not Set"
SVProgressHUD.showError(withStatus: error.localizedDescription)
SVProgressHUD.dismiss(withDelay: 1)
Utils.alert(title: "Error", message: error.localizedDescription, controller: self, completion: nil)
}
}
}
@ -155,9 +153,7 @@ class SettingsTableViewController: UITableViewController {
}
} catch {
DispatchQueue.main.async {
print(error)
SVProgressHUD.showError(withStatus: error.localizedDescription)
SVProgressHUD.dismiss(withDelay: 1)
Utils.alert(title: "Error", message: error.localizedDescription, controller: self, completion: nil)
}
}

2
pass/Helpers/Utils.swift
View file

@ -10,6 +10,7 @@ import Foundation
import SwiftyUserDefaults
import KeychainAccess
import UIKit
import SVProgressHUD
class Utils {
static func removeFileIfExists(atPath path: String) {
@ -65,6 +66,7 @@ class Utils {
}
static func alert(title: String, message: String, controller: UIViewController, completion: (() -> Void)?) {
SVProgressHUD.dismiss()
let alert = UIAlertController(title: title, message: message, preferredStyle: UIAlertControllerStyle.alert)
alert.addAction(UIAlertAction(title: "OK", style: UIAlertActionStyle.default, handler: nil))
controller.present(alert, animated: true, completion: completion)