Fix SwiftFormat violations

iammajid · iammajid · commit 3b313d596d9c · 2025-10-31T11:33:13.000+01:00
diff --git a/Cryptomator/AddVault/LocalVault/LocalFileSystemAuthenticationViewModel.swift b/Cryptomator/AddVault/LocalVault/LocalFileSystemAuthenticationViewModel.swift
@@ -40,7 +40,7 @@ class LocalFileSystemAuthenticationViewModel: SingleSectionTableViewModel, Local
 		}
 	}
 
-	public static let iCloudDriveRootDirectory = URL(fileURLWithPath: "\(iCloudDrivePrefix)com~apple~CloudDocs/")
+	static let iCloudDriveRootDirectory = URL(fileURLWithPath: "\(iCloudDrivePrefix)com~apple~CloudDocs/")
 	private static let iCloudDrivePrefix = "/private/var/mobile/Library/Mobile Documents/"
 	let documentPickerButtonText: String
 	let headerText: String
diff --git a/Cryptomator/Common/DatabaseManager.swift b/Cryptomator/Common/DatabaseManager.swift
@@ -13,7 +13,7 @@ import Foundation
 import GRDB
 
 class DatabaseManager {
-	public static var shared: DatabaseManager!
+	static var shared: DatabaseManager!
 
 	@Dependency(\.database) private var database
 
diff --git a/Cryptomator/Purchase/PurchaseViewModel.swift b/Cryptomator/Purchase/PurchaseViewModel.swift
@@ -16,7 +16,7 @@ enum PurchaseError: LocalizedError {
 	case paymentCancelled
 	case unknown
 
-	public var errorDescription: String? {
+	var errorDescription: String? {
 		switch self {
 		case .unavailableProduct:
 			return nil // should never happen
diff --git a/Cryptomator/Settings/SettingsCoordinator.swift b/Cryptomator/Settings/SettingsCoordinator.swift
@@ -84,7 +84,7 @@ class SettingsCoordinator: Coordinator {
 
 	func showManageSubscriptions() {
 		if #available(iOS 15.0, *), let scene = UIApplication.shared.connectedScenes.first as? UIWindowScene {
-			Task.init {
+			Task {
 				do {
 					try await AppStore.showManageSubscriptions(in: scene)
 				} catch {
diff --git a/Cryptomator/VaultDetail/ChangePassword/ChangePasswordViewModel.swift b/Cryptomator/VaultDetail/ChangePassword/ChangePasswordViewModel.swift
@@ -28,7 +28,7 @@ enum ChangePasswordViewModelError: Error {
 }
 
 extension ChangePasswordViewModelError: LocalizedError {
-	public var errorDescription: String? {
+	var errorDescription: String? {
 		switch self {
 		case .emptyPassword:
 			return LocalizedString.getValue("addVault.createNewVault.password.error.emptyPassword")
diff --git a/CryptomatorCommon/Sources/CryptomatorCommonCore/Hub/HubRepository.swift b/CryptomatorCommon/Sources/CryptomatorCommonCore/Hub/HubRepository.swift
@@ -13,7 +13,7 @@ public struct HubVault: Equatable {
 }
 
 private struct HubVaultRow: Codable, Equatable, PersistableRecord, FetchableRecord {
-	public static let databaseTableName = "hubVaultAccount"
+	static let databaseTableName = "hubVaultAccount"
 
 	let vaultUID: String
 	let subscriptionState: HubSubscriptionState
@@ -31,7 +31,7 @@ private struct HubVaultRow: Codable, Equatable, PersistableRecord, FetchableReco
 		case vaultUID, subscriptionState
 	}
 
-	public func encode(to container: inout PersistenceContainer) throws {
+	func encode(to container: inout PersistenceContainer) throws {
 		container[Columns.vaultUID] = vaultUID
 		container[Columns.subscriptionState] = subscriptionState
 	}
diff --git a/CryptomatorCommon/Sources/CryptomatorCommonCore/Mocks/CloudProviderMock.swift b/CryptomatorCommon/Sources/CryptomatorCommonCore/Mocks/CloudProviderMock.swift
@@ -242,7 +242,7 @@ final class CloudProviderMock: CloudProvider {
 	var moveFileFromToReturnValue: Promise<Void>!
 	var moveFileFromToClosure: ((CloudPath, CloudPath) -> Promise<Void>)?
 
-	public func moveFile(from sourceCloudPath: CloudPath, to targetCloudPath: CloudPath) -> Promise<Void> {
+	func moveFile(from sourceCloudPath: CloudPath, to targetCloudPath: CloudPath) -> Promise<Void> {
 		if let error = moveFileFromToThrowableError {
 			return Promise(error)
 		}
diff --git a/CryptomatorCommon/Sources/CryptomatorCommonCore/SwiftUI/SwiftUI+CustomKeyboard.swift b/CryptomatorCommon/Sources/CryptomatorCommonCore/SwiftUI/SwiftUI+CustomKeyboard.swift
@@ -93,7 +93,7 @@ public enum BackportedSubmitLabel {
 struct BackportedSubmitLabelModifier: ViewModifier {
 	let label: BackportedSubmitLabel
 
-	public func body(content: Content) -> some View {
+	func body(content: Content) -> some View {
 		if #available(iOS 15, *) {
 			content
 				.submitLabel(label.submitLabel)
diff --git a/CryptomatorCommon/Sources/CryptomatorCommonCore/SwiftUI/SwiftUI+Focus.swift b/CryptomatorCommon/Sources/CryptomatorCommonCore/SwiftUI/SwiftUI+Focus.swift
@@ -68,7 +68,7 @@ struct FocusModifier<T: CaseIterable & Hashable>: ViewModifier {
 	// swiftlint:disable:next weak_delegate
 	@State var delegate = TextFieldDelegate()
 
-	public func body(content: Content) -> some View {
+	func body(content: Content) -> some View {
 		content
 			.introspectTextField { textField in
 				if !(textField.delegate is TextFieldDelegate) {
diff --git a/CryptomatorCommon/Sources/CryptomatorCommonCore/SwiftUI/SwiftUI+ListBackground.swift b/CryptomatorCommon/Sources/CryptomatorCommonCore/SwiftUI/SwiftUI+ListBackground.swift
@@ -10,7 +10,7 @@ public extension View {
 struct ListBackgroundModifier: ViewModifier {
 	let color: Color
 
-	public func body(content: Content) -> some View {
+	func body(content: Content) -> some View {
 		if #available(iOS 16, *) {
 			content
 				.scrollContentBackground(.hidden)
diff --git a/CryptomatorFileProvider/Locks/FileSystemLock.swift b/CryptomatorFileProvider/Locks/FileSystemLock.swift
@@ -18,18 +18,18 @@ class FileSystemLock {
 		self.startLockPromise = startLockPromise
 	}
 
-	public func lock() -> Promise<Void> {
+	func lock() -> Promise<Void> {
 		startLockPromise.fulfill(())
 		return lockPromise.then { _ in }
 	}
 
-	public func unlock() -> Promise<Void> {
+	func unlock() -> Promise<Void> {
 		return lockPromise.then { lockNode in
 			lockNode.unlock()
 		}
 	}
 
-	public static func lockInOrder(_ locks: [FileSystemLock]) -> Promise<Void> {
+	static func lockInOrder(_ locks: [FileSystemLock]) -> Promise<Void> {
 		guard let firstLock = locks.first else {
 			return Promise(())
 		}
@@ -39,7 +39,7 @@ class FileSystemLock {
 		}
 	}
 
-	public static func unlockInOrder(_ locks: [FileSystemLock]) -> Promise<Void> {
+	static func unlockInOrder(_ locks: [FileSystemLock]) -> Promise<Void> {
 		guard let firstLock = locks.first else {
 			return Promise(())
 		}
diff --git a/CryptomatorFileProvider/Locks/LockManager.swift b/CryptomatorFileProvider/Locks/LockManager.swift
@@ -70,7 +70,7 @@ class LockManager {
 
 	// MARK: - Path Locks
 
-	public func getPathLockForReading(at path: CloudPath) -> FileSystemLock {
+	func getPathLockForReading(at path: CloudPath) -> FileSystemLock {
 		let partialPaths = path.getPartialCloudPaths()
 		let pendingStartLockPromise = Promise<Void>.pending()
 		let readLockPromise = pendingStartLockPromise.then {
@@ -82,7 +82,7 @@ class LockManager {
 		return FileSystemLock(lockPromise: readLockPromise, startLockPromise: pendingStartLockPromise)
 	}
 
-	public func getPathLockForWriting(at path: CloudPath) -> FileSystemLock {
+	func getPathLockForWriting(at path: CloudPath) -> FileSystemLock {
 		let pendingStartLockPromise = Promise<Void>.pending()
 		let writeLockPromise = pendingStartLockPromise.then {
 			self.getPathLock(for: path)
@@ -95,7 +95,7 @@ class LockManager {
 
 	// MARK: - Data Locks
 
-	public func getDataLockForReading(at path: CloudPath) -> FileSystemLock {
+	func getDataLockForReading(at path: CloudPath) -> FileSystemLock {
 		let pendingStartLockPromise = Promise<Void>.pending()
 		let readLockPromise = pendingStartLockPromise.then {
 			self.getDataLock(for: path)
@@ -106,7 +106,7 @@ class LockManager {
 		return FileSystemLock(lockPromise: readLockPromise, startLockPromise: pendingStartLockPromise)
 	}
 
-	public func getDataLockForWriting(at path: CloudPath) -> FileSystemLock {
+	func getDataLockForWriting(at path: CloudPath) -> FileSystemLock {
 		let pendingStartLockPromise = Promise<Void>.pending()
 		let writeLockPromise = pendingStartLockPromise.then {
 			self.getDataLock(for: path)
diff --git a/CryptomatorFileProvider/UnlockMonitor.swift b/CryptomatorFileProvider/UnlockMonitor.swift
@@ -157,7 +157,7 @@ protocol UnlockMonitorTaskExecutorType: AnyObject {
 }
 
 class UnlockMonitorTaskExecutor: UnlockMonitorTaskExecutorType {
-	public var runningBiometricalUnlock: Bool = false {
+	var runningBiometricalUnlock: Bool = false {
 		didSet {
 			if runningBiometricalUnlock {
 				lock.unlock(withCondition: UnlockMonitorTaskExecutor.RUNNING_BIOMETRICAL_UNLOCK)
@@ -179,7 +179,7 @@ class UnlockMonitorTaskExecutor: UnlockMonitorTaskExecutorType {
 		lock.unlock(withCondition: UnlockMonitorTaskExecutor.NO_RUNNING_BIOMETRICAL_UNLOCK)
 	}
 
-	public func execute(_ work: @escaping () -> Void) {
+	func execute(_ work: @escaping () -> Void) {
 		queue.async { [weak self] in
 			self?.wait()
 			work()
diff --git a/CryptomatorFileProvider/Workflow/WorkflowDependencyFactory.swift b/CryptomatorFileProvider/Workflow/WorkflowDependencyFactory.swift
@@ -38,7 +38,7 @@ class WorkflowDependencyFactory {
 	 - Parameter paths: The paths for which dependencies are to be created. These are the full paths that affect a workflow.
 	 - Parameter lockType: The lock type used to construct the leaf nodes (the nodes for the respective full path).
 	 */
-	public func createDependencies(paths: [CloudPath], lockType: LockType) -> WorkflowDependency {
+	func createDependencies(paths: [CloudPath], lockType: LockType) -> WorkflowDependency {
 		let unlock = Promise<Void>.pending()
 		var locks = [Promise<Void>]()
 		for path in paths {
@@ -58,7 +58,7 @@ class WorkflowDependencyFactory {
 	 - Parameter path: The path for which dependencies are to be created. These is the full path that affect a workflow.
 	 - Parameter lockType: The lock type used to construct the leaf nodes (the nodes for the respective full path).
 	 */
-	public func createDependencies(for path: CloudPath, lockType: LockType) -> WorkflowDependency {
+	func createDependencies(for path: CloudPath, lockType: LockType) -> WorkflowDependency {
 		return createDependencies(paths: [path], lockType: lockType)
 	}
 
diff --git a/CryptomatorFileProviderTests/Mocks/CustomCloudProviderMock.swift b/CryptomatorFileProviderTests/Mocks/CustomCloudProviderMock.swift
@@ -51,7 +51,7 @@ class CustomCloudProviderMock: CloudProvider {
 
 	var everyOperationShouldFailWithError: Error?
 
-	public func fetchItemMetadata(at cloudPath: CloudPath) -> Promise<CloudItemMetadata> {
+	func fetchItemMetadata(at cloudPath: CloudPath) -> Promise<CloudItemMetadata> {
 		if let error = everyOperationShouldFailWithError {
 			return Promise(error)
 		}
@@ -64,7 +64,7 @@ class CustomCloudProviderMock: CloudProvider {
 		}
 	}
 
-	public func fetchItemList(forFolderAt cloudPath: CloudPath, withPageToken pageToken: String?) -> Promise<CloudItemList> {
+	func fetchItemList(forFolderAt cloudPath: CloudPath, withPageToken pageToken: String?) -> Promise<CloudItemList> {
 		switch cloudPath {
 		case CloudPath("/itemNotFound"):
 			return Promise(CloudProviderError.itemNotFound)
@@ -96,7 +96,7 @@ class CustomCloudProviderMock: CloudProvider {
 		}
 	}
 
-	public func downloadFile(from cloudPath: CloudPath, to localURL: URL, onTaskCreation: ((URLSessionDownloadTask?) -> Void)?) -> Promise<Void> {
+	func downloadFile(from cloudPath: CloudPath, to localURL: URL, onTaskCreation: ((URLSessionDownloadTask?) -> Void)?) -> Promise<Void> {
 		precondition(localURL.isFileURL)
 		precondition(!localURL.hasDirectoryPath)
 		if let data = files[cloudPath.path] {
@@ -111,7 +111,7 @@ class CustomCloudProviderMock: CloudProvider {
 		}
 	}
 
-	public func uploadFile(from localURL: URL, to cloudPath: CloudPath, replaceExisting: Bool, onTaskCreation: ((URLSessionUploadTask?) -> Void)?) -> Promise<CloudItemMetadata> {
+	func uploadFile(from localURL: URL, to cloudPath: CloudPath, replaceExisting: Bool, onTaskCreation: ((URLSessionUploadTask?) -> Void)?) -> Promise<CloudItemMetadata> {
 		precondition(localURL.isFileURL)
 		precondition(!localURL.hasDirectoryPath)
 		switch cloudPath {
@@ -142,7 +142,7 @@ class CustomCloudProviderMock: CloudProvider {
 		}
 	}
 
-	public func createFolder(at cloudPath: CloudPath) -> Promise<Void> {
+	func createFolder(at cloudPath: CloudPath) -> Promise<Void> {
 		switch cloudPath {
 		case CloudPath("/FolderAlreadyExists/"):
 			return Promise(CloudProviderError.itemAlreadyExists)
@@ -154,17 +154,17 @@ class CustomCloudProviderMock: CloudProvider {
 		}
 	}
 
-	public func deleteFile(at cloudPath: CloudPath) -> Promise<Void> {
+	func deleteFile(at cloudPath: CloudPath) -> Promise<Void> {
 		deletedFiles.append(cloudPath.path)
 		return Promise(())
 	}
 
-	public func deleteFolder(at cloudPath: CloudPath) -> Promise<Void> {
+	func deleteFolder(at cloudPath: CloudPath) -> Promise<Void> {
 		deletedFolders.append(cloudPath.path)
 		return Promise(())
 	}
 
-	public func moveFile(from sourceCloudPath: CloudPath, to targetCloudPath: CloudPath) -> Promise<Void> {
+	func moveFile(from sourceCloudPath: CloudPath, to targetCloudPath: CloudPath) -> Promise<Void> {
 		switch targetCloudPath {
 		case CloudPath("/FileAlreadyExists.txt"):
 			return Promise(CloudProviderError.itemAlreadyExists)
@@ -176,7 +176,7 @@ class CustomCloudProviderMock: CloudProvider {
 		}
 	}
 
-	public func moveFolder(from sourceCloudPath: CloudPath, to targetCloudPath: CloudPath) -> Promise<Void> {
+	func moveFolder(from sourceCloudPath: CloudPath, to targetCloudPath: CloudPath) -> Promise<Void> {
 		switch targetCloudPath {
 		case CloudPath("/FolderAlreadyExists/"):
 			return Promise(CloudProviderError.itemAlreadyExists)
@@ -188,7 +188,7 @@ class CustomCloudProviderMock: CloudProvider {
 		}
 	}
 
-	public func setLastModifiedDate(_ date: Date?, for remoteURL: CloudPath) {
+	func setLastModifiedDate(_ date: Date?, for remoteURL: CloudPath) {
 		lastModifiedDate[remoteURL.path] = date
 	}
 }
diff --git a/FileProviderExtensionUI/UnlockVaultViewModel.swift b/FileProviderExtensionUI/UnlockVaultViewModel.swift
@@ -113,7 +113,7 @@ class UnlockVaultViewModel {
 	private let vaultCache: VaultCache
 	private let wrongBiometricalPassword: Bool
 
-	public convenience init(domain: NSFileProviderDomain, wrongBiometricalPassword: Bool) {
+	convenience init(domain: NSFileProviderDomain, wrongBiometricalPassword: Bool) {
 		self.init(domain: domain,
 		          wrongBiometricalPassword: wrongBiometricalPassword,
 		          passwordManager: VaultPasswordKeychainManager(),
diff --git a/Snapshots/SnapshotHelper.swift b/Snapshots/SnapshotHelper.swift
@@ -111,7 +111,7 @@ open class Snapshot: NSObject {
 			NSLog("Couldn't detect/set locale...")
 		}
 
-		if currentLocale.isEmpty && !deviceLanguage.isEmpty {
+		if currentLocale.isEmpty, !deviceLanguage.isEmpty {
 			currentLocale = Locale(identifier: deviceLanguage).identifier
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ class LocalFileSystemAuthenticationViewModel: SingleSectionTableViewModel, Local`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
`43`		`- public static let iCloudDriveRootDirectory = URL(fileURLWithPath: "\(iCloudDrivePrefix)com~apple~CloudDocs/")`
	`43`	`+ static let iCloudDriveRootDirectory = URL(fileURLWithPath: "\(iCloudDrivePrefix)com~apple~CloudDocs/")`
`44`	`44`	`private static let iCloudDrivePrefix = "/private/var/mobile/Library/Mobile Documents/"`
`45`	`45`	`let documentPickerButtonText: String`
`46`	`46`	`let headerText: String`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ enum ChangePasswordViewModelError: Error {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`extension ChangePasswordViewModelError: LocalizedError {`
`31`		`- public var errorDescription: String? {`
	`31`	`+ var errorDescription: String? {`
`32`	`32`	`switch self {`
`33`	`33`	`case .emptyPassword:`
`34`	`34`	`return LocalizedString.getValue("addVault.createNewVault.password.error.emptyPassword")`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public struct HubVault: Equatable {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`private struct HubVaultRow: Codable, Equatable, PersistableRecord, FetchableRecord {`
`16`		`- public static let databaseTableName = "hubVaultAccount"`
	`16`	`+ static let databaseTableName = "hubVaultAccount"`
`17`	`17`
`18`	`18`	`let vaultUID: String`
`19`	`19`	`let subscriptionState: HubSubscriptionState`
`@@ -31,7 +31,7 @@ private struct HubVaultRow: Codable, Equatable, PersistableRecord, FetchableReco`
`31`	`31`	`case vaultUID, subscriptionState`
`32`	`32`	`}`
`33`	`33`
`34`		`- public func encode(to container: inout PersistenceContainer) throws {`
	`34`	`+ func encode(to container: inout PersistenceContainer) throws {`
`35`	`35`	`container[Columns.vaultUID] = vaultUID`
`36`	`36`	`container[Columns.subscriptionState] = subscriptionState`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ final class CloudProviderMock: CloudProvider {`
`242`	`242`	`var moveFileFromToReturnValue: Promise<Void>!`
`243`	`243`	`var moveFileFromToClosure: ((CloudPath, CloudPath) -> Promise<Void>)?`
`244`	`244`
`245`		`- public func moveFile(from sourceCloudPath: CloudPath, to targetCloudPath: CloudPath) -> Promise<Void> {`
	`245`	`+ func moveFile(from sourceCloudPath: CloudPath, to targetCloudPath: CloudPath) -> Promise<Void> {`
`246`	`246`	`if let error = moveFileFromToThrowableError {`
`247`	`247`	`return Promise(error)`
`248`	`248`	`}`