Remove unused methods

cryptomator · Oct 16, 2024 · 1bd4518 · 1bd4518
1 parent 889984d
commit 1bd4518
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 45 deletions.
diff --git a/Cryptomator/Snapshots/SnapshotCoordinator.swift b/Cryptomator/Snapshots/SnapshotCoordinator.swift
@@ -100,10 +100,6 @@ private class SnapshotVaultLockingMock: VaultLocking {
 		reply(true)
 	}
 
-	func getUnlockedVaultDomainIdentifiers(reply: @escaping ([NSFileProviderDomainIdentifier]) -> Void) {
-		fatalError()
-	}
-
 	var serviceName: NSFileProviderServiceName = .init("org.cryptomator.ios.vault-locking")
 
 	func makeListenerEndpoint() throws -> NSXPCListenerEndpoint {

diff --git a/Cryptomator/VaultList/VaultCellViewModel.swift b/Cryptomator/VaultList/VaultCellViewModel.swift
@@ -16,7 +16,6 @@ protocol VaultCellViewModelProtocol: TableViewCellViewModel, ViewModel {
 	var vault: VaultInfo { get }
 	var lockButtonIsHidden: AnyPublisher<Bool, Never> { get }
 	func lockVault() -> Promise<Void>
-	func setVaultUnlockStatus(unlocked: Bool)
 }
 
 class VaultCellViewModel: TableViewCellViewModel, VaultCellViewModelProtocol {
@@ -46,18 +45,14 @@ class VaultCellViewModel: TableViewCellViewModel, VaultCellViewModelProtocol {
 		return getXPCPromise.then { xpc in
 			xpc.proxy.lockVault(domainIdentifier: domainIdentifier)
 		}.then {
-			self.setVaultUnlockStatus(unlocked: false)
+			self.vault.vaultIsUnlocked.value = false
 		}.catch { error in
 			self.errorPublisher.send(error)
 		}.always {
 			self.fileProviderConnector.invalidateXPC(getXPCPromise)
 		}
 	}
 
-	func setVaultUnlockStatus(unlocked: Bool) {
-		vault.vaultIsUnlocked.value = unlocked
-	}
-
 	override func hash(into hasher: inout Hasher) {
 		hasher.combine(vault.vaultUID)
 	}

diff --git a/CryptomatorCommon/Sources/CryptomatorCommonCore/FileProviderXPC/VaultLocking.swift b/CryptomatorCommon/Sources/CryptomatorCommonCore/FileProviderXPC/VaultLocking.swift
@@ -14,7 +14,6 @@ import Promises
 	func lockVault(domainIdentifier: NSFileProviderDomainIdentifier)
 	func gracefulLockVault(domainIdentifier: NSFileProviderDomainIdentifier, reply: @escaping (Error?) -> Void)
 	func getIsUnlockedVault(domainIdentifier: NSFileProviderDomainIdentifier, reply: @escaping (Bool) -> Void)
-	func getUnlockedVaultDomainIdentifiers(reply: @escaping ([NSFileProviderDomainIdentifier]) -> Void)
 }
 
 public extension NSFileProviderServiceName {
@@ -41,10 +40,4 @@ public extension VaultLocking {
 			self.getIsUnlockedVault(domainIdentifier: domainIdentifier, reply: replyHandler)
 		}
 	}
-
-	func getUnlockedVaultDomainIdentifiers() -> Promise<[NSFileProviderDomainIdentifier]> {
-		return wrap { replyHandler in
-			self.getUnlockedVaultDomainIdentifiers(reply: replyHandler)
-		}
-	}
 }
diff --git a/CryptomatorFileProvider/FileProviderAdapterManager.swift b/CryptomatorFileProvider/FileProviderAdapterManager.swift
@@ -141,12 +141,6 @@ public class FileProviderAdapterManager: FileProviderAdapterProviding {
 		return adapterCache.getItem(identifier: domainIdentifier) != nil
 	}
 
