mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-07-24 00:52:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,556 Commits 31 Branches 215 Tags
d4754448290e6956b650da11bcf95c93cbe57ea7
Commit Graph
195 Commits
Author SHA1 Message Date
Sebastian Stenzel d475444829 fixed some code smells 2022-03-31 09:59:16 +02:00
Sebastian Stenzel dc6b5774b8 Merge branch 'develop' into feature/javafx-launcher 
# Conflicts:
#	pom.xml
 2022-03-31 08:55:49 +02:00
Armin Schrenk e8c63dd3f3 Fixes #2138, closes #2127 
Return code 0 when running application found
 2022-03-30 16:00:05 +02:00
Sebastian Stenzel e907360419 refactored launcher, deleted UiLauncherModule 
component graph is now: Main → FxApplicationComponent → Tray, MainWindow, etc
 2022-03-29 20:39:46 +02:00
Armin Schrenk ef6f87bb19 Fixes #2126 
Remove deprecated env variable
 2022-03-29 17:24:01 +02:00
Sebastian Stenzel 73bbcdcca1 start javafx via Application.launch(...) again 2022-03-28 17:52:39 +02:00
Armin Schrenk 1f0c12ef7a Fix wrong debug message 2022-03-24 12:28:21 +01:00
Armin SchrenkandGitHub 303f84166f Merge pull request #2101 from kevinstsauveur/1583-vault-state-in-title-tray 
Show vault locked/unlocked state in the vault title in the tray menu

Closes #1583
 2022-03-22 12:45:21 +01:00
Armin Schrenk 9e594ea127 Fix not showing dir picker dialog when path does not exist 2022-03-22 12:44:06 +01:00
Kevin St-Sauveur 538cac3749 Changing prefix marker in unlocked vault name in tray menu 2022-03-21 15:37:32 -04:00
Sebastian Stenzel 6bad74720f Merge branch 'develop' into feature/simplified-workflow-results 2022-03-21 13:56:24 +01:00
Armin Schrenk d3e9239531 simplify name of test file for location check on vault creation 2022-03-16 15:24:55 +01:00
Kevin St-Sauveur 79e6a4cd48 Modify vault title when unlocked 2022-03-14 02:29:25 -04:00
Armin SchrenkandSebastian Stenzel 9b001b5071 Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com> 2022-03-03 17:45:21 +01:00
Armin SchrenkandSebastian Stenzel 14dc026354 Cleanup 
Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
 2022-03-02 17:24:54 +01:00
Armin Schrenkandsonarcloud fba0df10f9 Resolve code smells and a bug 
Co-authored-by: sonarcloud <sonarcloud@users.noreply.github.com>
 2022-03-02 15:28:01 +01:00
Armin Schrenk 4f4c992493 Further improvements: 
* make PARENT_NO_MOUNTPOINT preps system agnostic
* add unit tests for cleanup
 2022-03-02 14:40:27 +01:00
Armin Schrenk e15b68fc9b Refactor winfsp mount preps and add unit tests 2022-02-28 18:54:01 +01:00
Armin Schrenk 3ff3b1c63e refactor controller: 
* fix vault options UI not showing
* rename from "get" to "is" methods in vault options controller
 2022-02-28 13:03:36 +01:00
Armin Schrenk 55d1a8e935 Allow custom mount point for winfsp 2022-02-25 13:21:45 +01:00
JaniruTEC 1641a06d65 Renamed NO_PARENT_NO_MOUNT_POINT to UNUSED_ROOT_DIR in MountPointRequirement 2022-01-30 01:35:02 +01:00
Sebastian Stenzel e1a72c41a5 remove unused imports 2022-01-19 20:01:48 +01:00
Sebastian Stenzel 4d4098e0e0 cleanup 2022-01-19 19:49:33 +01:00
Sebastian Stenzel d52e59d7a4 dedup by setting title when setting the scene 2022-01-19 19:08:54 +01:00
Sebastian Stenzel 9440fb186f Merge branch 'develop' into feature/simplified-workflow-results, 
solving conflict with 5509033

# Conflicts:
#	src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingModule.java
 2022-01-19 17:35:04 +01:00
Sebastian Stenzel 9856792921 replaced UserInteractionLock with CompletableFuture in LockWorkflow 2022-01-19 17:21:32 +01:00
JaniruTEC 080ddbbb01 Applied changes from code review. 2022-01-18 02:25:25 +01:00
JaniruTEC b7902ad8fd Merge branch 'develop' into feature/1888-existing-drive-letter-error 2022-01-09 00:35:32 +01:00
Armin Schrenk 550903325d Add vault name in unlock window titles 2022-01-04 16:35:09 +01:00
Sebastian Stenzel 806ffe704c convert Dagger modules to interfaces 2021-12-16 17:09:25 +01:00
Sebastian Stenzel 6ca87d13f5 renamed class 2021-12-16 17:01:56 +01:00
Sebastian Stenzel 983a4d0b0f move masterkey selection to subcomponent 
and use CompletableFuture instead of UserInteractionLock + AtomicReference
 2021-12-16 17:00:49 +01:00
Sebastian Stenzel d72d9f533c Replace CharBuffer and char[] instances by destroyable Passphrase 2021-12-16 16:41:07 +01:00
Sebastian Stenzel 85a5146d4b wipe pw before losing reference 
[ci skip]
 2021-12-16 13:59:10 +01:00
Sebastian Stenzel 0bece0f591 move passphrase entry to subcomponent 
and use CompletableFuture instead of UserInteractionLock + AtomicReference
 2021-12-16 13:56:59 +01:00
JaniruTEC 46a3a4fc11 Added error message if user tries to mount to occupied drive. 
Fixes #1888
 2021-12-13 00:46:18 +01:00
Sebastian Stenzel 0fd6e5bbb0 fixed code smells 2021-12-03 12:17:07 +01:00
Sebastian Stenzel f277d4d21b fix resource leak 2021-12-03 12:10:40 +01:00
Sebastian Stenzel 2c42a9573e Merge branch 'develop' into feature/displayName 
# Conflicts:
#	pom.xml
 2021-12-02 08:52:40 +01:00
Armin Schrenk 13e9775458 Closes #1918 2021-11-29 17:33:11 +01:00
Martin Beyer 63b40091ea rename supporterCert WhiteSpace and VaultNameLength methods 2021-11-18 12:06:50 +01:00
Sebastian Stenzel 21d342d117 Add non-forced retry lock button 2021-11-17 14:03:04 +01:00
Sebastian Stenzel 1b43bf395f apply same error handling to "force lock" as well 2021-11-17 13:45:43 +01:00
Armin Schrenk ce9e1184ec bump cryptofs dependency 2021-11-09 12:39:45 +01:00
Armin Schrenk c1c5367e2a closes #1891 2021-11-03 11:54:24 +01:00
Sebastian Stenzel 1ca803691b Revert "increase robustness of vault creation:" 
This reverts commit f7fdb87d6d.
 2021-11-03 08:57:35 +01:00
Armin Schrenk f7fdb87d6d increase robustness of vault creation: 
* clean up after failed vault creation
* ignore if storage readme cannot be created
 2021-11-02 11:50:14 +01:00
Armin Schrenk c6c2133b34 closes #1863 2021-10-29 17:08:03 +02:00
Sebastian Stenzel 02a59dd538 support loading @2x images 2021-10-29 14:21:04 +02:00
Tobias Hagemann a4070f551b fixes #1404 2021-10-27 11:56:49 +02:00