From fe0a34907fa16039b4b6f269eb3bd4e45adbdde5 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Wed, 17 Aug 2016 15:59:36 +0200
Subject: [PATCH] Simplified settings/log file path handling. Removed support
 for %appdata%. Use ~/AppData/Roaming instead!

---
 main/ant-kit/src/main/resources/build.xml     |  2 ++
 .../ui/logging/ConfigurableFileAppender.java  |  4 ---
 .../cryptomator/ui/settings/Localization.java |  2 +-
 .../ui/settings/SettingsProvider.java         | 28 +++++++------------
 4 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/main/ant-kit/src/main/resources/build.xml b/main/ant-kit/src/main/resources/build.xml
index 018df82f4..89dd5c4bb 100644
--- a/main/ant-kit/src/main/resources/build.xml
+++ b/main/ant-kit/src/main/resources/build.xml
@@ -31,6 +31,7 @@
 			<fx:platform j2se="8.0">
 				<fx:property name="cryptomator.logPath" value="~/.Cryptomator/cryptomator.log" />
 				<fx:property name="cryptomator.upgradeLogPath" value="~/.Cryptomator/upgrade.log" />
+				<fx:property name="cryptomator.settingsPath" value="~/.Cryptomator/settings.json" />
 				<fx:jvmarg value="-Xmx512m"/>
 			</fx:platform>
 			<fx:resources>
@@ -53,6 +54,7 @@
 			<fx:platform j2se="8.0">
 				<fx:property name="cryptomator.logPath" value="~/.Cryptomator/cryptomator.log" />
 				<fx:property name="cryptomator.upgradeLogPath" value="~/.Cryptomator/upgrade.log" />
+				<fx:property name="cryptomator.settingsPath" value="~/.Cryptomator/settings.json" />
 				<fx:jvmarg value="-Xmx512m"/>
 			</fx:platform>
 			<fx:resources>
diff --git a/main/ui/src/main/java/org/cryptomator/ui/logging/ConfigurableFileAppender.java b/main/ui/src/main/java/org/cryptomator/ui/logging/ConfigurableFileAppender.java
index 375c51352..9074f9a87 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/logging/ConfigurableFileAppender.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/logging/ConfigurableFileAppender.java
@@ -97,10 +97,6 @@ public class ConfigurableFileAppender extends AbstractOutputStreamAppender<FileM
 		} else if (path.startsWith("/")) {
 			// absolute Path:
 			return FileSystems.getDefault().getPath(path);
-		} else if (SystemUtils.IS_OS_WINDOWS && path.startsWith("%appdata%/")) {
-			final String appdata = System.getenv("APPDATA");
-			final Path appdataPath = appdata != null ? FileSystems.getDefault().getPath(appdata) : FileSystems.getDefault().getPath(SystemUtils.USER_HOME);
-			return appdataPath.resolve(path.substring(10));
 		} else {
 			// relative Path:
 			try {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/settings/Localization.java b/main/ui/src/main/java/org/cryptomator/ui/settings/Localization.java
index 1c2fbf8d5..c13000625 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/settings/Localization.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/settings/Localization.java
@@ -39,7 +39,7 @@ public class Localization extends ResourceBundle {
 			Objects.requireNonNull(in);
 			Reader reader = new InputStreamReader(in, StandardCharsets.UTF_8);
 			this.fallback = new PropertyResourceBundle(reader);
-			LOG.info("Loaded localization from {}", LOCALIZATION_FILE);
+			LOG.info("Loaded localization from bundle:{}", LOCALIZATION_FILE);
 		} catch (IOException e) {
 			throw new UncheckedIOException(e);
 		}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/settings/SettingsProvider.java b/main/ui/src/main/java/org/cryptomator/ui/settings/SettingsProvider.java
index 417b6c369..6f752512d 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/settings/SettingsProvider.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/settings/SettingsProvider.java
@@ -17,6 +17,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
@@ -28,6 +29,7 @@ import javax.inject.Named;
 import javax.inject.Provider;
 import javax.inject.Singleton;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.SystemUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -38,23 +40,17 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 public class SettingsProvider implements Provider<Settings> {
 
 	private static final Logger LOG = LoggerFactory.getLogger(SettingsProvider.class);
-	private static final Path SETTINGS_DIR;
-	private static final String SETTINGS_FILE = "settings.json";
+	private static final Path DEFAULT_SETTINGS_PATH;
 	private static final long SAVE_DELAY_MS = 1000;
 
 	static {
-		final String appdata = System.getenv("APPDATA");
 		final FileSystem fs = FileSystems.getDefault();
-
-		if (SystemUtils.IS_OS_WINDOWS && appdata != null) {
-			SETTINGS_DIR = fs.getPath(appdata, "Cryptomator");
-		} else if (SystemUtils.IS_OS_WINDOWS && appdata == null) {
-			SETTINGS_DIR = fs.getPath(SystemUtils.USER_HOME, ".Cryptomator");
+		if (SystemUtils.IS_OS_WINDOWS) {
+			DEFAULT_SETTINGS_PATH = fs.getPath(SystemUtils.USER_HOME, "AppData/Roaming/Cryptomator/settings.json");
 		} else if (SystemUtils.IS_OS_MAC_OSX) {
-			SETTINGS_DIR = fs.getPath(SystemUtils.USER_HOME, "Library/Application Support/Cryptomator");
+			DEFAULT_SETTINGS_PATH = fs.getPath(SystemUtils.USER_HOME, "Library/Application Support/Cryptomator/settings.json");
 		} else {
-			// (os.contains("solaris") || os.contains("sunos") || os.contains("linux") || os.contains("unix"))
-			SETTINGS_DIR = fs.getPath(SystemUtils.USER_HOME, ".Cryptomator");
+			DEFAULT_SETTINGS_PATH = fs.getPath(SystemUtils.USER_HOME, ".Cryptomator/settings.json");
 		}
 	}
 
@@ -68,12 +64,8 @@ public class SettingsProvider implements Provider<Settings> {
 	}
 
 	private Path getSettingsPath() throws IOException {
-		String settingsPathProperty = System.getProperty("cryptomator.settingsPath");
-		if (settingsPathProperty == null) {
-			return SETTINGS_DIR.resolve(SETTINGS_FILE);
-		} else {
-			return FileSystems.getDefault().getPath(settingsPathProperty);
-		}
+		final String settingsPathProperty = System.getProperty("cryptomator.settingsPath");
+		return Optional.ofNullable(settingsPathProperty).filter(StringUtils::isNotBlank).map(FileSystems.getDefault()::getPath).orElse(DEFAULT_SETTINGS_PATH);
 	}
 
 	@Override
@@ -96,7 +88,7 @@ public class SettingsProvider implements Provider<Settings> {
 		}
 		ScheduledFuture<?> saveCmd = saveScheduler.schedule(() -> {
 			this.save(settings);
-		} , SAVE_DELAY_MS, TimeUnit.MILLISECONDS);
+		}, SAVE_DELAY_MS, TimeUnit.MILLISECONDS);
 		ScheduledFuture<?> previousSaveCmd = scheduledSaveCmd.getAndSet(saveCmd);
 		if (previousSaveCmd != null) {
 			previousSaveCmd.cancel(false);