Skip to content

Commit 59d83fe

Browse files
tobihagemanntobihagemann
committed
Merge branch 'release/2.6.0'
2 parents f3de4e0 + b1335c5 commit 59d83fe

File tree

94 files changed

+1374
-397
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+1374
-397
lines changed

‎.github/workflows/build.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
name: Build
22

33
on:
4-
[push]
4+
push:
5+
pull_request_target:
6+
types: [labeled]
57

68
jobs:
79
build:

‎.swiftlint.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
disabled_rules:
22
- file_length
33
- line_length
4+
- redundant_void_return
45
- todo
56
- type_body_length
67

@@ -14,6 +15,9 @@ included:
1415
- FileProviderExtension
1516
- FileProviderExtensionUI
1617

18+
excluded:
19+
- CryptomatorCommon/.build
20+
1721
identifier_name:
1822
min_length: 1
1923
max_length: 50

‎Cryptomator.xcodeproj/project.pbxproj

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1013,6 +1013,10 @@
10131013
748BF20F2B571BB4006304AD /* fil */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fil; path = fil.lproj/Intents.strings; sourceTree = "<group>"; };
10141014
748BF2102B571C0C006304AD /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/Localizable.strings; sourceTree = "<group>"; };
10151015
748BF2112B571C11006304AD /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/Intents.strings; sourceTree = "<group>"; };
1016+
749D911D2C93089D00FAD1A4 /* sl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sl; path = sl.lproj/Localizable.strings; sourceTree = "<group>"; };
1017+
749D911E2C9308A700FAD1A4 /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/Localizable.strings; sourceTree = "<group>"; };
1018+
749D912C2C9308DD00FAD1A4 /* sl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sl; path = sl.lproj/Intents.strings; sourceTree = "<group>"; };
1019+
749D912D2C9308DE00FAD1A4 /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/Intents.strings; sourceTree = "<group>"; };
10161020
74A1B13D2726A9E60098224B /* hi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hi; path = hi.lproj/Localizable.strings; sourceTree = "<group>"; };
10171021
74AE94EF27A0282300D71AEC /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/Localizable.strings; sourceTree = "<group>"; };
10181022
74AE94F027A0283500D71AEC /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -2332,9 +2336,11 @@
23322336
ro,
23332337
ru,
23342338
sk,
2339+
sl,
23352340
sv,
23362341
"sw-TZ",
23372342
tr,
2343+
uk,
23382344
"zh-Hans",
23392345
"zh-Hant",
23402346
"zh-HK",
@@ -3090,9 +3096,11 @@
30903096
74275AE128478E0F0058AD25 /* ro */,
30913097
74275AE228478E100058AD25 /* ru */,
30923098
74275AE328478E120058AD25 /* sk */,
3099+
749D912C2C9308DD00FAD1A4 /* sl */,
30933100
74275AE628478E140058AD25 /* sv */,
30943101
74275AE528478E140058AD25 /* sw-TZ */,
30953102
74275AE728478E160058AD25 /* tr */,
3103+
749D912D2C9308DE00FAD1A4 /* uk */,
30963104
74275AD128478DFF0058AD25 /* zh-Hans */,
30973105
74275AD228478E000058AD25 /* zh-Hant */,
30983106
74275AD028478DFF0058AD25 /* zh-HK */,
@@ -3139,9 +3147,11 @@
31393147
74DFF9DA26DF87A0009981ED /* ro */,
31403148
74267A1626A5798C004C61BC /* ru */,
31413149
74267A1726A57990004C61BC /* sk */,
3150+
749D911D2C93089D00FAD1A4 /* sl */,
31423151
74267A1A26A5799A004C61BC /* sv */,
31433152
74397A852832A09B00CB9410 /* sw-TZ */,
31443153
74267A1C26A5799F004C61BC /* tr */,
3154+
749D911E2C9308A700FAD1A4 /* uk */,
31453155
74267A1D26A579A4004C61BC /* zh-Hans */,
31463156
74397A842832A05E00CB9410 /* zh-Hant */,
31473157
74626665283BD2D20070924B /* zh-HK */,
@@ -3310,7 +3320,7 @@
33103320
GCC_WARN_UNUSED_FUNCTION = YES;
33113321
GCC_WARN_UNUSED_VARIABLE = YES;
33123322
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
3313-
MARKETING_VERSION = 2.5.2;
3323+
MARKETING_VERSION = 2.6.0;
33143324
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
33153325
MTL_FAST_MATH = YES;
33163326
ONLY_ACTIVE_ARCH = YES;
@@ -3372,7 +3382,7 @@
33723382
GCC_WARN_UNUSED_FUNCTION = YES;
33733383
GCC_WARN_UNUSED_VARIABLE = YES;
33743384
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
3375-
MARKETING_VERSION = 2.5.2;
3385+
MARKETING_VERSION = 2.6.0;
33763386
MTL_ENABLE_DEBUG_INFO = NO;
33773387
MTL_FAST_MATH = YES;
33783388
OTHER_SWIFT_FLAGS = "-Xfrontend -warn-long-expression-type-checking=200 -Xfrontend -warn-long-function-bodies=200";

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

