aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--autotests/testolmaccount.cpp51
-rw-r--r--autotests/testolmaccount.h3
-rw-r--r--lib/connection.cpp2
-rw-r--r--lib/database.cpp4
-rw-r--r--lib/database.h2
5 files changed, 25 insertions, 37 deletions
diff --git a/autotests/testolmaccount.cpp b/autotests/testolmaccount.cpp
index 04e23db6..9989665a 100644
--- a/autotests/testolmaccount.cpp
+++ b/autotests/testolmaccount.cpp
@@ -439,6 +439,7 @@ void TestOlmAccount::claimMultipleKeys()
QCOMPARE(res->oneTimeKeyCounts().value(SignedCurve25519Key), 10);
});
alice->run(res);
+ QVERIFY(spy.wait(10000));
auto olm1 = alice1->olmAccount();
olm1->generateOneTimeKeys(10);
@@ -449,6 +450,7 @@ void TestOlmAccount::claimMultipleKeys()
QCOMPARE(res1->oneTimeKeyCounts().value(SignedCurve25519Key), 10);
});
alice1->run(res1);
+ QVERIFY(spy1.wait(10000));
auto olm2 = alice2->olmAccount();
olm2->generateOneTimeKeys(10);
@@ -459,10 +461,7 @@ void TestOlmAccount::claimMultipleKeys()
QCOMPARE(res2->oneTimeKeyCounts().value(SignedCurve25519Key), 10);
});
alice2->run(res2);
-
- QVERIFY(spy.wait(10000));
- QVERIFY(spy1.wait(10000));
- QVERIFY(spy2.wait(1000)); // TODO this is failing even with 10000
+ QVERIFY(spy2.wait(10000));
// Bob will claim all keys from alice
CREATE_CONNECTION(bob, "bob3", "secret", "BobPhone")
@@ -473,18 +472,17 @@ void TestOlmAccount::claimMultipleKeys()
<< alice2->deviceId();
QHash<QString, QHash<QString, QString>> oneTimeKeys;
+ oneTimeKeys[alice->userId()] = QHash<QString, QString>();
for (const auto &d : devices_) {
- oneTimeKeys[alice->userId()] = QHash<QString, QString>();
oneTimeKeys[alice->userId()][d] = SignedCurve25519Key;
}
auto job = bob->callApi<ClaimKeysJob>(oneTimeKeys);
- connect(job, &BaseJob::result, this, [bob, job] {
- const auto userId = bob->userId();
+ QSignalSpy jobSpy(job, &BaseJob::finished);
+ QVERIFY(jobSpy.wait(10000));
+ const auto userId = alice->userId();
- // The device exists.
- QCOMPARE(job->oneTimeKeys().size(), 1);
- QCOMPARE(job->oneTimeKeys().value(userId).size(), 3);
- });
+ QCOMPARE(job->oneTimeKeys().size(), 1);
+ QCOMPARE(job->oneTimeKeys().value(userId).size(), 3);
}
void TestOlmAccount::enableEncryption()
@@ -492,28 +490,21 @@ void TestOlmAccount::enableEncryption()
CREATE_CONNECTION(alice, "alice9", "secret", "AlicePhone")
auto job = alice->createRoom(Connection::PublishRoom, {}, {}, {}, {});
- bool encryptedEmitted = false;
- connect(alice.get(), &Connection::newRoom, this,
- [alice, this, &encryptedEmitted](Quotient::Room* room) {
- room->activateEncryption();
- connect(room, &Room::encryption, this, [&encryptedEmitted, this](){
- encryptedEmitted = true;
- Q_EMIT enableEncryptionFinished();
- });
- connect(alice.get(), &Connection::syncDone, this, [alice, room](){
- if (!room->usesEncryption()) {
- alice->sync();
- }
- });
- alice->sync();
- });
QSignalSpy createRoomSpy(job, &BaseJob::success);
QVERIFY(createRoomSpy.wait(10000));
alice->sync();
-
- QSignalSpy finishedSpy(this, &TestOlmAccount::enableEncryptionFinished);
- QVERIFY(finishedSpy.wait(10000));
- QVERIFY(encryptedEmitted);
+ connect(alice.get(), &Connection::syncDone, this, [alice](){
+ qDebug() << "foo";
+ alice->sync();
+ });
+ while(alice->roomsCount(JoinState::Join) == 0) {
+ QThread::sleep(100);
+ }
+ auto room = alice->rooms(JoinState::Join)[0];
+ room->activateEncryption();
+ QSignalSpy encryptionSpy(room, &Room::encryption);
+ QVERIFY(encryptionSpy.wait(10000));
+ QVERIFY(room->usesEncryption());
}
QTEST_GUILESS_MAIN(TestOlmAccount)
diff --git a/autotests/testolmaccount.h b/autotests/testolmaccount.h
index 1d3da837..367092f6 100644
--- a/autotests/testolmaccount.h
+++ b/autotests/testolmaccount.h
@@ -13,9 +13,6 @@ class TestOlmAccount : public QObject
{
Q_OBJECT
-Q_SIGNALS:
- void enableEncryptionFinished();
-
private Q_SLOTS:
void pickleUnpickledTest();
void identityKeysValid();
diff --git a/lib/connection.cpp b/lib/connection.cpp
index 1ef2495d..0ef27486 100644
--- a/lib/connection.cpp
+++ b/lib/connection.cpp
@@ -579,7 +579,7 @@ void Connection::Private::completeSetup(const QString& mxId)
picklingMode = Encrypted { job.binaryData() };
}
- database = new Database(data->userId(), q);
+ database = new Database(data->userId(), data->deviceId(), q);
// init olmAccount
olmAccount = std::make_unique<QOlmAccount>(data->userId(), data->deviceId(), q);
diff --git a/lib/database.cpp b/lib/database.cpp
index b91b6ef1..84c93046 100644
--- a/lib/database.cpp
+++ b/lib/database.cpp
@@ -15,7 +15,7 @@
#include "e2ee/qolminboundsession.h"
using namespace Quotient;
-Database::Database(const QString& matrixId, QObject* parent)
+Database::Database(const QString& matrixId, const QString& deviceId, QObject* parent)
: QObject(parent)
, m_matrixId(matrixId)
{
@@ -23,7 +23,7 @@ Database::Database(const QString& matrixId, QObject* parent)
QSqlDatabase::addDatabase(QStringLiteral("QSQLITE"), QStringLiteral("Quotient_%1").arg(m_matrixId));
QString databasePath = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + QStringLiteral("/%1").arg(m_matrixId);
QDir(databasePath).mkpath(databasePath);
- database().setDatabaseName(databasePath + QStringLiteral("/quotient.db3"));
+ database().setDatabaseName(databasePath + QStringLiteral("/quotient_%1.db3").arg(deviceId));
database().open();
switch(version()) {
diff --git a/lib/database.h b/lib/database.h
index d244dc0b..d4d5fb56 100644
--- a/lib/database.h
+++ b/lib/database.h
@@ -14,7 +14,7 @@ class QUOTIENT_API Database : public QObject
{
Q_OBJECT
public:
- Database(const QString& matrixId, QObject* parent);
+ Database(const QString& matrixId, const QString& deviceId, QObject* parent);
int version();
void transaction();
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-04 12:21:43 +0000