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

lock vault on external unmount

Browse Source
This commit is contained in:
Armin Schrenk
2021-03-23 12:52:38 +01:00
parent c05e00d32a
commit 17dc32bb79
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,6 +42,7 @@ import java.util.EnumSet;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicReference;
import static org.cryptomator.common.Constants.MASTERKEY_FILENAME;
@@ -139,7 +140,14 @@ public class Vault {
cryptoFileSystem.set(fs);
try {
volume = volumeProvider.get();
volume.mount(fs, getEffectiveMountFlags());
volume.mount(fs, getEffectiveMountFlags()).handle((voit, throwable) -> {
destroyCryptoFileSystem();
setState(VaultState.LOCKED); //TODO: possible race conditions of the vault state. Use Platform.runLater()?
if (throwable != null) {
LOG.warn("Unexpected unmount and lock of vault" + getDisplayName(), throwable);
}
return CompletableFuture.completedFuture(null);
});
} catch (Exception e) {
destroyCryptoFileSystem();
throw e;