Sebastian Stenzel
6c2865a09d
simplify port/scheme check
2026-03-19 16:27:09 +01:00
Sebastian Stenzel
c3c7a23ccd
added test
2026-03-12 09:14:27 +01:00
Sebastian Stenzel
1a12684557
fix test
2026-03-11 22:42:25 +01:00
Sebastian Stenzel
1fde3650ca
renamed classes
2026-03-11 21:47:33 +01:00
Sebastian Stenzel
232e6fbf71
add tests
2026-03-11 21:05:14 +01:00
Armin Schrenk
7e888b0e3b
ensure logging for Substituting properties
2026-03-05 17:44:47 +01:00
Armin Schrenk
98db9649c3
Merge branch 'main' into develop
...
# Conflicts:
# pom.xml
2026-02-26 16:58:00 +01:00
Armin Schrenk
792734b486
add unit tests
2026-02-26 16:20:34 +01:00
Armin Schrenk
33851a8559
Refactor admin props
...
* rename class to AdminPropertiesFactory
* rename factory method to "create"
* remove side effects from methods
* returned properties default to system properties
2026-02-11 15:12:52 +01:00
Armin Schrenk
cff47b1c73
wrap system properties instead of direct modification
2026-02-11 14:36:55 +01:00
Armin Schrenk
53f368108a
Rename jvm property and actual config file
2026-02-09 16:54:04 +01:00
Armin Schrenk
5e52811c74
Remove hard coded default locations for admin config
2026-02-09 16:49:12 +01:00
Armin Schrenk
e9b3b505a8
apply suggestions from code review
2026-01-28 17:35:34 +01:00
Armin Schrenk
7ee0606306
adjust unit tests
2026-01-21 15:34:08 +01:00
Armin Schrenk
046372f95b
refactored BufferedLog
...
* rename to EventualLogger
* adhere to slf4j API
* ensure single instance
2026-01-21 15:33:26 +01:00
Armin Schrenk
d53f0880ca
add test for AdminPropertiesSetter
2026-01-15 18:06:24 +01:00
Sebastian Stenzel
8a434dcd96
more robust settings, exposed saveNow()
2025-11-05 22:23:34 +01:00
Sebastian Stenzel
c938c42c00
unified "check for update" and "do update" button
2025-11-02 15:40:32 +01:00
Tobias Hagemann
f1ef506e2b
Fix missing characters after Unicode in RTF files ( #3898 )
2025-06-16 10:36:19 +02:00
Armin Schrenk
7d2c4992af
update pom and adjust classes to new keychain api. ( #3877 )
2025-06-02 10:28:52 +02:00
Armin Schrenk
42ec41b991
clean up code
2025-03-12 12:19:27 +01:00
Armin Schrenk
c5c3d55658
Merge branch 'develop' into feature/touch-id
2025-03-11 17:08:13 +01:00
clkue
3aa627a467
fix unicode escaping for rtf file ( #3609 )
...
Signed-off-by: C1emency <>
Signed-off-by: clkue <clemens_kuennemann@protonmail.com >
2025-03-03 14:55:09 +01:00
Armin Schrenk
43fc976ad7
reduce #3311 to touchID
2025-02-19 11:49:59 +01:00
Armin Schrenk
80e101456b
adjust keychainManager to new API
2024-09-16 17:40:49 +02:00
Jan-Peter Klein
08f81b7df4
registered module in SettingsJsonTest
2024-04-29 11:12:14 +02:00
Sebastian Stenzel
def64aa2ac
added tests
2024-01-20 13:25:57 +01:00
Sebastian Stenzel
2e443c72a9
add new API encryptVaultKey(vaultKey, userKey)
...
and `decodeECPublicKey(byte[])`
2024-01-20 13:12:59 +01:00
Sebastian Stenzel
6ce34efb52
Merge branch 'develop' into feature/new-hub-keyloading
2023-07-28 15:23:00 +02:00
JaniruTEC
ae392b4014
Refactored "handleMountPointFolder" (now: "getMountPointState")
...
See: https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1273277804
2023-07-25 13:34:39 +02:00
JaniruTEC
1c34402c87
Applied minor corrections
...
See:
https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1273277251
https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1273280687
https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1273287847
2023-07-25 13:17:21 +02:00
JaniruTEC
587cff9518
Added more tests
2023-07-24 19:22:47 +02:00
JaniruTEC
ea8e850aa9
Moved check for dir/emptiness to "handleMountPointFolder"
2023-07-24 19:15:22 +02:00
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
f9f8a6b357
Added unit tests for MountWithinParentUtil
2023-07-19 15:39:14 +02:00
Sebastian Stenzel
e358ffd666
added tests
2023-07-04 16:47:54 +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
Sebastian Stenzel
746c8f54eb
Merge branch 'develop' into feature/new-hub-keyloading
...
# Conflicts:
# src/main/java/org/cryptomator/ui/keyloading/hub/CreateDeviceDto.java
# src/main/java/org/cryptomator/ui/keyloading/hub/RegisterDeviceController.java
2023-06-30 16:20:59 +02:00
Sebastian Stenzel
ed8457ff36
remove dead test
2023-06-30 13:53:25 +02:00
Sebastian Stenzel
e382a3bab9
make settings' fields public, remove accessor methods
2023-06-30 13:52:15 +02:00
Sebastian Stenzel
9cd50e8ae4
Merge pull request #2974 from cryptomator/feature/replace-gson
...
Replace GSON with Jackson
2023-06-30 13:48:19 +02:00
Armin Schrenk
29d63a0a83
final clean up
2023-06-30 11:57:09 +02:00
Armin Schrenk
8c3ede0d2a
clean up
2023-06-30 11:20:28 +02:00
Armin Schrenk
ee82965ef5
adding "integration tests"
2023-06-30 11:20:07 +02:00
Armin Schrenk
ab048508a8
change getProperty(key, default) and add unit test
2023-06-30 10:57:36 +02:00
