Merge branch 'release/2.8.3'

Author: tobihagemann

Cryptomator.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		11E84AE6F7F105AB9A0E2EAE /* TrustedHubHostsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0964E7C048AC1D59105CF75C /* TrustedHubHostsViewController.swift */; };
 		3BCBE843A35B7D9E16795451 /* LifetimeUpgradeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7EA4FC7AFEB4B45864C4FB10 /* LifetimeUpgradeViewModel.swift */; };
 		4A03255E25A368BF00E63D7A /* MainCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A03255D25A368BF00E63D7A /* MainCoordinator.swift */; };
 		4A03257825A36A6900E63D7A /* VaultListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A03257725A36A6900E63D7A /* VaultListViewController.swift */; };
@@ -375,6 +376,7 @@
 		4AFD8C0F269304A700F77BA6 /* UnlockVaultViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4AFD8C0E269304A700F77BA6 /* UnlockVaultViewModel.swift */; };
 		4AFE6AA82514B65800A4A315 /* CloudPath+NameCollision.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4AFE6AA72514B65800A4A315 /* CloudPath+NameCollision.swift */; };
 		4AFF1BB1272C337A00F41E1B /* XCTest+Combine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4AFF1BB0272C337A00F41E1B /* XCTest+Combine.swift */; };
+		6436F6BD08894DAD03812751 /* TrustedHubHostsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46F99A7913E9584535D9F5FC /* TrustedHubHostsViewModel.swift */; };
 		740376292587AFF70023FF53 /* libCryptomatorFileProvider.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 740375D72587AE7A0023FF53 /* libCryptomatorFileProvider.a */; };
 		7408E6BF267783F100D7FAEA /* LocalWebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7408E6BE267783F100D7FAEA /* LocalWebViewController.swift */; };
 		7408E6C126778C7A00D7FAEA /* LocalWebViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7408E6C026778C7A00D7FAEA /* LocalWebViewModel.swift */; };
@@ -554,11 +556,13 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		0964E7C048AC1D59105CF75C /* TrustedHubHostsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrustedHubHostsViewController.swift; sourceTree = "<group>"; };
 		1493C4C38F17D56A5AFA11AF /* pa */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pa; path = pa.lproj/Intents.strings; sourceTree = "<group>"; };
 		153B84C203850D7414DE2A66 /* FileProviderAdapterRecoverUploadsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileProviderAdapterRecoverUploadsTests.swift; sourceTree = "<group>"; };
 		1635F1C6B23AA6FBFF781706 /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/Localizable.strings; sourceTree = "<group>"; };
 		2EF42299CA3BB5AF289540DA /* lv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = lv; path = lv.lproj/Intents.strings; sourceTree = "<group>"; };
 		3FFDCEC6A6895EC4F495A160 /* pa */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pa; path = pa.lproj/Localizable.strings; sourceTree = "<group>"; };
+		46F99A7913E9584535D9F5FC /* TrustedHubHostsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrustedHubHostsViewModel.swift; sourceTree = "<group>"; };
 		4A03255D25A368BF00E63D7A /* MainCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainCoordinator.swift; sourceTree = "<group>"; };
 		4A03257725A36A6900E63D7A /* VaultListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VaultListViewController.swift; sourceTree = "<group>"; };
 		4A03258025A36B7D00E63D7A /* UIViewController+Preview.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+Preview.swift"; sourceTree = "<group>"; };
@@ -2058,10 +2062,20 @@
 				740D367D266A18DF0058744D /* SettingsViewController.swift */,
 				740D3681266A19150058744D /* SettingsViewModel.swift */,
 				7408E6CB26779BC200D7FAEA /* About */,
+				8DB472C9A9C7437C46DCAFD7 /* Hub */,
 			);
 			path = Settings;
 			sourceTree = "<group>";
 		};
