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

Simplify codes

Browse source
This commit is contained in:
Yishi Lin 2017-07-27 22:38:07 +08:00
parent 8ed8223758
commit f86a5eee65
1 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

24
pass/Controllers/PasswordsViewController.swift
View file

@ -306,7 +306,7 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
if gesture.state == UIGestureRecognizerState.began { if gesture.state == UIGestureRecognizerState.began {
let touchPoint = gesture.location(in: tableView) let touchPoint = gesture.location(in: tableView)
if let indexPath = tableView.indexPathForRow(at: touchPoint) { if let indexPath = tableView.indexPathForRow(at: touchPoint) {
copyToPasteboard(from: indexPath) decryptThenCopyPassword(from: indexPath)
} }
} }
} }
@ -324,21 +324,9 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
} }
func tableView(_ tableView: UITableView, accessoryButtonTappedForRowWith indexPath: IndexPath) { func tableView(_ tableView: UITableView, accessoryButtonTappedForRowWith indexPath: IndexPath) {
copyToPasteboard(from: indexPath) decryptThenCopyPassword(from: indexPath)
} }
private func copyToPasteboard(from indexPath: IndexPath) {
guard self.passwordStore.privateKey != nil else {
Utils.alert(title: "Cannot Copy Password", message: "PGP Key is not set. Please set your PGP Key first.", controller: self, completion: nil)
return
}
let password = getPasswordEntry(by: indexPath).passwordEntity!
UIImpactFeedbackGenerator(style: .medium).impactOccurred()
decryptThenCopyPassword(passwordEntity: password)
}
private func requestPGPKeyPassphrase() -> String { private func requestPGPKeyPassphrase() -> String {
let sem = DispatchSemaphore(value: 0) let sem = DispatchSemaphore(value: 0)
var passphrase = "" var passphrase = ""
@ -367,7 +355,13 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
return passphrase return passphrase
} }
private func decryptThenCopyPassword(passwordEntity: PasswordEntity) { private func decryptThenCopyPassword(from indexPath: IndexPath) {
guard self.passwordStore.privateKey != nil else {
Utils.alert(title: "Cannot Copy Password", message: "PGP Key is not set. Please set your PGP Key first.", controller: self, completion: nil)
return
}
let passwordEntity = getPasswordEntry(by: indexPath).passwordEntity!
UIImpactFeedbackGenerator(style: .medium).impactOccurred()
SVProgressHUD.setDefaultMaskType(.black) SVProgressHUD.setDefaultMaskType(.black)
SVProgressHUD.setDefaultStyle(.dark) SVProgressHUD.setDefaultStyle(.dark)
SVProgressHUD.show(withStatus: "Decrypting") SVProgressHUD.show(withStatus: "Decrypting")