From d45aa1434899559a95f4620dde2ff84a006b421d Mon Sep 17 00:00:00 2001
From: Tobias Fella <fella@posteo.de>
Date: Sun, 7 Jan 2024 21:28:41 +0100
Subject: [PATCH] Refactor some code around connection handling

---
 src/controller.cpp        | 13 -------------
 src/neochatconnection.cpp |  6 ++++++
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/controller.cpp b/src/controller.cpp
index c060cef89..ada7804cc 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -23,7 +23,6 @@
 #include <Quotient/csapi/logout.h>
 #include <Quotient/csapi/notifications.h>
 #include <Quotient/eventstats.h>
-#include <Quotient/jobs/downloadfilejob.h>
 #include <Quotient/qt_connection_util.h>
 
 #include "neochatconfig.h"
@@ -285,19 +284,7 @@ void Controller::setActiveConnection(NeoChatConnection *connection)
     if (connection == m_connection) {
         return;
     }
-    if (m_connection != nullptr) {
-        disconnect(m_connection, &NeoChatConnection::syncError, this, nullptr);
-        disconnect(m_connection, &NeoChatConnection::accountDataChanged, this, nullptr);
-    }
     m_connection = connection;
-    if (connection != nullptr) {
-        connect(connection, &NeoChatConnection::requestFailed, this, [](BaseJob *job) {
-            if (dynamic_cast<DownloadFileJob *>(job) && job->jsonData()["errcode"_ls].toString() == "M_TOO_LARGE"_ls) {
-                RoomManager::instance().warning(i18n("File too large to download."), i18n("Contact your matrix server administrator for support."));
-            }
-        });
-    }
-    NeoChatConfig::self()->save();
     Q_EMIT activeConnectionChanged();
 }
 
diff --git a/src/neochatconnection.cpp b/src/neochatconnection.cpp
index 133997aca..d144e219e 100644
--- a/src/neochatconnection.cpp
+++ b/src/neochatconnection.cpp
@@ -17,6 +17,7 @@
 #include <Quotient/csapi/content-repo.h>
 #include <Quotient/csapi/profile.h>
 #include <Quotient/database.h>
+#include <Quotient/jobs/downloadfilejob.h>
 #include <Quotient/qt_connection_util.h>
 #include <Quotient/settings.h>
 #include <Quotient/user.h>
@@ -49,6 +50,11 @@ NeoChatConnection::NeoChatConnection(QObject *parent)
             Q_EMIT userConsentRequired(job->errorUrl());
         }
     });
+    connect(this, &NeoChatConnection::requestFailed, this, [](BaseJob *job) {
+        if (dynamic_cast<DownloadFileJob *>(job) && job->jsonData()["errcode"_ls].toString() == "M_TOO_LARGE"_ls) {
+            RoomManager::instance().warning(i18n("File too large to download."), i18n("Contact your matrix server administrator for support."));
+        }
+    });
 }
 
 NeoChatConnection::NeoChatConnection(const QUrl &server, QObject *parent)