Merge branch 'release/2.7.0'

Author: tobihagemann

.github/CONTRIBUTING.md

@@ -14,6 +14,10 @@
 
 - Suggest your change by [submitting a new issue](https://github.com/cryptomator/ios/issues/new/choose) and start writing code.
 
+## Do you intend to add a new translation or change an existing one?
+
+Translations are not managed directly in this repository. Instead, we use [Crowdin](https://translate.cryptomator.org/), which automatically synchronizes translations with this repository. If you want to help us with translations, please visit our translation project on Crowdin.
+
 ## Code of Conduct
 
 Help us keep Cryptomator open and inclusive. Please read and follow our [Code of Conduct](CODE_OF_CONDUCT.md).

.github/ISSUE_TEMPLATE/bug.yml

@@ -1,7 +1,14 @@
 name: Bug Report
 description: Create a report to help us improve
-labels: ["type:bug"]
+type: "Bug"
 body:
+  - type: input
+    id: summary
+    attributes:
+      label: Summary
+      placeholder: Please summarize your problem.
+    validations:
+      required: true
   - type: checkboxes
     id: terms
     attributes:
@@ -11,13 +18,6 @@ body:
         required: true
       - label: I agree to follow this project's [Code of Conduct](https://github.com/cryptomator/ios/blob/develop/.github/CODE_OF_CONDUCT.md)
         required: true
-  - type: input
-    id: summary
-    attributes:
-      label: Summary
-      placeholder: Please summarize your problem.
-    validations:
-      required: true
   - type: textarea
     id: software-versions
     attributes:

.github/ISSUE_TEMPLATE/feature.yml

@@ -1,7 +1,14 @@
 name: Feature Request
 description: Suggest an idea for this project
-labels: ["type:feature-request"]
+type: "Feature"
 body:
+  - type: input
+    id: summary
+    attributes:
+      label: Summary
+      placeholder: Please summarize your feature request.
+    validations:
+      required: true
   - type: checkboxes
     id: terms
     attributes:
@@ -11,13 +18,6 @@ body:
         required: true
       - label: I agree to follow this project's [Code of Conduct](https://github.com/cryptomator/ios/blob/develop/.github/CODE_OF_CONDUCT.md)
         required: true
-  - type: input
-    id: summary
-    attributes:
-      label: Summary
-      placeholder: Please summarize your feature request.
-    validations:
-      required: true
   - type: textarea
     id: motivation
     attributes:

Cryptomator.xcodeproj/project.pbxproj

@@ -26,6 +26,7 @@ class CloudCell: UITableViewCell {
 	func configure(with cloudProviderType: CloudProviderType) {
 		imageView?.image = UIImage(storageIconFor: cloudProviderType)
 		textLabel?.text = cloudProviderType.localizedString()
+		detailTextLabel?.text = cloudProviderType.localizedSecondaryString()
 	}
 
 	@available(iOS 14, *)
@@ -36,6 +37,7 @@ class CloudCell: UITableViewCell {
 		var content = defaultContentConfiguration().updated(for: state)
 		content.image = UIImage(storageIconFor: cloudProviderType)
 		content.text = cloudProviderType.localizedString()
+		content.secondaryText = cloudProviderType.localizedSecondaryString()
 		contentConfiguration = content
 	}
 }

Cryptomator.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -72,6 +72,8 @@ private class CreateNewVaultChooseFolderViewModelMock: ChooseFolderViewModelProt
 	}
 
 	func refreshItems() {}
+
+	func addItem(_ item: CloudItemMetadata) {}
 }
 
 struct CreateNewVaultChooseFolderVCPreview: PreviewProvider {

Cryptomator/AddVault/CloudCell.swift

@@ -24,7 +24,7 @@ class CreateNewVaultCoordinator: AccountListing, CloudChoosing, DefaultShowEditA
 	}
 
 	func start() {
-		let viewModel = ChooseCloudViewModel(clouds: [.localFileSystem(type: .iCloudDrive), .dropbox, .googleDrive, .oneDrive, .pCloud, .box, .webDAV(type: .custom), .s3(type: .custom), .localFileSystem(type: .custom)], headerTitle: LocalizedString.getValue("addVault.createNewVault.chooseCloud.header"))
+		let viewModel = ChooseCloudViewModel(clouds: [.localFileSystem(type: .iCloudDrive), .dropbox, .googleDrive, .microsoftGraph(type: .oneDrive), .microsoftGraph(type: .sharePoint), .pCloud, .box, .webDAV(type: .custom), .s3(type: .custom), .localFileSystem(type: .custom)], headerTitle: LocalizedString.getValue("addVault.createNewVault.chooseCloud.header"))
 		let chooseCloudVC = ChooseCloudViewController(viewModel: viewModel)
 		chooseCloudVC.title = LocalizedString.getValue("addVault.createNewVault.title")
 		chooseCloudVC.coordinator = self
@@ -47,6 +47,11 @@ class CreateNewVaultCoordinator: AccountListing, CloudChoosing, DefaultShowEditA
 		authenticator.authenticate(cloudProviderType, from: viewController).then { account in
 			let provider = try CloudProviderDBManager.shared.getProvider(with: account.accountUID)
 			self.startFolderChooser(with: provider, account: account)
+		}.catch { error in
+			guard case CocoaError.userCancelled = error else {
+				self.handleError(error, for: self.navigationController)
+				return
+			}
 		}
 	}
 
