Fixed build error, cleaned up BoxCredential and BoxItem

cryptomator · Aug 20, 2024 · 86d3564 · 86d3564
1 parent cb72af7
commit 86d3564
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 37 deletions.
diff --git a/Sources/CryptomatorCloudAccess/Box/BoxCloudProvider.swift b/Sources/CryptomatorCloudAccess/Box/BoxCloudProvider.swift
@@ -746,35 +746,22 @@ public class BoxCloudProvider: CloudProvider {
 		let name = metadata.name ?? ""
 		let itemType = CloudItemType.file
 		let size = metadata.size.map { Int($0) }
-		let dateString = metadata.modifiedAt
-
-		let dateFormatter = ISO8601DateFormatter()
-
-		let lastModifiedDate = dateString != nil ? dateFormatter.date(from: dateString!) : nil
+		let lastModifiedDate = metadata.modifiedAt
 		return CloudItemMetadata(name: name, cloudPath: cloudPath, itemType: itemType, lastModifiedDate: lastModifiedDate, size: size)
 	}
 
 	private func convertToCloudItemMetadata(_ metadata: Folder, at cloudPath: CloudPath) -> CloudItemMetadata {
 		let name = metadata.name ?? ""
 		let itemType = CloudItemType.folder
-		let dateString = metadata.modifiedAt
-
-		let dateFormatter = ISO8601DateFormatter()
-
-		let lastModifiedDate = dateString != nil ? dateFormatter.date(from: dateString!) : nil
-
+		let lastModifiedDate = metadata.modifiedAt
 		return CloudItemMetadata(name: name, cloudPath: cloudPath, itemType: itemType, lastModifiedDate: lastModifiedDate, size: nil)
 	}
 
 	private func convertToCloudItemMetadata(_ metadata: FileFull, at cloudPath: CloudPath) -> CloudItemMetadata {
 		let name = metadata.name ?? ""
 		let itemType = CloudItemType.file
 		let size = metadata.size.map { Int($0) }
-		let dateString = metadata.modifiedAt
-
-		let dateFormatter = ISO8601DateFormatter()
-
-		let lastModifiedDate = dateString != nil ? dateFormatter.date(from: dateString!) : nil
+		let lastModifiedDate = metadata.modifiedAt
 		return CloudItemMetadata(name: name, cloudPath: cloudPath, itemType: itemType, lastModifiedDate: lastModifiedDate, size: size)
 	}
 

diff --git a/Sources/CryptomatorCloudAccess/Box/BoxCredential.swift b/Sources/CryptomatorCloudAccess/Box/BoxCredential.swift
@@ -13,7 +13,6 @@ import Promises
 
 public enum BoxCredentialErrors: Error {
 	case noUsername
-	case authenticationFailed
 }
 
 public class BoxCredential {
@@ -27,7 +26,6 @@ public class BoxCredential {
 
 	public func deauthenticate() -> Promise<Void> {
 		let pendingPromise = Promise<Void>.pending()
-
 		_Concurrency.Task {
 			do {
 				let networkSession = NetworkSession()
@@ -37,13 +35,11 @@ public class BoxCredential {
 				pendingPromise.reject(error)
 			}
 		}
-
 		return pendingPromise
 	}
 
 	public func getUsername() -> Promise<String> {
 		let pendingPromise = Promise<String>.pending()
-
 		_Concurrency.Task {
 			do {
 				let user = try await client.users.getUserMe()
@@ -56,13 +52,11 @@ public class BoxCredential {
 				pendingPromise.reject(error)
 			}
 		}
-
 		return pendingPromise
 	}
 
 	public func getUserId() -> Promise<String> {
 		let pendingPromise = Promise<String>.pending()
-
 		_Concurrency.Task {
 			do {
 				let user = try await client.users.getUserMe()
@@ -71,7 +65,6 @@ public class BoxCredential {
 				pendingPromise.reject(error)
 			}
 		}
-
 		return pendingPromise
 	}
 }
diff --git a/Sources/CryptomatorCloudAccess/Box/BoxItem.swift b/Sources/CryptomatorCloudAccess/Box/BoxItem.swift
@@ -22,20 +22,6 @@ struct BoxItem: Decodable, FetchableRecord, TableRecord, Equatable {
 }
 
 extension BoxItem {
-	// TODO: Must be checked whether this init is needed at all
-
-	init(cloudPath: CloudPath, folderItem: FileOrFolderOrWebLink) throws {
-		switch folderItem {
-		case let .file(file):
-			self.init(cloudPath: cloudPath, file: file)
-		case let .folder(folder):
-			self.init(cloudPath: cloudPath, folder: folder)
-		// Weblinks are currently not supported, if required they can be added later.
-		case .webLink:
-			throw BoxError.unexpectedContent
-		}
-	}
-
 	init(cloudPath: CloudPath, file: FileBase) {
 		self.cloudPath = cloudPath
 		self.identifier = file.id