From ad105b3df1b76b7a7c7b24d5cd1403ea98a3d5bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danny=20M=C3=B6sch?= <danny.moesch@icloud.com>
Date: Thu, 16 Jun 2022 04:55:02 +0200
Subject: [PATCH] Enable some more SwitfLint rules (#565)

---
 .swiftlint.yml                                           | 5 +++++
 pass/Controllers/PasswordDetailTableViewController.swift | 3 ++-
 pass/Controllers/QRScannerController.swift               | 9 ++++++---
 .../SSHKeyURLImportTableViewController..swift            | 3 ++-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.swiftlint.yml b/.swiftlint.yml
index ede56bc..61d2a40 100644
--- a/.swiftlint.yml
+++ b/.swiftlint.yml
@@ -11,6 +11,7 @@ excluded:
 ## Active rules
 
 only_rules:
+  - accessibility_label_for_image
 #  - anonymous_argument_in_multiline_closure
   - anyobject_protocol
   - array_init
@@ -27,6 +28,7 @@ only_rules:
   - collection_alignment
   - colon
   - comma
+  - comma_inheritance
   - comment_spacing
   - compiler_protocol_init
   - computed_accessors_order
@@ -141,6 +143,7 @@ only_rules:
   - override_in_extension
   - pattern_matching_keywords
 #  - prefer_nimble
+  - prefer_self_in_static_references
   - prefer_self_type_over_type_of_self
   - prefer_zero_over_explicit_init
 #  - prefixed_toplevel_constant # Violations are mostly in test code.
@@ -169,6 +172,7 @@ only_rules:
 #  - required_deinit
   - required_enum_case
   - return_arrow_whitespace
+  - return_value_from_void_function
   - self_in_property_initialization
   - shorthand_operator
   - single_test_class
@@ -193,6 +197,7 @@ only_rules:
 #  - type_body_length
 #  - type_contents_order
   - type_name
+  - unavailable_condition
   - unavailable_function
   - unneeded_break_in_switch
   - unneeded_parentheses_in_closure_argument
diff --git a/pass/Controllers/PasswordDetailTableViewController.swift b/pass/Controllers/PasswordDetailTableViewController.swift
index 3e7ad0f..90fdf8a 100644
--- a/pass/Controllers/PasswordDetailTableViewController.swift
+++ b/pass/Controllers/PasswordDetailTableViewController.swift
@@ -386,9 +386,10 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
 
     func openLink(to address: String?) {
         guard address != nil, let url = URL(string: formActualWebAddress(from: address!)) else {
-            return DispatchQueue.main.async {
+            DispatchQueue.main.async {
                 Utils.alert(title: "Error".localize(), message: "CannotFindValidUrl".localize(), controller: self, completion: nil)
             }
+            return
         }
         SecurePasteboard.shared.copy(textToCopy: password?.password)
         UIApplication.shared.open(url, options: [:], completionHandler: nil)
diff --git a/pass/Controllers/QRScannerController.swift b/pass/Controllers/QRScannerController.swift
index 9e0f05e..4693d66 100644
--- a/pass/Controllers/QRScannerController.swift
+++ b/pass/Controllers/QRScannerController.swift
@@ -90,13 +90,16 @@ class QRScannerController: UIViewController, AVCaptureMetadataOutputObjectsDeleg
 
     func metadataOutput(_: AVCaptureMetadataOutput, didOutput metadataObjects: [AVMetadataObject], from _: AVCaptureConnection) {
         guard let metadataObj = metadataObjects.first as? AVMetadataMachineReadableCodeObject else {
-            return setNotDetected()
+            setNotDetected()
+            return
         }
         guard supportedCodeTypes.contains(metadataObj.type) else {
-            return setNotDetected()
+            setNotDetected()
+            return
         }
         guard let barCodeObject = videoPreviewLayer?.transformedMetadataObject(for: metadataObj) else {
-            return setNotDetected()
+            setNotDetected()
+            return
         }
 
         // draw a bounds on the found QR code
diff --git a/pass/Controllers/SSHKeyURLImportTableViewController..swift b/pass/Controllers/SSHKeyURLImportTableViewController..swift
index d1cc108..f219f64 100644
--- a/pass/Controllers/SSHKeyURLImportTableViewController..swift
+++ b/pass/Controllers/SSHKeyURLImportTableViewController..swift
@@ -36,7 +36,8 @@ class SSHKeyURLImportTableViewController: AutoCellHeightUITableViewController {
                     self.performSegue(withIdentifier: "importSSHKeySegue", sender: self)
                 }
             )
-            return present(savePassphraseAlert, animated: true)
+            present(savePassphraseAlert, animated: true)
+            return
         }
         sshPrivateKeyURL = privateKeyURL
         performSegue(withIdentifier: "importSSHKeySegue", sender: self)