Lines changed: 29 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cryptomator/AddVault/AddVaultSuccessViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ private class VaultSuccessFooterView: UITableViewHeaderFooterView {
6868

6969
let text = NSMutableAttributedString(string: LocalizedString.getValue("addVault.success.footer"), attributes: [NSAttributedString.Key.foregroundColor: UIColor.secondaryLabel])
7070
text.append(NSAttributedString(string: " "))
71-
let learnMoreLink = NSAttributedString(string: LocalizedString.getValue("common.footer.learnMore"), attributes: [NSAttributedString.Key.link: URL(string: "https://docs.cryptomator.org/en/1.6/ios/access-vault/#enable-cryptomator-in-files-app")!])
71+
let learnMoreLink = NSAttributedString(string: LocalizedString.getValue("common.footer.learnMore"), attributes: [NSAttributedString.Key.link: URL(string: "https://docs.cryptomator.org/en/latest/ios/access-vault/#enable-cryptomator-in-files-app")!])
7272
text.append(learnMoreLink)
7373
textView.attributedText = text
7474
textView.isUserInteractionEnabled = true

‎Cryptomator/AddVault/CreateNewVault/CreateNewVaultCoordinator.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class CreateNewVaultCoordinator: AccountListing, CloudChoosing, DefaultShowEditA
2424
}
2525

2626
func start() {
27-
let viewModel = ChooseCloudViewModel(clouds: [.localFileSystem(type: .iCloudDrive), .dropbox, .googleDrive, .oneDrive, .pCloud, .webDAV(type: .custom), .s3(type: .custom), .localFileSystem(type: .custom)], headerTitle: LocalizedString.getValue("addVault.createNewVault.chooseCloud.header"))
27+
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"))
2828
let chooseCloudVC = ChooseCloudViewController(viewModel: viewModel)
2929
chooseCloudVC.title = LocalizedString.getValue("addVault.createNewVault.title")
3030
chooseCloudVC.coordinator = self

‎Cryptomator/AddVault/LocalVault/LocalFileSystemAuthenticationViewModel.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ class LocalFileSystemAuthenticationInfoFooterViewModel: AttributedTextHeaderFoot
132132
let infoText = LocalizedString.getValue("localFileSystemAuthentication.info.footer")
133133
let text = NSMutableAttributedString(string: infoText)
134134
text.append(NSAttributedString(string: " "))
135-
let learnMoreLink = NSAttributedString(string: LocalizedString.getValue("common.footer.learnMore"), attributes: [NSAttributedString.Key.link: URL(string: "https://docs.cryptomator.org/en/1.6/ios/cloud-management/#other-file-provider")!])
135+
let learnMoreLink = NSAttributedString(string: LocalizedString.getValue("common.footer.learnMore"), attributes: [NSAttributedString.Key.link: URL(string: "https://docs.cryptomator.org/en/latest/ios/cloud-management/#other-file-provider")!])
136136
text.append(learnMoreLink)
137137
super.init(attributedText: text)
138138
}

