AtaraxiaDev/cryptomator-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Add VaultConfigBuilder as parameter in createVault

Browse Source 
To enhance testing
This commit is contained in:
Julian Raufelder 2021-04-09 09:22:41 +02:00
parent 23350a8cd7
commit f6c8554779
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/src/main/java/org/cryptomator/data/cloud/crypto/MasterkeyCryptoCloudProvider.java
View File

@ -61,6 +61,12 @@ public class MasterkeyCryptoCloudProvider implements CryptoCloudProvider {
@Override @Override
public void create(CloudFolder location, CharSequence password) throws BackendException { public void create(CloudFolder location, CharSequence password) throws BackendException {
// Just for testing (id in VaultConfig is auto generated which makes sense while creating a vault but not for testing)
create(location, password, VaultConfig.createVaultConfig());
}
// Visible for testing
void create(CloudFolder location, CharSequence password, VaultConfig.VaultConfigBuilder vaultConfigBuilder) throws BackendException {
// 1. write masterkey: // 1. write masterkey:
Masterkey masterkey = Masterkey.generate(secureRandom); Masterkey masterkey = Masterkey.generate(secureRandom);
try (ByteArrayOutputStream data = new ByteArrayOutputStream()) { try (ByteArrayOutputStream data = new ByteArrayOutputStream()) {
@ -71,7 +77,7 @@ public class MasterkeyCryptoCloudProvider implements CryptoCloudProvider {
} }
// 2. initialize vault: // 2. initialize vault:
VaultConfig vaultConfig = new VaultConfig.VaultConfigBuilder() // VaultConfig vaultConfig = vaultConfigBuilder //
.vaultFormat(MAX_VAULT_VERSION) // .vaultFormat(MAX_VAULT_VERSION) //
.cipherCombo(DEFAULT_CIPHER_COMBO) // .cipherCombo(DEFAULT_CIPHER_COMBO) //
.keyId(URI.create(String.format("%s:%s", MASTERKEY_SCHEME, MASTERKEY_FILE_NAME))) // .keyId(URI.create(String.format("%s:%s", MASTERKEY_SCHEME, MASTERKEY_FILE_NAME))) //