From 2657ba5e6efb9ebc5db3db9efd72a736e4d4133f Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Wed, 29 Jan 2025 16:31:17 +0100 Subject: [PATCH] Remove check for overrideurl when migrating account. Signed-off-by: Camila Ayres --- src/gui/accountmanager.cpp | 38 ++------------------------------------ 1 file changed, 2 insertions(+), 36 deletions(-) diff --git a/src/gui/accountmanager.cpp b/src/gui/accountmanager.cpp index 88e24006e5fc9..cd754af9d586f 100644 --- a/src/gui/accountmanager.cpp +++ b/src/gui/accountmanager.cpp @@ -239,42 +239,8 @@ bool AccountManager::restoreFromLegacySettings() } } - // Check the theme url to see if it is the same url that the oC config was for - const auto overrideUrl = Theme::instance()->overrideServerUrl(); - const auto cleanOverrideUrl = overrideUrl.endsWith('/') ? overrideUrl.chopped(1) : overrideUrl; - qCInfo(lcAccountManager) << "Migrate: overrideUrl" << cleanOverrideUrl; - - if (!cleanOverrideUrl.isEmpty() && !Theme::instance()->multipleOverrideServers()) { - oCSettings->beginGroup(QLatin1String(accountsC)); - const auto accountsChildGroups = oCSettings->childGroups(); - for (const auto &accountId : accountsChildGroups) { - oCSettings->beginGroup(accountId); - const auto oCUrl = oCSettings->value(QLatin1String(urlC)).toString(); - const auto cleanOCUrl = oCUrl.endsWith('/') ? oCUrl.chopped(1) : oCUrl; - - - // in case the urls are equal reset the settings object to read from - // the ownCloud settings object - qCInfo(lcAccountManager) << "Migrate oC config if " << cleanOCUrl << " == " << cleanOverrideUrl << ":" - << (cleanOCUrl == cleanOverrideUrl ? "Yes" : "No"); - if (cleanOCUrl == cleanOverrideUrl) { - qCInfo(lcAccountManager) << "Copy settings" << oCSettings->allKeys().join(", "); - oCSettings->endGroup(); // current accountID group - oCSettings->endGroup(); // accounts group - settings = std::move(oCSettings); - break; - } - - oCSettings->endGroup(); - } - - if (oCSettings) { - oCSettings->endGroup(); - } - } else { - qCInfo(lcAccountManager) << "Copy settings" << oCSettings->allKeys().join(", "); - settings = std::move(oCSettings); - } + qCInfo(lcAccountManager) << "Copy settings" << oCSettings->allKeys().join(", "); + settings = std::move(oCSettings); ConfigFile::setDiscoveredLegacyConfigPath(configFileInfo.canonicalPath()); break;