Merge pull request #7218 from nextcloud/backport/7200/stable-3.14

[stable-3.14] disable our code for network timeout

src/libsync/abstractnetworkjob.cpp

@@ -46,6 +46,7 @@ Q_LOGGING_CATEGORY(lcNetworkJob, "nextcloud.sync.networkjob", QtInfoMsg)
 
 // If not set, it is overwritten by the Application constructor with the value from the config
 int AbstractNetworkJob::httpTimeout = qEnvironmentVariableIntValue("OWNCLOUD_TIMEOUT");
+bool AbstractNetworkJob::enableTimeout = false;
 
 AbstractNetworkJob::AbstractNetworkJob(const AccountPtr &account, const QString &path, QObject *parent)
     : QObject(parent)
@@ -57,7 +58,6 @@ AbstractNetworkJob::AbstractNetworkJob(const AccountPtr &account, const QString
     ASSERT(account != parent);
 
     _timer.setSingleShot(true);
-    _timer.setTimerType(Qt::VeryCoarseTimer);
     _timer.setInterval((httpTimeout ? httpTimeout : 300) * 1000); // default to 5 minutes.
     connect(&_timer, &QTimer::timeout, this, &AbstractNetworkJob::slotTimeout);
 
@@ -367,6 +367,11 @@ void AbstractNetworkJob::start()
 
 void AbstractNetworkJob::slotTimeout()
 {
+    // TODO: workaround, find cause of https://github.com/nextcloud/desktop/issues/7184
+    if (!AbstractNetworkJob::enableTimeout) {
+        return;
+    }
+
     _timedout = true;
     qCWarning(lcNetworkJob) << "Network job timeout" << (reply() ? reply()->request().url() : path());
     onTimedOut();

src/libsync/abstractnetworkjob.h

@@ -45,6 +45,8 @@ class OWNCLOUDSYNC_EXPORT AbstractNetworkJob : public QObject
     explicit AbstractNetworkJob(const AccountPtr &account, const QString &path, QObject *parent = nullptr);
     ~AbstractNetworkJob() override;
 
+    static bool enableTimeout;
+
     virtual void start();
 
     [[nodiscard]] AccountPtr account() const { return _account; }

test/testchunkingng.cpp

@@ -60,6 +60,8 @@ class TestChunkingNG : public QObject
 private slots:
     void initTestCase()
     {
+        AbstractNetworkJob::enableTimeout = true;
+
         OCC::Logger::instance()->setLogFlush(true);
         OCC::Logger::instance()->setLogDebug(true);
 

test/testremotediscovery.cpp

@@ -50,6 +50,8 @@ class TestRemoteDiscovery : public QObject
 private slots:
     void initTestCase()
     {
+        AbstractNetworkJob::enableTimeout = true;
+
         OCC::Logger::instance()->setLogFlush(true);
         OCC::Logger::instance()->setLogDebug(true);