mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-21 12:11:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/vault-format-8

Browse Source
This commit is contained in:
Sebastian Stenzel
2021-03-17 12:55:47 +01:00
parent e32ce22d24 31e938de6a
commit cdca4e047d
18 changed files with 64 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/ui/src/main/java/org/cryptomator/ui/common/DefaultSceneFactory.java
View File

@@ -42,8 +42,8 @@ public class DefaultSceneFactory implements Function<Parent, Scene> {
protected void configureScene(Scene scene) {
scene.windowProperty().addListener(observable -> {
Window window = scene.getWindow();
if (window instanceof Stage) {
setupDefaultAccelerators(scene, (Stage) window);
if (window instanceof Stage s) {
setupDefaultAccelerators(scene, s);
}
});
}

4
main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
View File

@@ -55,8 +55,8 @@ public class UnlockWorkflow extends Task<Boolean> {
setOnFailed(event -> {
Throwable throwable = event.getSource().getException();
if (throwable instanceof InvalidMountPointException) {
handleInvalidMountPoint((InvalidMountPointException) throwable);
if (throwable instanceof InvalidMountPointException e) {
handleInvalidMountPoint(e);
} else {
handleGenericError(throwable);
}

16
main/ui/src/test/java/org/cryptomator/ui/recoverykey/RecoveryKeyFactoryTest.java
View File

@@ -58,18 +58,22 @@ class RecoveryKeyFactoryTest {
@Test
@DisplayName("validateRecoveryKey() with invalid checksum")
public void testValidateValidateRecoveryKeyWithInvalidCrc() {
boolean result = inTest.validateRecoveryKey("pathway lift abuse plenty export texture gentleman landscape beyond ceiling around leaf cafe" //
+ " charity border breakdown victory surely computer cat linger restrict infer crowd live computer true written amazed investor boot" //
+ " depth left theory snow whereby terminal weekly reject happiness circuit partial cup wrong");
boolean result = inTest.validateRecoveryKey("""
pathway lift abuse plenty export texture gentleman landscape beyond ceiling around leaf cafe charity \
border breakdown victory surely computer cat linger restrict infer crowd live computer true written amazed \
investor boot depth left theory snow whereby terminal weekly reject happiness circuit partial cup wrong \
""");
Assertions.assertFalse(result);
}
@Test
@DisplayName("validateRecoveryKey() with valid input")
public void testValidateValidateRecoveryKeyWithValidKey() {
boolean result = inTest.validateRecoveryKey("pathway lift abuse plenty export texture gentleman landscape beyond ceiling around leaf cafe" //
+ " charity border breakdown victory surely computer cat linger restrict infer crowd live computer true written amazed investor boot" //
+ " depth left theory snow whereby terminal weekly reject happiness circuit partial cup ad");
boolean result = inTest.validateRecoveryKey("""
pathway lift abuse plenty export texture gentleman landscape beyond ceiling around leaf cafe charity \
border breakdown victory surely computer cat linger restrict infer crowd live computer true written amazed \
investor boot depth left theory snow whereby terminal weekly reject happiness circuit partial cup ad \
""");
Assertions.assertTrue(result);
}