1 files changed, 23 insertions, 19 deletions

diff --git a/lib/csapi/keys.cpp b/lib/csapi/keys.cpp
index d6bd2fab..2e4978f2 100644
--- a/lib/csapi/keys.cpp
+++ b/lib/csapi/keys.cpp
@@ -7,39 +7,43 @@
 using namespace Quotient;
 
 UploadKeysJob::UploadKeysJob(const Omittable<DeviceKeys>& deviceKeys,
-                             const QHash<QString, QVariant>& oneTimeKeys)
+                             const OneTimeKeys& oneTimeKeys,
+                             const OneTimeKeys& fallbackKeys)
     : BaseJob(HttpVerb::Post, QStringLiteral("UploadKeysJob"),
-              makePath("/_matrix/client/r0", "/keys/upload"))
+              makePath("/_matrix/client/v3", "/keys/upload"))
 {
-    QJsonObject _data;
-    addParam<IfNotEmpty>(_data, QStringLiteral("device_keys"), deviceKeys);
-    addParam<IfNotEmpty>(_data, QStringLiteral("one_time_keys"), oneTimeKeys);
-    setRequestData(std::move(_data));
+    QJsonObject _dataJson;
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("device_keys"), deviceKeys);
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("one_time_keys"),
+                         oneTimeKeys);
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("fallback_keys"),
+                         fallbackKeys);
+    setRequestData({ _dataJson });
     addExpectedKey("one_time_key_counts");
 }
 
 QueryKeysJob::QueryKeysJob(const QHash<QString, QStringList>& deviceKeys,
                            Omittable<int> timeout, const QString& token)
     : BaseJob(HttpVerb::Post, QStringLiteral("QueryKeysJob"),
-              makePath("/_matrix/client/r0", "/keys/query"))
+              makePath("/_matrix/client/v3", "/keys/query"))
 {
-    QJsonObject _data;
-    addParam<IfNotEmpty>(_data, QStringLiteral("timeout"), timeout);
-    addParam<>(_data, QStringLiteral("device_keys"), deviceKeys);
-    addParam<IfNotEmpty>(_data, QStringLiteral("token"), token);
-    setRequestData(std::move(_data));
+    QJsonObject _dataJson;
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("timeout"), timeout);
+    addParam<>(_dataJson, QStringLiteral("device_keys"), deviceKeys);
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("token"), token);
+    setRequestData({ _dataJson });
 }
 
 ClaimKeysJob::ClaimKeysJob(
     const QHash<QString, QHash<QString, QString>>& oneTimeKeys,
     Omittable<int> timeout)
     : BaseJob(HttpVerb::Post, QStringLiteral("ClaimKeysJob"),
-              makePath("/_matrix/client/r0", "/keys/claim"))
+              makePath("/_matrix/client/v3", "/keys/claim"))
 {
-    QJsonObject _data;
-    addParam<IfNotEmpty>(_data, QStringLiteral("timeout"), timeout);
-    addParam<>(_data, QStringLiteral("one_time_keys"), oneTimeKeys);
-    setRequestData(std::move(_data));
+    QJsonObject _dataJson;
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("timeout"), timeout);
+    addParam<>(_dataJson, QStringLiteral("one_time_keys"), oneTimeKeys);
+    setRequestData({ _dataJson });
     addExpectedKey("one_time_keys");
 }
 
@@ -55,13 +59,13 @@ QUrl GetKeysChangesJob::makeRequestUrl(QUrl baseUrl, const QString& from,
                                        const QString& to)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   makePath("/_matrix/client/r0",
+                                   makePath("/_matrix/client/v3",
                                             "/keys/changes"),
                                    queryToGetKeysChanges(from, to));
 }
 
 GetKeysChangesJob::GetKeysChangesJob(const QString& from, const QString& to)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetKeysChangesJob"),
-              makePath("/_matrix/client/r0", "/keys/changes"),
+              makePath("/_matrix/client/v3", "/keys/changes"),
               queryToGetKeysChanges(from, to))
 {}