mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-17 10:11:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,384 Commits 36 Branches 214 Tags
ab538cd21573de70aa7d100382a8a70c25eeccaf
Commit Graph

2384 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
JaniruTEC
ab538cd215 Fixed bug: Dropped MPCs if priorities were equal 
Fixed bug that caused MPCs with equal priorities to be dropped (even if they weren't equal).
Added additional criteria (hashCode) for cases were priorities are equal.

See the docs of ImmutableSortedSet for further information.
 2020-10-06 19:40:03 +02:00
JaniruTEC
354de225ed Reverted changes to WebDavVolume#getMountPoint() 
See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472888268
 2020-09-30 14:09:01 +02:00
JaniruTEC
9657a13912 Updated MPCModule to return a SortedSet and switched collector 
See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r474452898
 2020-09-28 23:34:47 +02:00
JaniruTEC
d5b8996a39 Fixed violation of method contract 
See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472857043
 2020-09-11 22:23:48 +02:00
JaniruTEC
f012977aac Fixed spelling 
See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472825411
 2020-09-11 21:47:30 +02:00
JaniruTEC
8680bd1dee Updated MountPointChooserModule and MPCs 
Updated MountPointChooserModule and MPCs to use bindings (@'Binds) instead of providers (@'Provides)
Updated CustomDriveLetterChooser and TemporaryMountPointChooser  to use VaultSettings instead of Vaults

See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472872166
 2020-09-07 22:25:01 +02:00
JaniruTEC
528510eb53 Renamed binding fuseAndWindows to restrictToStableFuseOnWindows 
Renamed binding fuseAndWindows to restrictToStableFuseOnWindows in MountOptionsController

See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r477135521
 2020-09-07 22:24:59 +02:00
JaniruTEC
cdbcd20241 Fixed faulty access introduced by parallel release of 1.5.8 2020-09-05 22:15:02 +02:00
JaniruTEC
fef3ade5c6 Merge branch 'develop' into feature/fuse-on-win 
Fixed conflicts in WebDavVolume
 2020-09-04 22:28:53 +02:00
Tobias Hagemann
194d7f0da9 Merge branch 'hotfix/1.5.8' into develop 2020-08-28 16:01:35 +02:00
Tobias Hagemann
f891a9f1a7 refactored that fix from 2a335eb7af 2020-08-28 14:25:26 +02:00
Tobias Hagemann
2a335eb7af fixed test 2020-08-28 14:06:09 +02:00
Tobias Hagemann
6578ac0121 use mountName in FUSE on macOS instead of displayName 2020-08-28 13:55:17 +02:00
Tobias Hagemann
83f9514a42 fixed icon views of labels in new password screen that could only appear once 
(cherry picked from commit 4723416d45)
 2020-08-28 13:41:43 +02:00
Tobias Hagemann
c92f1aa655 updated third-party licenses 2020-08-28 13:34:41 +02:00
Tobias Hagemann
688993ba37 preparing 1.5.8 2020-08-28 12:58:50 +02:00
Armin Schrenk
ddfc8d5bc3 Merge branch 'feature/#1289-introduceVaultname' into hotfix/1.5.8 2020-08-28 11:59:56 +02:00
Armin Schrenk
c3141e3601 minor adjustments 2020-08-28 11:58:46 +02:00
Armin Schrenk
f49974180b Fixing test 2020-08-28 11:19:56 +02:00
Armin Schrenk
eb6ade49f6 refactor to use parameterized test 2020-08-27 16:18:20 +02:00
Armin Schrenk
6553c04256 add code to migrate legacy settings.json files to new property. 2020-08-27 15:53:20 +02:00
Armin Schrenk
a8cb015a06 rename property and getters in vault class for display name. 2020-08-27 15:52:16 +02:00
Sebastian Stenzel
ce06ddf312 updated webdav dependencies 
(cherry picked from commit 8c4d35d3db)
 2020-08-26 12:51:28 +02:00
Armin Schrenk
fee2d4bc0c Merge pull request #1311 from cryptomator/feature/alternativeAutostartWin 
Feature/alternative autostart win
 2020-08-26 11:44:37 +02:00
Armin Schrenk
a2a990bd0c Correct spelling 2020-08-26 11:36:46 +02:00
Armin Schrenk
cedbe6523d Merge pull request #1294 from purejava/access-kde-wallets 
This adds the missing part to linux system keychain access: use KDE wallets
 2020-08-26 10:03:55 +02:00
JaniruTEC
ec64055d93 Renamed property "position" (defined by MPC) to "priority" 2020-08-21 22:41:15 +02:00
JaniruTEC
6f542ac8b8 Replaced "assert" with IllegalStateException 2020-08-21 21:57:12 +02:00
Ralph Plawetzki
8a3c101764 Merge remote branch 'cryptomator/develop' into access-kde-wallets 2020-08-21 19:30:46 +02:00
infeo
49a8689090 Remove legacy concepts: 
* in vaultSettings, displayName does not listen on path
* the caller/creater of vault settings must set the name explicitly
* add localizable default vault name
 2020-08-21 13:30:05 +02:00
infeo
8f5c4997b1 closes #1300 2020-08-21 11:32:51 +02:00
infeo
900fdd7f6f minor changes 
* removing unused imports
* exchanging addListener() by Easybind.subscribe()
 2020-08-21 11:17:55 +02:00
Tobias Hagemann
4723416d45 fixed icon views of labels in new password screen that could only appear once 2020-08-21 10:13:45 +02:00
JaniruTEC
8483f71f57 Refactored CustomMountPointChooser 
See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472832435
 2020-08-21 00:55:33 +02:00
JaniruTEC
5dac594cc9 Removed Phasesystem, specified docs, removed default #isApplicable() 
See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472835069 https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472839837 https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472820689 https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472872901
 2020-08-21 00:00:13 +02:00
infeo
06f4e160d6 Migrate to easybind fork 2020-08-20 21:25:54 +02:00
infeo
1d38ee2fcb Further improvements: 
* corrected bad english
* improved documentation
* restricted visibility of specific exception
 2020-08-20 13:49:31 +02:00
Sebastian Stenzel
921b70ebaa updated webdav dependencies 
(cherry picked from commit 8c4d35d3db)
 2020-08-20 13:38:40 +02:00
infeo
0f56d424da Refactored AutoStartStrategy: 
* prevented on best effort basis inconsistent states
* extracted the registry setting as an own strategy (by methods)
* refactored the overriden methods to call the strategies (registry or folder) depending on the different variables
* removed Powershell specific ToggleException
* added documentation
 2020-08-20 12:18:57 +02:00
JaniruTEC
4cd43a2b1c Merge branch 'develop' into feature/fuse-on-win 2020-08-19 15:53:26 +02:00
JaniruTEC
1ef359e68b Added messages to rethrown IOExceptions 2020-08-19 15:47:09 +02:00
JaniruTEC
58ce1e45b8 Updated Codestyle to not use any arrangements 2020-08-19 15:34:08 +02:00
Martin Beyer
bd854e7f7a updates secret-service for linux keychains and fixes #1268 2020-08-19 15:31:42 +02:00
JaniruTEC
3ecc0cf906 Cleaned up MountPointRequirement 
See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472827299
See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472826920
 2020-08-19 14:45:10 +02:00
JaniruTEC
ea6925f905 Replaced #wrapAsIMPE() with explicit call to IMPExc 
See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472872373 https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472859488 https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472827776
 2020-08-19 11:44:18 +02:00
JaniruTEC
f45b78d8c0 Removed accidental debugcode, updated lookup for env-var 
See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472848604
See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472851003
 2020-08-19 11:44:01 +02:00
JaniruTEC
75ca8a91f8 Merge remote-tracking branch 'upstream/develop' into feature/fuse-on-win 2020-08-19 11:42:55 +02:00
JaniruTEC
16462d05c8 Refactored changes, cleaned up 
Changed visibility of methods
Removed Logger from AbstractVolume
Moved mountPoint and #getMountPoint()
Renamed fuseMnt to mount in FuseVol (as in DokanyVol)
Removed unnecessary mountPoint-field from WebDavVolume
 2020-08-18 21:27:13 +02:00
JaniruTEC
cbef54f05c Added Logger, moved cleanup, moved choosing 2020-08-18 21:27:03 +02:00
JaniruTEC
f601ff4ce3 Moved #isSupported() in the file, moved #determineMountPoint() 2020-08-18 21:26:52 +02:00