mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-22 12:41:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,904 Commits 36 Branches 214 Tags
0fa041da85293c640edff415db65d727f7747d87
Commit Graph

1283 Commits

Author SHA1 Message Date
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
Sebastian Stenzel
4abb41aebd Merge branch 'develop' into feature/integrations-api-1.1.0 
# Conflicts:
#	src/main/java/org/cryptomator/ui/traymenu/TrayMenuController.java
 2022-03-23 11:02:48 +01:00
Armin Schrenk
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
Sebastian Stenzel
ad6d5bfae9 resolved class name conflict 2022-03-07 17:42:56 +01:00
Sebastian Stenzel
a404740ceb Updated to integrations-api 1.1.0-beta2 2022-03-07 17:35:48 +01:00
Armin Schrenk
9b001b5071 Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com> 2022-03-03 17:45:21 +01:00
Armin Schrenk
14dc026354 Cleanup 
Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
 2022-03-02 17:24:54 +01:00
Armin Schrenk
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
Sebastian Stenzel
9f7442c1c0 read clientId from vault config 2022-02-23 12:49:39 +01:00
Sebastian Stenzel
64abbc8205 Merge branch 'develop' into feature/hub 
# Conflicts:
#	.github/workflows/release.yml
#	pom.xml
#	src/main/resources/license/THIRD-PARTY.txt
 2022-02-18 09:38:25 +01:00
Sebastian Stenzel
165f190004 read device registration url from vault config 2022-02-18 09:13:33 +01:00
JaniruTEC
12a21bbb71 Added "--version" (short: "-v") 2022-02-17 02:39:48 +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
Sebastian Stenzel
abc0f952e0 closing the window will cancel implicitly 2021-12-15 17:32:11 +01:00
Sebastian Stenzel
e6f43d1f05 no need to run code in ui thread 2021-12-15 17:31:08 +01:00
Sebastian Stenzel
25b9722019 Use CompletableFuture instead of UserInteractionLock + AtomicReference 2021-12-15 17:19:59 +01:00
Sebastian Stenzel
157bef5df6 close dialog after successful device registration (to be improved lol) 2021-12-15 17:19:00 +01:00
Sebastian Stenzel
ef281f810f register device via rest api 2021-12-14 17:35:24 +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
Armin Schrenk
921dd8fe67 Add query to redirection to provide more context in the frontend (#1973) 
Co-authored-by: Sebastian Stenzel <sebastian.stenzel@gmail.com>
 2021-12-10 13:42:37 +01:00
Sebastian Stenzel
fb580ff79d read masterkey from JWE 2021-12-09 14:03:39 +01:00
Sebastian Stenzel
0110e5bedd added JWE decryption helper 2021-12-09 14:02:39 +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