diff --git a/pom.xml b/pom.xml
index 374f4c5be..a6386e66c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,31 +30,31 @@
2.1.1
2.6.1
- 1.2.0-beta4
- 1.2.0-beta3
- 1.2.0-beta2
- 1.2.0-beta2
- 2.0.0-beta5
- 2.0.0-beta2
- 2.0.0-beta5
+ 1.2.0
+ 1.2.0
+ 1.2.0
+ 1.2.0
+ 2.0.0
+ 2.0.0
+ 2.0.0
3.12.0
- 2.44
+ 2.45
2.2
31.1-jre
- 2.9.1
- 19
- 4.2.1
- 9.25.4
- 1.4.4
- 2.0.3
+ 2.10.1
+ 19.0.2.1
+ 4.3.0
+ 9.31
+ 1.4.5
+ 2.0.6
0.5.1
1.7.0
- 5.9.1
- 4.8.0
+ 5.9.2
+ 5.1.1
2.2
@@ -66,7 +66,7 @@
-
+
org.cryptomator
cryptolib
${cryptomator.cryptolib.version}
diff --git a/src/main/java/org/cryptomator/ui/common/FxmlFile.java b/src/main/java/org/cryptomator/ui/common/FxmlFile.java
index eac58eb86..c5b66498a 100644
--- a/src/main/java/org/cryptomator/ui/common/FxmlFile.java
+++ b/src/main/java/org/cryptomator/ui/common/FxmlFile.java
@@ -15,7 +15,7 @@ public enum FxmlFile {
HEALTH_CHECK_LIST("/fxml/health_check_list.fxml"), //
HUB_NO_KEYCHAIN("/fxml/hub_no_keychain.fxml"), //
HUB_AUTH_FLOW("/fxml/hub_auth_flow.fxml"), //
- HUB_LICENSE_EXCEEDED("/fxml/hub_license_exceeded.fxml"), //
+ HUB_INVALID_LICENSE("/fxml/hub_invalid_license.fxml"), //
HUB_RECEIVE_KEY("/fxml/hub_receive_key.fxml"), //
HUB_REGISTER_DEVICE("/fxml/hub_register_device.fxml"), //
HUB_REGISTER_SUCCESS("/fxml/hub_register_success.fxml"), //
diff --git a/src/main/java/org/cryptomator/ui/keyloading/hub/HubKeyLoadingModule.java b/src/main/java/org/cryptomator/ui/keyloading/hub/HubKeyLoadingModule.java
index 5adcb243d..6f63ee98e 100644
--- a/src/main/java/org/cryptomator/ui/keyloading/hub/HubKeyLoadingModule.java
+++ b/src/main/java/org/cryptomator/ui/keyloading/hub/HubKeyLoadingModule.java
@@ -102,10 +102,10 @@ public abstract class HubKeyLoadingModule {
}
@Provides
- @FxmlScene(FxmlFile.HUB_LICENSE_EXCEEDED)
+ @FxmlScene(FxmlFile.HUB_INVALID_LICENSE)
@KeyLoadingScoped
- static Scene provideLicenseExceededScene(@KeyLoading FxmlLoaderFactory fxmlLoaders) {
- return fxmlLoaders.createScene(FxmlFile.HUB_LICENSE_EXCEEDED);
+ static Scene provideInvalidLicenseScene(@KeyLoading FxmlLoaderFactory fxmlLoaders) {
+ return fxmlLoaders.createScene(FxmlFile.HUB_INVALID_LICENSE);
}
@Provides
@@ -162,8 +162,8 @@ public abstract class HubKeyLoadingModule {
@Binds
@IntoMap
- @FxControllerKey(LicenseExceededController.class)
- abstract FxController bindLicenseExceededController(LicenseExceededController controller);
+ @FxControllerKey(InvalidLicenseController.class)
+ abstract FxController bindInvalidLicenseController(InvalidLicenseController controller);
@Binds
@IntoMap
diff --git a/src/main/java/org/cryptomator/ui/keyloading/hub/LicenseExceededController.java b/src/main/java/org/cryptomator/ui/keyloading/hub/InvalidLicenseController.java
similarity index 72%
rename from src/main/java/org/cryptomator/ui/keyloading/hub/LicenseExceededController.java
rename to src/main/java/org/cryptomator/ui/keyloading/hub/InvalidLicenseController.java
index 115ba16b4..6e0240ce6 100644
--- a/src/main/java/org/cryptomator/ui/keyloading/hub/LicenseExceededController.java
+++ b/src/main/java/org/cryptomator/ui/keyloading/hub/InvalidLicenseController.java
@@ -7,12 +7,12 @@ import javax.inject.Inject;
import javafx.fxml.FXML;
import javafx.stage.Stage;
-public class LicenseExceededController implements FxController {
+public class InvalidLicenseController implements FxController {
private final Stage window;
@Inject
- public LicenseExceededController(@KeyLoading Stage window) {
+ public InvalidLicenseController(@KeyLoading Stage window) {
this.window = window;
}
diff --git a/src/main/java/org/cryptomator/ui/keyloading/hub/ReceiveKeyController.java b/src/main/java/org/cryptomator/ui/keyloading/hub/ReceiveKeyController.java
index 44a09b988..6f6e7cb42 100644
--- a/src/main/java/org/cryptomator/ui/keyloading/hub/ReceiveKeyController.java
+++ b/src/main/java/org/cryptomator/ui/keyloading/hub/ReceiveKeyController.java
@@ -42,11 +42,11 @@ public class ReceiveKeyController implements FxController {
private final Lazy registerDeviceScene;
private final Lazy unauthorizedScene;
private final URI vaultBaseUri;
- private final Lazy licenseExceededScene;
+ private final Lazy invalidLicenseScene;
private final HttpClient httpClient;
@Inject
- public ReceiveKeyController(@KeyLoading Vault vault, ExecutorService executor, @KeyLoading Stage window, @Named("deviceId") String deviceId, @Named("bearerToken") AtomicReference tokenRef, CompletableFuture result, @FxmlScene(FxmlFile.HUB_REGISTER_DEVICE) Lazy registerDeviceScene, @FxmlScene(FxmlFile.HUB_UNAUTHORIZED_DEVICE) Lazy unauthorizedScene, @FxmlScene(FxmlFile.HUB_LICENSE_EXCEEDED) Lazy licenseExceededScene) {
+ public ReceiveKeyController(@KeyLoading Vault vault, ExecutorService executor, @KeyLoading Stage window, @Named("deviceId") String deviceId, @Named("bearerToken") AtomicReference tokenRef, CompletableFuture result, @FxmlScene(FxmlFile.HUB_REGISTER_DEVICE) Lazy registerDeviceScene, @FxmlScene(FxmlFile.HUB_UNAUTHORIZED_DEVICE) Lazy unauthorizedScene, @FxmlScene(FxmlFile.HUB_INVALID_LICENSE) Lazy invalidLicenseScene) {
this.window = window;
this.deviceId = deviceId;
this.bearerToken = Objects.requireNonNull(tokenRef.get());
@@ -54,7 +54,7 @@ public class ReceiveKeyController implements FxController {
this.registerDeviceScene = registerDeviceScene;
this.unauthorizedScene = unauthorizedScene;
this.vaultBaseUri = getVaultBaseUri(vault);
- this.licenseExceededScene = licenseExceededScene;
+ this.invalidLicenseScene = invalidLicenseScene;
this.window.addEventHandler(WindowEvent.WINDOW_HIDING, this::windowClosed);
this.httpClient = HttpClient.newBuilder().version(HttpClient.Version.HTTP_1_1).executor(executor).build();
}
@@ -96,7 +96,7 @@ public class ReceiveKeyController implements FxController {
}
private void licenseExceeded() {
- window.setScene(licenseExceededScene.get());
+ window.setScene(invalidLicenseScene.get());
}
private void needsDeviceRegistration() {
diff --git a/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java b/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java
index 12fdfd692..ef6148c87 100644
--- a/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java
+++ b/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java
@@ -5,6 +5,7 @@ import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
import com.tobiasdiez.easybind.EasyBind;
+import org.apache.commons.lang3.SystemUtils;
import org.cryptomator.common.vaults.Vault;
import org.cryptomator.integrations.mount.Mountpoint;
import org.cryptomator.integrations.revealpath.RevealFailedException;
@@ -101,7 +102,11 @@ public class VaultDetailUnlockedController implements FxController {
private void handleDragEvent(DragEvent event) {
if (DragEvent.DRAG_OVER.equals(event.getEventType()) && event.getGestureSource() == null && event.getDragboard().hasFiles()) {
- event.acceptTransferModes(TransferMode.LINK);
+ if(SystemUtils.IS_OS_WINDOWS || SystemUtils.IS_OS_MAC) {
+ event.acceptTransferModes(TransferMode.LINK);
+ } else {
+ event.acceptTransferModes(TransferMode.ANY);
+ }
draggingOver.set(true);
} else if (DragEvent.DRAG_DROPPED.equals(event.getEventType()) && event.getGestureSource() == null && event.getDragboard().hasFiles()) {
List ciphertextPaths = event.getDragboard().getFiles().stream().map(File::toPath).map(this::getCiphertextPath).flatMap(Optional::stream).toList();
diff --git a/src/main/resources/fxml/hub_license_exceeded.fxml b/src/main/resources/fxml/hub_invalid_license.fxml
similarity index 84%
rename from src/main/resources/fxml/hub_license_exceeded.fxml
rename to src/main/resources/fxml/hub_invalid_license.fxml
index 10be37307..e01443a3f 100644
--- a/src/main/resources/fxml/hub_license_exceeded.fxml
+++ b/src/main/resources/fxml/hub_invalid_license.fxml
@@ -13,7 +13,7 @@
-