+		8DB472C9A9C7437C46DCAFD7 /* Hub */ = {
+			isa = PBXGroup;
+			children = (
+				0964E7C048AC1D59105CF75C /* TrustedHubHostsViewController.swift */,
+				46F99A7913E9584535D9F5FC /* TrustedHubHostsViewModel.swift */,
+			);
+			path = Hub;
+			sourceTree = "<group>";
+		};
 		743D95FA2D76EE88002D73C3 /* MicrosoftGraph */ = {
 			isa = PBXGroup;
 			children = (
@@ -2973,6 +2987,8 @@
 				74F5DC1F26DD036D00AFE989 /* StoreManager.swift in Sources */,
 				74F5DC1C26DCD2FB00AFE989 /* StoreObserver.swift in Sources */,
 				4A21B49626BC0270000D13DF /* VaultDetailInfoFooterViewModel.swift in Sources */,
+				11E84AE6F7F105AB9A0E2EAE /* TrustedHubHostsViewController.swift in Sources */,
+				6436F6BD08894DAD03812751 /* TrustedHubHostsViewModel.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3422,7 +3438,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 2.8.2;
+				MARKETING_VERSION = 2.8.3;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -3484,7 +3500,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 2.8.2;
+				MARKETING_VERSION = 2.8.3;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "-Xfrontend -warn-long-expression-type-checking=200 -Xfrontend -warn-long-function-bodies=200";

Cryptomator/Settings/Hub/TrustedHubHostsViewController.swift

@@ -0,0 +1,166 @@
+//
+//  TrustedHubHostsViewController.swift
+//  Cryptomator
+//
+//  Created by Tobias Hagemann on 12.03.26.
+//  Copyright © 2026 Skymatic GmbH. All rights reserved.
+//
+
+import CryptomatorCommonCore
+import UIKit
+
+class TrustedHubHostsViewController: BaseUITableViewController {
+	private enum Section {
+		case hosts
+		case clearAll
+	}
+
+	private enum Item: Hashable {
+		case host(String)
+		case clearAll
+	}
+
+	private class DataSource: UITableViewDiffableDataSource<Section, Item> {
+		var deleteRowAction: ((UITableView, UITableViewCell.EditingStyle, IndexPath) -> Void)?
+
+		override func tableView(_ tableView: UITableView, canEditRowAt indexPath: IndexPath) -> Bool {
+			guard let item = itemIdentifier(for: indexPath) else { return false }
+			switch item {
+			case .host:
+				return true
+			case .clearAll:
+				return false
+			}
+		}
+
+		override func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCell.EditingStyle, forRowAt indexPath: IndexPath) {
+			deleteRowAction?(tableView, editingStyle, indexPath)
+		}
+	}
+
+	private let viewModel: TrustedHubHostsViewModel
+	private var dataSource: DataSource?
+	private lazy var emptyListMessage: UIView = {
+		let label = UILabel()
+		label.font = .preferredFont(forTextStyle: .body)
+		label.adjustsFontForContentSizeCategory = true
+		label.textAlignment = .center
+		label.numberOfLines = 0
+		label.text = viewModel.emptyListMessage
+		label.translatesAutoresizingMaskIntoConstraints = false
+
+		let container = UIView()
+		container.addSubview(label)
+		NSLayoutConstraint.activate([
+			label.leadingAnchor.constraint(equalTo: container.readableContentGuide.leadingAnchor),
+			label.trailingAnchor.constraint(equalTo: container.readableContentGuide.trailingAnchor),
+			label.centerYAnchor.constraint(equalTo: container.centerYAnchor)
+		])
+		return container
+	}()
+
+	init(viewModel: TrustedHubHostsViewModel) {
+		self.viewModel = viewModel
+		super.init()
+	}
+
+	override func viewDidLoad() {
+		super.viewDidLoad()
+		title = viewModel.title
+		tableView.register(UITableViewCell.self, forCellReuseIdentifier: "HostCell")
+		tableView.register(UITableViewCell.self, forCellReuseIdentifier: "ClearAllCell")
+		configureDataSource()
+		applySnapshot()
+	}
+
+	private func configureDataSource() {
+		dataSource = DataSource(tableView: tableView) { tableView, indexPath, item in
+			switch item {
+			case let .host(host):
+				let cell = tableView.dequeueReusableCell(withIdentifier: "HostCell", for: indexPath)
+				cell.textLabel?.text = host
+				cell.selectionStyle = .none
+				return cell
+			case .clearAll:
+				let cell = tableView.dequeueReusableCell(withIdentifier: "ClearAllCell", for: indexPath)
+				cell.textLabel?.text = LocalizedString.getValue("trustedHubHosts.clearAll")
+				cell.textLabel?.textColor = .systemRed
+				cell.selectionStyle = .default
+				return cell
+			}
+		}
+		dataSource?.deleteRowAction = { [weak self] _, editingStyle, indexPath in
+			guard editingStyle == .delete,
+			      let self,
+			      let item = self.dataSource?.itemIdentifier(for: indexPath),
+			      case let .host(host) = item else { return }
+			self.deleteHost(host)
+		}
+	}
+
+	private func applySnapshot() {
+		var snapshot = NSDiffableDataSourceSnapshot<Section, Item>()
+		let hosts = viewModel.hosts
+		if hosts.isEmpty {
+			if isEditing {
+				setEditing(false, animated: false)
+			}
+			navigationItem.rightBarButtonItem = nil
+			tableView.backgroundView = emptyListMessage
+			tableView.contentInsetAdjustmentBehavior = .never
+			tableView.separatorStyle = .none
+		} else {
+			navigationItem.rightBarButtonItem = editButtonItem
+			tableView.backgroundView = nil
+			tableView.contentInsetAdjustmentBehavior = .automatic
+			tableView.separatorStyle = .singleLine
+			snapshot.appendSections([.hosts, .clearAll])
+			snapshot.appendItems(hosts.map { .host($0) }, toSection: .hosts)
+			snapshot.appendItems([.clearAll], toSection: .clearAll)
+		}
+		dataSource?.apply(snapshot, animatingDifferences: false)
+	}
+
+	// MARK: - UITableViewDelegate
+
+	override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+		tableView.deselectRow(at: indexPath, animated: true)
+		guard let item = dataSource?.itemIdentifier(for: indexPath) else { return }
+		switch item {
+		case .host:
+			break
+		case .clearAll:
+			showClearAllAlert()
+		}
+	}
+
+	override func tableView(_ tableView: UITableView, trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? {
+		guard let item = dataSource?.itemIdentifier(for: indexPath), case let .host(host) = item else {
+			return nil
+		}
+		let deleteAction = UIContextualAction(style: .destructive, title: LocalizedString.getValue("common.button.remove")) { [weak self] _, _, completion in
+			self?.deleteHost(host)
+			completion(true)
+		}
+		return UISwipeActionsConfiguration(actions: [deleteAction])
+	}
+
+	// MARK: - Private
+
+	private func deleteHost(_ host: String) {
+		viewModel.removeHost(host)
+		applySnapshot()
+	}
+
+	private func showClearAllAlert() {
+		let alertController = UIAlertController(title: nil, message: LocalizedString.getValue("trustedHubHosts.clearAll.alert.message"), preferredStyle: .alert)
+		let clearAction = UIAlertAction(title: LocalizedString.getValue("common.button.clear"), style: .destructive) { [weak self] _ in
+			self?.viewModel.clearAllHosts()
+			self?.applySnapshot()
+		}
+		let cancelAction = UIAlertAction(title: LocalizedString.getValue("common.button.cancel"), style: .cancel)
+		alertController.addAction(clearAction)
+		alertController.addAction(cancelAction)
+		present(alertController, animated: true, completion: nil)
+	}
+}

Cryptomator/Settings/Hub/TrustedHubHostsViewModel.swift

@@ -0,0 +1,40 @@
+//
+//  TrustedHubHostsViewModel.swift
+//  Cryptomator
+//
+//  Created by Tobias Hagemann on 12.03.26.
+//  Copyright © 2026 Skymatic GmbH. All rights reserved.
+//
+
+import CryptomatorCommonCore
+import Foundation
+
+class TrustedHubHostsViewModel {
+	var title: String {
+		return LocalizedString.getValue("settings.hub.trustedHosts")
+	}
+
+	var emptyListMessage: String {
+		return LocalizedString.getValue("trustedHubHosts.emptyList.message")
+	}
+
+	var hosts: [String] {
+		return cryptomatorSettings.trustedHubAuthorities.sorted()
+	}
+
+	private var cryptomatorSettings: CryptomatorSettings
+
+	init(cryptomatorSettings: CryptomatorSettings = CryptomatorUserDefaults.shared) {
+		self.cryptomatorSettings = cryptomatorSettings
+	}
+
+	func removeHost(_ host: String) {
+		var authorities = cryptomatorSettings.trustedHubAuthorities
+		authorities.remove(host)
+		cryptomatorSettings.trustedHubAuthorities = authorities
+	}
+
+	func clearAllHosts() {
+		cryptomatorSettings.trustedHubAuthorities = []
+	}
+}

Cryptomator/Settings/SettingsCoordinator.swift

@@ -49,6 +49,12 @@ class SettingsCoordinator: Coordinator {
 		navigationController.present(activityController, animated: true)
 	}
 
+	func showTrustedHubHosts() {
+		let viewModel = TrustedHubHostsViewModel()
+		let viewController = TrustedHubHostsViewController(viewModel: viewModel)
+		navigationController.pushViewController(viewController, animated: true)
+	}
+
 	func showCloudServices() {
 		let viewModel = ChooseCloudViewModel(clouds: [.dropbox, .googleDrive, .microsoftGraph(type: .oneDrive), .microsoftGraph(type: .sharePoint), .pCloud, .box, .webDAV(type: .custom), .s3(type: .custom)], headerTitle: "")
 		let chooseCloudVC = ChooseCloudViewController(viewModel: viewModel)

Cryptomator/Settings/SettingsViewController.swift

@@ -115,6 +115,8 @@ class SettingsViewController: StaticUITableViewController<SettingsSection> {
 			sendLogFile(sender: cell)
 		case .clearCache:
 			clearCache()
+		case .showTrustedHubHosts:
+			coordinator?.showTrustedHubHosts()
 		case .showCloudServices:
 			showCloudServices()
 		case .showContact:

Cryptomator/Settings/SettingsViewModel.swift

@@ -18,6 +18,7 @@ enum SettingsButtonAction: String {
 	case showAbout
 	case sendLogFile
 	case clearCache
+	case showTrustedHubHosts
 	case showCloudServices
 	case showContact
 	case showRateApp
@@ -32,6 +33,7 @@ enum SettingsSection: Int {
 	case unlockFullVersionSection = 0
 	case cloudServiceSection
 	case cacheSection
+	case hubSection
 	case aboutSection
 	case debugSection
 	case miscSection
@@ -72,6 +74,9 @@ class SettingsViewModel: TableViewModel<SettingsSection> {
 				cacheSizeCellViewModel,
 				clearCacheButtonCellViewModel
 			]),
+			Section(id: .hubSection, elements: [
+				ButtonCellViewModel.createDisclosureButton(action: SettingsButtonAction.showTrustedHubHosts, title: LocalizedString.getValue("settings.hub.trustedHosts"))
+			]),
 			Section(id: .aboutSection, elements: aboutSectionElements),
 			Section(id: .debugSection, elements: [
 				debugModeViewModel,

CryptomatorCommon/Sources/CryptomatorCommonCore/CryptomatorUserDefaults.swift

@@ -15,6 +15,7 @@ public protocol CryptomatorSettings {
 	var trialExpirationDate: Date? { get set }
 	var fullVersionUnlocked: Bool { get set }
 	var hasRunningSubscription: Bool { get set }
+	var trustedHubAuthorities: Set<String> { get set }
 	#if !ALWAYS_PREMIUM
 	var tenthAnniversaryBannerDismissed: Bool {
 		get set
@@ -118,6 +119,11 @@ extension CryptomatorUserDefaults: CryptomatorSettings {
 		set { write(value: newValue) }
 	}
 
+	public var trustedHubAuthorities: Set<String> {
+		get { Set(read() as [String]? ?? []) }
+		set { write(value: Array(newValue).sorted()) }
+	}
+
 	#if !ALWAYS_PREMIUM
 	public var tenthAnniversaryBannerDismissed: Bool {
 		get { read() ?? false }