Skip to content

Commit 22081d2

Browse files
tobihagemanntobihagemann
committed
Merge branch 'release/2.3.0'
2 parents 74d302b + ebdd600 commit 22081d2

File tree

107 files changed

+2512
-101
lines changed

Some content is hidden

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

107 files changed

+2512
-101
lines changed

‎.crowdin.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,9 @@ commit_message: '[ci skip]'
22
files:
33
- source: /SharedResources/en.lproj/Localizable.strings
44
translation: /SharedResources/%osx_code%/%original_file_name%
5+
skip_untranslated_strings: false
6+
skip_untranslated_files: true
7+
- source: /CryptomatorIntents/en.lproj/Intents.strings
8+
translation: /CryptomatorIntents/%osx_code%/%original_file_name%
9+
skip_untranslated_strings: false
510
skip_untranslated_files: true

‎Cryptomator.xcodeproj/project.pbxproj

Lines changed: 268 additions & 3 deletions
Large diffs are not rendered by default.

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

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

‎Cryptomator.xcodeproj/xcshareddata/xcschemes/CryptomatorIntents.xcscheme

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1340"
4+
wasCreatedForAppExtension = "YES"
5+
version = "2.0">
6+
<BuildAction
7+
parallelizeBuildables = "YES"
8+
buildImplicitDependencies = "YES">
9+
<BuildActionEntries>
10+
<BuildActionEntry
11+
buildForTesting = "YES"
12+
buildForRunning = "YES"
13+
buildForProfiling = "YES"
14+
buildForArchiving = "YES"
15+
buildForAnalyzing = "YES">
16+
<BuildableReference
17+
BuildableIdentifier = "primary"
18+
BlueprintIdentifier = "4AD3D7D3282EBDE7008188CD"
19+
BuildableName = "CryptomatorIntents.appex"
20+
BlueprintName = "CryptomatorIntents"
21+
ReferencedContainer = "container:Cryptomator.xcodeproj">
22+
</BuildableReference>
23+
</BuildActionEntry>
24+
<BuildActionEntry
25+
buildForTesting = "YES"
26+
buildForRunning = "YES"
27+
buildForProfiling = "YES"
28+
buildForArchiving = "YES"
29+
buildForAnalyzing = "YES">
30+
<BuildableReference
31+
BuildableIdentifier = "primary"
32+
BlueprintIdentifier = "4AE97DA724572E4900452814"
33+
BuildableName = "Cryptomator.app"
34+
BlueprintName = "Cryptomator"
35+
ReferencedContainer = "container:Cryptomator.xcodeproj">
36+
</BuildableReference>
37+
</BuildActionEntry>
38+
</BuildActionEntries>
39+
</BuildAction>
40+
<TestAction
41+
buildConfiguration = "Debug"
42+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
43+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
44+
shouldUseLaunchSchemeArgsEnv = "YES">
45+
<Testables>
46+
</Testables>
47+
</TestAction>
48+
<LaunchAction
49+
buildConfiguration = "Debug"
50+
selectedDebuggerIdentifier = ""
51+
selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
52+
launchStyle = "0"
53+
askForAppToLaunch = "Yes"
54+
useCustomWorkingDirectory = "NO"
55+
ignoresPersistentStateOnLaunch = "NO"
56+
debugDocumentVersioning = "YES"
57+
debugServiceExtension = "internal"
58+
allowLocationSimulation = "YES"
59+
launchAutomaticallySubstyle = "2">
60+
<BuildableProductRunnable
61+
runnableDebuggingMode = "0">
62+
<BuildableReference
63+
BuildableIdentifier = "primary"
64+
BlueprintIdentifier = "4AE97DA724572E4900452814"
65+
BuildableName = "Cryptomator.app"
66+
BlueprintName = "Cryptomator"
67+
ReferencedContainer = "container:Cryptomator.xcodeproj">
68+
</BuildableReference>
69+
</BuildableProductRunnable>
70+
</LaunchAction>
71+
<ProfileAction
72+
buildConfiguration = "Release"
73+
shouldUseLaunchSchemeArgsEnv = "YES"
74+
savedToolIdentifier = ""
75+
useCustomWorkingDirectory = "NO"
76+
debugDocumentVersioning = "YES"
77+
askForAppToLaunch = "Yes"
78+
launchAutomaticallySubstyle = "2">
79+
<BuildableProductRunnable
80+
runnableDebuggingMode = "0">
81+
<BuildableReference
82+
BuildableIdentifier = "primary"
83+
BlueprintIdentifier = "4AE97DA724572E4900452814"
84+
BuildableName = "Cryptomator.app"
85+
BlueprintName = "Cryptomator"
86+
ReferencedContainer = "container:Cryptomator.xcodeproj">
87+
</BuildableReference>
88+
</BuildableProductRunnable>
89+
</ProfileAction>
90+
<AnalyzeAction
91+
buildConfiguration = "Debug">
92+
</AnalyzeAction>
93+
<ArchiveAction
94+
buildConfiguration = "Release"
95+
revealArchiveInOrganizer = "YES">
96+
</ArchiveAction>
97+
</Scheme>

