Tails: use feather_data instead of .feather

diff --git a/src/utils/Utils.cpp b/src/utils/Utils.cpp
index 0240ac448e8b5174e98787e41613ef8c490cd6c9..0a07e79280dc1a91e347ba8f55d592431d190f68 100644 (file)
--- a/src/utils/Utils.cpp
+++ b/src/utils/Utils.cpp
@@ -110,14 +110,25 @@ QString defaultWalletDir() {
 
     if (TailsOS::detect()) {
         QString path = []{
+            // Starting in 1.1.0 the wallet and config directory were moved from ./.feather to ./feather_data
+            // A user might accidentally delete the folder containing the file hidden folder after moving the AppImage
+            // We return the old path if it still exists
+
             QString appImagePath = qgetenv("APPIMAGE");
             if (appImagePath.isEmpty()) {
                 qDebug() << "Not an appimage, using currentPath()";
-                return QDir::currentPath() + "/.feather/Monero/wallets";
+                if (QDir(QDir::currentPath() + "/.feather").exists()) {
+                    return QDir::currentPath() + "/.feather/Monero/wallets";
+                }
+                return QDir::currentPath() + "/feather_data/wallets";
             }
 
             QFileInfo appImageDir(appImagePath);
-            return appImageDir.absoluteDir().path() + "/.feather/Monero/wallets";
+            QString absolutePath = appImageDir.absoluteDir().path();
+            if (QDir(absolutePath + "/.feather").exists()) {
+                return absolutePath + "/.feather/Monero/wallets";
+            }
+            return absolutePath + "/feather_data/wallets";
         }();
 
         return path;

diff --git a/src/utils/config.cpp b/src/utils/config.cpp
index 3026592fea1373aa4de97df7c306b509bab409ef..1b8113fdedbc236fbbf914a2a55e183fc519dcba 100644 (file)
--- a/src/utils/config.cpp
+++ b/src/utils/config.cpp
@@ -176,11 +176,18 @@ QDir Config::defaultConfigDir() {
             QString appImagePath = qgetenv("APPIMAGE");
             if (appImagePath.isEmpty()) {
                 qDebug() << "Not an appimage, using currentPath()";
-                return QDir::currentPath() + "/.feather/.config/feather";
+                if (QDir(QDir::currentPath() + "/.feather").exists()) {
+                    return QDir::currentPath() + "/.feather/.config/feather";
+                }
+                return QDir::currentPath() + "/feather_data";
             }
 
             QFileInfo appImageDir(appImagePath);
-            return appImageDir.absoluteDir().path() + "/.feather/.config/feather";
+            QString absolutePath = appImageDir.absoluteDir().path();
+            if (QDir(absolutePath + "/.feather").exists()) {
+                return absolutePath + "/.feather/.config/feather";
+            }
+            return absolutePath + "/feather_data";
         }();
 
         return QDir(path);