Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Initial support for Cryptomator Hub #315

Merged
merged 51 commits into from
Nov 24, 2023
Merged

Initial support for Cryptomator Hub #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
1a607bb
Moved Coordinator to CryptomatorCommonCore
phil1995 Jul 22, 2022
39d53be
Preliminary commit to add support for Cryptomator hub
phil1995 Jul 23, 2022
3daea0d
Merge branch 'develop' into feature/hub-poc
tobihagemann Jan 19, 2023
3628095
Added associated domains
tobihagemann Mar 9, 2023
ccae88d
Merge branch 'develop' into feature/hub-poc
tobihagemann Mar 13, 2023
1ac8878
Increase minimum deployment target to iOS 14
phil1995 Mar 14, 2023
85b619c
Increase swift-tools-version to actually use iOS 14 as minimum deploy…
phil1995 Mar 14, 2023
a0ebdc0
First Cleanup
phil1995 Mar 14, 2023
761904b
Make ViewModel calls async
phil1995 Mar 14, 2023
650b956
Remove commented code
phil1995 Mar 14, 2023
55c13f3
Resolve todos related to missing errors
phil1995 Mar 15, 2023
ff282b2
Code cleanup
phil1995 Mar 15, 2023
1b3eb5d
Update deprecated Package.swift
phil1995 Mar 15, 2023
a0c100b
mainactor usage
phil1995 Mar 15, 2023
e4f7ace
Refactoring
phil1995 Apr 18, 2023
e74f5d5
Remove unused class
phil1995 Apr 18, 2023
f340f3f
Remove comment
phil1995 Apr 18, 2023
6c816e1
Fix SwiftLint errors
phil1995 Apr 18, 2023
05517b1
Design improvements
phil1995 May 21, 2023
cbd5d34
added device type
tobihagemann Jul 10, 2023
16c4017
changed redirect url to associated domain
tobihagemann Aug 22, 2023
dcc1c95
fixed unneeded_synthesized_initializer reported by swiftlint
tobihagemann Aug 22, 2023
d8b2893
reverted redirect url to custom scheme, removed associated domain
tobihagemann Sep 19, 2023
9198b1b
applied swiftformat
tobihagemann Sep 19, 2023
eb74a14
updated dependencies
tobihagemann Sep 21, 2023
3733c1a
Removed unused code
tobihagemann Sep 22, 2023
0adf8a7
Localized OpenExistingVaultCoordinator
tobihagemann Sep 22, 2023
eb2c8a6
Prefilled device name
tobihagemann Sep 22, 2023
35f5d5b
Localized HubAuthentication
tobihagemann Sep 22, 2023
443cc3b
Merge branch 'develop' into feature/hub-poc
tobihagemann Oct 11, 2023
fcc66c3
Merge branch 'develop' into feature/hub-poc
tobihagemann Oct 17, 2023
e8d87e8
Active Hub subscription unlocks full version for corresponding vault
phil1995 Oct 25, 2023
a9405be
Merge pull request #326 from cryptomator/feature/hub-poc-2
tobihagemann Oct 28, 2023
9921496
Updated hub authentication flow
phil1995 Nov 14, 2023
7fb8e04
Add unit tests for AddHubVaultUnlockHandler
phil1995 Nov 19, 2023
49cec82
Move FileProviderConnector to dependency values
phil1995 Nov 19, 2023
325491d
Moved CryptomatorHubAuthenticator related dependencies to DependencyV…
phil1995 Nov 19, 2023
c4d8470
Add HubAuthenticationViewModelTests
phil1995 Nov 19, 2023
a5696ac
Use Xcode 14.3.1
phil1995 Nov 19, 2023
467018f
Run swiftformat
tobihagemann Nov 21, 2023
3b28346
Use Xcode 15.0.1
tobihagemann Nov 21, 2023
27c9e27
Use iPhone 15 Pro
tobihagemann Nov 21, 2023
6c7b241
Removed unused localizations
tobihagemann Nov 21, 2023
575960f
Fix missing mocked value
phil1995 Nov 21, 2023
1f26529
Fixed test
tobihagemann Nov 22, 2023
f264019
Removed Xcode selection, use default
tobihagemann Nov 22, 2023
4bcc6a3
Change device
phil1995 Nov 22, 2023
b70cec2
Use structured concurrency for StoreObserverTests
phil1995 Nov 22, 2023
c228955
Decrease accuracy for trial started check
phil1995 Nov 22, 2023
1d749f7
Fix linter warning
phil1995 Nov 22, 2023
bb5824b
Merge pull request #329 from cryptomator/feature/hub-poc-3
tobihagemann Nov 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ on:
jobs:
build:
name: Build and test
runs-on: macos-12
runs-on: macos-13
env:
DERIVED_DATA_PATH: 'DerivedData'
DEVICE: 'iPhone 12 Pro'
DEVICE: 'iPhone 14 Pro'
if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
strategy:
matrix:
Expand Down
73 changes: 43 additions & 30 deletions Cryptomator.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

Loading