[stable-3.17] fix(gui): initialise e2e()->account() from Account

src/gui/connectionvalidator.cpp

@@ -322,7 +322,6 @@ void ConnectionValidator::slotUserFetched(UserInfo *userInfo)
 
 #ifndef TOKEN_AUTH_ONLY
     connect(_account->e2e(), &ClientSideEncryption::initializationFinished, this, &ConnectionValidator::reportConnected);
-    _account->e2e()->setAccount(_account);
     _account->e2e()->initialize(nullptr);
 #else
     reportResult(Connected);

src/gui/folderman.h

@@ -7,7 +7,7 @@
 #ifndef FOLDERMAN_H
 #define FOLDERMAN_H
 
 #include <QByteArray>
 #include <QObject>
 #include <QQueue>
 #include <QList>
@@ -27,6 +27,7 @@
 class EndToEndTestHelper;
 class TestSyncConflictsModel;
 class TestRemoteWipe;
+class FolderManTestHelper;
 
 namespace OCC {
 
@@ -415,6 +416,7 @@
     friend class ::EndToEndTestHelper;
     friend class ::TestFolderStatusModel;
     friend class ::TestRemoteWipe;
+    friend class ::FolderManTestHelper;
 };
 
 } // namespace OCC

src/libsync/account.cpp

@@ -84,6 +84,7 @@ AccountPtr Account::create()
 {
     AccountPtr acc = AccountPtr(new Account);
     acc->setSharedThis(acc);
+    acc->_e2e.setAccount(acc);
     return acc;
 }
 

test/CMakeLists.txt

@@ -19,6 +19,7 @@ add_library(testutils
   sharetestutils.cpp
   endtoendtestutils.cpp
   activitylistmodeltestutils.cpp
+  foldermantestutils.cpp
 )
 
 target_link_libraries(testutils PUBLIC Nextcloud::sync Qt::Test Qt::Core5Compat)
@@ -144,6 +145,12 @@ nextcloud_add_test(Folder)
 nextcloud_add_test(FolderMan)
 nextcloud_add_test(RemoteWipe)
 
+if(NOT BUILD_FILE_PROVIDER_MODULE)
+    # the File Provider build crashes this test in CI for some reason
+    # I'm not yet sure what's causing it as it works fine with a classic build...
+    nextcloud_add_test(AccountSettings)
+endif()
+
 configure_file(test_journal.db "${PROJECT_BINARY_DIR}/bin/test_journal.db" COPYONLY)
 
 find_package(CMocka)

test/foldermantestutils.cpp

@@ -0,0 +1,17 @@
+/*
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "foldermantestutils.h"
+
+FolderManTestHelper::FolderManTestHelper(QObject *parent)
+    : QObject{parent}
+{
+
+}
+
+FolderManTestHelper::~FolderManTestHelper()
+{
+
+}

test/foldermantestutils.h

@@ -0,0 +1,25 @@
+/*
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#pragma once
+
+#include <QObject>
+
+#include "gui/folderman.h"
+
+using namespace OCC;
+
+/// Helper class to enable usage of FolderMan::instance() from within the
+/// tested code.
+class FolderManTestHelper : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit FolderManTestHelper(QObject *parent = nullptr);
+    ~FolderManTestHelper() override;
+
+    FolderMan fm;
+};

test/testaccountsettings.cpp

@@ -0,0 +1,59 @@
+/*
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: CC0-1.0
+ *
+ * This software is in the public domain, furnished "as is", without technical
+ * support, and with no warranty, express or implied, as to its usefulness for
+ * any purpose.
+ */
+
+#include <QtTest>
+
+#include "account.h"
+#include "testhelper.h"
+#include "foldermantestutils.h"
+#include "logger.h"
+
+#include "accountsettings.h"
+
+using namespace OCC;
+
+class TestAccountSettings : public QObject
+{
+    Q_OBJECT
+
+    FolderManTestHelper helper;
+
+private slots:
+    void initTestCase()
+    {
+        OCC::Logger::instance()->setLogFlush(true);
+        OCC::Logger::instance()->setLogDebug(true);
+
+        QStandardPaths::setTestModeEnabled(true);
+    }
+
+    void test_whenAccountStateIsNotConnected_doesNotCrash()
+    {
+        auto account = Account::create();
+        auto accountState = new FakeAccountState(account);
+        accountState->setStateForTesting(OCC::AccountState::SignedOut);
+        QCOMPARE_EQ(accountState->state(), OCC::AccountState::SignedOut);
+        AccountSettings a(accountState);
+    }
+
+    void test_whenAccountStateIsConnected_doesNotCrash()
+    {
+        // this occurred because ConnectionValidator used to set the account
+        // inside a Account's _e2e member, instead of letting Account itself
+        // do that.
+
+        auto account = Account::create();
+        auto accountState = new FakeAccountState(account);
+        QCOMPARE_EQ(accountState->state(), OCC::AccountState::Connected);
+        AccountSettings a(accountState);
+    }
+};
+
+QTEST_MAIN(TestAccountSettings)
+#include "testaccountsettings.moc"

test/testhelper.h

@@ -6,7 +6,7 @@
 #ifndef TESTHELPER_H
 #define TESTHELPER_H
 
 #include "gui/accountstate.h"
 #include "gui/folder.h"
 #include "creds/httpcredentials.h"
 
@@ -44,6 +44,16 @@
 public slots:
     void checkConnectivity() override {};
 
+    void setStateForTesting(OCC::AccountState::State state)
+    {
+        if (_state == state) {
+            return;
+        }
+
+        _state = state;
+        Q_EMIT stateChanged(state);
+    }
+
 private slots:
     void setState(OCC::AccountState::State state) override { Q_UNUSED(state) };
 };