From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Fri, 5 May 2023 02:17:45 +0000 (+0800)
Subject: Ask before attempting to import legacy accounts
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~10^2~46^2~7
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fba808103cbecc1c0c517c94e31a0ab3660b9077;p=nextcloud-desktop.git

Ask before attempting to import legacy accounts

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
---

diff --git a/src/gui/accountmanager.cpp b/src/gui/accountmanager.cpp
index 1ecb1485a..1c923295e 100644
--- a/src/gui/accountmanager.cpp
+++ b/src/gui/accountmanager.cpp
@@ -175,11 +175,18 @@ bool AccountManager::restoreFromLegacySettings()
                                                       legacyCfgFileGrandParentFolder + legacyCfgFileRelativePath};
 
         for (const auto &configFile : legacyLocations) {
-            if (const QFileInfo configFileInfo(configFile);
-                    configFileInfo.exists() && configFileInfo.isReadable()) {
-
+            if (const QFileInfo configFileInfo(configFile); configFileInfo.exists() && configFileInfo.isReadable()) {
                 qCInfo(lcAccountManager) << "Migrate: checking old config " << configFile;
 
+                const auto importQuestion = tr("An existing configuration from a legacy desktop client was detected.\n"
+                                               "Should an account import be attempted?");
+                const auto messageBoxSelection = QMessageBox::question(nullptr, tr("Legacy import"), importQuestion);
+
+                if (messageBoxSelection == QMessageBox::No) {
+                    // User said don't import, return immediately
+                    return false;
+                }
+
                 auto oCSettings = std::make_unique<QSettings>(configFile, QSettings::IniFormat);
                 if (oCSettings->status() != QSettings::Status::NoError) {
                     qCInfo(lcAccountManager) << "Error reading legacy configuration file" << oCSettings->status();