From ff947f8e17ef391e778ea70e2a041f56e14597a6 Mon Sep 17 00:00:00 2001 From: Bob Sun Date: Fri, 10 Mar 2017 23:01:56 -0800 Subject: [PATCH] Move get category text logic to model --- .../PasswordDetailTableViewController.swift | 13 +------------ pass/Models/PasswordEntity.swift | 11 +++++++++++ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pass/Controllers/PasswordDetailTableViewController.swift b/pass/Controllers/PasswordDetailTableViewController.swift index 6dd2586..16a9f95 100644 --- a/pass/Controllers/PasswordDetailTableViewController.swift +++ b/pass/Controllers/PasswordDetailTableViewController.swift @@ -63,23 +63,12 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni var tableData = Array() - private func generateCategoryText() -> String { - var passwordCategoryArray: [String] = [] - var parent = passwordEntity?.parent - while parent != nil { - passwordCategoryArray.append(parent!.name!) - parent = parent!.parent - } - passwordCategoryArray.reverse() - return passwordCategoryArray.joined(separator: " > ") - } - override func viewDidLoad() { super.viewDidLoad() tableView.register(UINib(nibName: "LabelTableViewCell", bundle: nil), forCellReuseIdentifier: "labelCell") tableView.register(UINib(nibName: "PasswordDetailTitleTableViewCell", bundle: nil), forCellReuseIdentifier: "passwordDetailTitleTableViewCell") - passwordCategoryText = generateCategoryText() + passwordCategoryText = passwordEntity!.getCategoryText() let tapGesture = UITapGestureRecognizer(target: self, action: #selector(PasswordDetailTableViewController.tapMenu(recognizer:))) tableView.addGestureRecognizer(tapGesture) diff --git a/pass/Models/PasswordEntity.swift b/pass/Models/PasswordEntity.swift index f881279..91b2a5f 100644 --- a/pass/Models/PasswordEntity.swift +++ b/pass/Models/PasswordEntity.swift @@ -27,4 +27,15 @@ extension PasswordEntity { let encryptedData = try pgp.encryptData(plainData, usingPublicKey: pgp.getKeysOf(.public)[0], armored: false) return encryptedData } + + func getCategoryText() -> String { + var parentEntity = parent + var passwordCategoryArray: [String] = [] + while parentEntity != nil { + passwordCategoryArray.append(parentEntity!.name!) + parentEntity = parentEntity!.parent + } + passwordCategoryArray.reverse() + return passwordCategoryArray.joined(separator: " > ") + } }