mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-17 02:01:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,615 Commits 36 Branches 214 Tags
9bb24320bf5619c5e48ffd7c00e96f82086c19d0
Commit Graph

4615 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
JaniruTEC
9bb24320bf Stopped user from mounting to vaults to the same path 2023-07-24 18:53:19 +02:00
JaniruTEC
59d89faf38 Turned calls to "assumeTrue" into guard functions 
See: https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1270734307
 2023-07-21 16:48:33 +02:00
JaniruTEC
8f67404766 Fixed method violating API contract 
See: https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1269458822
 2023-07-21 15:35:56 +02:00
JaniruTEC
1942850888 Replaced OS-Check with Assumptions 
See: https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1269461956
 2023-07-20 16:44:49 +02:00
JaniruTEC
821cc0940d Stopped wrapping IOEs as UncheckedIOEs 
See:
https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1269444937
https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1269445672
https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1269445894
 2023-07-20 16:34:51 +02:00
JaniruTEC
419a7ab245 Fixed faulty unit test 2023-07-19 23:53:58 +02:00
JaniruTEC
a29ebfd302 Updated error message 2023-07-19 23:39:11 +02:00
JaniruTEC
73da954355 Merge branch 'feature/3001-more-error-messages' into feature/2856-folder-mounts-win 
# Conflicts:
# src/main/java/org/cryptomator/common/mount/MountWithinParentUtil.java
# src/main/resources/i18n/strings.properties
 2023-07-19 23:38:20 +02:00
JaniruTEC
879e6dcab7 Updated error message 
See: https://github.com/cryptomator/cryptomator/pull/3001#discussion_r1268035540
 2023-07-19 16:10:48 +02:00
JaniruTEC
f9f8a6b357 Added unit tests for MountWithinParentUtil 2023-07-19 15:39:14 +02:00
JaniruTEC
3ea6da3c6d Fixed thrown exception 2023-07-19 15:36:23 +02:00
JaniruTEC
bb0b1b3592 Cleaned up merge 2023-07-19 15:36:22 +02:00
JaniruTEC
0b6782d44b Refactored error message to use ObservableValues 2023-07-18 20:11:24 +02:00
JaniruTEC
ed6f1ad8d1 Merge branch 'feature/3001-more-error-messages' into feature/2856-folder-mounts-win 
# Conflicts:
#	src/main/java/org/cryptomator/common/mount/MountWithinParentUtil.java
 2023-07-14 23:05:48 +02:00
JaniruTEC
c3ac043c68 Removed MountPointPreparationException 
See: https://github.com/cryptomator/cryptomator/pull/3001#discussion_r1263572178
 2023-07-14 21:13:11 +02:00
JaniruTEC
a90e75ceba Renamed exceptions 
See: https://github.com/cryptomator/cryptomator/pull/3001#discussion_r1263563166
 2023-07-14 15:09:36 +02:00
JaniruTEC
aa2e63acb0 Added @PropertyKey 
See: https://github.com/cryptomator/cryptomator/pull/3001#discussion_r1263039593
 2023-07-14 14:58:56 +02:00
JaniruTEC
a259d554fa Removed unused import 
See: https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1263556873
 2023-07-14 14:53:00 +02:00
JaniruTEC
f5e035fa3b Applied suggestions from code review 
Updated log message
Replaced caught exception

See: https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1262297316
https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1262298832
 2023-07-13 15:22:21 +02:00
JaniruTEC
96ebb67085 Applied suggestions from code review 
See: https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1260955250
 2023-07-12 19:17:37 +02:00
