From 5e4fbaec8a9e16449a3313b40f4271cce3d756f2 Mon Sep 17 00:00:00 2001
From: Yishi Lin <yishilin14@gmail.com>
Date: Sun, 23 Feb 2020 03:24:55 +0800
Subject: [PATCH] Remove pwd flavor selector from settings

User's latest selection in the add/edit page will be remembered.
---
 .../GeneralSettingsTableViewController.swift  | 43 +------------------
 1 file changed, 2 insertions(+), 41 deletions(-)

diff --git a/pass/Controllers/GeneralSettingsTableViewController.swift b/pass/Controllers/GeneralSettingsTableViewController.swift
index dad23e9..cb6eb4b 100644
--- a/pass/Controllers/GeneralSettingsTableViewController.swift
+++ b/pass/Controllers/GeneralSettingsTableViewController.swift
@@ -70,15 +70,12 @@ class GeneralSettingsTableViewController: BasicStaticTableViewController {
             [[.title: "AboutRepository".localize(), .action: "segue", .link: "showAboutRepositorySegue"],],
 
             // section 1
-            [
-                [.title: "PasswordGeneratorFlavor".localize(), .action: "none", .style: CellDataStyle.value1],
-            ],
-
-            // section 2
             [
                 [.title: "RememberPgpKeyPassphrase".localize(), .action: "none",],
                 [.title: "RememberGitCredentialPassphrase".localize(), .action: "none",],
             ],
+            
+            // section 2
             [
                 [.title: "ShowFolders".localize(), .action: "none",],
                 [.title: "HidePasswordImages".localize(), .action: "none",],
@@ -142,47 +139,11 @@ class GeneralSettingsTableViewController: BasicStaticTableViewController {
             cell.accessoryView = accessoryView
             cell.selectionStyle = .none
             hidePasswordImagesSwitch.isOn = Defaults.isHidePasswordImagesOn
-        case "PasswordGeneratorFlavor".localize():
-            cell.accessoryType = .disclosureIndicator
-            cell.detailTextLabel?.text = Defaults.passwordGeneratorFlavor.localized
         default: break
         }
         return cell
     }
 
-    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        super.tableView(tableView, didSelectRowAt: indexPath)
-        let cell = tableView.cellForRow(at: indexPath)!
-        if cell.textLabel!.text! == "PasswordGeneratorFlavor".localize() {
-            tableView.deselectRow(at: indexPath, animated: true)
-            showPasswordGeneratorFlavorActionSheet(sourceCell: cell)
-        }
-    }
-
-    func showPasswordGeneratorFlavorActionSheet(sourceCell: UITableViewCell) {
-        let optionMenu = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet)
-
-        PasswordGeneratorFlavor.allCases.forEach { flavor in
-            var actionTitle = flavor.longNameLocalized
-            if Defaults.passwordGeneratorFlavor == flavor {
-                actionTitle = "✓ " + actionTitle
-            }
-            let action = UIAlertAction(title: actionTitle, style: .default) { _ in
-                Defaults.passwordGeneratorFlavor = flavor
-                sourceCell.detailTextLabel?.text = Defaults.passwordGeneratorFlavor.localized
-            }
-            optionMenu.addAction(action)
-        }
-
-        let cancelAction = UIAlertAction(title: "Cancel".localize(), style: .cancel, handler: nil)
-        optionMenu.addAction(cancelAction)
-        
-        optionMenu.popoverPresentationController?.sourceView = sourceCell
-        optionMenu.popoverPresentationController?.sourceRect = sourceCell.bounds
-        
-        self.present(optionMenu, animated: true, completion: nil)
-    }
-
     @objc func tapHideUnknownSwitchDetailButton(_ sender: Any?) {
         let alertMessage = "HideUnknownFieldsExplanation.".localize()
         let alertTitle = "HideUnknownFields".localize()