diff options
| -rw-r--r-- | .github/workflows/ci.yml | 2 | ||||
| -rw-r--r-- | lib/connection.cpp | 16 | ||||
| -rw-r--r-- | lib/connection.h | 4 |
3 files changed, 21 insertions, 1 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 24d58a4c..b704b3b9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -112,7 +112,7 @@ jobs: # Build libQuotient as a shared library across platforms but also # check the static configuration somewhere CMAKE_ARGS="-G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DBUILD_SHARED_LIBS=${{ !matrix.sonar && runner.os == 'Linux' }} \ + -DBUILD_SHARED_LIBS=${{ runner.os == 'Linux' }} \ -DCMAKE_INSTALL_PREFIX=~/.local \ -DCMAKE_PREFIX_PATH=~/.local \ -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON" diff --git a/lib/connection.cpp b/lib/connection.cpp index b585fcc6..4abb77a5 100644 --- a/lib/connection.cpp +++ b/lib/connection.cpp @@ -2154,4 +2154,20 @@ void Connection::saveMegolmSession(Room* room, const QString& senderKey, QOlmInb { database()->saveMegolmSession(room->id(), senderKey, session->sessionId(), session->pickle(picklingMode())); } + +QStringList Connection::devicesForUser(User* user) const +{ + return d->deviceKeys[user->id()].keys(); +} + +QString Connection::curveKeyForUserDevice(const QString& user, const QString& device) const +{ + return d->deviceKeys[user][device].keys["curve25519:" % device]; +} + +QString Connection::edKeyForUserDevice(const QString& user, const QString& device) const +{ + return d->deviceKeys[user][device].keys["ed25519:" % device]; +} + #endif diff --git a/lib/connection.h b/lib/connection.h index 165d8d68..4a475319 100644 --- a/lib/connection.h +++ b/lib/connection.h @@ -680,6 +680,10 @@ public Q_SLOTS: void encryptionUpdate(Room *room); PicklingMode picklingMode() const; QJsonObject decryptNotification(const QJsonObject ¬ification); + + QStringList devicesForUser(User* user) const; + QString curveKeyForUserDevice(const QString &user, const QString& device) const; + QString edKeyForUserDevice(const QString& user, const QString& device) const; #endif Q_SIGNALS: /// \brief Initial server resolution has failed |