JaniruTEC
614756c740 Added message for HideawayAlreadyExistsException 2023-07-11 22:35:08 +02:00
JaniruTEC
2a9d1e3fba Added messages for MountPointCouldNotBeClearedException and MountPointNotEmptyDirectoryException 2023-07-11 22:33:27 +02:00
JaniruTEC
9361a75cd8 Refactored UnlockInvalidMountPointController to use improved Exceptions 2023-07-11 21:53:18 +02:00
JaniruTEC
becc5e316a Made interaction between Unlock logic & UI more consistent 2023-07-11 21:53:18 +02:00
JaniruTEC
08a1e1ec7d Added/Refactored exceptions to account for more cases 2023-07-11 21:53:18 +02:00
JaniruTEC
12f5f41968 Redefined IllegalMountPointException and MountPointPreparationException 2023-07-11 21:53:18 +02:00
JaniruTEC
58c7774e0d Added arg3 to FormattedLabel 2023-07-11 21:50:52 +02:00
JaniruTEC
5e2e8c35d5 Added cleanup of junctions on Win 2023-07-10 17:38:30 +02:00
JaniruTEC
328f2f89a8 Removed unnecessary checks 2023-07-10 16:01:39 +02:00
JaniruTEC
92b77baf40 Improved handling of existing hideaways 2023-07-10 15:58:38 +02:00
JaniruTEC
e484813233 Added check for deletion of hideaway 2023-07-07 16:19:16 +02:00
JaniruTEC
c30c90d2c3 Merge pull request #2985 from cryptomator/feature/2981-differ-options-preferences 
Fix 2981
 2023-07-05 16:27:55 +02:00
JaniruTEC
91de0c1813 Added called to #showMainWindow 
See: https://github.com/cryptomator/cryptomator/pull/2985#discussion_r1252863161
 2023-07-05 15:50:35 +02:00
JaniruTEC
a3c953d437 Refactored decision model 
See: https://github.com/cryptomator/cryptomator/pull/2985#pullrequestreview-1514141146
 2023-07-05 15:49:43 +02:00
JaniruTEC
743da019f9 Cleaned up UnlockInvalidMountPointController 
See:
https://github.com/cryptomator/cryptomator/pull/2985#discussion_r1252868655
https://github.com/cryptomator/cryptomator/pull/2985#discussion_r1252874468
 2023-07-05 15:26:19 +02:00
Armin Schrenk
2c984ad405 use system property path.separator and fix failing unit test on windows 2023-07-04 16:31:28 +02:00
JaniruTEC
171b0e61ad Finished implementation 2023-07-04 16:14:08 +02:00
JaniruTEC
e5047c242c Moved subcomponent-bindings 
Moved bindings for VaultOptionsComponent and HealthCheckComponent from MainWindowModule to FxApplicationModule
 2023-07-04 15:35:23 +02:00
JaniruTEC
131145e8b8 Merge branch 'develop' into feature/2981-differ-options-preferences 2023-07-04 14:00:44 +02:00
JaniruTEC
11a0136cb9 Fixed run configurations 
See: #2982
 2023-07-04 13:55:42 +02:00
Armin Schrenk
e92b80bdf4 fix local win build script to download jfxmods 2023-07-04 12:42:55 +02:00
Armin Schrenk
9d81b2312f fix local build script to parse two digit verison nums correctly 2023-07-04 12:41:58 +02:00
Armin Schrenk
511dbe355a Fixes #2982 2023-07-04 12:41:06 +02:00
JaniruTEC
cca6d475b3 Updated UI 2023-07-03 21:14:12 +02:00
JaniruTEC
88c6246ceb Prepared UnlockInvalidMountPointController for new feature 2023-07-03 21:08:49 +02:00
Armin Schrenk
168b9ef096 changed default folder mount location on macOS 2023-07-03 13:11:38 +02:00
Sebastian Stenzel
6c8005e1b2 use github.ref instead of inputs.ref 
[ci skip]
 2023-07-03 10:59:32 +02:00
Sebastian Stenzel
ed8457ff36 remove dead test 2023-06-30 13:53:25 +02:00
Sebastian Stenzel
a50bc8e05c reduce api surface 2023-06-30 13:53:06 +02:00
Sebastian Stenzel
e382a3bab9 make settings' fields public, remove accessor methods 2023-06-30 13:52:15 +02:00