fix(migration): set all settings from the previous version of the client.

src/gui/accountmanager.cpp

@@ -1,3 +1,3 @@
 /*
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2015 ownCloud GmbH
@@ -276,9 +276,11 @@
                     selectedAccountIds = childGroups;
                 }
 
+                const auto legacyVersion = oCSettings->value(ConfigFile::clientVersionC, {}).toString();
+                ConfigFile().setClientPreviousVersionString(legacyVersion);
+                qCInfo(lcAccountManager) << "Migrating from" << legacyVersion;
                 qCInfo(lcAccountManager) << "Copy settings" << oCSettings->allKeys().join(", ");
                 settings = std::move(oCSettings);
-
                 ConfigFile::setDiscoveredLegacyConfigPath(configFileInfo.canonicalPath());
                 break;
             } else {
@@ -288,14 +290,40 @@
     }
 
     ConfigFile configFile;
+    // General settings
     configFile.setVfsEnabled(settings->value(ConfigFile::isVfsEnabledC, configFile.isVfsEnabled()).toBool());
-    configFile.setLaunchOnSystemStartup(settings->value(ConfigFile::launchOnSystemStartupC, configFile.launchOnSystemStartup()).toBool());
-    configFile.setOptionalServerNotifications(settings->value(ConfigFile::optionalServerNotificationsC, configFile.optionalServerNotifications()).toBool());
-    configFile.setPromptDeleteFiles(settings->value(ConfigFile::promptDeleteC, configFile.promptDeleteFiles()).toBool());
-    configFile.setShowCallNotifications(settings->value(ConfigFile::showCallNotificationsC, configFile.showCallNotifications()).toBool());
-    configFile.setShowChatNotifications(settings->value(ConfigFile::showChatNotificationsC, configFile.showChatNotifications()).toBool());
-    configFile.setShowQuotaWarningNotifications(settings->value(ConfigFile::showQuotaWarningNotificationsC, configFile.showQuotaWarningNotifications()).toBool());
-    configFile.setShowInExplorerNavigationPane(settings->value(ConfigFile::showInExplorerNavigationPaneC, configFile.showInExplorerNavigationPane()).toBool());
+    configFile.setLaunchOnSystemStartup(settings->value(ConfigFile::launchOnSystemStartupC,
+                                                        configFile.launchOnSystemStartup()).toBool());
+    configFile.setOptionalServerNotifications(settings->value(ConfigFile::optionalServerNotificationsC,
+                                                              configFile.optionalServerNotifications()).toBool());
+    configFile.setPromptDeleteFiles(settings->value(ConfigFile::promptDeleteC,
+                                                    configFile.promptDeleteFiles()).toBool());
+    configFile.setShowCallNotifications(settings->value(ConfigFile::showCallNotificationsC,
+                                                        configFile.showCallNotifications()).toBool());
+    configFile.setShowChatNotifications(settings->value(ConfigFile::showChatNotificationsC,
+                                                        configFile.showChatNotifications()).toBool());
+    configFile.setShowQuotaWarningNotifications(settings->value(ConfigFile::showQuotaWarningNotificationsC,
+                                                                configFile.showQuotaWarningNotifications()).toBool());
+    configFile.setShowInExplorerNavigationPane(settings->value(ConfigFile::showInExplorerNavigationPaneC,
+                                                               configFile.showInExplorerNavigationPane()).toBool());
+    // Advanced
+    configFile.setConfirmExternalStorage(settings->value(ConfigFile::confirmExternalStorageC,
+                                                         configFile.confirmExternalStorage()).toBool());
+    configFile.setNotifyExistingFoldersOverLimit(settings->value(ConfigFile::notifyExistingFoldersOverLimitC,
+                                                                 configFile.notifyExistingFoldersOverLimit()).toBool());
+    const auto newBigFolderSizeLimit = settings->value(ConfigFile::newBigFolderSizeLimitC,
+                                                       configFile.newBigFolderSizeLimit().second).toLongLong();
+    configFile.setNewBigFolderSizeLimit(configFile.useNewBigFolderSizeLimit(), newBigFolderSizeLimit);
+    configFile.setStopSyncingExistingFoldersOverLimit(settings->value(ConfigFile::stopSyncingExistingFoldersOverLimitC,
+                                                                      configFile.stopSyncingExistingFoldersOverLimit()).toBool());
+    configFile.setMoveToTrash(settings->value(ConfigFile::moveToTrashC, configFile.moveToTrash()).toBool());
+    // Info
+    configFile.setUpdateChannel(settings->value(ConfigFile::updateChannelC, configFile.currentUpdateChannel()).toString());
+    auto previousAppName = settings->contains(ConfigFile::legacyAppName) ? ConfigFile::legacyAppName
+                                                                         : ConfigFile::unbrandedAppName;
+    const auto updaterGroupName = QString("%1/%2").arg(previousAppName, ConfigFile::autoUpdateCheckC);
+    configFile.setAutoUpdateCheck(settings->value(updaterGroupName, configFile.autoUpdateCheck()).toBool(), {});
+    // Network
     ClientProxy().saveProxyConfigurationFromSettings(*settings);
     configFile.setUseUploadLimit(settings->value(ConfigFile::useUploadLimitC, configFile.useUploadLimit()).toInt());
     configFile.setUploadLimit(settings->value(ConfigFile::uploadLimitC, configFile.uploadLimit()).toInt());
@@ -582,13 +610,33 @@
         }
         acc->_settingsMap.insert(key, settings.value(key));
     }
-
     acc->setCredentials(CredentialsFactory::create(authType));
-    acc->setProxyType(settings.value(networkProxyTypeC).value<QNetworkProxy::ProxyType>());
-    acc->setProxyHostName(settings.value(networkProxyHostNameC).toString());
-    acc->setProxyPort(settings.value(networkProxyPortC).toInt());
-    acc->setProxyNeedsAuth(settings.value(networkProxyNeedsAuthC).toBool());
-    acc->setProxyUser(settings.value(networkProxyUserC).toString());
+
+    {
+        auto accountProxyType = settings.value(networkProxyTypeC).value<QNetworkProxy::ProxyType>();
+        auto accountProxyHost = settings.value(networkProxyHostNameC).toString();
+        auto accountProxyPort = settings.value(networkProxyPortC).toInt();
+        auto accountProxyNeedsAuth = settings.value(networkProxyNeedsAuthC).toBool();
+        auto accountProxyUser = settings.value(networkProxyUserC).toString();
+        const auto globalProxyType = settings.value(ClientProxy::proxyTypeC).value<QNetworkProxy::ProxyType>();
+        qCDebug(lcAccountManager) << "Account proxy type:" <<  accountProxyType;
+        qCDebug(lcAccountManager) << "Global proxy type:" <<  globalProxyType;
+        if (accountProxyType == QNetworkProxy::NoProxy && globalProxyType != QNetworkProxy::NoProxy) {
+            accountProxyType = globalProxyType;
+            accountProxyHost = settings.value(ClientProxy::proxyHostC).toString();
+            accountProxyPort =  settings.value(ClientProxy::proxyPortC).toInt();
+            accountProxyNeedsAuth = settings.value(ClientProxy::proxyNeedsAuthC).toBool();
+            accountProxyUser = settings.value(ClientProxy::proxyUserC).toString();
+            qCInfo(lcAccountManager) << "Account has no proxy set, using global proxy instead.";
+        }
+
+        acc->setProxyType(accountProxyType);
+        acc->setProxyHostName(accountProxyHost);
+        acc->setProxyPort(accountProxyPort);
+        acc->setProxyNeedsAuth(accountProxyNeedsAuth);
+        acc->setProxyUser(accountProxyUser);
+    }
+
     acc->setUploadLimitSetting(
         settings.value(
             networkUploadLimitSettingC,
@@ -599,7 +647,6 @@
             networkDownloadLimitSettingC,
             QVariant::fromValue(Account::AccountNetworkTransferLimitSetting::NoLimit)
         ).value<Account::AccountNetworkTransferLimitSetting>());
-
     acc->setUploadLimit(settings.value(networkUploadLimitC).toInt());
     acc->setDownloadLimit(settings.value(networkDownloadLimitC).toInt());
 
@@ -786,7 +833,7 @@
 
 bool AccountManager::forceLegacyImport() const
 {
-    return _forceLegacyImport;
+   return _forceLegacyImport;
 }
 
 void AccountManager::setForceLegacyImport(const bool forceLegacyImport)

src/gui/application.cpp

@@ -1,3 +1,3 @@
 /*
  * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2014 ownCloud GmbH
@@ -124,14 +124,12 @@
     FolderMan::backwardMigrationSettingsKeys(&deleteKeys, &ignoreKeys);
 
     ConfigFile configFile;
-
-    // Did the client version change?
-    // (The client version is adjusted further down)
-    const auto currentVersion = QVersionNumber::fromString(MIRALL_VERSION_STRING);
-    const auto previousVersion = QVersionNumber::fromString(configFile.clientVersionString());
-    const auto versionChanged = previousVersion != currentVersion;
-    const auto downgrading = previousVersion > currentVersion;
-
+    if (configFile.clientPreviousVersionString().isEmpty()) {
+        configFile.setClientPreviousVersionString(configFile.clientVersionString());
+    }
+
+    qCDebug(lcApplication) << "Is migration?"  << configFile.isMigration();
+    const auto versionChanged = configFile.isUpgrade() || configFile.isDowngrade();
     if (versionChanged) {
         qCInfo(lcApplication) << "Version changed. Removing updater settings from config.";
         configFile.cleanUpdaterConfiguration();
@@ -177,7 +175,7 @@
                "Continuing will mean <b>%2 these settings</b>.<br>"
                "<br>"
                "The current configuration file was already backed up to <i>%3</i>.")
-                .arg((downgrading ? tr("newer", "newer software version") : tr("older", "older software version")),
+                .arg((configFile.isDowngrade() ? tr("newer", "newer software version") : tr("older", "older software version")),
                      deleteKeys.isEmpty()? tr("ignoring") : tr("deleting"),
                      backupFilesList.join("<br>")));
         box.addButton(tr("Quit"), QMessageBox::AcceptRole);

src/libsync/clientproxy.cpp

@@ -12,15 +12,6 @@
 #include <QThreadPool>
 #include <QSettings>
 
-namespace {
-    constexpr auto proxyTypeC = "Proxy/type";
-    constexpr auto proxyHostC = "Proxy/host";
-    constexpr auto proxyPortC = "Proxy/port";
-    constexpr auto proxyUserC = "Proxy/user";
-    constexpr auto proxyPassC = "Proxy/pass";
-    constexpr auto proxyNeedsAuthC = "Proxy/needsAuth";
-}
-
 namespace OCC {
 
 Q_LOGGING_CATEGORY(lcClientProxy, "nextcloud.sync.clientproxy", QtInfoMsg)

src/libsync/clientproxy.h

@@ -7,7 +7,7 @@
 #ifndef CLIENTPROXY_H
 #define CLIENTPROXY_H
 
 #include <QObject>
 #include <QNetworkProxy>
 #include <QRunnable>
 #include <QUrl>
@@ -37,6 +37,13 @@
     static QString printQNetworkProxy(const QNetworkProxy &proxy);
     static const char *proxyTypeToCStr(QNetworkProxy::ProxyType type);
 
+    static constexpr char proxyTypeC[] = "Proxy/type";
+    static constexpr char proxyHostC[] = "Proxy/host";
+    static constexpr char proxyPortC[] = "Proxy/port";
+    static constexpr char proxyUserC[] = "Proxy/user";
+    static constexpr char proxyPassC[] = "Proxy/pass";
+    static constexpr char proxyNeedsAuthC[] = "Proxy/needsAuth";
+
 public slots:
     void setupQtProxyFromConfig();
     void saveProxyConfigurationFromSettings(const QSettings &settings);