From 74a78242e24b656432850175d2bc295ada80bd4d Mon Sep 17 00:00:00 2001
From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Tue, 25 Jun 2024 18:19:32 +0800
Subject: [PATCH] Remove overwrought loadFromSettings method from AccountState

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
---
 src/gui/accountmanager.cpp | 13 ++++++-------
 src/gui/accountstate.cpp   |  6 ------
 src/gui/accountstate.h     |  6 ------
 3 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/gui/accountmanager.cpp b/src/gui/accountmanager.cpp
index ac1dcf81e5..2425581b3c 100644
--- a/src/gui/accountmanager.cpp
+++ b/src/gui/accountmanager.cpp
@@ -105,14 +105,13 @@ AccountManager::AccountsRestoreResult AccountManager::restore(const bool alsoRes
         if (!skipSettingsKeys.contains(settings->group())) {
             if (const auto acc = loadAccountHelper(*settings)) {
                 acc->_id = accountId;
-                if (auto accState = AccountState::loadFromSettings(acc, *settings)) {
-                    auto jar = qobject_cast<CookieJar*>(acc->_am->cookieJar());
-                    ASSERT(jar);
-                    if (jar) {
-                        jar->restore(acc->cookieJarPath());
-                    }
-                    addAccountState(accState);
+                const auto accState = new AccountState(acc);
+                const auto jar = qobject_cast<CookieJar*>(acc->_am->cookieJar());
+                Q_ASSERT(jar);
+                if (jar) {
+                    jar->restore(acc->cookieJarPath());
                 }
+                addAccountState(accState);
             }
         } else {
             qCInfo(lcAccountManager) << "Account" << accountId << "is too new, ignoring";
diff --git a/src/gui/accountstate.cpp b/src/gui/accountstate.cpp
index 63a130a10e..d1a0957791 100644
--- a/src/gui/accountstate.cpp
+++ b/src/gui/accountstate.cpp
@@ -85,12 +85,6 @@ AccountState::AccountState(const AccountPtr &account)
 
 AccountState::~AccountState() = default;
 
-AccountState *AccountState::loadFromSettings(AccountPtr account, QSettings & /*settings*/)
-{
-    auto accountState = new AccountState(account);
-    return accountState;
-}
-
 AccountPtr AccountState::account() const
 {
     return _account;
diff --git a/src/gui/accountstate.h b/src/gui/accountstate.h
index 7c32d69000..77caa1b405 100644
--- a/src/gui/accountstate.h
+++ b/src/gui/accountstate.h
@@ -92,12 +92,6 @@ public:
     explicit AccountState(const AccountPtr &account);
     ~AccountState() override;
 
-    /** Creates an account state from settings and an Account object.
-     *
-     * Use from AccountManager with a prepared QSettings object only.
-     */
-    static AccountState *loadFromSettings(AccountPtr account, QSettings &settings);
-
     AccountPtr account() const;
 
     ConnectionStatus connectionStatus() const;