X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/5c754b6f5d5bd3273b3c0722cf3eabbcd02c20b9..22f19c406779893d08675c2d06d2b7708cc3f2a8:/src/main/java/org/asamk/signal/Main.java diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java index 97e3f9b2..6204778d 100644 --- a/src/main/java/org/asamk/signal/Main.java +++ b/src/main/java/org/asamk/signal/Main.java @@ -212,17 +212,19 @@ public class Main { * @return the data directory to be used by signal-cli. */ private static File getDefaultDataPath() { - File dataPath = new File(IOUtils.getDataHomeDir(), "/signal-cli"); + File dataPath = new File(IOUtils.getDataHomeDir(), "signal-cli"); if (dataPath.exists()) { return dataPath; } - File legacySettingsPath = new File(System.getProperty("user.home"), "/.config/signal"); + File configPath = new File(System.getProperty("user.home"), ".config"); + + File legacySettingsPath = new File(configPath, "signal"); if (legacySettingsPath.exists()) { return legacySettingsPath; } - legacySettingsPath = new File(System.getProperty("user.home"), "/.config/textsecure"); + legacySettingsPath = new File(configPath, "textsecure"); if (legacySettingsPath.exists()) { return legacySettingsPath; }