aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/connection.cpp4
-rw-r--r--lib/encryptionmanager.cpp6
2 files changed, 4 insertions, 6 deletions
diff --git a/lib/connection.cpp b/lib/connection.cpp
index 26de0c5f..50e31d52 100644
--- a/lib/connection.cpp
+++ b/lib/connection.cpp
@@ -480,8 +480,8 @@ void Connection::sync(int timeout)
d->syncTimeout = timeout;
Filter filter;
- filter.room.edit().timeline.edit().limit.emplace(100);
- filter.room.edit().state.edit().lazyLoadMembers.emplace(d->lazyLoading);
+ filter.room.timeline.limit.emplace(100);
+ filter.room.state.lazyLoadMembers.emplace(d->lazyLoading);
auto job = d->syncJob =
callApi<SyncJob>(BackgroundRequest, d->data->lastEvent(), filter,
timeout);
diff --git a/lib/encryptionmanager.cpp b/lib/encryptionmanager.cpp
index 0895fae9..c50459f3 100644
--- a/lib/encryptionmanager.cpp
+++ b/lib/encryptionmanager.cpp
@@ -89,13 +89,11 @@ public:
// A map from senderKey to InboundSession
QMap<QString, InboundSession*> sessions; // TODO: cache
void updateDeviceKeys(
- const QHash<QString, QHash<QString, QueryKeysJob::DeviceInformation>>&
- deviceKeys)
+ const QHash<QString, QHash<QString, QueryKeysJob::DeviceKeys>>& deviceKeys)
{
for (auto userId : deviceKeys.keys()) {
for (auto deviceId : deviceKeys.value(userId).keys()) {
- QueryKeysJob::DeviceInformation info =
- deviceKeys.value(userId).value(deviceId);
+ auto info = deviceKeys.value(userId).value(deviceId);
// TODO: ed25519Verify, etc
}
}