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, 16 insertions, 14 deletions

diff --git a/lib/csapi/profile.cpp b/lib/csapi/profile.cpp
index 64ac84ca..f024ed82 100644
--- a/lib/csapi/profile.cpp
+++ b/lib/csapi/profile.cpp
@@ -9,56 +9,58 @@ using namespace Quotient;
 SetDisplayNameJob::SetDisplayNameJob(const QString& userId,
                                      const QString& displayname)
     : BaseJob(HttpVerb::Put, QStringLiteral("SetDisplayNameJob"),
-              makePath("/_matrix/client/r0", "/profile/", userId, "/displayname"))
+              makePath("/_matrix/client/v3", "/profile/", userId,
+                       "/displayname"))
 {
-    QJsonObject _data;
-    addParam<>(_data, QStringLiteral("displayname"), displayname);
-    setRequestData(std::move(_data));
+    QJsonObject _dataJson;
+    addParam<>(_dataJson, QStringLiteral("displayname"), displayname);
+    setRequestData({ _dataJson });
 }
 
 QUrl GetDisplayNameJob::makeRequestUrl(QUrl baseUrl, const QString& userId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   makePath("/_matrix/client/r0", "/profile/",
+                                   makePath("/_matrix/client/v3", "/profile/",
                                             userId, "/displayname"));
 }
 
 GetDisplayNameJob::GetDisplayNameJob(const QString& userId)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetDisplayNameJob"),
-              makePath("/_matrix/client/r0", "/profile/", userId, "/displayname"),
+              makePath("/_matrix/client/v3", "/profile/", userId,
+                       "/displayname"),
               false)
 {}
 
 SetAvatarUrlJob::SetAvatarUrlJob(const QString& userId, const QUrl& avatarUrl)
     : BaseJob(HttpVerb::Put, QStringLiteral("SetAvatarUrlJob"),
-              makePath("/_matrix/client/r0", "/profile/", userId, "/avatar_url"))
+              makePath("/_matrix/client/v3", "/profile/", userId, "/avatar_url"))
 {
-    QJsonObject _data;
-    addParam<>(_data, QStringLiteral("avatar_url"), avatarUrl);
-    setRequestData(std::move(_data));
+    QJsonObject _dataJson;
+    addParam<>(_dataJson, QStringLiteral("avatar_url"), avatarUrl);
+    setRequestData({ _dataJson });
 }
 
 QUrl GetAvatarUrlJob::makeRequestUrl(QUrl baseUrl, const QString& userId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   makePath("/_matrix/client/r0", "/profile/",
+                                   makePath("/_matrix/client/v3", "/profile/",
                                             userId, "/avatar_url"));
 }
 
 GetAvatarUrlJob::GetAvatarUrlJob(const QString& userId)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetAvatarUrlJob"),
-              makePath("/_matrix/client/r0", "/profile/", userId, "/avatar_url"),
+              makePath("/_matrix/client/v3", "/profile/", userId, "/avatar_url"),
               false)
 {}
 
 QUrl GetUserProfileJob::makeRequestUrl(QUrl baseUrl, const QString& userId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   makePath("/_matrix/client/r0", "/profile/",
+                                   makePath("/_matrix/client/v3", "/profile/",
                                             userId));
 }
 
 GetUserProfileJob::GetUserProfileJob(const QString& userId)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetUserProfileJob"),
-              makePath("/_matrix/client/r0", "/profile/", userId), false)
+              makePath("/_matrix/client/v3", "/profile/", userId), false)
 {}