‎Cryptomator/Info.plist

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,13 @@
5656
<key>NSAllowsArbitraryLoads</key>
5757
<true/>
5858
</dict>
59+
<key>NSFaceIDUsageDescription</key>
60+
<string>This lets you unlock your vault.</string>
61+
<key>NSUserActivityTypes</key>
62+
<array>
63+
<string>GetFolderIntent</string>
64+
<string>SaveFileIntent</string>
65+
</array>
5966
<key>UILaunchStoryboardName</key>
6067
<string>LaunchScreen</string>
6168
<key>UIRequiredDeviceCapabilities</key>
@@ -75,7 +82,5 @@
7582
<string>UIInterfaceOrientationLandscapeLeft</string>
7683
<string>UIInterfaceOrientationLandscapeRight</string>
7784
</array>
78-
<key>NSFaceIDUsageDescription</key>
79-
<string>This lets you unlock your vault.</string>
8085
</dict>
8186
</plist>

‎Cryptomator/Settings/SettingsCoordinator.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,12 @@ class SettingsCoordinator: Coordinator {
6969
}
7070
}
7171

72+
func openShortcutsGuide() {
73+
if let shortcutsGuideURL = URL(string: "https://docs.cryptomator.org/en/1.6/ios/shortcuts-guide/") {
74+
UIApplication.shared.open(shortcutsGuideURL)
75+
}
76+
}
77+
7278
func showUnlockFullVersion() {
7379
let child = SettingsPurchaseCoordinator(navigationController: navigationController)
7480
childCoordinators.append(child) // TODO: remove missing?

‎Cryptomator/Settings/SettingsViewController.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,8 @@ class SettingsViewController: StaticUITableViewController<SettingsSection> {
129129
viewModel.restorePurchase().then { [weak self] _ in
130130
self?.refreshRows()
131131
}
132+
case .showShortcutsGuide:
133+
coordinator?.openShortcutsGuide()
132134
case .none:
133135
break
134136
}

‎Cryptomator/Settings/SettingsViewModel.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ enum SettingsButtonAction: String {
2020
case showCloudServices
2121
case showContact
2222
case showRateApp
23+
case showShortcutsGuide
2324
case showUnlockFullVersion
2425
case showManageSubscriptions
2526
case restorePurchase
@@ -61,6 +62,7 @@ class SettingsViewModel: TableViewModel<SettingsSection> {
6162
ButtonCellViewModel<SettingsButtonAction>(action: .sendLogFile, title: LocalizedString.getValue("settings.sendLogFile"))
6263
]),
6364
Section(id: .miscSection, elements: [
65+
ButtonCellViewModel(action: SettingsButtonAction.showShortcutsGuide, title: LocalizedString.getValue("settings.shortcutsGuide")),
6466
ButtonCellViewModel(action: SettingsButtonAction.showContact, title: LocalizedString.getValue("settings.contact")),
6567
ButtonCellViewModel(action: SettingsButtonAction.showRateApp, title: LocalizedString.getValue("settings.rateApp"))
6668
])

‎CryptomatorCommon/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ let package = Package(
2626
)
2727
],
2828
dependencies: [
29-
.package(url: "https://github.com/cryptomator/cloud-access-swift.git", .upToNextMinor(from: "1.2.0")),
29+
.package(url: "https://github.com/cryptomator/cloud-access-swift.git", .upToNextMinor(from: "1.3.0")),
3030
.package(url: "https://github.com/CocoaLumberjack/CocoaLumberjack.git", .upToNextMinor(from: "3.7.0"))
3131
],
3232
targets: [

‎CryptomatorCommon/Sources/CryptomatorCommonCore/CryptomatorDatabase.swift

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ public class CryptomatorDatabase {
3434
}
3535

3636
static var migrator: DatabaseMigrator {
37-
CryptomatorDatabase.cleanupOldDatabase()
38-
3937
var migrator = DatabaseMigrator()
4038
migrator.registerMigration("v1") { db in
4139
try v1Migration(db)
@@ -187,19 +185,4 @@ public class CryptomatorDatabase {
187185
}
188186
}
189187
}
190-
191-
/**
192-
Removes the old shared database (prior 2.0.0-beta9).
193-
194-
The old shared database prior 2.0.0-beta9 does not support the new CloudProviderType with associated values for WebDAV and LocalFileSystem.
195-
Instead of simply nuking the existing database, we remove the old database (and change the path of the new database) as this also resolves issues when upgrading from an older testflight version to the release version.
196-
This function will be removed in the future.
197-
*/
198-
private static func cleanupOldDatabase() {
199-
#warning("TODO (after April 2022): Remove this function")
200-
guard let url = oldSharedDBURL else {
201-
return
202-
}
203-
try? FileManager.default.removeItem(at: url)
204-
}
205188
}

0 commit comments

Comments
 (0)