From 5270c92b76ce45901bde44b179812215e47e4af2 Mon Sep 17 00:00:00 2001 From: Danny Moesch Date: Mon, 6 Jul 2020 10:04:41 +0200 Subject: [PATCH] Enable SwiftLint rule 'overridden_super_call' and fix all violations --- .swiftlint.yml | 2 +- pass/Controllers/PasswordDetailTableViewController.swift | 2 +- pass/Controllers/PasswordsViewController.swift | 3 ++- pass/Controllers/SettingsSplitViewController.swift | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.swiftlint.yml b/.swiftlint.yml index 7d1dd80..c9dbceb 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -120,7 +120,7 @@ whitelist_rules: - operator_whitespace - optional_enum_case_matching - orphaned_doc_comment -# - overridden_super_call + - overridden_super_call - override_in_extension - pattern_matching_keywords - prefer_self_type_over_type_of_self diff --git a/pass/Controllers/PasswordDetailTableViewController.swift b/pass/Controllers/PasswordDetailTableViewController.swift index 4ec3118..289d97d 100644 --- a/pass/Controllers/PasswordDetailTableViewController.swift +++ b/pass/Controllers/PasswordDetailTableViewController.swift @@ -77,7 +77,7 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni } override func viewDidAppear(_ animated: Bool) { - super.viewWillAppear(animated) + super.viewDidAppear(animated) if shouldPopCurrentView { let alert = UIAlertController(title: "Notice".localize(), message: "PreviousChangesDiscarded.".localize(), preferredStyle: UIAlertController.Style.alert) alert.addAction(UIAlertAction.okAndPopView(controller: self)) diff --git a/pass/Controllers/PasswordsViewController.swift b/pass/Controllers/PasswordsViewController.swift index c90ac53..b14877c 100644 --- a/pass/Controllers/PasswordsViewController.swift +++ b/pass/Controllers/PasswordsViewController.swift @@ -326,7 +326,8 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV tableView.refreshControl = passwordStore.repositoryExists() ? syncControl : nil } - override func viewWillDisappear(_: Bool) { + override func viewWillDisappear(_ animated: Bool) { + super.viewWillDisappear(animated) // Remove gesture recognizer from navigation bar when view is about to disappear navigationController?.navigationBar.removeGestureRecognizer(tapNavigationBarGestureRecognizer) } diff --git a/pass/Controllers/SettingsSplitViewController.swift b/pass/Controllers/SettingsSplitViewController.swift index 153a267..cdb12a7 100644 --- a/pass/Controllers/SettingsSplitViewController.swift +++ b/pass/Controllers/SettingsSplitViewController.swift @@ -10,6 +10,7 @@ import UIKit class SettingsSplitViewController: UISplitViewController, UISplitViewControllerDelegate { override func viewDidLoad() { + super.viewDidLoad() delegate = self preferredDisplayMode = .allVisible }