1717import java .nio .file .Path ;
1818import java .nio .file .StandardOpenOption ;
1919import java .util .Objects ;
20+ import java .util .Optional ;
2021import java .util .concurrent .Executors ;
2122import java .util .concurrent .ScheduledExecutorService ;
2223import java .util .concurrent .ScheduledFuture ;
2829import javax .inject .Provider ;
2930import javax .inject .Singleton ;
3031
32+ import org .apache .commons .lang3 .StringUtils ;
3133import org .apache .commons .lang3 .SystemUtils ;
3234import org .slf4j .Logger ;
3335import org .slf4j .LoggerFactory ;
3840public class SettingsProvider implements Provider <Settings > {
3941
4042 private static final Logger LOG = LoggerFactory .getLogger (SettingsProvider .class );
41- private static final Path SETTINGS_DIR ;
42- private static final String SETTINGS_FILE = "settings.json" ;
43+ private static final Path DEFAULT_SETTINGS_PATH ;
4344 private static final long SAVE_DELAY_MS = 1000 ;
4445
4546 static {
46- final String appdata = System .getenv ("APPDATA" );
4747 final FileSystem fs = FileSystems .getDefault ();
48-
49- if (SystemUtils .IS_OS_WINDOWS && appdata != null ) {
50- SETTINGS_DIR = fs .getPath (appdata , "Cryptomator" );
51- } else if (SystemUtils .IS_OS_WINDOWS && appdata == null ) {
52- SETTINGS_DIR = fs .getPath (SystemUtils .USER_HOME , ".Cryptomator" );
48+ if (SystemUtils .IS_OS_WINDOWS ) {
49+ DEFAULT_SETTINGS_PATH = fs .getPath (SystemUtils .USER_HOME , "AppData/Roaming/Cryptomator/settings.json" );
5350 } else if (SystemUtils .IS_OS_MAC_OSX ) {
54- SETTINGS_DIR = fs .getPath (SystemUtils .USER_HOME , "Library/Application Support/Cryptomator" );
51+ DEFAULT_SETTINGS_PATH = fs .getPath (SystemUtils .USER_HOME , "Library/Application Support/Cryptomator/settings.json " );
5552 } else {
56- // (os.contains("solaris") || os.contains("sunos") || os.contains("linux") || os.contains("unix"))
57- SETTINGS_DIR = fs .getPath (SystemUtils .USER_HOME , ".Cryptomator" );
53+ DEFAULT_SETTINGS_PATH = fs .getPath (SystemUtils .USER_HOME , ".Cryptomator/settings.json" );
5854 }
5955 }
6056
@@ -68,12 +64,8 @@ public SettingsProvider(@Named("VaultJsonMapper") ObjectMapper objectMapper) {
6864 }
6965
7066 private Path getSettingsPath () throws IOException {
71- String settingsPathProperty = System .getProperty ("cryptomator.settingsPath" );
72- if (settingsPathProperty == null ) {
73- return SETTINGS_DIR .resolve (SETTINGS_FILE );
74- } else {
75- return FileSystems .getDefault ().getPath (settingsPathProperty );
76- }
67+ final String settingsPathProperty = System .getProperty ("cryptomator.settingsPath" );
68+ return Optional .ofNullable (settingsPathProperty ).filter (StringUtils ::isNotBlank ).map (FileSystems .getDefault ()::getPath ).orElse (DEFAULT_SETTINGS_PATH );
7769 }
7870
7971 @ Override
@@ -96,7 +88,7 @@ private void scheduleSave(Settings settings) {
9688 }
9789 ScheduledFuture <?> saveCmd = saveScheduler .schedule (() -> {
9890 this .save (settings );
99- } , SAVE_DELAY_MS , TimeUnit .MILLISECONDS );
91+ }, SAVE_DELAY_MS , TimeUnit .MILLISECONDS );
10092 ScheduledFuture <?> previousSaveCmd = scheduledSaveCmd .getAndSet (saveCmd );
10193 if (previousSaveCmd != null ) {
10294 previousSaveCmd .cancel (false );
0 commit comments