From fba808103cbecc1c0c517c94e31a0ab3660b9077 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Fri, 5 May 2023 10:17:45 +0800 Subject: [PATCH] Ask before attempting to import legacy accounts Signed-off-by: Claudio Cambra --- src/gui/accountmanager.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) 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(configFile, QSettings::IniFormat); if (oCSettings->status() != QSettings::Status::NoError) { qCInfo(lcAccountManager) << "Error reading legacy configuration file" << oCSettings->status(); -- 2.39.5