‎Cryptomator/AddVault/OpenExistingVault/OpenExistingVaultCoordinator.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class OpenExistingVaultCoordinator: AccountListing, CloudChoosing, DefaultShowEd
2525
}
2626

2727
func start() {
28-
let viewModel = ChooseCloudViewModel(clouds: [.localFileSystem(type: .iCloudDrive), .dropbox, .googleDrive, .oneDrive, .pCloud, .webDAV(type: .custom), .s3(type: .custom), .localFileSystem(type: .custom)], headerTitle: LocalizedString.getValue("addVault.openExistingVault.chooseCloud.header"))
28+
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"))
2929
let chooseCloudVC = ChooseCloudViewController(viewModel: viewModel)
3030
chooseCloudVC.title = LocalizedString.getValue("addVault.openExistingVault.title")
3131
chooseCloudVC.coordinator = self

‎Cryptomator/AppDelegate.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
4949
DDLogError("Setting up OneDrive failed with error: \(error)")
5050
}
5151
PCloudSetup.constants = PCloudSetup(appKey: CloudAccessSecrets.pCloudAppKey, sharedContainerIdentifier: nil)
52+
BoxSetup.constants = BoxSetup(clientId: CloudAccessSecrets.boxClientId, clientSecret: CloudAccessSecrets.boxClientSecret, sharedContainerIdentifier: nil)
5253

5354
// Set up payment queue
5455
SKPaymentQueue.default().add(StoreObserver.shared)

‎Cryptomator/Common/CloudAccountList/AccountListViewController.swift

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@
66
// Copyright © 2021 Skymatic GmbH. All rights reserved.
77
//
88

9+
import AuthenticationServices
10+
import CocoaLumberjackSwift
911
import CryptomatorCommon
1012
import CryptomatorCommonCore
1113
import Foundation
1214
import Promises
1315
import UIKit
1416

