From 3155799de2cb4f1d1569ebb6b4c2c6b45f2a1423 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Sun, 15 May 2022 15:27:16 +0200 Subject: [PATCH 1/2] Default path for ssl key store is nested inside "JabRef" directory --- src/main/java/org/jabref/preferences/JabRefPreferences.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java index efbe39e12c9..0b9e4f78ce6 100644 --- a/src/main/java/org/jabref/preferences/JabRefPreferences.java +++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java @@ -527,7 +527,10 @@ private JabRefPreferences() { defaults.put(PROXY_PASSWORD, ""); // SSL - defaults.put(TRUSTSTORE_PATH, Path.of(AppDirsFactory.getInstance().getUserDataDir("ssl", SearchFieldConstants.VERSION, "org.jabref")).resolveSibling("truststore.jks").toString()); + defaults.put(TRUSTSTORE_PATH, Path.of(AppDirsFactory.getInstance() + .getUserDataDir("JabRef", SearchFieldConstants.VERSION, "org.jabref")) + .resolve("ssl") + .resolve("truststore.jks").toString()); defaults.put(POS_X, 0); defaults.put(POS_Y, 0); From 1edab9a5da26ab8bb3ca5b9e1b740b1dfd8abe08 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Sun, 15 May 2022 15:50:11 +0200 Subject: [PATCH 2/2] Fix sub directory --- src/main/java/org/jabref/preferences/JabRefPreferences.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java index 0b9e4f78ce6..7405ad85b67 100644 --- a/src/main/java/org/jabref/preferences/JabRefPreferences.java +++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java @@ -528,8 +528,7 @@ private JabRefPreferences() { // SSL defaults.put(TRUSTSTORE_PATH, Path.of(AppDirsFactory.getInstance() - .getUserDataDir("JabRef", SearchFieldConstants.VERSION, "org.jabref")) - .resolve("ssl") + .getUserDataDir("JabRef", "ssl", "org.jabref")) .resolve("truststore.jks").toString()); defaults.put(POS_X, 0);