Remove sharedAccessManager

2 files changed, 3 insertions, 13 deletions

diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp
index 0b5c69046..3870f6cdd 100644
--- a/src/libsync/account.cpp
+++ b/src/libsync/account.cpp
@@ -152,8 +152,7 @@ void Account::setCredentials(AbstractCredentials *cred)
     if (_am) {
         jar = _am->cookieJar();
         jar->setParent(nullptr);
-
-        _am.reset();
+        _am->deleteLater();
     }
 
     // The order for these two is important! Reading the credential's
@@ -161,10 +160,7 @@ void Account::setCredentials(AbstractCredentials *cred)
     _credentials.reset(cred);
     cred->setAccount(this);
 
-    // Note: This way the QNAM can outlive the Account and Credentials.
-    // This is necessary to avoid issues with the QNAM being deleted while
-    // processing slotHandleSslErrors().
-    _am.reset(_credentials->createAM(), &QObject::deleteLater);
+    _am = _credentials->createAM();
 
     if (jar) {
         _am->setCookieJar(jar);
@@ -203,11 +199,6 @@ AccessManager *Account::accessManager()
     return _am.data();
 }
 
-QSharedPointer<AccessManager> Account::sharedAccessManager()
-{
-    return _am;
-}
-
 QNetworkReply *Account::sendRawRequest(const QByteArray &verb, const QUrl &url, QNetworkRequest req, QIODevice *data)
 {
     Q_ASSERT(verb.isUpper());
diff --git a/src/libsync/account.h b/src/libsync/account.h
index 55534f9e6..f594607cd 100644
--- a/src/libsync/account.h
+++ b/src/libsync/account.h
@@ -205,7 +205,6 @@ public:
     void clearCookieJar();
 
     AccessManager *accessManager();
-    [[deprecated]] QSharedPointer<AccessManager> sharedAccessManager();
 
     JobQueue *jobQueue();
 
@@ -263,7 +262,7 @@ private:
     Capabilities _capabilities;
     QString _serverVersion;
     QuotaInfo *_quotaInfo;
-    QSharedPointer<AccessManager> _am;
+    QPointer<AccessManager> _am;
     QScopedPointer<AbstractCredentials> _credentials;
     bool _http2Supported = false;