diff --git a/main/pom.xml b/main/pom.xml
index d6a873714..bbe17f5e5 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -28,7 +28,7 @@
1.5.2
1.0.4
2.0.0
- 0.1.4
+ 0.1.5
2.5
3.6
@@ -59,6 +59,10 @@
true
+
+ jcenter
+ http://jcenter.bintray.com
+
diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java
index 0f6010eec..9cb42f13d 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java
@@ -395,7 +395,7 @@ public class MainController implements ViewController {
return;
}
if (newValue.getState() != Vault.State.LOCKED) {
- this.showUnlockedView(newValue);
+ this.showUnlockedView(newValue, false);
} else if (!newValue.doesVaultDirectoryExist()) {
this.showNotFoundView();
} else if (newValue.isValidVaultDirectory() && upgradeStrategyForSelectedVault.isPresent()) {
@@ -494,16 +494,17 @@ public class MainController implements ViewController {
public void didUnlock(Vault vault) {
if (vault.equals(selectedVault.getValue())) {
- this.showUnlockedView(vault);
+ this.showUnlockedView(vault, true);
}
}
- private void showUnlockedView(Vault vault) {
- final UnlockedController ctrl = unlockedVaults.computeIfAbsent(vault, k -> {
- return viewControllerLoader.load("/fxml/unlocked.fxml");
- });
+ private void showUnlockedView(Vault vault, boolean reveal) {
+ final UnlockedController ctrl = unlockedVaults.computeIfAbsent(vault, k -> viewControllerLoader.load("/fxml/unlocked.fxml"));
ctrl.setVault(vault);
ctrl.setListener(this::didLock);
+ if (reveal) {
+ ctrl.revealVault(vault);
+ }
activeController.set(ctrl);
}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockedController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockedController.java
index bfd25c1fe..27664be52 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockedController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockedController.java
@@ -8,25 +8,10 @@
******************************************************************************/
package org.cryptomator.ui.controllers;
-import static java.lang.String.format;
-
-import java.io.IOException;
import java.util.Optional;
import javax.inject.Inject;
-import org.cryptomator.frontend.webdav.ServerLifecycleException;
-import org.cryptomator.frontend.webdav.mount.Mounter.CommandFailedException;
-import org.cryptomator.ui.l10n.Localization;
-import org.cryptomator.ui.model.Vault;
-import org.cryptomator.ui.util.AsyncTaskService;
-import org.cryptomator.ui.util.DialogBuilderUtil;
-import org.fxmisc.easybind.EasyBind;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.util.concurrent.Runnables;
-
import javafx.animation.Animation;
import javafx.animation.KeyFrame;
import javafx.animation.Timeline;
@@ -46,13 +31,20 @@ import javafx.scene.control.Alert;
import javafx.scene.control.ButtonType;
import javafx.scene.control.ContextMenu;
import javafx.scene.control.Label;
-import javafx.scene.control.MenuItem;
import javafx.scene.control.ToggleButton;
-import javafx.scene.input.Clipboard;
-import javafx.scene.input.ClipboardContent;
import javafx.scene.layout.VBox;
import javafx.stage.PopupWindow.AnchorLocation;
import javafx.util.Duration;
+import org.cryptomator.frontend.webdav.mount.Mounter.CommandFailedException;
+import org.cryptomator.ui.l10n.Localization;
+import org.cryptomator.ui.model.Vault;
+import org.cryptomator.ui.util.AsyncTaskService;
+import org.cryptomator.ui.util.DialogBuilderUtil;
+import org.fxmisc.easybind.EasyBind;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static java.lang.String.format;
public class UnlockedController implements ViewController {
@@ -181,7 +173,7 @@ public class UnlockedController implements ViewController {
revealVault(vault.get());
}
- private void revealVault(Vault vault) {
+ void revealVault(Vault vault) {
asyncTaskService.asyncTaskOf(() -> {
vault.reveal();
}).onSuccess(() -> {