-	public func getDomainIdentifiersOfUnlockedVaults() -> [NSFileProviderDomainIdentifier] {
-		let cachedIdentifiers = adapterCache.getAllCachedIdentifiers()
-		cachedIdentifiers.forEach { updateLockStatus(domainIdentifier: $0) }
-		return adapterCache.getAllCachedIdentifiers()
-	}
-
 	/**
 	 Locks a vault gracefully.
 
@@ -250,7 +244,6 @@ protocol FileProviderAdapterCacheType {
 	func cacheItem(_ item: AdapterCacheItem, identifier: NSFileProviderDomainIdentifier)
 	func removeItem(identifier: NSFileProviderDomainIdentifier)
 	func getItem(identifier: NSFileProviderDomainIdentifier) -> AdapterCacheItem?
-	func getAllCachedIdentifiers() -> [NSFileProviderDomainIdentifier]
 }
 
 class FileProviderAdapterCache: FileProviderAdapterCacheType {
@@ -274,10 +267,4 @@ class FileProviderAdapterCache: FileProviderAdapterCacheType {
 			return cachedAdapters[identifier]
 		}
 	}
-
-	func getAllCachedIdentifiers() -> [NSFileProviderDomainIdentifier] {
-		queue.sync {
-			return cachedAdapters.map { $0.key }
-		}
-	}
 }
diff --git a/CryptomatorFileProvider/ServiceSource/VaultLockingServiceSource.swift b/CryptomatorFileProvider/ServiceSource/VaultLockingServiceSource.swift
@@ -35,8 +35,4 @@ public class VaultLockingServiceSource: ServiceSource, VaultLocking {
 	public func getIsUnlockedVault(domainIdentifier: NSFileProviderDomainIdentifier, reply: @escaping (Bool) -> Void) {
 		reply(FileProviderAdapterManager.shared.vaultIsUnlocked(domainIdentifier: domainIdentifier))
 	}
-
-	public func getUnlockedVaultDomainIdentifiers(reply: @escaping ([NSFileProviderDomainIdentifier]) -> Void) {
-		reply(FileProviderAdapterManager.shared.getDomainIdentifiersOfUnlockedVaults())
-	}
 }
diff --git a/CryptomatorFileProviderTests/FileProviderAdapterManagerTests.swift b/CryptomatorFileProviderTests/FileProviderAdapterManagerTests.swift
@@ -246,8 +246,6 @@ class FileProviderAdapterManagerTests: XCTestCase {
 		}
 		vaultKeepUnlockedHelperMock.shouldAutoLockVaultWithVaultUIDClosure = { $0 != unlockedDomainIdentifier.rawValue }
 
-		XCTAssertEqual([unlockedDomainIdentifier], fileProviderAdapterManager.getDomainIdentifiersOfUnlockedVaults())
-
 		XCTAssertFalse(unlockedVaultMaintenanceManagerMock.enableMaintenanceModeCalled)
 		XCTAssertFalse(unlockedVaultMaintenanceManagerMock.disableMaintenanceModeCalled)
 		XCTAssertEqual(1, lockedVaultMaintenanceManagerMock.enableMaintenanceModeCallsCount)

diff --git a/CryptomatorFileProviderTests/Mocks/FileProviderAdapterCacheTypeMock.swift b/CryptomatorFileProviderTests/Mocks/FileProviderAdapterCacheTypeMock.swift
@@ -75,9 +75,4 @@ final class FileProviderAdapterCacheTypeMock: FileProviderAdapterCacheType {
 
 	var getAllCachedIdentifiersReturnValue: [NSFileProviderDomainIdentifier]!
 	var getAllCachedIdentifiersClosure: (() -> [NSFileProviderDomainIdentifier])?
-
-	func getAllCachedIdentifiers() -> [NSFileProviderDomainIdentifier] {
-		getAllCachedIdentifiersCallsCount += 1
-		return getAllCachedIdentifiersClosure.map({ $0() }) ?? getAllCachedIdentifiersReturnValue
-	}
 }
diff --git a/CryptomatorTests/VaultListViewModelTests.swift b/CryptomatorTests/VaultListViewModelTests.swift
@@ -244,10 +244,6 @@ class VaultLockingMock: VaultLocking {
 		reply(unlockedVaults.contains(domainIdentifier))
 	}
 
-	func getUnlockedVaultDomainIdentifiers(reply: @escaping ([NSFileProviderDomainIdentifier]) -> Void) {
-		reply(unlockedVaults)
-	}
-
 	let serviceName = NSFileProviderServiceName("org.cryptomator.ios.vault-locking")
 
 	func makeListenerEndpoint() throws -> NSXPCListenerEndpoint {