Merge branch 'dev' into device-verification

# Conflicts:
#	autotests/testfilecrypto.cpp
#	lib/connection.cpp
#	lib/connection.h
#	lib/database.cpp
#	lib/database.h
#	lib/e2ee/qolmoutboundsession.cpp
#	lib/e2ee/qolmoutboundsession.h
#	lib/eventitem.h
#	lib/events/encryptedevent.cpp
#	lib/events/encryptedevent.h
#	lib/events/encryptedfile.cpp
#	lib/events/encryptedfile.h
#	lib/events/keyverificationevent.cpp
#	lib/events/keyverificationevent.h
#	lib/events/roomkeyevent.h
#	lib/room.cpp
#	lib/room.h

1 files changed, 15 insertions, 14 deletions

diff --git a/lib/csapi/pusher.cpp b/lib/csapi/pusher.cpp
index ef4b3767..fb6595fc 100644
--- a/lib/csapi/pusher.cpp
+++ b/lib/csapi/pusher.cpp
@@ -9,12 +9,12 @@ using namespace Quotient;
 QUrl GetPushersJob::makeRequestUrl(QUrl baseUrl)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   makePath("/_matrix/client/r0", "/pushers"));
+                                   makePath("/_matrix/client/v3", "/pushers"));
 }
 
 GetPushersJob::GetPushersJob()
     : BaseJob(HttpVerb::Get, QStringLiteral("GetPushersJob"),
-              makePath("/_matrix/client/r0", "/pushers"))
+              makePath("/_matrix/client/v3", "/pushers"))
 {}
 
 PostPusherJob::PostPusherJob(const QString& pushkey, const QString& kind,
@@ -23,17 +23,18 @@ PostPusherJob::PostPusherJob(const QString& pushkey, const QString& kind,
                              const QString& lang, const PusherData& data,
                              const QString& profileTag, Omittable<bool> append)
     : BaseJob(HttpVerb::Post, QStringLiteral("PostPusherJob"),
-              makePath("/_matrix/client/r0", "/pushers/set"))
+              makePath("/_matrix/client/v3", "/pushers/set"))
 {
-    QJsonObject _data;
-    addParam<>(_data, QStringLiteral("pushkey"), pushkey);
-    addParam<>(_data, QStringLiteral("kind"), kind);
-    addParam<>(_data, QStringLiteral("app_id"), appId);
-    addParam<>(_data, QStringLiteral("app_display_name"), appDisplayName);
-    addParam<>(_data, QStringLiteral("device_display_name"), deviceDisplayName);
-    addParam<IfNotEmpty>(_data, QStringLiteral("profile_tag"), profileTag);
-    addParam<>(_data, QStringLiteral("lang"), lang);
-    addParam<>(_data, QStringLiteral("data"), data);
-    addParam<IfNotEmpty>(_data, QStringLiteral("append"), append);
-    setRequestData(std::move(_data));
+    QJsonObject _dataJson;
+    addParam<>(_dataJson, QStringLiteral("pushkey"), pushkey);
+    addParam<>(_dataJson, QStringLiteral("kind"), kind);
+    addParam<>(_dataJson, QStringLiteral("app_id"), appId);
+    addParam<>(_dataJson, QStringLiteral("app_display_name"), appDisplayName);
+    addParam<>(_dataJson, QStringLiteral("device_display_name"),
+               deviceDisplayName);
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("profile_tag"), profileTag);
+    addParam<>(_dataJson, QStringLiteral("lang"), lang);
+    addParam<>(_dataJson, QStringLiteral("data"), data);
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("append"), append);
+    setRequestData({ _dataJson });
 }