From 95278a95ce4cb52b0f4c42f79a8939b413c9eed1 Mon Sep 17 00:00:00 2001 From: AsamK Date: Sun, 27 Mar 2016 14:02:28 +0200 Subject: [PATCH] Use the old config directory .config/textsecure as fallback --- README.md | 4 ++++ src/main/java/org/asamk/signal/Main.java | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/README.md b/README.md index f951669d..e2a3145e 100644 --- a/README.md +++ b/README.md @@ -78,6 +78,10 @@ The password and cryptographic keys are created when registering and stored in t $HOME/.config/signal/data/ +For legacy users, the old config directory is used as a fallback: + + $HOME/.config/textsecure/data/ + ## Building This project uses [Gradle](http://gradle.org) for building and maintaining diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java index a4e50bb4..5d6e419b 100644 --- a/src/main/java/org/asamk/signal/Main.java +++ b/src/main/java/org/asamk/signal/Main.java @@ -83,6 +83,12 @@ public class Main { String settingsPath = ns.getString("config"); if (TextUtils.isEmpty(settingsPath)) { settingsPath = System.getProperty("user.home") + "/.config/signal"; + if (!new File(settingsPath).exists()) { + String legacySettingsPath = System.getProperty("user.home") + "/.config/textsecure"; + if (new File(legacySettingsPath).exists()) { + settingsPath = legacySettingsPath; + } + } } m = new Manager(username, settingsPath); -- 2.50.1