diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java index e00c7c6ee..e51d50fd3 100644 --- a/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java +++ b/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java @@ -8,7 +8,6 @@ import org.cryptomator.cryptofs.CryptoFileSystem; import org.cryptomator.frontend.dokany.Mount; import org.cryptomator.frontend.dokany.MountFactory; import org.cryptomator.frontend.dokany.MountFailedException; -import org.cryptomator.frontend.dokany.RevealException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,22 +52,11 @@ public class DokanyVolume extends AbstractVolume { } @Override - public void reveal(RevealerFacade r) throws VolumeException { + public void reveal(RevealerFacade revealer) throws VolumeException { try { - mount.reveal(p -> { - try { - r.reveal(p); - } catch (VolumeException e) { - throw new RevealException(e); - } - }); - } catch (RevealException e) { - LOG.debug("Revealing the vault in file manger failed: " + e.getMessage()); - if (e.getCause() instanceof VolumeException) { - throw (VolumeException) e.getCause(); - } else { - throw new VolumeException(e); - } + mount.reveal(revealer::reveal); + } catch (Exception e) { + throw new VolumeException(e); } } diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java index 191b47526..b8d3b650d 100644 --- a/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java +++ b/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java @@ -12,7 +12,6 @@ import org.cryptomator.frontend.fuse.mount.FuseMountFactory; import org.cryptomator.frontend.fuse.mount.FuseNotSupportedException; import org.cryptomator.frontend.fuse.mount.Mount; import org.cryptomator.frontend.fuse.mount.Mounter; -import org.cryptomator.frontend.fuse.mount.RevealException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -73,22 +72,11 @@ public class FuseVolume extends AbstractVolume { } @Override - public void reveal(RevealerFacade r) throws VolumeException { + public void reveal(RevealerFacade revealer) throws VolumeException { try { - mount.reveal(p -> { - try { - r.reveal(p); - } catch (VolumeException e) { - throw new RevealException(e); - } - }); - } catch (RevealException e) { - LOG.debug("Revealing the vault in file manger failed: " + e.getMessage()); - if (e.getCause() instanceof VolumeException) { - throw (VolumeException) e.getCause(); - } else { - throw new VolumeException(e); - } + mount.reveal(revealer::reveal); + } catch (Exception e) { + throw new VolumeException(e); } } diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java index 7af21d01a..312098303 100644 --- a/main/commons/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java +++ b/main/commons/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java @@ -73,22 +73,11 @@ public class WebDavVolume implements Volume { } @Override - public void reveal(RevealerFacade r) throws VolumeException { + public void reveal(RevealerFacade revealer) throws VolumeException { try { - mount.reveal(p -> { - try { - r.reveal(p); - } catch (VolumeException e) { - throw new Mounter.RevealException(e); - } - }); - } catch (Mounter.RevealException e) { - LOG.debug("Revealing the vault in file manger failed: " + e.getMessage()); - if (e.getCause() instanceof VolumeException) { - throw (VolumeException) e.getCause(); - } else { - throw new VolumeException(e); - } + mount.reveal(revealer::reveal); + } catch (Exception e) { + throw new VolumeException(e); } } diff --git a/main/pom.xml b/main/pom.xml index dda21d3b6..fbeed196e 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -29,9 +29,9 @@ 0.2.1 0.1.0-beta3 0.1.0-beta2 - 1.2.7 - 1.2.2 - 1.1.0 + 1.2.8 + 1.2.3 + 1.1.1 15