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

Added message for HideawayAlreadyExistsException

Browse Source
This commit is contained in:
JaniruTEC
2023-07-11 22:35:08 +02:00
parent 2a9d1e3fba
commit 614756c740
4 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/cryptomator/common/mount/HideawayAlreadyExistsException.java
View File

@@ -4,7 +4,14 @@ import java.nio.file.Path;
public class HideawayAlreadyExistsException extends IllegalMountPointException {
public HideawayAlreadyExistsException(Path path, String msg) {
private final Path hideaway;
public HideawayAlreadyExistsException(Path path, Path hideaway, String msg) {
super(path, msg);
this.hideaway = hideaway;
}
public Path getHideaway() {
return hideaway;
}
}

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

@@ -26,7 +26,7 @@ public final class MountWithinParentUtil {
//TODO: possible improvement by just deleting an _empty_ hideaway
if (mpExists && hideExists) { //both resources exist (whatever type)
throw new HideawayAlreadyExistsException(mountPoint, "Hideaway (" + hideaway + ") already exists for mountpoint: " + mountPoint);
throw new HideawayAlreadyExistsException(mountPoint, hideaway, "Hideaway (" + hideaway + ") already exists for mountpoint: " + mountPoint);
} else if (!mpExists && !hideExists) { //neither mountpoint nor hideaway exist
throw new MountPointNotExistsException(mountPoint);
} else if (!mpExists) { //only hideaway exists

7
src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java
View File

@@ -1,5 +1,6 @@
package org.cryptomator.ui.unlock;
import org.cryptomator.common.mount.HideawayAlreadyExistsException;
import org.cryptomator.common.mount.IllegalMountPointException;
import org.cryptomator.common.mount.MountPointCouldNotBeClearedException;
import org.cryptomator.common.mount.MountPointInUseException;
@@ -31,6 +32,7 @@ public class UnlockInvalidMountPointController implements FxController {
private final ExceptionType exceptionType;
private final Path exceptionPath;
private final String exceptionMessage;
private final Path hideawayPath;
public FormattedLabel dialogDescription;
@@ -45,6 +47,7 @@ public class UnlockInvalidMountPointController implements FxController {
this.exceptionType = getExceptionType(exc);
this.exceptionPath = exc.getMountpoint();
this.exceptionMessage = exc.getMessage();
this.hideawayPath = exc instanceof HideawayAlreadyExistsException haeExc ? haeExc.getHideaway() : null;
}
@FXML
@@ -52,6 +55,7 @@ public class UnlockInvalidMountPointController implements FxController {
dialogDescription.setFormat(resourceBundle.getString(exceptionType.translationKey));
dialogDescription.setArg1(exceptionPath);
dialogDescription.setArg2(exceptionMessage);
dialogDescription.setArg3(hideawayPath);
}
@FXML
@@ -76,6 +80,7 @@ public class UnlockInvalidMountPointController implements FxController {
case MountPointNotSupportedException x -> ExceptionType.NOT_SUPPORTED;
case MountPointNotExistsException x -> ExceptionType.NOT_EXISTING;
case MountPointInUseException x -> ExceptionType.IN_USE;
case HideawayAlreadyExistsException x -> ExceptionType.HIDEAWAY_EXISTS;
case MountPointCouldNotBeClearedException x -> ExceptionType.COULD_NOT_BE_CLEARED;
case MountPointNotEmptyDirectoryException x -> ExceptionType.NOT_EMPTY_DIRECTORY;
default -> ExceptionType.GENERIC;
@@ -87,6 +92,7 @@ public class UnlockInvalidMountPointController implements FxController {
NOT_SUPPORTED("unlock.error.customPath.description.notSupported", ButtonAction.SHOW_PREFERENCES),
NOT_EXISTING("unlock.error.customPath.description.notExists", ButtonAction.SHOW_VAULT_OPTIONS),
IN_USE("unlock.error.customPath.description.inUse", ButtonAction.SHOW_VAULT_OPTIONS),
HIDEAWAY_EXISTS("unlock.error.customPath.description.hideawayExists", ButtonAction.SHOW_VAULT_OPTIONS),
COULD_NOT_BE_CLEARED("unlock.error.customPath.description.couldNotBeCleaned", ButtonAction.SHOW_VAULT_OPTIONS),
NOT_EMPTY_DIRECTORY("unlock.error.customPath.description.notEmptyDir", ButtonAction.SHOW_VAULT_OPTIONS),
GENERIC("unlock.error.customPath.description.generic", ButtonAction.SHOW_PREFERENCES);
@@ -102,6 +108,7 @@ public class UnlockInvalidMountPointController implements FxController {
private enum ButtonAction {
//TODO Add option to show filesystem, e.g. for ExceptionType.HIDEAWAY_EXISTS
SHOW_PREFERENCES,
SHOW_VAULT_OPTIONS;