@@ -135,10 +140,11 @@ private class AuthenticatedCreateNewVaultCoordinator: FolderChoosing, VaultInsta
 		navigationController.pushViewController(passwordVC, animated: true)
 	}
 
-	func showCreateNewFolder(parentPath: CloudPath) {
+	func showCreateNewFolder(parentPath: CloudPath, delegate: ChooseFolderViewModelProtocol?) {
 		let modalNavigationController = BaseNavigationController()
 		let child = AuthenticatedFolderCreationCoordinator(navigationController: modalNavigationController, provider: provider, parentPath: parentPath)
 		child.parentCoordinator = self
+		child.delegate = delegate
 		childCoordinators.append(child)
 		navigationController.topViewController?.present(modalNavigationController, animated: true)
 		child.start()
@@ -163,6 +169,7 @@ private class AuthenticatedCreateNewVaultCoordinator: FolderChoosing, VaultInsta
 
 class AuthenticatedFolderCreationCoordinator: FolderCreating, ChildCoordinator {
 	weak var parentCoordinator: Coordinator?
+	weak var delegate: ChooseFolderViewModelProtocol?
 	var childCoordinators = [Coordinator]()
 	var navigationController: UINavigationController
 	private let provider: CloudProvider
@@ -183,6 +190,7 @@ class AuthenticatedFolderCreationCoordinator: FolderCreating, ChildCoordinator {
 
 	func createdNewFolder(at folderPath: CloudPath) {
 		navigationController.dismiss(animated: true)
+		delegate?.addItem(CloudItemMetadata(name: folderPath.lastPathComponent, cloudPath: folderPath, itemType: .folder, lastModifiedDate: nil, size: nil))
 		if let folderChoosingParentCoordinator = parentCoordinator as? FolderChoosing {
 			folderChoosingParentCoordinator.showItems(for: folderPath)
 		}

Cryptomator/AddVault/CreateNewVault/CreateNewVaultChooseFolderViewController.swift

@@ -102,6 +102,8 @@ private class OpenExistingVaultChooseFolderViewModelMock: ChooseFolderViewModelP
 	}
 
 	func refreshItems() {}
+
+	func addItem(_ item: CloudItemMetadata) {}
 }
 
 struct OpenExistingVaultChooseFolderVCPreview: PreviewProvider {

Cryptomator/AddVault/CreateNewVault/CreateNewVaultCoordinator.swift

@@ -25,7 +25,7 @@ class OpenExistingVaultCoordinator: AccountListing, CloudChoosing, DefaultShowEd
 	}
 
 	func start() {
-		let viewModel = ChooseCloudViewModel(clouds: [.localFileSystem(type: .iCloudDrive), .dropbox, .googleDrive, .oneDrive, .pCloud, .box, .webDAV(type: .custom), .s3(type: .custom), .localFileSystem(type: .custom)], headerTitle: LocalizedString.getValue("addVault.openExistingVault.chooseCloud.header"))
+		let viewModel = ChooseCloudViewModel(clouds: [.localFileSystem(type: .iCloudDrive), .dropbox, .googleDrive, .microsoftGraph(type: .oneDrive), .microsoftGraph(type: .sharePoint), .pCloud, .box, .webDAV(type: .custom), .s3(type: .custom), .localFileSystem(type: .custom)], headerTitle: LocalizedString.getValue("addVault.openExistingVault.chooseCloud.header"))
 		let chooseCloudVC = ChooseCloudViewController(viewModel: viewModel)
 		chooseCloudVC.title = LocalizedString.getValue("addVault.openExistingVault.title")
 		chooseCloudVC.coordinator = self
@@ -48,6 +48,11 @@ class OpenExistingVaultCoordinator: AccountListing, CloudChoosing, DefaultShowEd
 		authenticator.authenticate(cloudProviderType, from: viewController).then { account in
 			let provider = try CloudProviderDBManager.shared.getProvider(with: account.accountUID)
 			self.startFolderChooser(with: provider, account: account)
+		}.catch { error in
+			guard case CocoaError.userCancelled = error else {
+				self.handleError(error, for: self.navigationController)
+				return
+			}
 		}
 	}
 
@@ -208,7 +213,7 @@ private class AuthenticatedOpenExistingVaultCoordinator: VaultInstalling, Folder
 		child.start()
 	}
 
-	func showCreateNewFolder(parentPath: CloudPath) {}
+	func showCreateNewFolder(parentPath: CloudPath, delegate: ChooseFolderViewModelProtocol?) {}
 
 	func handleError(error: Error) {
 		navigationController.popViewController(animated: true)