mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-14 08:41:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,079 Commits 36 Branches 214 Tags
93fe27989ac0e59fa1b035e5cf7a70b8fd000f8d
Commit Graph

1698 Commits

Author SHA1 Message Date
Armin Schrenk
eddf586b81 Merge pull request #4078 from cryptomator/feature/files-in-use 
Feature: Files in use
 2025-12-29 16:00:36 +01:00
Armin Schrenk
93d95ecd93 make message more clear 
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
 2025-12-21 12:42:11 +01:00
Armin Schrenk
05a41a625c reset selection index everytime window is shown 
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
 2025-12-21 12:32:35 +01:00
Armin Schrenk
2aff02a186 cleanup 
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
 2025-12-21 12:27:07 +01:00
Armin Schrenk
4b7de11750 dedup css 
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
 2025-12-21 12:26:08 +01:00
Armin Schrenk
aaf921afcf Adjust notification dialog 
* add scrollbar to description content
* move filename to own visual element
* move vaultName above message

Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
 2025-12-21 11:40:02 +01:00
Armin Schrenk
7718445f7c rename method 
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
 2025-12-21 11:00:01 +01:00
Armin Schrenk
0fa27f66c9 Use proper icon for in-use event 2025-12-19 13:54:47 +01:00
Armin Schrenk
111c5ae2de correctly convert URI path to system path 2025-12-19 13:25:42 +01:00
Armin Schrenk
8ca7e34d8f minor fixes 2025-12-18 16:47:45 +01:00
Armin Schrenk
0fa6f0d915 only close notification window on index error 2025-12-18 16:20:58 +01:00
Armin Schrenk
4ffd8f4467 add localization for file-is-in-use-event in event view 2025-12-18 16:19:42 +01:00
Armin Schrenk
bb0c1b54c1 Add log message to get used mount service 2025-12-18 15:39:56 +01:00
Armin Schrenk
8eb91f6471 Change design of files-in-use-notification 
* add timestamp of event occurance
* move filename into message section
* remove translations
 2025-12-18 13:28:04 +01:00
Armin Schrenk
eb20fd7278 add device name to filesystemowner and display device name in notification 2025-12-17 16:55:42 +01:00
Armin Schrenk
d836798361 only one instance of notification window 2025-12-17 16:27:10 +01:00
Armin Schrenk
0cd6eb8b5e use Path api to concat (string) paths for events 
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
 2025-12-16 12:52:35 +01:00
Armin Schrenk
0b2107309b guard the notification window from theoretical thread races 
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
 2025-12-16 12:33:25 +01:00
Armin Schrenk
532cdf30ac Fix typos 2025-12-12 17:41:29 +01:00
Armin Schrenk
d746e9e215 add translation to event 2025-12-12 16:55:15 +01:00
Armin Schrenk
408c80744a Show notification for fileIsInUseEvent 2025-12-12 13:29:46 +01:00
Armin Schrenk
eb90a7fb33 Merge branch 'feature/files-in-use' into feature/notify-fallback 
# Conflicts:
#	src/main/java/org/cryptomator/common/EventMap.java
#	src/main/java/org/cryptomator/common/vaults/Vault.java
 2025-12-12 12:31:08 +01:00
Armin Schrenk
a47814f38c cleanup 2025-12-12 12:26:46 +01:00
Armin Schrenk
8b157fd935 add dark theme 2025-12-12 12:25:47 +01:00
Armin Schrenk
5e582f666c add accessibleText 2025-12-12 11:37:42 +01:00
Armin Schrenk
bebe3064ee hide paging if there is only one event 2025-12-12 11:21:39 +01:00
Armin Schrenk
bbf8e1d1e5 Ensure that keyloader is not reused between vaults 2025-12-11 14:35:23 +01:00
Armin Schrenk
98d2442deb For hub vaults set filesystem owner 2025-12-11 14:34:45 +01:00
Armin Schrenk
cac5c86dab Merge branch 'develop' into feature/files-in-use 
# Conflicts:
#	pom.xml
 2025-12-10 13:04:34 +01:00
Armin Schrenk
5a0145800d Redesign notifcation dialog 
* add Cryptomator title
* include vault name in message
* remove bottom section and move button to current message area
 2025-12-10 13:01:07 +01:00
Armin Schrenk
f4b56e5e51 rename variable 2025-12-10 12:34:33 +01:00
Armin Schrenk
7cfb63ed48 cleanup in NotificationController 2025-12-10 12:34:09 +01:00
Armin Schrenk
2521cd2bfb cleanup 
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
 2025-12-09 18:13:04 +01:00
Tobias Hagemann
a4c85be61c Add accessible text to form controls and table columns (#4066) 2025-12-06 07:41:39 +01:00
Armin Schrenk
5b9e70da33 implement code suggestions 
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
 2025-12-05 17:32:24 +01:00
Armin Schrenk
b83a3c27c6 [skip ci] remove unused import 
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
 2025-12-05 16:52:04 +01:00
Armin Schrenk
5c2954de03 guard controller from NPE 
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
 2025-12-05 16:43:39 +01:00
Armin Schrenk
8a834fe71c fix window placement 
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
 2025-12-05 16:38:37 +01:00
Armin Schrenk
4ff2905723 regularly poll for notification updates 
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
 2025-12-05 16:37:31 +01:00
Armin Schrenk
538e01b1e5 consider location of system bar when placing notification window 
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
 2025-12-05 15:54:05 +01:00
Armin Schrenk
3135be9178 fix logic in notificationManager 
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
 2025-12-05 12:14:07 +01:00
Armin Schrenk
2c456f5323 fix more issues 
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
 2025-12-05 11:58:16 +01:00
Armin Schrenk
9d464e3a4f fix threading issue in notification manager 
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
 2025-12-05 11:53:43 +01:00
Armin Schrenk
83199eb1de use VaultEvent for notification to also show affected vault 
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
 2025-12-05 11:35:54 +01:00
Armin Schrenk
5772ffec17 activate notifications by consuming vault events 
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
 2025-12-05 11:27:01 +01:00
Armin Schrenk
f3415277d7 cleanup 
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
 2025-12-05 11:23:52 +01:00
Armin Schrenk
8e9a001fde clean up 
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
 2025-12-05 10:50:48 +01:00
Armin Schrenk
5e229395f1 remove test code 
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
 2025-12-05 10:50:32 +01:00
Armin Schrenk
18dd9770f2 add second fake event 
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
 2025-12-04 17:03:47 +01:00
Armin Schrenk
185c5a4f5d implement more ui logic 
and reduce css

Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
 2025-12-04 17:03:36 +01:00