mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-18 18:51:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/hub-local-access

Browse Source
This commit is contained in:
Armin Schrenk
2023-03-20 20:43:34 +01:00
parent 4fc07c27b3 e15dd7565f
commit 6e4e9cd261
57 changed files with 1087 additions and 693 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/cryptomator/common/mount/MountPointPreparationException.java
View File

@@ -2,6 +2,10 @@ package org.cryptomator.common.mount;
public class MountPointPreparationException extends RuntimeException {
public MountPointPreparationException(String msg) {
super(msg);
}
public MountPointPreparationException(Throwable cause) {
super(cause);
}

11
src/main/java/org/cryptomator/common/mount/MountWithinParentUtil.java
View File

@@ -51,8 +51,19 @@ public final class MountWithinParentUtil {
if (SystemUtils.IS_OS_WINDOWS) {
Files.setAttribute(hideaway, WIN_HIDDEN_ATTR, true, LinkOption.NOFOLLOW_LINKS);
}
int attempts = 0;
while (!Files.notExists(mountPoint)) {
if (attempts >= 10) {
throw new MountPointPreparationException("Path " + mountPoint + " could not be cleared");
}
Thread.sleep(1000);
attempts++;
}
} catch (IOException e) {
throw new MountPointPreparationException(e);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
throw new MountPointPreparationException(e);
}
}
}

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

@@ -6,6 +6,7 @@ import org.slf4j.LoggerFactory;
import javax.inject.Inject;
import javax.inject.Singleton;
import javafx.application.Platform;
import javafx.collections.ObservableList;
import java.io.IOException;
import java.time.Instant;
@@ -40,6 +41,7 @@ public class AutoLocker {
private void autolock(Vault vault) {
try {
vault.lock(false);
Platform.runLater(() -> vault.stateProperty().set(VaultState.Value.LOCKED));
LOG.info("Autolocked {} after idle timeout", vault.getDisplayName());
} catch (UnmountFailedException | IOException e) {
LOG.error("Autolocking failed.", e);

2
src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java
View File

@@ -23,7 +23,7 @@ import java.util.ResourceBundle;
@PreferencesScoped
public class VolumePreferencesController implements FxController {
private static final String DOCS_MOUNTING_URL = "https://docs.cryptomator.org/en/1.7/desktop/vault-mounting/";
private static final String DOCS_MOUNTING_URL = "https://docs.cryptomator.org/en/1.7/desktop/volume-type/";
private final Settings settings;
private final ObservableValue<MountService> selectedMountService;