Enable CI checking for Swift code formatting and format all swift code (

#263)
DefinedNet · Feb 21, 2025 · 4621cbc · 4621cbc
1 parent 4d34083
commit 4621cbc
Show file tree

Hide file tree

Showing 10 changed files with 1,563 additions and 1,486 deletions.
diff --git a/.github/workflows/swiftfmt.yml b/.github/workflows/swiftfmt.yml
@@ -17,6 +17,5 @@ jobs:
         with:
           show-progress: false
 
-    # Re-enable in follow-up PR that does the formatting.
-    #   - name: Check formating
-    #     run: ./swift-format.sh check
+      - name: Check formating
+        run: ./swift-format.sh check
diff --git a/ios/NebulaNetworkExtension/Keychain.swift b/ios/NebulaNetworkExtension/Keychain.swift
@@ -3,67 +3,68 @@ import Foundation
 let groupName = "group.net.defined.mobileNebula"
 
 class KeyChain {
-    class func save(key: String, data: Data, managed: Bool) -> Bool {
-        var query: [String: Any] = [
-            kSecClass as String       : kSecClassGenericPassword as String,
-            kSecAttrAccount as String : key,
-            kSecValueData as String   : data,
-            kSecAttrAccessGroup as String: groupName,
-        ]
-
-        if (managed) {
-            query[kSecAttrAccessible as String] = kSecAttrAccessibleAfterFirstUnlock
-        }
+  class func save(key: String, data: Data, managed: Bool) -> Bool {
+    var query: [String: Any] = [
+      kSecClass as String: kSecClassGenericPassword as String,
+      kSecAttrAccount as String: key,
+      kSecValueData as String: data,
+      kSecAttrAccessGroup as String: groupName,
+    ]
 
-        // Attempt to delete an existing key to allow for an overwrite
-        _ = self.delete(key: key)
-        return SecItemAdd(query as CFDictionary, nil) == 0
+    if managed {
+      query[kSecAttrAccessible as String] = kSecAttrAccessibleAfterFirstUnlock
     }
 
-    class func load(key: String) -> Data? {
-        let query: [String: Any] = [
-            kSecClass as String       : kSecClassGenericPassword,
-            kSecAttrAccount as String : key,
-            kSecReturnData as String  : kCFBooleanTrue!,
-            kSecMatchLimit as String  : kSecMatchLimitOne,
-            kSecAttrAccessGroup as String: groupName,
-        ]
+    // Attempt to delete an existing key to allow for an overwrite
+    _ = self.delete(key: key)
+    return SecItemAdd(query as CFDictionary, nil) == 0
+  }
 
-        var dataTypeRef: AnyObject? = nil
+  class func load(key: String) -> Data? {
+    let query: [String: Any] = [
+      kSecClass as String: kSecClassGenericPassword,
+      kSecAttrAccount as String: key,
+      kSecReturnData as String: kCFBooleanTrue!,
+      kSecMatchLimit as String: kSecMatchLimitOne,
+      kSecAttrAccessGroup as String: groupName,
+    ]
 
-        let status: OSStatus = SecItemCopyMatching(query as CFDictionary, &dataTypeRef)
+    var dataTypeRef: AnyObject? = nil
 
-        if status == noErr {
-            return dataTypeRef as! Data?
-        } else {
-            return nil
-        }
-    }
-
-    class func delete(key: String) -> Bool {
-       let query: [String: Any] = [
-           kSecClass as String       : kSecClassGenericPassword as String,
-           kSecAttrAccount as String : key,
-           kSecAttrAccessGroup as String: groupName,
-       ]
+    let status: OSStatus = SecItemCopyMatching(query as CFDictionary, &dataTypeRef)
 
-        return SecItemDelete(query as CFDictionary) == 0
+    if status == noErr {
+      return dataTypeRef as! Data?
+    } else {
+      return nil
     }
+  }
+
+  class func delete(key: String) -> Bool {
+    let query: [String: Any] = [
+      kSecClass as String: kSecClassGenericPassword as String,
+      kSecAttrAccount as String: key,
+      kSecAttrAccessGroup as String: groupName,
+    ]
+
+    return SecItemDelete(query as CFDictionary) == 0
+  }
 }
 
 extension Data {
 
-    init<T>(from value: T) {
-        var value = value
-        var data = Data()
-        withUnsafePointer(to: &value, { (ptr: UnsafePointer<T>) -> Void in
-            data = Data(buffer: UnsafeBufferPointer(start: ptr, count: 1))
-        })
-        self.init(data)
-    }
+  init<T>(from value: T) {
+    var value = value
+    var data = Data()
+    withUnsafePointer(
+      to: &value,
+      { (ptr: UnsafePointer<T>) -> Void in
+        data = Data(buffer: UnsafeBufferPointer(start: ptr, count: 1))
+      })
+    self.init(data)
+  }
 
-    func to<T>(type: T.Type) -> T {
-        return self.withUnsafeBytes { $0.load(as: T.self) }
-    }
+  func to<T>(type: T.Type) -> T {
+    return self.withUnsafeBytes { $0.load(as: T.self) }
+  }
 }
-