Sebastian Stenzel 5 роки тому
батько
коміт
7f8659afed

+ 7 - 0
main/commons/src/main/java/org/cryptomator/common/Constants.java

@@ -0,0 +1,7 @@
+package org.cryptomator.common;
+
+public interface Constants {
+
+	String MASTERKEY_FILENAME = "masterkey.cryptomator";
+
+}

+ 2 - 1
main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java

@@ -48,11 +48,12 @@ import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Predicate;
 
+import static org.cryptomator.common.Constants.MASTERKEY_FILENAME;
+
 @PerVault
 public class Vault {
 	
 	private static final Logger LOG = LoggerFactory.getLogger(Vault.class);
-	private static final String MASTERKEY_FILENAME = "masterkey.cryptomator"; // TODO: deduplicate constant declared in multiple classes
 	private static final Path HOME_DIR = Paths.get(SystemUtils.USER_HOME);
 
 	private final VaultSettings vaultSettings;

+ 2 - 2
main/commons/src/main/java/org/cryptomator/common/vaults/VaultListManager.java

@@ -25,11 +25,11 @@ import java.util.Collection;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+import static org.cryptomator.common.Constants.MASTERKEY_FILENAME;
+
 @Singleton
 public class VaultListManager {
 	
-	private static final String MASTERKEY_FILENAME = "masterkey.cryptomator"; // TODO: deduplicate constant declared in multiple classes
-
 	private final VaultComponent.Builder vaultComponentBuilder;
 	private final ObservableList<Vault> vaultList;
 

+ 1 - 1
main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java

@@ -42,12 +42,12 @@ import java.util.ResourceBundle;
 import java.util.concurrent.ExecutorService;
 
 import static java.nio.charset.StandardCharsets.US_ASCII;
+import static org.cryptomator.common.Constants.MASTERKEY_FILENAME;
 
 @AddVaultWizardScoped
 public class CreateNewVaultPasswordController implements FxController {
 
 	private static final Logger LOG = LoggerFactory.getLogger(CreateNewVaultPasswordController.class);
-	private static final String MASTERKEY_FILENAME = "masterkey.cryptomator"; // TODO: deduplicate constant declared in multiple classes
 
 	private final Stage window;
 	private final Lazy<Scene> chooseLocationScene;

+ 2 - 1
main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java

@@ -28,11 +28,12 @@ import javax.inject.Named;
 import java.io.IOException;
 import java.util.ResourceBundle;
 
+import static org.cryptomator.common.Constants.MASTERKEY_FILENAME;
+
 @ChangePasswordScoped
 public class ChangePasswordController implements FxController {
 
 	private static final Logger LOG = LoggerFactory.getLogger(ChangePasswordController.class);
-	private static final String MASTERKEY_FILENAME = "masterkey.cryptomator"; // TODO: deduplicate constant declared in multiple classes
 
 	private final Stage window;
 	private final Vault vault;

+ 0 - 4
main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java

@@ -129,10 +129,6 @@ public class FxApplication extends Application {
 	private void loadSelectedStyleSheet(UiTheme desiredTheme) {
 		UiTheme theme = licenseHolder.isValidLicense() ? desiredTheme : UiTheme.LIGHT;
 		switch (theme) {
-//			case CUSTOM:
-//				// TODO
-//				Application.setUserAgentStylesheet(getClass().getResource("/css/mac_theme.css").toString());
-//				break;
 			case DARK:
 				Application.setUserAgentStylesheet(getClass().getResource("/css/dark_theme.css").toString());
 				macFunctions.map(MacFunctions::uiAppearance).ifPresent(JniException.ignore(MacApplicationUiAppearance::setToDarkAqua));

+ 0 - 1
main/ui/src/main/java/org/cryptomator/ui/fxapp/UpdateChecker.java

@@ -69,7 +69,6 @@ public class UpdateChecker {
 		String latestVersion = updateCheckerService.getValue();
 		LOG.info("Current version: {}, lastest version: {}", currentVersion, latestVersion);
 
-		// TODO settings.lastVersionCheck = Instant.now()
 		if (currentVersion == null || semVerComparator.compare(currentVersion, latestVersion) < 0) {
 			// update is available
 			latestVersionProperty.set(latestVersion);

+ 2 - 1
main/ui/src/main/java/org/cryptomator/ui/launcher/AppLaunchEventHandler.java

@@ -14,11 +14,12 @@ import java.nio.file.Path;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ExecutorService;
 
+import static org.cryptomator.common.Constants.MASTERKEY_FILENAME;
+
 @Singleton
 class AppLaunchEventHandler {
 
 	private static final Logger LOG = LoggerFactory.getLogger(AppLaunchEventHandler.class);
-	private static final String MASTERKEY_FILENAME = "masterkey.cryptomator"; // TODO: deduplicate constant declared in multiple classes
 
 	private final BlockingQueue<AppLaunchEvent> launchEventQueue;
 	private final ExecutorService executorService;

+ 2 - 1
main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowController.java

@@ -20,11 +20,12 @@ import java.nio.file.Path;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import static org.cryptomator.common.Constants.MASTERKEY_FILENAME;
+
 @MainWindowScoped
 public class MainWindowController implements FxController {
 
 	private static final Logger LOG = LoggerFactory.getLogger(MainWindowController.class);
-	private static final String MASTERKEY_FILENAME = "masterkey.cryptomator"; // TODO: deduplicate constant declared in multiple classes
 
 	private final VaultListManager vaultListManager;
 	private final WrongFileAlertComponent.Builder wrongFileAlert;

+ 2 - 1
main/ui/src/main/java/org/cryptomator/ui/migration/MigrationRunController.java

@@ -40,11 +40,12 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
+import static org.cryptomator.common.Constants.MASTERKEY_FILENAME;
+
 @MigrationScoped
 public class MigrationRunController implements FxController {
 
 	private static final Logger LOG = LoggerFactory.getLogger(MigrationRunController.class);
-	private static final String MASTERKEY_FILENAME = "masterkey.cryptomator"; // TODO: deduplicate constant declared in multiple classes
 	private static final long MIGRATION_PROGRESS_UPDATE_MILLIS = 50;
 
 	private final Stage window;

+ 2 - 1
main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyFactory.java

@@ -12,10 +12,11 @@ import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.Collection;
 
+import static org.cryptomator.common.Constants.MASTERKEY_FILENAME;
+
 @Singleton
 public class RecoveryKeyFactory {
 
-	private static final String MASTERKEY_FILENAME = "masterkey.cryptomator"; // TODO: deduplicate constant declared in multiple classes
 	private static final byte[] PEPPER = new byte[0];
 	
 	private final WordEncoder wordEncoder;

+ 0 - 1
main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayIconController.java

@@ -33,7 +33,6 @@ public class TrayIconController {
 		macFunctions.map(MacFunctions::uiAppearance).ifPresent(uiAppearance -> uiAppearance.addListener(this::macInterfaceThemeChanged));
 
 		if (SystemUtils.IS_OS_WINDOWS) {
-			// TODO: test on windows: is this a double click?
 			trayIcon.addActionListener(trayMenuController::showMainWindow);
 		}