Finish tan claiming and add swiftlint (eu-digital-green-certificates#30)

DGCAWallet.xcodeproj/project.pbxproj

@@ -288,6 +288,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = CEA6D712261F8D2900715333 /* Build configuration list for PBXNativeTarget "DGCAWallet" */;
 			buildPhases = (
+				CE17E3342645A0C100029D95 /* ShellScript */,
 				CEA6D6E4261F8D2700715333 /* Sources */,
 				CEA6D6E5261F8D2700715333 /* Frameworks */,
 				CEA6D6E6261F8D2700715333 /* Resources */,
@@ -420,6 +421,26 @@
 		};
 /* End PBXResourcesBuildPhase section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		CE17E3342645A0C100029D95 /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nif which swiftlint >/dev/null; then\n  swiftlint\nelse\n  echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		CEA6D6E4261F8D2700715333 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@@ -634,7 +655,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.t-systems.DGCAWallet.dev";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Debug;
 		};
@@ -654,7 +675,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.t-systems.DGCAWallet.dev";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Release;
 		};

DGCAWallet/Components/FullFloatingPanelLayout.swift

@@ -34,7 +34,7 @@ class FullFloatingPanelLayout: FloatingPanelLayout {
   var anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring] {
     let top = FloatingPanelLayoutAnchor(absoluteInset: 16.0, edge: .top, referenceGuide: .safeArea)
     return [
-      .full: top,
+      .full: top
     ]
   }
 }

DGCAWallet/Components/RoundedButton.swift

@@ -29,8 +29,8 @@ import UIKit
 
 @IBDesignable
 class RoundedButton: UIButton {
-  @IBInspectable var radius: CGFloat = 6.0 { didSet(v) { initialize() } }
-  @IBInspectable var padding: CGFloat = 4.0 { didSet(v) { initialize() } }
+  @IBInspectable var radius: CGFloat = 6.0 { didSet(value) { initialize() } }
+  @IBInspectable var padding: CGFloat = 4.0 { didSet(value) { initialize() } }
 
   override init(frame: CGRect) {
     super.init(frame: frame)

DGCAWallet/Extensions/UIColor.swift

@@ -24,7 +24,6 @@
 //  
 //  Created by Yannick Spreen on 4/29/21.
 //  
-
 
 import UIKit
 

DGCAWallet/Extensions/UIFont.swift

@@ -29,7 +29,6 @@
 
 import UIKit
 
-
 extension UIFont {
   public var weight: UIFont.Weight {
     guard let weightNumber = traits[.weight] as? NSNumber else { return .regular }

DGCAWallet/Extensions/UIViewController.swift

@@ -25,7 +25,6 @@
 //  Created by Yannick Spreen on 5/3/21.
 //  
 
-
 import UIKit
 import SwiftDGC
 
@@ -40,12 +39,12 @@ extension UIViewController {
     handler: ((_ text: String?) -> Void)? = nil
   ) {
     let alert = UIAlertController(title: title, message: subtitle, preferredStyle: .alert)
-    alert.addTextField { (textField:UITextField) in
+    alert.addTextField { (textField: UITextField) in
       textField.placeholder = inputPlaceholder
       textField.keyboardType = inputKeyboardType
     }
-    alert.addAction(UIAlertAction(title: actionTitle, style: .default) { action in
-      guard let textField =  alert.textFields?.first else {
+    alert.addAction(UIAlertAction(title: actionTitle, style: .default) { _ in
+      guard let textField = alert.textFields?.first else {
         handler?(nil)
         return
       }
@@ -65,7 +64,7 @@ extension UIViewController {
     handler: ((Bool) -> Void)? = nil
   ) {
     let alert = UIAlertController(title: title, message: subtitle, preferredStyle: .alert)
-    alert.addAction(UIAlertAction(title: actionTitle, style: .default) { action in
+    alert.addAction(UIAlertAction(title: actionTitle, style: .default) { _ in
       handler?(true)
     })
     if let cancelTitle = cancelTitle {

DGCAWallet/Models/LocalData.swift

@@ -23,16 +23,15 @@
 //  DGCAWallet
 //  
 //  Created by Yannick Spreen on 4/25/21.
-//  
-
+//
 
 import Foundation
 import SwiftDGC
 
 struct DatedCertString: Codable {
   var date: Date
   var certString: String
-  var storedTAN : String?
+  var storedTAN: String?
   var cert: HCert? {
     HCert(from: certString)
   }

DGCAWallet/Protocols/CertViewerDelegate.swift

@@ -26,6 +26,6 @@
 
 import Foundation
 
-protocol CertViewerDelegate {
+protocol CertViewerDelegate: AnyObject {
   func childDismissed(_ newCertAdded: Bool)
 }

DGCAWallet/Protocols/ChildDismissedDelegate.swift

@@ -26,7 +26,7 @@
 
 import Foundation
 
-protocol CertViewerDelegate {
+protocol CertViewerDelegate: class {
   func childDismissed()
   func openSettings()
 }

DGCAWallet/Services/Brightness.swift

@@ -24,7 +24,6 @@
 //  
 //  Created by Yannick Spreen on 4/30/21.
 //  
-
 
 import Foundation
 import UIKit

DGCAWallet/Services/GatewayConnection.swift

@@ -39,7 +39,7 @@ struct GatewayConnection {
       return
     }
     // Replace dashes, spaces, etc. and turn into uppercase.
-    let set = CharacterSet(charactersIn: "0123456789").union(.capitalizedLetters)
+    let set = CharacterSet(charactersIn: "0123456789").union(.uppercaseLetters)
     tan = tan.uppercased().components(separatedBy: set.inverted).joined()
 
     let tanHash = SHA256.stringDigest(input: Data(tan.data(using: .utf8) ?? .init()))
@@ -53,23 +53,28 @@ struct GatewayConnection {
         return
       }
 
-      let keyParam: [String: Any] = [
-        "type": "EC",
-        "value": pubKey,
-      ]
+      let keyParam: [String: Any] = [ "type": "EC", "value": pubKey ]
       let param: [String: Any] = [
         "DGCI": cert.uvci,
         "TANHash": tanHash,
         "certhash": certHash,
         "publicKey": keyParam,
         "signature": sign.base64EncodedString(),
-        "sigAlg": "SHA256withECDSA",
+        "sigAlg": "SHA256withECDSA"
       ]
-      AF.request(serverURI + claimEndpoint, method: .post, parameters: param, encoding: JSONEncoding.default, headers: nil, interceptor: nil, requestModifier: nil).response {
+      AF.request(
+        serverURI + claimEndpoint,
+        method: .post,
+        parameters: param,
+        encoding: JSONEncoding.default,
+        headers: nil,
+        interceptor: nil,
+        requestModifier: nil
+      ).response {
         guard
           case .success(_) = $0.result,
           let status = $0.response?.statusCode,
-          status == 204
+          status / 100 == 2
         else {
           completion?(false, nil)
           return

DGCAWallet/Services/SecureBackground.swift

@@ -25,7 +25,6 @@
 //  Created by Yannick Spreen on 4/27/21.
 //  
 
-
 import Foundation
 import UIKit
 import LocalAuthentication
@@ -52,7 +51,9 @@ struct SecureBackground {
   public static func disable() {
     if imageView != nil {
       if activation.timeIntervalSinceNow < -1 {
-        (UIApplication.shared.windows[0].rootViewController as? UINavigationController)?.popToRootViewController(animated: false)
+        (
+          UIApplication.shared.windows[0].rootViewController as? UINavigationController
+        )?.popToRootViewController(animated: false)
       }
       imageView?.removeFromSuperview()
       imageView = nil
@@ -75,7 +76,7 @@ struct SecureBackground {
       completion?(true)
       return
     }
-    context.evaluatePolicy(.deviceOwnerAuthentication, localizedReason: reason ) { success, error in
+    context.evaluatePolicy(.deviceOwnerAuthentication, localizedReason: reason ) { success, _ in
       if success {
         // Move to the main thread because a state update triggers UI changes.
         DispatchQueue.main.async {

DGCAWallet/SupportingFiles/AppDelegate.swift

@@ -29,7 +29,10 @@ import UIKit
 @main
 class AppDelegate: UIResponder, UIApplicationDelegate {
 
-  func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+  func application(
+    _ application: UIApplication,
+    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
+  ) -> Bool {
     // Override point for customization after application launch.
     return true
   }
@@ -43,4 +46,3 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
   }
 
 }
-

DGCAWallet/SupportingFiles/SceneDelegate.swift

@@ -41,4 +41,3 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
   }
 
 }
-

DGCAWallet/ViewControllers/CertPages.swift

@@ -24,7 +24,6 @@
 //  
 //  Created by Yannick Spreen on 4/30/21.
 //  
-
 
 import UIKit
 
@@ -34,7 +33,7 @@ class CertPagesVC: UIPageViewController {
   var index = 0
   let vcs: [UIViewController] = [
     UIStoryboard(name: "CertificateViewer", bundle: .main).instantiateViewController(withIdentifier: "code"),
-    UIStoryboard(name: "CertificateViewer", bundle: .main).instantiateViewController(withIdentifier: "infoTable"),
+    UIStoryboard(name: "CertificateViewer", bundle: .main).instantiateViewController(withIdentifier: "infoTable")
   ]
 
   override func viewDidLoad() {
@@ -65,12 +64,18 @@ class CertPagesVC: UIPageViewController {
 }
 
 extension CertPagesVC: UIPageViewControllerDataSource {
-  func pageViewController(_ pageViewController: UIPageViewController, viewControllerBefore viewController: UIViewController) -> UIViewController? {
+  func pageViewController(
+    _ pageViewController: UIPageViewController,
+    viewControllerBefore viewController: UIViewController
+  ) -> UIViewController? {
     let index = vcs.firstIndex(of: viewController) ?? 0
     return index == 0 ? nil : vcs[index - 1]
   }
 
-  func pageViewController(_ pageViewController: UIPageViewController, viewControllerAfter viewController: UIViewController) -> UIViewController? {
+  func pageViewController(
+    _ pageViewController: UIPageViewController,
+    viewControllerAfter viewController: UIViewController
+  ) -> UIViewController? {
     let index = vcs.firstIndex(of: viewController) ?? vcs.count - 1
     return index == vcs.count - 1 ? nil : vcs[index + 1]
   }
@@ -93,11 +98,11 @@ extension CertPagesVC: UIPageViewControllerDelegate {
   ) {
     guard
       completed,
-      let vc = pageViewController.viewControllers?.first
+      let controller = pageViewController.viewControllers?.first
     else {
       return
     }
-    index = vcs.firstIndex(of: vc) ?? 0
+    index = vcs.firstIndex(of: controller) ?? 0
     setBrightness()
   }
 }

DGCAWallet/ViewControllers/CertTable.swift

@@ -24,7 +24,7 @@
 //  
 //  Created by Yannick Spreen on 4/30/21.
 //  
-        
+
 import SwiftDGC
 import UIKit
 
@@ -44,7 +44,6 @@ class CertTableVC: UIViewController {
   }
 }
 
-
 extension CertTableVC: UITableViewDataSource {
   func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
     return hCert.info.count

DGCAWallet/ViewControllers/CertificateViewer.swift

@@ -38,7 +38,7 @@ class CertificateViewerVC: UIViewController {
 
   var hCert: HCert!
   var tan: String?
-  var childDismissedDelegate: CertViewerDelegate?
+  weak var childDismissedDelegate: CertViewerDelegate?
   public var isSaved = true
 
   func draw() {

DGCAWallet/ViewControllers/Home.swift

@@ -24,7 +24,6 @@
 //  
 //  Created by Yannick Spreen on 4/25/21.
 //  
-
 
 import Foundation
 import UIKit
@@ -34,7 +33,7 @@ class HomeVC: UIViewController {
   override func viewDidLoad() {
     super.viewDidLoad()
 
-    HCert.PREFETCH_ALL_CODES = true
+    HCert.prefetchAllCodes = true
     LocalData.initialize {
       DispatchQueue.main.async { [weak self] in
         guard let self = self else {

DGCAWallet/ViewControllers/List.swift

@@ -24,7 +24,6 @@
 //  
 //  Created by Yannick Spreen on 4/25/21.
 //  
-
 
 import Foundation
 import UIKit
@@ -158,7 +157,11 @@ extension ListVC: UITableViewDelegate {
 }
 
 extension ListVC: FloatingPanelControllerDelegate {
-  func floatingPanel(_ fpc: FloatingPanelController, shouldRemoveAt location: CGPoint, with velocity: CGVector) -> Bool {
+  func floatingPanel(
+    _ fpc: FloatingPanelController,
+    shouldRemoveAt location: CGPoint,
+    with velocity: CGVector
+  ) -> Bool {
     let pos = location.y / view.bounds.height
     if pos >= 0.33 {
       return true