15-
class AccountListViewController: ListViewController<AccountCellContent> {
17+
class AccountListViewController: ListViewController<AccountCellContent>, ASWebAuthenticationPresentationContextProviding {
1618
weak var coordinator: (Coordinator & AccountListing)?
1719
private let viewModel: AccountListViewModelProtocol
1820

@@ -103,6 +105,16 @@ class AccountListViewController: ListViewController<AccountCellContent> {
103105
}
104106
}
105107

108+
// MARK: - ASWebAuthenticationPresentationContextProviding
109+
110+
func presentationAnchor(for session: ASWebAuthenticationSession) -> ASPresentationAnchor {
111+
guard let window = UIApplication.shared.windows.first else {
112+
DDLogInfo("No window could be found as presentation anchor.")
113+
return ASPresentationAnchor()
114+
}
115+
return window
116+
}
117+
106118
// MARK: - Internal
107119

108120
private func handleLogout(_ sender: AccountCellButton) {
@@ -130,7 +142,7 @@ class AccountListViewController: ListViewController<AccountCellContent> {
130142

131143
private func supportsEditing(_ cloudProviderType: CloudProviderType) -> Bool {
132144
switch cloudProviderType {
133-
case .dropbox, .googleDrive, .localFileSystem, .oneDrive, .pCloud:
145+
case .box, .dropbox, .googleDrive, .localFileSystem, .oneDrive, .pCloud:
134146
return false
135147
case .s3, .webDAV:
136148
return true

‎Cryptomator/Common/CloudAccountList/AccountListViewModel.swift

Lines changed: 34 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -66,46 +66,55 @@ class AccountListViewModel: AccountListViewModelProtocol {
6666
}
6767
}
6868

69+
func refreshBoxItems() -> Promise<Void> {
70+
return all(accountInfos
71+
.map { BoxCredential(tokenStorage: BoxTokenStorage(userID: $0.accountUID)) }
72+
.map { self.createAccountCellContent(for: $0) }
73+
).then { accounts in
74+
self.accounts = accounts
75+
}
76+
}
77+
6978
func createAccountCellContent(from accountInfo: AccountInfo) throws -> AccountCellContent {
7079
switch cloudProviderType {
80+
case .box:
81+
return createAccountCellContentPlaceholder()
7182
case .dropbox:
72-
let credential = DropboxCredential(tokenUID: accountInfo.accountUID)
73-
return createAccountCellContentPlaceholder(for: credential)
83+
return createAccountCellContentPlaceholder()
7484
case .googleDrive:
7585
let credential = GoogleDriveCredential(userID: accountInfo.accountUID)
7686
return try createAccountCellContent(for: credential)
87+
case .localFileSystem:
88+
throw AccountListError.unsupportedCloudProviderType
7789
case .oneDrive:
7890
let credential = try OneDriveCredential(with: accountInfo.accountUID)
7991
return try createAccountCellContent(for: credential)
8092
case .pCloud:
81-
let credential = try PCloudCredential(userID: accountInfo.accountUID)
82-
return createAccountCellContentPlaceholder(for: credential)
83-
case .webDAV:
84-
guard let credential = WebDAVCredentialManager.shared.getCredentialFromKeychain(with: accountInfo.accountUID) else {
85-
throw CloudProviderAccountError.accountNotFoundError
86-
}
87-
return createAccountCellContent(for: credential)
88-
case .localFileSystem:
89-
throw AccountListError.unsupportedCloudProviderType
93+
return createAccountCellContentPlaceholder()
9094
case .s3:
9195
guard let credential = S3CredentialManager.shared.getCredential(with: accountInfo.accountUID) else {
9296
throw CloudProviderAccountError.accountNotFoundError
9397
}
9498
let displayName = try S3CredentialManager.shared.getDisplayName(for: credential)
9599
return createAccountCellContent(for: credential, displayName: displayName)
100+
case .webDAV:
101+
guard let credential = WebDAVCredentialManager.shared.getCredentialFromKeychain(with: accountInfo.accountUID) else {
102+
throw CloudProviderAccountError.accountNotFoundError
103+
}
104+
return createAccountCellContent(for: credential)
96105
}
97106
}
98107

108+
private func createAccountCellContentPlaceholder() -> AccountCellContent {
109+
return AccountCellContent(mainLabelText: "(…)", detailLabelText: nil)
110+
}
111+
99112
private func createAccountCellContent(for credential: DropboxCredential) -> Promise<AccountCellContent> {
100113
return credential.getUsername().then { username in
101114
AccountCellContent(mainLabelText: username, detailLabelText: nil)
102115
}
103116
}
104117

105-
private func createAccountCellContentPlaceholder(for credential: DropboxCredential) -> AccountCellContent {
106-
return AccountCellContent(mainLabelText: "(…)", detailLabelText: nil)
107-
}
108-
109118
private func createAccountCellContent(for credential: GoogleDriveCredential) throws -> AccountCellContent {
110119
let username = try credential.getUsername()
111120
return AccountCellContent(mainLabelText: username, detailLabelText: nil)
@@ -122,8 +131,10 @@ class AccountListViewModel: AccountListViewModelProtocol {
122131
}
123132
}
124133

125-
private func createAccountCellContentPlaceholder(for credential: PCloudCredential) -> AccountCellContent {
126-
return AccountCellContent(mainLabelText: "(…)", detailLabelText: nil)
134+
func createAccountCellContent(for credential: BoxCredential) -> Promise<AccountCellContent> {
135+
return credential.getUsername().then { username in
136+
AccountCellContent(mainLabelText: username, detailLabelText: nil)
137+
}
127138
}
128139

129140
func createAccountCellContent(for credential: WebDAVCredential) -> AccountCellContent {
@@ -203,6 +214,12 @@ class AccountListViewModel: AccountListViewModelProtocol {
203214
}.catch { error in
204215
self.databaseChangedPublisher.send(.failure(error))
205216
}
217+
} else if self.cloudProviderType == .box {
218+
self.refreshBoxItems().then {
219+
self.databaseChangedPublisher.send(.success(self.accounts))
220+
}.catch { error in
221+
self.databaseChangedPublisher.send(.failure(error))
222+
}
206223
}
207224
})
208225
return databaseChangedPublisher.eraseToAnyPublisher()

0 commit comments

Comments
 (0)