From 82caf76e1298373eb37f8a9cc894c15fb0d6de0c Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Fri, 17 Nov 2023 15:51:20 +0100 Subject: [PATCH] clean up --- .../cryptomator/ui/keyloading/hub/HubKeyLoadingStrategy.java | 1 - .../ui/keyloading/hub/RegisterDeviceController.java | 3 +-- .../ui/keyloading/hub/RegisterFailedController.java | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/org/cryptomator/ui/keyloading/hub/HubKeyLoadingStrategy.java b/src/main/java/org/cryptomator/ui/keyloading/hub/HubKeyLoadingStrategy.java index 71372f32a..40f845a63 100644 --- a/src/main/java/org/cryptomator/ui/keyloading/hub/HubKeyLoadingStrategy.java +++ b/src/main/java/org/cryptomator/ui/keyloading/hub/HubKeyLoadingStrategy.java @@ -1,7 +1,6 @@ package org.cryptomator.ui.keyloading.hub; import com.google.common.base.Preconditions; -import com.nimbusds.jose.JWEObject; import dagger.Lazy; import org.cryptomator.common.keychain.KeychainManager; import org.cryptomator.common.keychain.NoKeychainAccessProviderException; diff --git a/src/main/java/org/cryptomator/ui/keyloading/hub/RegisterDeviceController.java b/src/main/java/org/cryptomator/ui/keyloading/hub/RegisterDeviceController.java index 5af479342..701d484f5 100644 --- a/src/main/java/org/cryptomator/ui/keyloading/hub/RegisterDeviceController.java +++ b/src/main/java/org/cryptomator/ui/keyloading/hub/RegisterDeviceController.java @@ -40,7 +40,6 @@ import java.text.ParseException; import java.time.Duration; import java.time.Instant; import java.util.Objects; -import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; import java.util.concurrent.ExecutorService; @@ -186,7 +185,7 @@ public class RegisterDeviceController implements FxController { switch (cause) { case CompletionException e when e.getCause() instanceof JWEHelper.InvalidJweKeyException -> invalidSetupCode.set(true); default -> { - if(cause instanceof DeviceAlreadyExistsException) { + if (cause instanceof DeviceAlreadyExistsException) { LOG.debug("Device already registered in hub instance {} for different user", hubConfig.authSuccessUrl); } else { LOG.warn("Device setup failed.", cause); diff --git a/src/main/java/org/cryptomator/ui/keyloading/hub/RegisterFailedController.java b/src/main/java/org/cryptomator/ui/keyloading/hub/RegisterFailedController.java index 495fda7dd..8218c6f94 100644 --- a/src/main/java/org/cryptomator/ui/keyloading/hub/RegisterFailedController.java +++ b/src/main/java/org/cryptomator/ui/keyloading/hub/RegisterFailedController.java @@ -5,7 +5,6 @@ import org.cryptomator.ui.keyloading.KeyLoading; import javax.inject.Inject; import javax.inject.Named; -import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; import javafx.fxml.FXML; import javafx.stage.Stage;