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

Refactored PerVault, Vault and VaultSettings

Browse Source 
Made @`PerVault public
Added import for VaultException to Vault
Added convenience method to VaultSettings
This commit is contained in:
JaniruTEC
2020-08-11 02:50:33 +02:00
parent ce262b691a
commit c3fbddc671
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java
View File

@@ -120,6 +120,14 @@ public class VaultSettings {
return winDriveLetter;
}
public Optional<String> getWinDriveLetter() {
String current = this.winDriveLetter.get();
if (!Strings.isNullOrEmpty(current)) {
return Optional.of(current);
}
return Optional.empty();
}
public BooleanProperty unlockAfterStartup() {
return unlockAfterStartup;
}

2
main/commons/src/main/java/org/cryptomator/common/vaults/PerVault.java
View File

@@ -8,6 +8,6 @@ import java.lang.annotation.RetentionPolicy;
@Scope
@Documented
@Retention(RetentionPolicy.RUNTIME)
@interface PerVault {
public @interface PerVault {
}

7
main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java
View File

@@ -17,6 +17,7 @@ import javafx.beans.property.ObjectProperty;
import org.apache.commons.lang3.SystemUtils;
import org.cryptomator.common.LazyInitializer;
import org.cryptomator.common.settings.VaultSettings;
import org.cryptomator.common.vaults.Volume.VolumeException;
import org.cryptomator.cryptofs.CryptoFileSystem;
import org.cryptomator.cryptofs.CryptoFileSystemProperties;
import org.cryptomator.cryptofs.CryptoFileSystemProperties.FileSystemFlags;
@@ -120,7 +121,7 @@ public class Vault {
return CryptoFileSystemProvider.newFileSystem(getPath(), fsProps);
}
public synchronized void unlock(CharSequence passphrase) throws CryptoException, IOException, Volume.VolumeException {
public synchronized void unlock(CharSequence passphrase) throws CryptoException, IOException, VolumeException {
if (vaultSettings.useCustomMountPath().get() && Strings.isNullOrEmpty(vaultSettings.customMountPath().get())) {
throw new NotDirectoryException("");
}
@@ -129,7 +130,7 @@ public class Vault {
volume.mount(fs, getEffectiveMountFlags());
}
public synchronized void lock(boolean forced) throws Volume.VolumeException {
public synchronized void lock(boolean forced) throws VolumeException {
if (forced && volume.supportsForcedUnmount()) {
volume.unmountForced();
} else {
@@ -145,7 +146,7 @@ public class Vault {
}
}
public void reveal() throws Volume.VolumeException {
public void reveal() throws VolumeException {
volume.reveal();
}