remove merge changes

nextmcloud · Aug 13, 2024 · 75329c1 · 75329c1
1 parent fb2a165
commit 75329c1
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 16 deletions.
diff --git a/doc/conffile.rst b/doc/conffile.rst
@@ -51,7 +51,7 @@ Some interesting values that can be set on the configuration file are:
 |                                  |                          | The client adjusts the chunk size until each chunk upload takes approximately this long.               |
 |                                  |                          | Set to 0 to disable dynamic chunk sizing.                                                              |
 +----------------------------------+--------------------------+--------------------------------------------------------------------------------------------------------+
-| ``promptDeleteAllFiles``         | ``false``                | If a UI prompt should ask for confirmation if it was detected that all files and folders were deleted. |
+| ``promptDeleteAllFiles``         | ``false``                 | If a UI prompt should ask for confirmation if it was detected that all files and folders were deleted. |
 +----------------------------------+--------------------------+--------------------------------------------------------------------------------------------------------+
 | ``timeout``                      | ``300``                  | The timeout for network connections in seconds.                                                        |
 +----------------------------------+--------------------------+--------------------------------------------------------------------------------------------------------+

diff --git a/src/gui/creds/webflowcredentials.cpp b/src/gui/creds/webflowcredentials.cpp
@@ -190,6 +190,7 @@ void WebFlowCredentials::slotAskFromUserCredentialsProvided(const QString &user,
     emit asked();
 
     _askDialog->close();
+    _askDialog->deleteLater();
     _askDialog = nullptr;
 }
 

diff --git a/src/gui/navigationpanehelper.cpp b/src/gui/navigationpanehelper.cpp
@@ -97,9 +97,8 @@ void NavigationPaneHelper::updateCloudStorageRegistry()
 
                 QString title = folder->shortGuiRemotePathOrAppName();
                 // Write the account name in the sidebar only when using more than one account.
-                if (AccountManager::instance()->accounts().size() > 1) {
-                    title = title % " - " % folder->accountState()->account()->prettyName();
-                }
+                if (AccountManager::instance()->accounts().size() > 1)
+                    title = title % " - " % folder->accountState()->account()->displayName();
                 QString iconPath = QDir::toNativeSeparators(qApp->applicationFilePath());
                 QString targetFolderPath = QDir::toNativeSeparators(folder->cleanPath());
 

diff --git a/src/gui/owncloudsetupwizard.cpp b/src/gui/owncloudsetupwizard.cpp
@@ -333,9 +333,7 @@ void OwncloudSetupWizard::slotConnectToOCUrl(const QString &url)
 {
     qCInfo(lcWizard) << "Connect to url: " << url;
     AbstractCredentials *creds = _ocWizard->getCredentials();
-    if (creds) {
-        _ocWizard->account()->setCredentials(creds);
-    }
+    _ocWizard->account()->setCredentials(creds);
 
     const auto fetchUserNameJob = new JsonApiJob(_ocWizard->account()->sharedFromThis(), QStringLiteral("/ocs/v1.php/cloud/user"));
     connect(fetchUserNameJob, &JsonApiJob::jsonReceived, this, [this, url](const QJsonDocument &json, int statusCode) {

diff --git a/src/gui/socketapi/socketapi.cpp b/src/gui/socketapi/socketapi.cpp
@@ -444,13 +444,6 @@ void SocketApi::slotReadSocket()
                                        << "with argument:" << argument;
                 socketApiJob->failure(QStringLiteral("command not found"));
             }
-        } else if (command.startsWith("ENCRYPT")) {
-            if (indexOfMethod != -1) {
-                ASSERT(thread() == QThread::currentThread())
-                staticMetaObject.method(indexOfMethod)
-                    .invoke(this, Qt::QueuedConnection, Q_ARG(QString, argument.toString()),
-                            Q_ARG(SocketListener *, listener.data()));
-            }
         } else {
             if (indexOfMethod != -1) {
                 // to ensure that listener is still valid we need to call it with Qt::DirectConnection

diff --git a/src/gui/wizard/welcomepage.cpp b/src/gui/wizard/welcomepage.cpp
@@ -96,7 +96,7 @@ void WelcomePage::setupCreateAccountButton()
     connect(_ui->createAccountButton, &QPushButton::clicked, this, [this](bool /*checked*/) {
         _ocWizard->setRegistration(true);
         _nextPage = WizardCommon::Page_WebView;
-        _ocWizard->setAuthType(OCC::DetermineAuthTypeJob::WebViewFlow);
+        _ocWizard->next();
     });
 #else // WITH_WEBENGINE
     connect(_ui->createAccountButton, &QPushButton::clicked, this, [this](bool /*checked*/) {

diff --git a/src/libsync/abstractnetworkjob.cpp b/src/libsync/abstractnetworkjob.cpp
@@ -116,7 +116,6 @@ void AbstractNetworkJob::setupConnections(QNetworkReply *reply)
     connect(reply, &QNetworkReply::metaDataChanged, this, &AbstractNetworkJob::networkActivity);
     connect(reply, &QNetworkReply::downloadProgress, this, &AbstractNetworkJob::networkActivity);
     connect(reply, &QNetworkReply::uploadProgress, this, &AbstractNetworkJob::networkActivity);
-    connect(reply, &QNetworkReply::redirected, this, [reply, this] (const QUrl &url) { emit redirected(reply, url, 0);});
 }
 
 QNetworkReply *AbstractNetworkJob::addTimer(QNetworkReply *reply)