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

Improve edit password to make it consistent with Pass

Browse source
This commit is contained in:
Bob Sun 2017-04-25 13:01:17 -07:00
parent 86cb8a84cd
commit 055ea243a3
No known key found for this signature in database
GPG key ID: 1F86BA2052FED3B4
6 changed files with 136 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pass/Controllers/EditPasswordTableViewController.swift
View file

@ -53,7 +53,7 @@ class EditPasswordTableViewController: PasswordEditorTableViewController {
if cellContents["additions"]! != "" {
plainText = "\(cellContents["password"]!)\n\(cellContents["additions"]!)"
} else {
plainText = "\(cellContents["password"]!)\n"
plainText = "\(cellContents["password"]!)"
}
let name = URL(string: cellContents["name"]!)!.lastPathComponent
let url = URL(string: cellContents["name"]!)!.appendingPathExtension("gpg")

1
pass/Controllers/GitConfigSettingTableViewController.swift
View file

@ -22,7 +22,6 @@ class GitConfigSettingTableViewController: UITableViewController {
}
override func shouldPerformSegue(withIdentifier identifier: String, sender: Any?) -> Bool {
print("test should perform \(identifier)")
if identifier == "saveGitConfigSettingSegue" {
guard let name = nameTextField.text, !name.isEmpty else {
Utils.alert(title: "Cannot Save", message: "Please set name first.", controller: self, completion: nil)

50
pass/Controllers/PasswordDetailTableViewController.swift
View file

@ -212,28 +212,26 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
}
@IBAction private func saveEditPassword(segue: UIStoryboardSegue) {
if self.password!.changed {
if self.password!.changed != 0 {
SVProgressHUD.show(withStatus: "Saving")
DispatchQueue.global(qos: .userInitiated).async {
do {
self.passwordEntity = try self.passwordStore.update(passwordEntity: self.passwordEntity!, password: self.password!)
} catch {
DispatchQueue.main.async {
Utils.alert(title: "Error", message: error.localizedDescription, controller: self, completion: nil)
}
}
DispatchQueue.main.async {
self.setTableData()
self.tableView.reloadData()
SVProgressHUD.showSuccess(withStatus: "Success")
SVProgressHUD.dismiss(withDelay: 1)
}
do {
self.passwordEntity = try self.passwordStore.edit(passwordEntity: self.passwordEntity!, password: self.password!)
} catch {
Utils.alert(title: "Error", message: error.localizedDescription, controller: self, completion: nil)
}
self.setTableData()
self.tableView.reloadData()
SVProgressHUD.showSuccess(withStatus: "Success")
SVProgressHUD.dismiss(withDelay: 1)
}
}
@IBAction private func deletePassword(segue: UIStoryboardSegue) {
passwordStore.delete(passwordEntity: passwordEntity!)
do {
try passwordStore.delete(passwordEntity: passwordEntity!)
} catch {
Utils.alert(title: "Error", message: error.localizedDescription, controller: self, completion: nil)
}
let _ = navigationController?.popViewController(animated: true)
}
@ -387,20 +385,14 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
}
// commit the change of HOTP counter
if password!.changed {
DispatchQueue.global(qos: .userInitiated).async {
do {
self.passwordEntity = try self.passwordStore.update(passwordEntity: self.passwordEntity!, password: self.password!)
} catch {
DispatchQueue.main.async {
Utils.alert(title: "Error", message: error.localizedDescription, controller: self, completion: nil)
}
}
DispatchQueue.main.async {
SVProgressHUD.showSuccess(withStatus: "Password Copied\nCounter Updated")
SVProgressHUD.dismiss(withDelay: 1)
}
if password!.changed != 0 {
do {
self.passwordEntity = try self.passwordStore.edit(passwordEntity: self.passwordEntity!, password: self.password!)
} catch {
Utils.alert(title: "Error", message: error.localizedDescription, controller: self, completion: nil)
}
SVProgressHUD.showSuccess(withStatus: "Password Copied\nCounter Updated")
SVProgressHUD.dismiss(withDelay: 1)
}
}