mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-20 09:36:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Apply suggestions from code review

Browse Source 
more renaming

Co-authored-by: Tobias Hagemann <tobias.hagemann@skymatic.de>
This commit is contained in:
Armin Schrenk
2023-04-18 15:34:20 +02:00
committed by GitHub
parent dc9b39202f
commit d9f945e70a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/cryptomator/ui/convertvault/HubToPasswordConvertController.java
View File

@@ -100,7 +100,7 @@ public class HubToPasswordConvertController implements FxController {
@FXML
public void convert() {
Preconditions.checkState(newPasswordController.isGoodPassword());
LOG.info("Converting hub vault {} to local", vault.getPath());
LOG.info("Converting hub vault {} to password", vault.getPath());
CompletableFuture.runAsync(() -> conversionStarted.setValue(true), Platform::runLater) //
.thenRunAsync(this::convertInternal, backgroundExecutorService)
.whenCompleteAsync((result, exception) -> {
@@ -121,7 +121,7 @@ public class HubToPasswordConvertController implements FxController {
recoveryKeyFactory.newMasterkeyFileWithPassphrase(vault.getPath(), recoveryKey.get(), passphrase);
LOG.debug("Successfully created masterkey file for vault {}", vault.getPath());
backupHubConfig(vault.getPath().resolve(VAULTCONFIG_FILENAME));
replaceWithLocalConfig(passphrase);
replaceWithPasswordConfig(passphrase);
} catch (MasterkeyLoadingFailedException e) {
throw new CompletionException(new IOException("Vault conversion failed", e));
} catch (IOException e) {

6
src/test/java/org/cryptomator/ui/convertvault/HubToPasswordConvertControllerTest.java
View File

@@ -104,7 +104,7 @@ public class HubToPasswordConvertControllerTest {
Mockito.when(vaultPath.resolve(anyString())).thenReturn(configPath);
Mockito.doNothing().when(recoveryKeyFactory).newMasterkeyFileWithPassphrase(any(), anyString(), any());
Mockito.doNothing().when(inSpy).backupHubConfig(any());
Mockito.doNothing().when(inSpy).replaceWithLocalConfig(any());
Mockito.doNothing().when(inSpy).replaceWithPasswordConfig(any());
Mockito.doNothing().when(passphrase).destroy();
}
@@ -115,13 +115,13 @@ public class HubToPasswordConvertControllerTest {
Mockito.verify(recoveryKeyFactory, times(1)).newMasterkeyFileWithPassphrase(vaultPath, actualRecoveryKey, passphrase);
Mockito.verify(inSpy, times(1)).backupHubConfig(configPath);
Mockito.verify(inSpy, times(1)).replaceWithLocalConfig(passphrase);
Mockito.verify(inSpy, times(1)).replaceWithPasswordConfig(passphrase);
Mockito.verify(passphrase, times(1)).destroy();
}
@Test
public void testConvertInternalWrapsCryptoException() throws IOException {
Mockito.doThrow(new MasterkeyLoadingFailedException("yadda")).when(inSpy).replaceWithLocalConfig(any());
Mockito.doThrow(new MasterkeyLoadingFailedException("yadda")).when(inSpy).replaceWithPasswordConfig(any());
Assertions.assertThrows(CompletionException.class, inSpy::convertInternal);