diff --git a/main/keychain/src/test/java/org/cryptomator/keychain/WindowsProtectedKeychainAccessTest.java b/main/keychain/src/test/java/org/cryptomator/keychain/WindowsProtectedKeychainAccessTest.java index 796634f5e..aa5c2b2f4 100644 --- a/main/keychain/src/test/java/org/cryptomator/keychain/WindowsProtectedKeychainAccessTest.java +++ b/main/keychain/src/test/java/org/cryptomator/keychain/WindowsProtectedKeychainAccessTest.java @@ -15,19 +15,17 @@ import org.junit.jupiter.api.io.TempDir; import org.mockito.Mockito; import org.mockito.stubbing.Answer; -import java.io.IOException; import java.nio.file.Path; import java.util.Optional; import java.util.stream.Stream; public class WindowsProtectedKeychainAccessTest { - private Path keychainPath; private WindowsProtectedKeychainAccess keychain; @BeforeEach - public void setup(@TempDir Path tempDir) throws IOException { - keychainPath = tempDir.resolve("keychainfile.tmp"); + public void setup(@TempDir Path tempDir) { + Path keychainPath = tempDir.resolve("keychainfile.tmp"); Environment env = Mockito.mock(Environment.class); Mockito.when(env.getKeychainPath()).thenReturn(Stream.of(keychainPath)); WinFunctions winFunctions = Mockito.mock(WinFunctions.class); @@ -40,7 +38,7 @@ public class WindowsProtectedKeychainAccessTest { } @Test - public void testStoreAndLoad() throws IOException { + public void testStoreAndLoad() { String storedPw1 = "topSecret"; String storedPw2 = "bottomSecret"; keychain.storePassphrase("myPassword", storedPw1); diff --git a/main/launcher/src/main/java/org/cryptomator/launcher/CryptomatorComponent.java b/main/launcher/src/main/java/org/cryptomator/launcher/CryptomatorComponent.java index e22a85f9e..6d5c47b05 100644 --- a/main/launcher/src/main/java/org/cryptomator/launcher/CryptomatorComponent.java +++ b/main/launcher/src/main/java/org/cryptomator/launcher/CryptomatorComponent.java @@ -2,13 +2,9 @@ package org.cryptomator.launcher; import dagger.Component; import org.cryptomator.common.CommonsModule; -import org.cryptomator.common.Environment; -import org.cryptomator.logging.DebugMode; import org.cryptomator.logging.LoggerModule; -import javax.inject.Named; import javax.inject.Singleton; -import java.util.Optional; @Singleton @Component(modules = {CryptomatorModule.class, CommonsModule.class, LoggerModule.class}) diff --git a/main/launcher/src/main/java/org/cryptomator/launcher/FileOpenRequestHandler.java b/main/launcher/src/main/java/org/cryptomator/launcher/FileOpenRequestHandler.java index c422b8b51..a2f9c901e 100644 --- a/main/launcher/src/main/java/org/cryptomator/launcher/FileOpenRequestHandler.java +++ b/main/launcher/src/main/java/org/cryptomator/launcher/FileOpenRequestHandler.java @@ -6,9 +6,15 @@ *******************************************************************************/ package org.cryptomator.launcher; +import org.cryptomator.ui.model.AppLaunchEvent; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; import java.awt.Desktop; import java.awt.desktop.OpenFilesEvent; -import java.awt.desktop.QuitStrategy; import java.io.File; import java.nio.file.FileSystem; import java.nio.file.FileSystems; @@ -17,17 +23,8 @@ import java.nio.file.Path; import java.util.Arrays; import java.util.Objects; import java.util.concurrent.BlockingQueue; -import java.util.function.Function; import java.util.stream.Stream; -import org.cryptomator.ui.model.AppLaunchEvent; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; - @Singleton class FileOpenRequestHandler { diff --git a/main/launcher/src/main/java/org/cryptomator/launcher/FxApplicationComponent.java b/main/launcher/src/main/java/org/cryptomator/launcher/FxApplicationComponent.java index 701e3e546..562151f43 100644 --- a/main/launcher/src/main/java/org/cryptomator/launcher/FxApplicationComponent.java +++ b/main/launcher/src/main/java/org/cryptomator/launcher/FxApplicationComponent.java @@ -10,7 +10,6 @@ import dagger.Subcomponent; import javafx.application.Application; import javafx.stage.Stage; import org.cryptomator.common.FxApplicationScoped; -import org.cryptomator.logging.DebugMode; import org.cryptomator.ui.controllers.ViewControllerLoader; import javax.inject.Named; diff --git a/main/ui/src/main/java/org/cryptomator/ui/UiModule.java b/main/ui/src/main/java/org/cryptomator/ui/UiModule.java index f1cbc1c00..b93c5ddae 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/UiModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/UiModule.java @@ -14,7 +14,6 @@ import javafx.beans.binding.Binding; import org.apache.commons.lang3.SystemUtils; import org.cryptomator.common.FxApplicationScoped; import org.cryptomator.common.settings.Settings; -import org.cryptomator.common.settings.SettingsProvider; import org.cryptomator.frontend.webdav.WebDavServer; import org.cryptomator.keychain.KeychainModule; import org.cryptomator.ui.controllers.ViewControllerModule; diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/ChangePasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/ChangePasswordController.java index 2965d5dbd..c72dda3dd 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/controllers/ChangePasswordController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/ChangePasswordController.java @@ -9,27 +9,9 @@ *******************************************************************************/ package org.cryptomator.ui.controllers; -import java.io.IOException; -import java.io.UncheckedIOException; -import java.util.Objects; -import java.util.Optional; - -import javax.inject.Inject; - -import javafx.beans.Observable; -import org.cryptomator.cryptolib.api.InvalidPassphraseException; -import org.cryptomator.cryptolib.api.UnsupportedVaultFormatException; -import org.cryptomator.ui.controls.SecPasswordField; -import org.cryptomator.ui.l10n.Localization; -import org.cryptomator.ui.model.Vault; -import org.cryptomator.ui.util.PasswordStrengthUtil; -import org.fxmisc.easybind.EasyBind; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import javafx.application.Application; import javafx.application.Platform; -import javafx.beans.binding.BooleanBinding; +import javafx.beans.Observable; import javafx.beans.property.IntegerProperty; import javafx.beans.property.SimpleIntegerProperty; import javafx.event.ActionEvent; @@ -41,6 +23,21 @@ import javafx.scene.control.Label; import javafx.scene.layout.GridPane; import javafx.scene.layout.Region; import javafx.scene.text.Text; +import org.cryptomator.cryptolib.api.InvalidPassphraseException; +import org.cryptomator.cryptolib.api.UnsupportedVaultFormatException; +import org.cryptomator.ui.controls.SecPasswordField; +import org.cryptomator.ui.l10n.Localization; +import org.cryptomator.ui.model.Vault; +import org.cryptomator.ui.util.PasswordStrengthUtil; +import org.fxmisc.easybind.EasyBind; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.inject.Inject; +import java.io.IOException; +import java.io.UncheckedIOException; +import java.util.Objects; +import java.util.Optional; public class ChangePasswordController implements ViewController { @@ -113,7 +110,7 @@ public class ChangePasswordController implements ViewController { passwordStrengthLabel.textProperty().bind(EasyBind.map(passwordStrength, strengthRater::getStrengthDescription)); } - private void passwordsChanged(Observable observable) { + private void passwordsChanged(@SuppressWarnings("unused") Observable observable) { boolean oldPasswordEmpty = oldPasswordField.getCharacters().length() == 0; boolean newPasswordEmpty = newPasswordField.getCharacters().length() == 0; boolean passwordsEqual = newPasswordField.getCharacters().equals(retypePasswordField.getCharacters()); diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/InitializeController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/InitializeController.java index 5e727d5f1..44ddcecd1 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/controllers/InitializeController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/InitializeController.java @@ -9,16 +9,17 @@ ******************************************************************************/ package org.cryptomator.ui.controllers; -import java.io.IOException; -import java.nio.file.FileAlreadyExistsException; -import java.util.Objects; -import java.util.Optional; - -import javax.inject.Inject; - +import javafx.application.Platform; import javafx.beans.Observable; import javafx.beans.property.IntegerProperty; -import javafx.beans.value.ObservableIntegerValue; +import javafx.beans.property.SimpleIntegerProperty; +import javafx.event.ActionEvent; +import javafx.fxml.FXML; +import javafx.scene.Parent; +import javafx.scene.control.Button; +import javafx.scene.control.Label; +import javafx.scene.layout.GridPane; +import javafx.scene.layout.Region; import org.cryptomator.ui.controls.SecPasswordField; import org.cryptomator.ui.l10n.Localization; import org.cryptomator.ui.model.Vault; @@ -27,17 +28,11 @@ import org.fxmisc.easybind.EasyBind; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javafx.application.Platform; -import javafx.beans.binding.BooleanBinding; -import javafx.beans.property.SimpleIntegerProperty; -import javafx.beans.value.ObservableValue; -import javafx.event.ActionEvent; -import javafx.fxml.FXML; -import javafx.scene.Parent; -import javafx.scene.control.Button; -import javafx.scene.control.Label; -import javafx.scene.layout.GridPane; -import javafx.scene.layout.Region; +import javax.inject.Inject; +import java.io.IOException; +import java.nio.file.FileAlreadyExistsException; +import java.util.Objects; +import java.util.Optional; public class InitializeController implements ViewController { @@ -101,7 +96,7 @@ public class InitializeController implements ViewController { passwordStrengthLabel.textProperty().bind(EasyBind.map(passwordStrength, strengthRater::getStrengthDescription)); } - private void passwordsChanged(Observable observable) { + private void passwordsChanged(@SuppressWarnings("unused") Observable observable) { boolean passwordsEmpty = passwordField.getCharacters().length() == 0; boolean passwordsEqual = passwordField.getCharacters().equals(retypePasswordField.getCharacters()); okButton.setDisable(passwordsEmpty || !passwordsEqual); 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 971e919dc..9e435e389 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 @@ -20,7 +20,6 @@ import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleObjectProperty; import javafx.collections.FXCollections; import javafx.collections.ObservableList; -import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.geometry.Side; import javafx.scene.Parent; @@ -52,11 +51,11 @@ import org.cryptomator.ui.controls.DirectoryListCell; import org.cryptomator.ui.l10n.Localization; import org.cryptomator.ui.model.AppLaunchEvent; import org.cryptomator.ui.model.AutoUnlocker; -import org.cryptomator.ui.model.upgrade.UpgradeStrategies; -import org.cryptomator.ui.model.upgrade.UpgradeStrategy; import org.cryptomator.ui.model.Vault; import org.cryptomator.ui.model.VaultFactory; import org.cryptomator.ui.model.VaultList; +import org.cryptomator.ui.model.upgrade.UpgradeStrategies; +import org.cryptomator.ui.model.upgrade.UpgradeStrategy; import org.cryptomator.ui.util.DialogBuilderUtil; import org.cryptomator.ui.util.Tasks; import org.fxmisc.easybind.EasyBind; diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/SettingsController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/SettingsController.java index 3321b978d..f055573c5 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/controllers/SettingsController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/SettingsController.java @@ -156,7 +156,7 @@ public class SettingsController implements ViewController { } } - private void setVisibilityGvfsElements(Observable obs, Object oldValue, Object newValue) { + private void setVisibilityGvfsElements(@SuppressWarnings("unused") Observable obs, @SuppressWarnings("unused")Object oldValue, Object newValue) { prefGvfsSchemeLabel.setVisible(SystemUtils.IS_OS_LINUX && ((VolumeImpl) newValue).getDisplayName().equals("WebDAV")); prefGvfsScheme.setVisible(SystemUtils.IS_OS_LINUX && ((VolumeImpl) newValue).getDisplayName().equals("WebDAV")); } diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java index a9ab0049e..4800027f1 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java @@ -13,7 +13,6 @@ import com.google.common.base.Strings; import javafx.application.Application; import javafx.beans.value.ChangeListener; import javafx.beans.value.ObservableValue; -import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.scene.Parent; import javafx.scene.control.Alert; @@ -287,7 +286,7 @@ public class UnlockController implements ViewController { // **************************************** @FXML - public void didClickDownloadsLink(ActionEvent event) { + public void didClickDownloadsLink() { app.getHostServices().showDocument("https://cryptomator.org/downloads/#allVersions"); } @@ -296,7 +295,7 @@ public class UnlockController implements ViewController { // **************************************** @FXML - private void didClickAdvancedOptionsButton(ActionEvent event) { + private void didClickAdvancedOptionsButton() { messageText.setText(null); advancedOptions.setVisible(!advancedOptions.isVisible()); if (advancedOptions.isVisible()) { @@ -312,7 +311,7 @@ public class UnlockController implements ViewController { } } - private void mountNameDidChange(ObservableValue property, String oldValue, String newValue) { + private void mountNameDidChange(@SuppressWarnings("unused") ObservableValue property, @SuppressWarnings("unused")String oldValue, String newValue) { // newValue is guaranteed to be a-z0-9_, see #filterAlphanumericKeyEvents if (newValue.isEmpty()) { mountName.setText(vault.getMountName()); @@ -321,7 +320,8 @@ public class UnlockController implements ViewController { } } - public void didClickChooseCustomMountPoint(ActionEvent actionEvent) { + @FXML + public void didClickChooseCustomMountPoint() { DirectoryChooser dirChooser = new DirectoryChooser(); File file = dirChooser.showDialog(mainWindow); if (file != null) { @@ -372,7 +372,7 @@ public class UnlockController implements ViewController { } } - private void winDriveLetterDidChange(ObservableValue property, Character oldValue, Character newValue) { + private void winDriveLetterDidChange(@SuppressWarnings("unused") ObservableValue property, @SuppressWarnings("unused") Character oldValue, Character newValue) { vault.setWinDriveLetter(newValue); } @@ -396,7 +396,7 @@ public class UnlockController implements ViewController { // **************************************** @FXML - private void didClickSavePasswordCheckbox(ActionEvent event) { + private void didClickSavePasswordCheckbox() { if (!savePassword.isSelected() && hasStoredPassword()) { Alert confirmDialog = DialogBuilderUtil.buildConfirmationDialog( // localization.getString("unlock.savePassword.delete.confirmation.title"), // @@ -427,7 +427,7 @@ public class UnlockController implements ViewController { // **************************************** @FXML - private void didClickUnlockButton(ActionEvent event) { + private void didClickUnlockButton() { advancedOptions.setDisable(true); advancedOptions.setVisible(false); advancedOptionsButton.setText(localization.getString("unlock.button.advancedOptions.show")); 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 3143f8c3d..b64ace29c 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,10 +8,6 @@ ******************************************************************************/ package org.cryptomator.ui.controllers; -import javax.inject.Inject; -import java.util.Optional; -import java.util.concurrent.ExecutorService; - import javafx.animation.Animation; import javafx.animation.KeyFrame; import javafx.animation.Timeline; @@ -42,6 +38,10 @@ import org.fxmisc.easybind.EasyBind; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.inject.Inject; +import java.util.Optional; +import java.util.concurrent.ExecutorService; + import static java.lang.String.format; public class UnlockedController implements ViewController { @@ -103,7 +103,7 @@ public class UnlockedController implements ViewController { } @FXML - private void didClickLockVault(ActionEvent event) { + private void didClickLockVault() { regularLockVault(this::lockVaultSucceeded); } @@ -156,7 +156,7 @@ public class UnlockedController implements ViewController { } @FXML - private void didClickMoreOptions(ActionEvent event) { + private void didClickMoreOptions() { if (moreOptionsMenu.isShowing()) { moreOptionsMenu.hide(); } else { @@ -166,7 +166,7 @@ public class UnlockedController implements ViewController { } @FXML - private void didClickRevealVault(ActionEvent event) { + private void didClickRevealVault() { revealVault(vault.get()); } diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/FuseVolume.java b/main/ui/src/main/java/org/cryptomator/ui/model/FuseVolume.java index b2eb7cf0f..fcd69493d 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/model/FuseVolume.java +++ b/main/ui/src/main/java/org/cryptomator/ui/model/FuseVolume.java @@ -16,7 +16,6 @@ import javax.inject.Inject; import java.io.IOException; import java.nio.file.DirectoryNotEmptyException; import java.nio.file.DirectoryStream; -import java.nio.file.FileAlreadyExistsException; import java.nio.file.Files; import java.nio.file.NotDirectoryException; import java.nio.file.Path; diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/Vault.java b/main/ui/src/main/java/org/cryptomator/ui/model/Vault.java index acaa33fdf..bd48150fc 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/model/Vault.java +++ b/main/ui/src/main/java/org/cryptomator/ui/model/Vault.java @@ -18,7 +18,6 @@ import javafx.beans.property.SimpleObjectProperty; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.SystemUtils; import org.cryptomator.common.LazyInitializer; -import org.cryptomator.common.settings.Settings; import org.cryptomator.common.settings.VaultSettings; import org.cryptomator.cryptofs.CryptoFileSystem; import org.cryptomator.cryptofs.CryptoFileSystemProperties; @@ -52,9 +51,7 @@ public class Vault { public static final Predicate NOT_LOCKED = hasState(State.LOCKED).negate(); private static final Logger LOG = LoggerFactory.getLogger(Vault.class); private static final String MASTERKEY_FILENAME = "masterkey.cryptomator"; - private static final String LOCALHOST_ALIAS = "cryptomator-vault"; - private final Settings settings; private final VaultSettings vaultSettings; private final Provider volumeProvider; private final AtomicReference cryptoFileSystem = new AtomicReference<>(); @@ -67,8 +64,7 @@ public class Vault { } @Inject - Vault(Settings settings, VaultSettings vaultSettings, Provider volumeProvider) { - this.settings = settings; + Vault(VaultSettings vaultSettings, Provider volumeProvider) { this.vaultSettings = vaultSettings; this.volumeProvider = volumeProvider; }