From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Wed, 11 Jan 2023 15:58:48 +0000 (+0100)
Subject: More concisely clean paths of trailing slash URLs in restore old config migration... 
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~11^2~33^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=39914e51666ecc3d6c5b86ed22e2a6b269ef2b17;p=nextcloud-desktop.git

More concisely clean paths of trailing slash URLs in restore old config migration method of AccountManager

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

diff --git a/src/gui/accountmanager.cpp b/src/gui/accountmanager.cpp
index 41ad72efe..adb0fd04f 100644
--- a/src/gui/accountmanager.cpp
+++ b/src/gui/accountmanager.cpp
@@ -182,22 +182,19 @@ bool AccountManager::restoreFromLegacySettings()
                 }
 
                 // Check the theme url to see if it is the same url that the oC config was for
-                auto overrideUrl = Theme::instance()->overrideServerUrl();
-                qCInfo(lcAccountManager) << "Migrate: overrideUrl" << overrideUrl;
-                if (!overrideUrl.isEmpty()) {
-                    if (overrideUrl.endsWith('/')) {
-                        overrideUrl.chop(1);
-                    }
-                    auto oCUrl = oCSettings->value(QLatin1String(urlC)).toString();
-                    if (oCUrl.endsWith('/')) {
-                        oCUrl.chop(1);
-                    }
+                const auto overrideUrl = Theme::instance()->overrideServerUrl();
+                const auto cleanOverrideUrl = overrideUrl.endsWith('/') ? overrideUrl.chopped(1) : overrideUrl;
+                qCInfo(lcAccountManager) << "Migrate: overrideUrl" << cleanOverrideUrl;
+
+                if (!cleanOverrideUrl.isEmpty()) {
+                    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 " << oCUrl << " == " << overrideUrl << ":"
-                                             << (oCUrl == overrideUrl ? "Yes" : "No");
-                    if (oCUrl == overrideUrl) {
+                    qCInfo(lcAccountManager) << "Migrate oC config if " << cleanOCUrl << " == " << cleanOverrideUrl << ":"
+                                             << (cleanOCUrl == cleanOverrideUrl ? "Yes" : "No");
+                    if (cleanOCUrl == cleanOverrideUrl) {
                         qCInfo(lcAccountManager) << "Copy settings" << oCSettings->allKeys().join(", ");
                         settings = std::move(oCSettings);
                     }