From e1d83c996e501649b2253741e4a80ce54646b317 Mon Sep 17 00:00:00 2001 From: JaniruTEC Date: Sat, 12 Jun 2021 01:45:31 +0200 Subject: [PATCH] Fixed independent spelling mistakes Added @SuppressWarnings("SpellCheckingInspection") to binary data (e.g. keys) or deliberately misspelled strings --- .github/SUPPORT.md | 2 +- .../java/org/cryptomator/common/CommonsModule.java | 1 + .../java/org/cryptomator/common/Environment.java | 4 ++-- .../org/cryptomator/common/SemVerComparator.java | 10 +++++----- .../org/cryptomator/common/settings/Settings.java | 4 ++-- .../common/settings/SettingsProvider.java | 2 +- .../cryptomator/common/settings/VaultSettings.java | 4 ++-- .../common/settings/VaultSettingsJsonAdapter.java | 2 +- .../org/cryptomator/common/vaults/VaultModule.java | 2 +- .../org/cryptomator/common/vaults/VaultState.java | 2 +- .../java/org/cryptomator/common/vaults/Volume.java | 4 ++-- .../cryptomator/common/vaults/WebDavVolume.java | 2 +- .../cryptomator/ui/common/FxmlLoaderFactory.java | 4 ++-- .../ui/controls/NiceSecurePasswordField.java | 8 ++++---- .../cryptomator/ui/health/CheckListController.java | 8 ++++---- .../ui/keyloading/KeyLoadingStrategy.java | 4 ++-- .../MasterkeyFileLoadingStrategy.java | 8 ++++---- .../ui/launcher/AppLaunchEventHandler.java | 2 +- .../java/org/cryptomator/ui/lock/LockWorkflow.java | 2 +- .../ui/mainwindow/MainWindowTitleController.java | 2 +- .../cryptomator/ui/recoverykey/WordEncoder.java | 14 +++++++------- .../ui/stats/VaultStatisticsController.java | 2 +- src/main/resources/i18n/strings.properties | 6 +++--- .../org/cryptomator/common/LicenseCheckerTest.java | 5 +++++ .../common/settings/SettingsJsonAdapterTest.java | 1 + .../settings/VaultSettingsJsonAdapterTest.java | 1 + .../org/cryptomator/launcher/IpcFactoryTest.java | 2 +- .../ui/addvaultwizard/ReadMeGeneratorTest.java | 1 + .../ui/controls/SecurePasswordFieldTest.java | 6 ++++++ .../ui/recoverykey/AutoCompleterTest.java | 2 ++ 30 files changed, 67 insertions(+), 50 deletions(-) diff --git a/.github/SUPPORT.md b/.github/SUPPORT.md index c7dc14547..f9ef8460a 100644 --- a/.github/SUPPORT.md +++ b/.github/SUPPORT.md @@ -14,5 +14,5 @@ For _everything else_, please visit our official [Cryptomator Community](https:/ - Discussions about the apps - [Development discussions](https://community.cryptomator.org/c/development) - General questions - - Discussions regarding our design decissions + - Discussions regarding our design decisions - Our roadmap diff --git a/src/main/java/org/cryptomator/common/CommonsModule.java b/src/main/java/org/cryptomator/common/CommonsModule.java index 705f98b8f..eb7e6cd13 100644 --- a/src/main/java/org/cryptomator/common/CommonsModule.java +++ b/src/main/java/org/cryptomator/common/CommonsModule.java @@ -46,6 +46,7 @@ public abstract class CommonsModule { private static final int NUM_CORE_BG_THREADS = 6; private static final long BG_THREAD_KEEPALIVE_SECONDS = 60l; + @SuppressWarnings("SpellCheckingInspection") @Provides @Singleton @Named("licensePublicKey") diff --git a/src/main/java/org/cryptomator/common/Environment.java b/src/main/java/org/cryptomator/common/Environment.java index e27ae9bde..a6c20c2d7 100644 --- a/src/main/java/org/cryptomator/common/Environment.java +++ b/src/main/java/org/cryptomator/common/Environment.java @@ -123,8 +123,8 @@ public class Environment { return Stream.empty(); } else { Iterable iter = Splitter.on(separator).split(value); - Spliterator spliter = Spliterators.spliteratorUnknownSize(iter.iterator(), Spliterator.ORDERED | Spliterator.IMMUTABLE); - return StreamSupport.stream(spliter, false); + Spliterator spliterator = Spliterators.spliteratorUnknownSize(iter.iterator(), Spliterator.ORDERED | Spliterator.IMMUTABLE); + return StreamSupport.stream(spliterator, false); } } } diff --git a/src/main/java/org/cryptomator/common/SemVerComparator.java b/src/main/java/org/cryptomator/common/SemVerComparator.java index e0ff9ae25..0f9148bd5 100644 --- a/src/main/java/org/cryptomator/common/SemVerComparator.java +++ b/src/main/java/org/cryptomator/common/SemVerComparator.java @@ -60,17 +60,17 @@ public class SemVerComparator implements Comparator { final int commonCompCount = Math.min(vComps1.length, vComps2.length); for (int i = 0; i < commonCompCount; i++) { - int subversionComparisionResult = 0; + int subversionComparisonResult = 0; try { final int v1 = Integer.parseInt(vComps1[i]); final int v2 = Integer.parseInt(vComps2[i]); - subversionComparisionResult = v1 - v2; + subversionComparisonResult = v1 - v2; } catch (NumberFormatException ex) { // ok, lets compare this fragment lexicographically - subversionComparisionResult = vComps1[i].compareTo(vComps2[i]); + subversionComparisonResult = vComps1[i].compareTo(vComps2[i]); } - if (subversionComparisionResult != 0) { - return subversionComparisionResult; + if (subversionComparisonResult != 0) { + return subversionComparisonResult; } } diff --git a/src/main/java/org/cryptomator/common/settings/Settings.java b/src/main/java/org/cryptomator/common/settings/Settings.java index ee654db49..e4cb9b8f7 100644 --- a/src/main/java/org/cryptomator/common/settings/Settings.java +++ b/src/main/java/org/cryptomator/common/settings/Settings.java @@ -30,7 +30,7 @@ public class Settings { public static final int MIN_PORT = 1024; public static final int MAX_PORT = 65535; public static final boolean DEFAULT_ASKED_FOR_UPDATE_CHECK = false; - public static final boolean DEFAULT_CHECK_FOR_UDPATES = false; + public static final boolean DEFAULT_CHECK_FOR_UPDATES = false; public static final boolean DEFAULT_START_HIDDEN = false; public static final int DEFAULT_PORT = 42427; public static final int DEFAULT_NUM_TRAY_NOTIFICATIONS = 3; @@ -46,7 +46,7 @@ public class Settings { private final ObservableList directories = FXCollections.observableArrayList(VaultSettings::observables); private final BooleanProperty askedForUpdateCheck = new SimpleBooleanProperty(DEFAULT_ASKED_FOR_UPDATE_CHECK); - private final BooleanProperty checkForUpdates = new SimpleBooleanProperty(DEFAULT_CHECK_FOR_UDPATES); + private final BooleanProperty checkForUpdates = new SimpleBooleanProperty(DEFAULT_CHECK_FOR_UPDATES); private final BooleanProperty startHidden = new SimpleBooleanProperty(DEFAULT_START_HIDDEN); private final IntegerProperty port = new SimpleIntegerProperty(DEFAULT_PORT); private final IntegerProperty numTrayNotifications = new SimpleIntegerProperty(DEFAULT_NUM_TRAY_NOTIFICATIONS); diff --git a/src/main/java/org/cryptomator/common/settings/SettingsProvider.java b/src/main/java/org/cryptomator/common/settings/SettingsProvider.java index 8310d0fa9..3be42f7ac 100644 --- a/src/main/java/org/cryptomator/common/settings/SettingsProvider.java +++ b/src/main/java/org/cryptomator/common/settings/SettingsProvider.java @@ -101,7 +101,7 @@ public class SettingsProvider implements Supplier { if (settings == null) { return; } - final Optional settingsPath = env.getSettingsPath().findFirst(); // alway save to preferred (first) path + final Optional settingsPath = env.getSettingsPath().findFirst(); // always save to preferred (first) path settingsPath.ifPresent(path -> { Runnable saveCommand = () -> this.save(settings, path); ScheduledFuture scheduledTask = scheduler.schedule(saveCommand, SAVE_DELAY_MS, TimeUnit.MILLISECONDS); diff --git a/src/main/java/org/cryptomator/common/settings/VaultSettings.java b/src/main/java/org/cryptomator/common/settings/VaultSettings.java index 10a023806..a7f366bfd 100644 --- a/src/main/java/org/cryptomator/common/settings/VaultSettings.java +++ b/src/main/java/org/cryptomator/common/settings/VaultSettings.java @@ -31,7 +31,7 @@ import java.util.Random; public class VaultSettings { public static final boolean DEFAULT_UNLOCK_AFTER_STARTUP = false; - public static final boolean DEFAULT_REAVEAL_AFTER_MOUNT = true; + public static final boolean DEFAULT_REVEAL_AFTER_MOUNT = true; public static final boolean DEFAULT_USES_INDIVIDUAL_MOUNTPATH = false; public static final boolean DEFAULT_USES_READONLY_MODE = false; public static final String DEFAULT_MOUNT_FLAGS = ""; @@ -47,7 +47,7 @@ public class VaultSettings { private final StringProperty displayName = new SimpleStringProperty(); private final StringProperty winDriveLetter = new SimpleStringProperty(); private final BooleanProperty unlockAfterStartup = new SimpleBooleanProperty(DEFAULT_UNLOCK_AFTER_STARTUP); - private final BooleanProperty revealAfterMount = new SimpleBooleanProperty(DEFAULT_REAVEAL_AFTER_MOUNT); + private final BooleanProperty revealAfterMount = new SimpleBooleanProperty(DEFAULT_REVEAL_AFTER_MOUNT); private final BooleanProperty useCustomMountPath = new SimpleBooleanProperty(DEFAULT_USES_INDIVIDUAL_MOUNTPATH); private final StringProperty customMountPath = new SimpleStringProperty(); private final BooleanProperty usesReadOnlyMode = new SimpleBooleanProperty(DEFAULT_USES_READONLY_MODE); diff --git a/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java b/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java index 0cf92a48b..15a081f0d 100644 --- a/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java +++ b/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java @@ -44,7 +44,7 @@ class VaultSettingsJsonAdapter { String customMountPath = null; String winDriveLetter = null; boolean unlockAfterStartup = VaultSettings.DEFAULT_UNLOCK_AFTER_STARTUP; - boolean revealAfterMount = VaultSettings.DEFAULT_REAVEAL_AFTER_MOUNT; + boolean revealAfterMount = VaultSettings.DEFAULT_REVEAL_AFTER_MOUNT; boolean useCustomMountPath = VaultSettings.DEFAULT_USES_INDIVIDUAL_MOUNTPATH; boolean usesReadOnlyMode = VaultSettings.DEFAULT_USES_READONLY_MODE; String mountFlags = VaultSettings.DEFAULT_MOUNT_FLAGS; diff --git a/src/main/java/org/cryptomator/common/vaults/VaultModule.java b/src/main/java/org/cryptomator/common/vaults/VaultModule.java index 901ee7f42..4ee13a083 100644 --- a/src/main/java/org/cryptomator/common/vaults/VaultModule.java +++ b/src/main/java/org/cryptomator/common/vaults/VaultModule.java @@ -138,7 +138,7 @@ public class VaultModule { // see https://github.com/billziss-gh/winfsp/blob/5d0b10d0b643652c00ebb4704dc2bb28e7244973/src/dll/fuse/fuse_main.c#L53-L62 for syntax guide // see https://github.com/billziss-gh/winfsp/blob/5d0b10d0b643652c00ebb4704dc2bb28e7244973/src/dll/fuse/fuse.c#L295-L319 for options (-o <...>) - // see https://github.com/billziss-gh/winfsp/wiki/Frequently-Asked-Questions/5ba00e4be4f5e938eaae6ef1500b331de12dee77 (FUSE 4.) on why the given defaults were choosen + // see https://github.com/billziss-gh/winfsp/wiki/Frequently-Asked-Questions/5ba00e4be4f5e938eaae6ef1500b331de12dee77 (FUSE 4.) on why the given defaults were chosen private String getWindowsFuseDefaultMountFlags(StringBinding mountName, ReadOnlyBooleanProperty readOnly) { assert SystemUtils.IS_OS_WINDOWS; StringBuilder flags = new StringBuilder(); diff --git a/src/main/java/org/cryptomator/common/vaults/VaultState.java b/src/main/java/org/cryptomator/common/vaults/VaultState.java index 801ea7653..51365fbd2 100644 --- a/src/main/java/org/cryptomator/common/vaults/VaultState.java +++ b/src/main/java/org/cryptomator/common/vaults/VaultState.java @@ -46,7 +46,7 @@ public class VaultState extends ObservableValueBase implements UNLOCKED, /** - * Unknown state due to preceeding unrecoverable exceptions. + * Unknown state due to preceding unrecoverable exceptions. */ ERROR; } diff --git a/src/main/java/org/cryptomator/common/vaults/Volume.java b/src/main/java/org/cryptomator/common/vaults/Volume.java index f608122bf..5f434fa43 100644 --- a/src/main/java/org/cryptomator/common/vaults/Volume.java +++ b/src/main/java/org/cryptomator/common/vaults/Volume.java @@ -12,7 +12,7 @@ import java.util.function.Consumer; import java.util.stream.Stream; /** - * Takes a Volume and usess it to mount an unlocked vault + * Takes a Volume and uses it to mount an unlocked vault */ public interface Volume { @@ -24,7 +24,7 @@ public interface Volume { boolean isSupported(); /** - * Gets the coresponding enum type of the {@link VolumeImpl volume implementation ("VolumeImpl")} that is implemented by this Volume. + * Gets the corresponding enum type of the {@link VolumeImpl volume implementation ("VolumeImpl")} that is implemented by this Volume. * * @return the type of implementation as defined by the {@link VolumeImpl VolumeImpl enum} */ diff --git a/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java b/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java index 03c83377c..b1850bc1e 100644 --- a/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java +++ b/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java @@ -67,7 +67,7 @@ public class WebDavVolume implements Volume { throw new IllegalStateException("Mounting requires unlocked WebDAV servlet."); } - //on windows, prevent an automatic drive letter selection in the upstream library. Either we choose already a specifc one or there is no free. + //on windows, prevent an automatic drive letter selection in the upstream library. Either we choose already a specific one or there is no free. Supplier driveLetterSupplier; if (System.getProperty("os.name").toLowerCase().contains("windows") && vaultSettings.winDriveLetter().isEmpty().get()) { driveLetterSupplier = () -> windowsDriveLetters.getAvailableDriveLetter().orElse(null); diff --git a/src/main/java/org/cryptomator/ui/common/FxmlLoaderFactory.java b/src/main/java/org/cryptomator/ui/common/FxmlLoaderFactory.java index cf8940cc2..cbd023ce3 100644 --- a/src/main/java/org/cryptomator/ui/common/FxmlLoaderFactory.java +++ b/src/main/java/org/cryptomator/ui/common/FxmlLoaderFactory.java @@ -67,8 +67,8 @@ public class FxmlLoaderFactory { } Parent root = loader.getRoot(); // TODO: discuss if we can remove language-specific stylesheets - // List addtionalStyleSheets = Splitter.on(',').omitEmptyStrings().splitToList(resourceBundle.getString("additionalStyleSheets")); - // addtionalStyleSheets.forEach(styleSheet -> root.getStylesheets().add("/css/" + styleSheet)); + // List additionalStyleSheets = Splitter.on(',').omitEmptyStrings().splitToList(resourceBundle.getString("additionalStyleSheets")); + // additionalStyleSheets.forEach(styleSheet -> root.getStylesheets().add("/css/" + styleSheet)); return sceneFactory.apply(root); } diff --git a/src/main/java/org/cryptomator/ui/controls/NiceSecurePasswordField.java b/src/main/java/org/cryptomator/ui/controls/NiceSecurePasswordField.java index 928cfc40e..4a4e43fff 100644 --- a/src/main/java/org/cryptomator/ui/controls/NiceSecurePasswordField.java +++ b/src/main/java/org/cryptomator/ui/controls/NiceSecurePasswordField.java @@ -12,8 +12,8 @@ import javafx.scene.layout.StackPane; public class NiceSecurePasswordField extends StackPane { private static final String STYLE_CLASS = "nice-secure-password-field"; - private static final String ICONS_STLYE_CLASS = "icons"; - private static final String REVEAL_BUTTON_STLYE_CLASS = "reveal-button"; + private static final String ICONS_STYLE_CLASS = "icons"; + private static final String REVEAL_BUTTON_STYLE_CLASS = "reveal-button"; private static final int ICON_SPACING = 6; private static final double ICON_SIZE = 14.0; @@ -30,7 +30,7 @@ public class NiceSecurePasswordField extends StackPane { iconContainer.setAlignment(Pos.CENTER_RIGHT); iconContainer.setMaxWidth(Double.NEGATIVE_INFINITY); iconContainer.setPrefWidth(42); // TODO - iconContainer.getStyleClass().add(ICONS_STLYE_CLASS); + iconContainer.getStyleClass().add(ICONS_STYLE_CLASS); StackPane.setAlignment(iconContainer, Pos.CENTER_RIGHT); capsLockedIcon.setGlyph(FontAwesome5Icon.ARROW_UP); @@ -51,7 +51,7 @@ public class NiceSecurePasswordField extends StackPane { revealPasswordButton.setFocusTraversable(false); revealPasswordButton.visibleProperty().bind(passwordField.focusedProperty()); revealPasswordButton.managedProperty().bind(passwordField.focusedProperty()); - revealPasswordButton.getStyleClass().add(REVEAL_BUTTON_STLYE_CLASS); + revealPasswordButton.getStyleClass().add(REVEAL_BUTTON_STYLE_CLASS); passwordField.revealPasswordProperty().bind(revealPasswordButton.selectedProperty()); diff --git a/src/main/java/org/cryptomator/ui/health/CheckListController.java b/src/main/java/org/cryptomator/ui/health/CheckListController.java index ccb41d56b..169083e02 100644 --- a/src/main/java/org/cryptomator/ui/health/CheckListController.java +++ b/src/main/java/org/cryptomator/ui/health/CheckListController.java @@ -46,7 +46,7 @@ public class CheckListController implements FxController { private final ReportWriter reportWriter; private final ExecutorService executorService; private final ObjectProperty selectedTask; - private final Lazy errorComponenBuilder; + private final Lazy errorComponentBuilder; private final SimpleObjectProperty> runningTask; private final Binding running; private final Binding finished; @@ -60,13 +60,13 @@ public class CheckListController implements FxController { @Inject - public CheckListController(@HealthCheckWindow Stage window, Lazy> tasks, ReportWriter reportWriteTask, ObjectProperty selectedTask, ExecutorService executorService, Lazy errorComponenBuilder) { + public CheckListController(@HealthCheckWindow Stage window, Lazy> tasks, ReportWriter reportWriteTask, ObjectProperty selectedTask, ExecutorService executorService, Lazy errorComponentBuilder) { this.window = window; this.tasks = FXCollections.observableArrayList(tasks.get()); this.reportWriter = reportWriteTask; this.executorService = executorService; this.selectedTask = selectedTask; - this.errorComponenBuilder = errorComponenBuilder; + this.errorComponentBuilder = errorComponentBuilder; this.runningTask = new SimpleObjectProperty<>(); this.running = EasyBind.wrapNullable(runningTask).mapObservable(Worker::runningProperty).orElse(false); this.finished = EasyBind.wrapNullable(runningTask).mapObservable(Worker::stateProperty).map(END_STATES::contains).orElse(false); @@ -131,7 +131,7 @@ public class CheckListController implements FxController { reportWriter.writeReport(tasks); } catch (IOException e) { LOG.error("Failed to write health check report.", e); - errorComponenBuilder.get().cause(e).window(window).returnToScene(window.getScene()).build().showErrorScene(); + errorComponentBuilder.get().cause(e).window(window).returnToScene(window.getScene()).build().showErrorScene(); } } diff --git a/src/main/java/org/cryptomator/ui/keyloading/KeyLoadingStrategy.java b/src/main/java/org/cryptomator/ui/keyloading/KeyLoadingStrategy.java index ed8ca0540..eaef7480b 100644 --- a/src/main/java/org/cryptomator/ui/keyloading/KeyLoadingStrategy.java +++ b/src/main/java/org/cryptomator/ui/keyloading/KeyLoadingStrategy.java @@ -35,7 +35,7 @@ public interface KeyLoadingStrategy extends MasterkeyLoader { } /** - * Release any ressources or do follow-up tasks after loading a key. + * Release any resources or do follow-up tasks after loading a key. * * @param unlockedSuccessfully true if successfully unlocked a vault with the loaded key * @implNote This method might be invoked multiple times, depending on whether multiple attempts to load a key are started. @@ -47,7 +47,7 @@ public interface KeyLoadingStrategy extends MasterkeyLoader { /** * A key loading strategy that will always fail by throwing a {@link MasterkeyLoadingFailedException}. * - * @param exception The cause of the failure. If not alreay an {@link MasterkeyLoadingFailedException}, it will get wrapped. + * @param exception The cause of the failure. If not already an {@link MasterkeyLoadingFailedException}, it will get wrapped. * @return A new KeyLoadingStrategy that will always fail with an {@link MasterkeyLoadingFailedException}. */ static KeyLoadingStrategy failed(Exception exception) { diff --git a/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingStrategy.java b/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingStrategy.java index f8fbdd720..39db1cc04 100644 --- a/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingStrategy.java +++ b/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingStrategy.java @@ -32,7 +32,7 @@ public class MasterkeyFileLoadingStrategy implements KeyLoadingStrategy { public static final String SCHEME = "masterkeyfile"; private final Vault vault; - private final MasterkeyFileAccess masterkeyFileAcccess; + private final MasterkeyFileAccess masterkeyFileAccess; private final Stage window; private final Lazy passphraseEntryScene; private final Lazy selectMasterkeyFileScene; @@ -45,9 +45,9 @@ public class MasterkeyFileLoadingStrategy implements KeyLoadingStrategy { private boolean wrongPassword; @Inject - public MasterkeyFileLoadingStrategy(@KeyLoading Vault vault, MasterkeyFileAccess masterkeyFileAcccess, @KeyLoading Stage window, @FxmlScene(FxmlFile.UNLOCK_ENTER_PASSWORD) Lazy passphraseEntryScene, @FxmlScene(FxmlFile.UNLOCK_SELECT_MASTERKEYFILE) Lazy selectMasterkeyFileScene, UserInteractionLock passwordEntryLock, UserInteractionLock masterkeyFileProvisionLock, AtomicReference password, AtomicReference filePath, MasterkeyFileLoadingFinisher finisher) { + public MasterkeyFileLoadingStrategy(@KeyLoading Vault vault, MasterkeyFileAccess masterkeyFileAccess, @KeyLoading Stage window, @FxmlScene(FxmlFile.UNLOCK_ENTER_PASSWORD) Lazy passphraseEntryScene, @FxmlScene(FxmlFile.UNLOCK_SELECT_MASTERKEYFILE) Lazy selectMasterkeyFileScene, UserInteractionLock passwordEntryLock, UserInteractionLock masterkeyFileProvisionLock, AtomicReference password, AtomicReference filePath, MasterkeyFileLoadingFinisher finisher) { this.vault = vault; - this.masterkeyFileAcccess = masterkeyFileAcccess; + this.masterkeyFileAccess = masterkeyFileAccess; this.window = window; this.passphraseEntryScene = passphraseEntryScene; this.selectMasterkeyFileScene = selectMasterkeyFileScene; @@ -68,7 +68,7 @@ public class MasterkeyFileLoadingStrategy implements KeyLoadingStrategy { filePath = getAlternateMasterkeyFilePath(); } CharSequence passphrase = getPassphrase(); - return masterkeyFileAcccess.load(filePath, passphrase); + return masterkeyFileAccess.load(filePath, passphrase); } catch (InterruptedException e) { Thread.currentThread().interrupt(); throw new UnlockCancelledException("Unlock interrupted", e); diff --git a/src/main/java/org/cryptomator/ui/launcher/AppLaunchEventHandler.java b/src/main/java/org/cryptomator/ui/launcher/AppLaunchEventHandler.java index 49ef79e83..f4e5bb790 100644 --- a/src/main/java/org/cryptomator/ui/launcher/AppLaunchEventHandler.java +++ b/src/main/java/org/cryptomator/ui/launcher/AppLaunchEventHandler.java @@ -64,7 +64,7 @@ class AppLaunchEventHandler { } } - // TODO dedup MainWindowController... + // TODO deduplicate MainWindowController... private void addOrRevealVault(Path potentialVaultPath) { assert Platform.isFxApplicationThread(); try { diff --git a/src/main/java/org/cryptomator/ui/lock/LockWorkflow.java b/src/main/java/org/cryptomator/ui/lock/LockWorkflow.java index 87fd486f2..73b4844b9 100644 --- a/src/main/java/org/cryptomator/ui/lock/LockWorkflow.java +++ b/src/main/java/org/cryptomator/ui/lock/LockWorkflow.java @@ -22,7 +22,7 @@ import javafx.stage.Window; /** * The sequence of actions performed and checked during lock of a vault. *

- * This class implements the Task interface, sucht that it can run in the background with some possible forground operations/requests to the ui, without blocking the main app. + * This class implements the Task interface, sucht that it can run in the background with some possible foreground operations/requests to the ui, without blocking the main app. * If the task state is *

  • succeeded, the vault was successfully locked;
    • *
  • canceled, the lock was canceled;
    • diff --git a/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java b/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java index ea9311c88..ef050e799 100644 --- a/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java +++ b/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java @@ -129,7 +129,7 @@ public class MainWindowTitleController implements FxController { } public boolean isShowMinimizeButton() { - // always show the minimize button if no tray icon is present OR it is explicitily enabled + // always show the minimize button if no tray icon is present OR it is explicitly enabled return !trayMenuInitialized || settings.showMinimizeButton().get(); } } diff --git a/src/main/java/org/cryptomator/ui/recoverykey/WordEncoder.java b/src/main/java/org/cryptomator/ui/recoverykey/WordEncoder.java index ba4753879..7d31d660c 100644 --- a/src/main/java/org/cryptomator/ui/recoverykey/WordEncoder.java +++ b/src/main/java/org/cryptomator/ui/recoverykey/WordEncoder.java @@ -58,7 +58,7 @@ class WordEncoder { * @throws IllegalArgumentException If input is not a multiple of three bytes */ public String encodePadded(byte[] input) { - Preconditions.checkArgument(input.length % 3 == 0, "input needs to be padded to a multipe of three"); + Preconditions.checkArgument(input.length % 3 == 0, "input needs to be padded to a multiple of three"); StringBuilder sb = new StringBuilder(); for (int i = 0; i < input.length; i += 3) { byte b1 = input[i]; @@ -85,12 +85,12 @@ class WordEncoder { * @throws IllegalArgumentException If the encoded string doesn't consist of a multiple of two words or one of the words is unknown to this encoder. */ public byte[] decode(String encoded) { - List splitted = Splitter.on(DELIMITER).omitEmptyStrings().splitToList(Strings.nullToEmpty(encoded)); - Preconditions.checkArgument(splitted.size() % 2 == 0, "%s needs to be a multiple of two words", encoded); - byte[] result = new byte[splitted.size() / 2 * 3]; - for (int i = 0; i < splitted.size(); i += 2) { - String w1 = splitted.get(i); - String w2 = splitted.get(i + 1); + List split = Splitter.on(DELIMITER).omitEmptyStrings().splitToList(Strings.nullToEmpty(encoded)); + Preconditions.checkArgument(split.size() % 2 == 0, "%s needs to be a multiple of two words", encoded); + byte[] result = new byte[split.size() / 2 * 3]; + for (int i = 0; i < split.size(); i += 2) { + String w1 = split.get(i); + String w2 = split.get(i + 1); int firstWordIndex = indices.getOrDefault(w1, -1); int secondWordIndex = indices.getOrDefault(w2, -1); Preconditions.checkArgument(firstWordIndex != -1, "%s not in dictionary", w1); diff --git a/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java b/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java index f8937e90f..96116db36 100644 --- a/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java +++ b/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java @@ -102,7 +102,7 @@ public class VaultStatisticsController implements FxController { this.decryptedBytesRead = readData; this.encryptedBytesWrite = writeData; - // initialize data once and change value of datapoints later: + // initialize data once and change value of data points later: for (int i = 0; i < IO_SAMPLING_STEPS; i++) { decryptedBytesRead.getData().add(new Data<>(i, 0)); encryptedBytesWrite.getData().add(new Data<>(i, 0)); diff --git a/src/main/resources/i18n/strings.properties b/src/main/resources/i18n/strings.properties index f0f550769..692423e8f 100644 --- a/src/main/resources/i18n/strings.properties +++ b/src/main/resources/i18n/strings.properties @@ -14,7 +14,7 @@ generic.button.done=Done generic.button.next=Next generic.button.print=Print ## Error -generic.error.title=An unexpected error occured +generic.error.title=An unexpected error occurred generic.error.instruction=This should not have happened. Please report the error text below and include a description of what steps did lead to this error. # Defaults @@ -131,7 +131,7 @@ migration.start.confirm=Yes, my vault is fully synced migration.run.enterPassword=Enter the password for "%s" migration.run.startMigrationBtn=Migrate Vault migration.run.progressHint=This might take some time… -## Sucess +## Success migration.success.nextStepsInstructions=Migrated "%s" successfully.\nYou can now unlock your vault. migration.success.unlockNow=Unlock Now ## Missing file system capabilities @@ -148,7 +148,7 @@ migration.impossible.moreInfo=The vault can still be opened with an older versio # Health Check health.title=Vault Health Check -health.start.introduction=The Vault Health Check is a collection of checks to detect and possilby fix problems in the internal structure of your vault. Please note, that not all problems are fixable. You need the vault password to perform the checks. +health.start.introduction=The Vault Health Check is a collection of checks to detect and possibly fix problems in the internal structure of your vault. Please note, that not all problems are fixable. You need the vault password to perform the checks. health.start.configValid=Reading and parsing vault configuration file was successful. Proceed to select checks. health.start.configInvalid=Error while reading and parsing the vault configuration file. health.checkList.header=Available Health Checks diff --git a/src/test/java/org/cryptomator/common/LicenseCheckerTest.java b/src/test/java/org/cryptomator/common/LicenseCheckerTest.java index 02d6a6d29..2370b2fe2 100644 --- a/src/test/java/org/cryptomator/common/LicenseCheckerTest.java +++ b/src/test/java/org/cryptomator/common/LicenseCheckerTest.java @@ -9,6 +9,7 @@ import java.util.Optional; public class LicenseCheckerTest { + @SuppressWarnings("SpellCheckingInspection") private static final String PUBLIC_KEY = """ MIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQBgc4HZz+/fBbC7lmEww0AO3NK9wVZ\ PDZ0VEnsaUFLEYpTzb90nITtJUcPUbvOsdZIZ1Q8fnbquAYgxXL5UgHMoywAib47\ @@ -25,6 +26,7 @@ public class LicenseCheckerTest { @Test public void testCheckValidLicense() { + @SuppressWarnings("SpellCheckingInspection") String license = "eyJhbGciOiJFUzUxMiIsInR5cCI6IkpXVCIsImtpZCI6InhaRGZacHJ5NFA5dlpQWnlHMmZOQlJqLTdMejVvbVZkbTd0SG9DZ1NOZlkifQ.eyJzdWIiOiJjcnlwdG9ib3RAZXhhbXBsZS5jb20iLCJpYXQiOjE1MTYyMzkwMjJ9.AQaBIKQdNCxmRJi2wLOcbagTgi39WhdWwgdpKTYSPicg-aPr_tst_RjmnqMemx3cBe0Blr4nEbj_lAtSKHz_i61fAUyI1xCIAZYbK9Q3ICHIHQl3AiuCpBwFl-k81OB4QDYiKpEc9gLN5dhW_VymJMsgOvyiC0UjC91f2AM7s46byDNj"; Optional decoded = licenseChecker.check(license); @@ -35,6 +37,7 @@ public class LicenseCheckerTest { @Test public void testCheckInvalidLicenseHeader() { + @SuppressWarnings("SpellCheckingInspection") String license = "EyJhbGciOiJFUzUxMiIsInR5cCI6IkpXVCIsImtpZCI6InhaRGZacHJ5NFA5dlpQWnlHMmZOQlJqLTdMejVvbVZkbTd0SG9DZ1NOZlkifQ.eyJzdWIiOiJjcnlwdG9ib3RAZXhhbXBsZS5jb20iLCJpYXQiOjE1MTYyMzkwMjJ9.AQaBIKQdNCxmRJi2wLOcbagTgi39WhdWwgdpKTYSPicg-aPr_tst_RjmnqMemx3cBe0Blr4nEbj_lAtSKHz_i61fAUyI1xCIAZYbK9Q3ICHIHQl3AiuCpBwFl-k81OB4QDYiKpEc9gLN5dhW_VymJMsgOvyiC0UjC91f2AM7s46byDNj"; Optional decoded = licenseChecker.check(license); @@ -44,6 +47,7 @@ public class LicenseCheckerTest { @Test public void testCheckInvalidLicensePayload() { + @SuppressWarnings("SpellCheckingInspection") String license = "eyJhbGciOiJFUzUxMiIsInR5cCI6IkpXVCIsImtpZCI6InhaRGZacHJ5NFA5dlpQWnlHMmZOQlJqLTdMejVvbVZkbTd0SG9DZ1NOZlkifQ.EyJzdWIiOiJjcnlwdG9ib3RAZXhhbXBsZS5jb20iLCJpYXQiOjE1MTYyMzkwMjJ9.AQaBIKQdNCxmRJi2wLOcbagTgi39WhdWwgdpKTYSPicg-aPr_tst_RjmnqMemx3cBe0Blr4nEbj_lAtSKHz_i61fAUyI1xCIAZYbK9Q3ICHIHQl3AiuCpBwFl-k81OB4QDYiKpEc9gLN5dhW_VymJMsgOvyiC0UjC91f2AM7s46byDNj"; Optional decoded = licenseChecker.check(license); @@ -53,6 +57,7 @@ public class LicenseCheckerTest { @Test public void testCheckInvalidLicenseSignature() { + @SuppressWarnings("SpellCheckingInspection") String license = "eyJhbGciOiJFUzUxMiIsInR5cCI6IkpXVCIsImtpZCI6InhaRGZacHJ5NFA5dlpQWnlHMmZOQlJqLTdMejVvbVZkbTd0SG9DZ1NOZlkifQ.eyJzdWIiOiJjcnlwdG9ib3RAZXhhbXBsZS5jb20iLCJpYXQiOjE1MTYyMzkwMjJ9.aQaBIKQdNCxmRJi2wLOcbagTgi39WhdWwgdpKTYSPicg-aPr_tst_RjmnqMemx3cBe0Blr4nEbj_lAtSKHz_i61fAUyI1xCIAZYbK9Q3ICHIHQl3AiuCpBwFl-k81OB4QDYiKpEc9gLN5dhW_VymJMsgOvyiC0UjC91f2AM7s46byDNj"; Optional decoded = licenseChecker.check(license); diff --git a/src/test/java/org/cryptomator/common/settings/SettingsJsonAdapterTest.java b/src/test/java/org/cryptomator/common/settings/SettingsJsonAdapterTest.java index a03eb1d57..b2ecf4b89 100644 --- a/src/test/java/org/cryptomator/common/settings/SettingsJsonAdapterTest.java +++ b/src/test/java/org/cryptomator/common/settings/SettingsJsonAdapterTest.java @@ -44,6 +44,7 @@ public class SettingsJsonAdapterTest { Assertions.assertEquals(VolumeImpl.FUSE, settings.preferredVolumeImpl().get()); } + @SuppressWarnings("SpellCheckingInspection") @ParameterizedTest(name = "fromJson() should throw IOException for input: {0}") @ValueSource(strings = { // "", // diff --git a/src/test/java/org/cryptomator/common/settings/VaultSettingsJsonAdapterTest.java b/src/test/java/org/cryptomator/common/settings/VaultSettingsJsonAdapterTest.java index a606de948..3d902ba6c 100644 --- a/src/test/java/org/cryptomator/common/settings/VaultSettingsJsonAdapterTest.java +++ b/src/test/java/org/cryptomator/common/settings/VaultSettingsJsonAdapterTest.java @@ -40,6 +40,7 @@ public class VaultSettingsJsonAdapterTest { ); } + @SuppressWarnings("SpellCheckingInspection") @Test public void testSerialize() throws IOException { VaultSettings vaultSettings = new VaultSettings("test"); diff --git a/src/test/java/org/cryptomator/launcher/IpcFactoryTest.java b/src/test/java/org/cryptomator/launcher/IpcFactoryTest.java index aeb9fbeb3..d5e244d0c 100644 --- a/src/test/java/org/cryptomator/launcher/IpcFactoryTest.java +++ b/src/test/java/org/cryptomator/launcher/IpcFactoryTest.java @@ -24,7 +24,7 @@ public class IpcFactoryTest { private IpcProtocolImpl protocolHandler = Mockito.mock(IpcProtocolImpl.class); @Test - @DisplayName("Wihout IPC port files") + @DisplayName("Without IPC port files") public void testNoIpcWithoutPortFile() throws IOException { IpcFactory inTest = new IpcFactory(environment, protocolHandler); diff --git a/src/test/java/org/cryptomator/ui/addvaultwizard/ReadMeGeneratorTest.java b/src/test/java/org/cryptomator/ui/addvaultwizard/ReadMeGeneratorTest.java index 9715c6654..97f02aee1 100644 --- a/src/test/java/org/cryptomator/ui/addvaultwizard/ReadMeGeneratorTest.java +++ b/src/test/java/org/cryptomator/ui/addvaultwizard/ReadMeGeneratorTest.java @@ -11,6 +11,7 @@ import java.util.List; public class ReadMeGeneratorTest { + @SuppressWarnings("SpellCheckingInspection") @ParameterizedTest @CsvSource({ // "test,test", // diff --git a/src/test/java/org/cryptomator/ui/controls/SecurePasswordFieldTest.java b/src/test/java/org/cryptomator/ui/controls/SecurePasswordFieldTest.java index 0956967e6..865966049 100644 --- a/src/test/java/org/cryptomator/ui/controls/SecurePasswordFieldTest.java +++ b/src/test/java/org/cryptomator/ui/controls/SecurePasswordFieldTest.java @@ -49,6 +49,7 @@ public class SecurePasswordFieldTest { Assertions.assertEquals("anteater", pwField.getCharacters().toString()); } + @SuppressWarnings("SpellCheckingInspection") @Test @DisplayName("\"anteater\".insert(3, \"b\")") public void insert2() { @@ -76,6 +77,7 @@ public class SecurePasswordFieldTest { Assertions.assertEquals("ant", pwField.getCharacters().toString()); } + @SuppressWarnings("SpellCheckingInspection") @Test @DisplayName("\"anteater\".replace(0, 3, \"hand\")") public void replace1() { @@ -85,6 +87,7 @@ public class SecurePasswordFieldTest { Assertions.assertEquals("handeater", pwField.getCharacters().toString()); } + @SuppressWarnings("SpellCheckingInspection") @Test @DisplayName("\"anteater\".replace(3, 6, \"keep\")") public void replace2() { @@ -94,6 +97,7 @@ public class SecurePasswordFieldTest { Assertions.assertEquals("antkeeper", pwField.getCharacters().toString()); } + @SuppressWarnings("SpellCheckingInspection") @Test @DisplayName("\"anteater\".replace(0, 3, \"bee\")") public void replace3() { @@ -105,6 +109,7 @@ public class SecurePasswordFieldTest { } + @SuppressWarnings("SpellCheckingInspection") @Test @DisplayName("entering NFC string leads to NFC char[]") public void enterNfcString() { @@ -125,6 +130,7 @@ public class SecurePasswordFieldTest { Assertions.assertEquals('\uDCA9', result.charAt(9)); } + @SuppressWarnings("SpellCheckingInspection") @Test @DisplayName("entering NFD string leads to NFC char[]") public void enterNfdString() { diff --git a/src/test/java/org/cryptomator/ui/recoverykey/AutoCompleterTest.java b/src/test/java/org/cryptomator/ui/recoverykey/AutoCompleterTest.java index e5bbe24c9..953507b89 100644 --- a/src/test/java/org/cryptomator/ui/recoverykey/AutoCompleterTest.java +++ b/src/test/java/org/cryptomator/ui/recoverykey/AutoCompleterTest.java @@ -43,6 +43,7 @@ public class AutoCompleterTest { Assertions.assertEquals("tame", result.get()); } + @SuppressWarnings("SpellCheckingInspection") @ParameterizedTest @DisplayName("find 'teach'") @ValueSource(strings = {"te", "tea", "teac", "teach"}) @@ -52,6 +53,7 @@ public class AutoCompleterTest { Assertions.assertEquals("teach", result.get()); } + @SuppressWarnings("SpellCheckingInspection") @ParameterizedTest @DisplayName("find 'teacher'") @ValueSource(strings = {"teache", "teacher"})