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, 4 insertions, 4 deletions

diff --git a/lib/csapi/to_device.cpp b/lib/csapi/to_device.cpp
index 628e8314..e10fac69 100644
--- a/lib/csapi/to_device.cpp
+++ b/lib/csapi/to_device.cpp
@@ -10,10 +10,10 @@ SendToDeviceJob::SendToDeviceJob(
     const QString& eventType, const QString& txnId,
     const QHash<QString, QHash<QString, QJsonObject>>& messages)
     : BaseJob(HttpVerb::Put, QStringLiteral("SendToDeviceJob"),
-              makePath("/_matrix/client/r0", "/sendToDevice/", eventType, "/",
+              makePath("/_matrix/client/v3", "/sendToDevice/", eventType, "/",
                        txnId))
 {
-    QJsonObject _data;
-    addParam<>(_data, QStringLiteral("messages"), messages);
-    setRequestData(std::move(_data));
+    QJsonObject _dataJson;
+    addParam<>(_dataJson, QStringLiteral("messages"), messages);
+    setRequestData({ _dataJson });
 }