From: AsamK Date: Sun, 8 Aug 2021 13:52:44 +0000 (+0200) Subject: Remove fallbacks to deprecated data paths X-Git-Tag: v0.9.0~91 X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/f449a242e4341a8dabc62efe6ce33682e71b386f Remove fallbacks to deprecated data paths --- diff --git a/CHANGELOG.md b/CHANGELOG.md index 60eaa33a..4b3085f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,10 @@ # Changelog ## [Unreleased] -### Changed +### Breaking changes - Removed deprecated `--json` parameter, use `--output=json` instead +- Removed deprecated fallback data paths, only `$XDG_DATA_HOME/signal-cli` is used now + For those still using the old paths (`$HOME/.config/signal`, `$HOME/.config/textsecure`) you need to move those to the new location. ## [0.8.5] - 2021-08-07 ### Added diff --git a/README.md b/README.md index 86e8591b..f8eee725 100644 --- a/README.md +++ b/README.md @@ -67,11 +67,6 @@ The password and cryptographic keys are created when registering and stored in t $XDG_DATA_HOME/signal-cli/data/ $HOME/.local/share/signal-cli/data/ -For legacy users, the old config directories are used as a fallback: - - $HOME/.config/signal/data/ - $HOME/.config/textsecure/data/ - ## Building This project uses [Gradle](http://gradle.org) for building and maintaining diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc index a821d2a8..54bf8671 100644 --- a/man/signal-cli.1.adoc +++ b/man/signal-cli.1.adoc @@ -503,12 +503,6 @@ The password and cryptographic keys are created when registering and stored in t `$XDG_DATA_HOME/signal-cli/` (`$HOME/.local/share/signal-cli/`) -For legacy users, the old config directories are used as a fallback: - - $HOME/.config/signal/ - - $HOME/.config/textsecure/ - == Authors Maintained by AsamK , who is assisted by other open source contributors. diff --git a/src/main/java/org/asamk/signal/App.java b/src/main/java/org/asamk/signal/App.java index 86d9a971..9e410d2f 100644 --- a/src/main/java/org/asamk/signal/App.java +++ b/src/main/java/org/asamk/signal/App.java @@ -305,32 +305,9 @@ public class App { } /** - * Uses $XDG_DATA_HOME/signal-cli if it exists, or if none of the legacy directories exist: - * - $HOME/.config/signal - * - $HOME/.config/textsecure - * - * @return the data directory to be used by signal-cli. + * @return the default data directory to be used by signal-cli. */ private static File getDefaultDataPath() { - var dataPath = new File(IOUtils.getDataHomeDir(), "signal-cli"); - if (dataPath.exists()) { - return dataPath; - } - - var configPath = new File(System.getProperty("user.home"), ".config"); - - var legacySettingsPath = new File(configPath, "signal"); - if (legacySettingsPath.exists()) { - logger.warn("Using legacy data path \"{}\", please move it to \"{}\".", legacySettingsPath, dataPath); - return legacySettingsPath; - } - - legacySettingsPath = new File(configPath, "textsecure"); - if (legacySettingsPath.exists()) { - logger.warn("Using legacy data path \"{}\", please move it to \"{}\".", legacySettingsPath, dataPath); - return legacySettingsPath; - } - - return dataPath; + return new File(IOUtils.getDataHomeDir(), "signal-cli"); } }