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

4 files changed, 10 insertions, 54 deletions

diff --git a/lib/csapi/definitions/auth_data.h b/lib/csapi/definitions/auth_data.h
index e92596d0..a9972323 100644
--- a/lib/csapi/definitions/auth_data.h
+++ b/lib/csapi/definitions/auth_data.h
@@ -10,7 +10,10 @@ namespace Quotient {
 /// Used by clients to submit authentication information to the
 /// interactive-authentication API
 struct AuthenticationData {
-    /// The login type that the client is attempting to complete.
+    /// The authentication type that the client is attempting to complete.
+    /// May be omitted if `session` is given, and the client is reissuing a
+    /// request which it believes has been completed out-of-band (for example,
+    /// via the [fallback mechanism](#fallback)).
     QString type;
 
     /// The value of the session key given by the homeserver.
@@ -25,7 +28,7 @@ struct JsonObjectConverter<AuthenticationData> {
     static void dumpTo(QJsonObject& jo, const AuthenticationData& pod)
     {
         fillJson(jo, pod.authInfo);
-        addParam<>(jo, QStringLiteral("type"), pod.type);
+        addParam<IfNotEmpty>(jo, QStringLiteral("type"), pod.type);
         addParam<IfNotEmpty>(jo, QStringLiteral("session"), pod.session);
     }
     static void fillFrom(QJsonObject jo, AuthenticationData& pod)
diff --git a/lib/csapi/definitions/openid_token.h b/lib/csapi/definitions/openid_token.h
index 3c447321..9b026dea 100644
--- a/lib/csapi/definitions/openid_token.h
+++ b/lib/csapi/definitions/openid_token.h
@@ -8,7 +8,7 @@
 
 namespace Quotient {
 
-struct OpenidToken {
+struct OpenIdCredentials {
     /// An access token the consumer may use to verify the identity of
     /// the person who generated the token. This is given to the federation
     /// API `GET /openid/userinfo` to verify the user's identity.
@@ -27,8 +27,8 @@ struct OpenidToken {
 };
 
 template <>
-struct JsonObjectConverter<OpenidToken> {
-    static void dumpTo(QJsonObject& jo, const OpenidToken& pod)
+struct JsonObjectConverter<OpenIdCredentials> {
+    static void dumpTo(QJsonObject& jo, const OpenIdCredentials& pod)
     {
         addParam<>(jo, QStringLiteral("access_token"), pod.accessToken);
         addParam<>(jo, QStringLiteral("token_type"), pod.tokenType);
@@ -36,7 +36,7 @@ struct JsonObjectConverter<OpenidToken> {
                    pod.matrixServerName);
         addParam<>(jo, QStringLiteral("expires_in"), pod.expiresIn);
     }
-    static void fillFrom(const QJsonObject& jo, OpenidToken& pod)
+    static void fillFrom(const QJsonObject& jo, OpenIdCredentials& pod)
     {
         fromJson(jo.value("access_token"_ls), pod.accessToken);
         fromJson(jo.value("token_type"_ls), pod.tokenType);
diff --git a/lib/csapi/definitions/public_rooms_response.h b/lib/csapi/definitions/public_rooms_response.h
index 2938b4ec..d0a2595c 100644
--- a/lib/csapi/definitions/public_rooms_response.h
+++ b/lib/csapi/definitions/public_rooms_response.h
@@ -9,9 +9,6 @@
 namespace Quotient {
 
 struct PublicRoomsChunk {
-    /// Aliases of the room. May be empty.
-    QStringList aliases;
-
     /// The canonical alias of the room, if any.
     QString canonicalAlias;
 
@@ -49,7 +46,6 @@ template <>
 struct JsonObjectConverter<PublicRoomsChunk> {
     static void dumpTo(QJsonObject& jo, const PublicRoomsChunk& pod)
     {
-        addParam<IfNotEmpty>(jo, QStringLiteral("aliases"), pod.aliases);
         addParam<IfNotEmpty>(jo, QStringLiteral("canonical_alias"),
                              pod.canonicalAlias);
         addParam<IfNotEmpty>(jo, QStringLiteral("name"), pod.name);
@@ -64,7 +60,6 @@ struct JsonObjectConverter<PublicRoomsChunk> {
     }
     static void fillFrom(const QJsonObject& jo, PublicRoomsChunk& pod)
     {
-        fromJson(jo.value("aliases"_ls), pod.aliases);
         fromJson(jo.value("canonical_alias"_ls), pod.canonicalAlias);
         fromJson(jo.value("name"_ls), pod.name);
         fromJson(jo.value("num_joined_members"_ls), pod.numJoinedMembers);
@@ -77,44 +72,4 @@ struct JsonObjectConverter<PublicRoomsChunk> {
     }
 };
 
-/// A list of the rooms on the server.
-struct PublicRoomsResponse {
-    /// A paginated chunk of public rooms.
-    QVector<PublicRoomsChunk> chunk;
-
-    /// A pagination token for the response. The absence of this token
-    /// means there are no more results to fetch and the client should
-    /// stop paginating.
-    QString nextBatch;
-
-    /// A pagination token that allows fetching previous results. The
-    /// absence of this token means there are no results before this
-    /// batch, i.e. this is the first batch.
-    QString prevBatch;
-
-    /// An estimate on the total number of public rooms, if the
-    /// server has an estimate.
-    Omittable<int> totalRoomCountEstimate;
-};
-
-template <>
-struct JsonObjectConverter<PublicRoomsResponse> {
-    static void dumpTo(QJsonObject& jo, const PublicRoomsResponse& pod)
-    {
-        addParam<>(jo, QStringLiteral("chunk"), pod.chunk);
-        addParam<IfNotEmpty>(jo, QStringLiteral("next_batch"), pod.nextBatch);
-        addParam<IfNotEmpty>(jo, QStringLiteral("prev_batch"), pod.prevBatch);
-        addParam<IfNotEmpty>(jo, QStringLiteral("total_room_count_estimate"),
-                             pod.totalRoomCountEstimate);
-    }
-    static void fillFrom(const QJsonObject& jo, PublicRoomsResponse& pod)
-    {
-        fromJson(jo.value("chunk"_ls), pod.chunk);
-        fromJson(jo.value("next_batch"_ls), pod.nextBatch);
-        fromJson(jo.value("prev_batch"_ls), pod.prevBatch);
-        fromJson(jo.value("total_room_count_estimate"_ls),
-                 pod.totalRoomCountEstimate);
-    }
-};
-
 } // namespace Quotient
diff --git a/lib/csapi/definitions/push_condition.h b/lib/csapi/definitions/push_condition.h
index ce66d075..6a048ba8 100644
--- a/lib/csapi/definitions/push_condition.h
+++ b/lib/csapi/definitions/push_condition.h
@@ -24,9 +24,7 @@ struct PushCondition {
     QString key;
 
     /// Required for `event_match` conditions. The glob-style pattern to
-    /// match against. Patterns with no special glob characters should be
-    /// treated as having asterisks prepended and appended when testing the
-    /// condition.
+    /// match against.
     QString pattern;
 
     /// Required for `room_member_count` conditions. A decimal integer