Merge branch 'master' into forget-rooms-really

18 files changed, 25 insertions, 25 deletions

diff --git a/lib/csapi/capabilities.cpp b/lib/csapi/capabilities.cpp
index 210423f5..fb506784 100644
--- a/lib/csapi/capabilities.cpp
+++ b/lib/csapi/capabilities.cpp
@@ -76,7 +76,7 @@ BaseJob::Status GetCapabilitiesJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
     if (!json.contains("capabilities"_ls))
-        return { JsonParseError,
+        return { IncorrectResponse,
             "The key 'capabilities' not found in the response" };
     fromJson(json.value("capabilities"_ls), d->capabilities);
     return Success;
diff --git a/lib/csapi/content-repo.cpp b/lib/csapi/content-repo.cpp
index 22223985..7e490604 100644
--- a/lib/csapi/content-repo.cpp
+++ b/lib/csapi/content-repo.cpp
@@ -50,7 +50,7 @@ BaseJob::Status UploadContentJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
     if (!json.contains("content_uri"_ls))
-        return { JsonParseError,
+        return { IncorrectResponse,
             "The key 'content_uri' not found in the response" };
     fromJson(json.value("content_uri"_ls), d->contentUri);
     return Success;
diff --git a/lib/csapi/create_room.cpp b/lib/csapi/create_room.cpp
index 448547ae..3101152a 100644
--- a/lib/csapi/create_room.cpp
+++ b/lib/csapi/create_room.cpp
@@ -77,7 +77,7 @@ BaseJob::Status CreateRoomJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
     if (!json.contains("room_id"_ls))
-        return { JsonParseError,
+        return { IncorrectResponse,
             "The key 'room_id' not found in the response" };
     fromJson(json.value("room_id"_ls), d->roomId);
     return Success;
diff --git a/lib/csapi/filter.cpp b/lib/csapi/filter.cpp
index 982e60b5..9f412d53 100644
--- a/lib/csapi/filter.cpp
+++ b/lib/csapi/filter.cpp
@@ -39,7 +39,7 @@ BaseJob::Status DefineFilterJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
     if (!json.contains("filter_id"_ls))
-        return { JsonParseError,
+        return { IncorrectResponse,
             "The key 'filter_id' not found in the response" };
     fromJson(json.value("filter_id"_ls), d->filterId);
     return Success;
diff --git a/lib/csapi/joining.cpp b/lib/csapi/joining.cpp
index 00d930fa..544f442f 100644
--- a/lib/csapi/joining.cpp
+++ b/lib/csapi/joining.cpp
@@ -57,7 +57,7 @@ BaseJob::Status JoinRoomByIdJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
     if (!json.contains("room_id"_ls))
-        return { JsonParseError,
+        return { IncorrectResponse,
             "The key 'room_id' not found in the response" };
     fromJson(json.value("room_id"_ls), d->roomId);
     return Success;
@@ -124,7 +124,7 @@ BaseJob::Status JoinRoomJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
     if (!json.contains("room_id"_ls))
-        return { JsonParseError,
+        return { IncorrectResponse,
             "The key 'room_id' not found in the response" };
     fromJson(json.value("room_id"_ls), d->roomId);
     return Success;
diff --git a/lib/csapi/keys.cpp b/lib/csapi/keys.cpp
index 6c16a8a3..5bbc1aab 100644
--- a/lib/csapi/keys.cpp
+++ b/lib/csapi/keys.cpp
@@ -42,7 +42,7 @@ BaseJob::Status UploadKeysJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
     if (!json.contains("one_time_key_counts"_ls))
-        return { JsonParseError,
+        return { IncorrectResponse,
             "The key 'one_time_key_counts' not found in the response" };
     fromJson(json.value("one_time_key_counts"_ls), d->oneTimeKeyCounts);
     return Success;
diff --git a/lib/csapi/list_joined_rooms.cpp b/lib/csapi/list_joined_rooms.cpp
index 85a9cae4..297a5ae0 100644
--- a/lib/csapi/list_joined_rooms.cpp
+++ b/lib/csapi/list_joined_rooms.cpp
@@ -44,7 +44,7 @@ BaseJob::Status GetJoinedRoomsJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
     if (!json.contains("joined_rooms"_ls))
-        return { JsonParseError,
+        return { IncorrectResponse,
             "The key 'joined_rooms' not found in the response" };
     fromJson(json.value("joined_rooms"_ls), d->joinedRooms);
     return Success;
diff --git a/lib/csapi/notifications.cpp b/lib/csapi/notifications.cpp
index c00b7cb0..5d3bdb47 100644
--- a/lib/csapi/notifications.cpp
+++ b/lib/csapi/notifications.cpp
@@ -80,7 +80,7 @@ BaseJob::Status GetNotificationsJob::parseJson(const QJsonDocument& data)
     auto json = data.object();
     fromJson(json.value("next_token"_ls), d->nextToken);
     if (!json.contains("notifications"_ls))
-        return { JsonParseError,
+        return { IncorrectResponse,
             "The key 'notifications' not found in the response" };
     fromJson(json.value("notifications"_ls), d->notifications);
     return Success;
diff --git a/lib/csapi/openid.cpp b/lib/csapi/openid.cpp
index b27fe0b8..03d24790 100644
--- a/lib/csapi/openid.cpp
+++ b/lib/csapi/openid.cpp
@@ -57,19 +57,19 @@ BaseJob::Status RequestOpenIdTokenJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
     if (!json.contains("access_token"_ls))
-        return { JsonParseError,
+        return { IncorrectResponse,
             "The key 'access_token' not found in the response" };
     fromJson(json.value("access_token"_ls), d->accessToken);
     if (!json.contains("token_type"_ls))
-        return { JsonParseError,
+        return { IncorrectResponse,
             "The key 'token_type' not found in the response" };
     fromJson(json.value("token_type"_ls), d->tokenType);
     if (!json.contains("matrix_server_name"_ls))
-        return { JsonParseError,
+        return { IncorrectResponse,
             "The key 'matrix_server_name' not found in the response" };
     fromJson(json.value("matrix_server_name"_ls), d->matrixServerName);
     if (!json.contains("expires_in"_ls))
-        return { JsonParseError,
+        return { IncorrectResponse,
             "The key 'expires_in' not found in the response" };
     fromJson(json.value("expires_in"_ls), d->expiresIn);
     return Success;
diff --git a/lib/csapi/presence.cpp b/lib/csapi/presence.cpp
index 024d7a34..210ee0ae 100644
--- a/lib/csapi/presence.cpp
+++ b/lib/csapi/presence.cpp
@@ -74,7 +74,7 @@ BaseJob::Status GetPresenceJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
     if (!json.contains("presence"_ls))
-        return { JsonParseError,
+        return { IncorrectResponse,
             "The key 'presence' not found in the response" };
     fromJson(json.value("presence"_ls), d->presence);
     fromJson(json.value("last_active_ago"_ls), d->lastActiveAgo);
diff --git a/lib/csapi/pushrules.cpp b/lib/csapi/pushrules.cpp
index b91d18f7..9b5b7cd1 100644
--- a/lib/csapi/pushrules.cpp
+++ b/lib/csapi/pushrules.cpp
@@ -44,7 +44,7 @@ BaseJob::Status GetPushRulesJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
     if (!json.contains("global"_ls))
-        return { JsonParseError,
+        return { IncorrectResponse,
             "The key 'global' not found in the response" };
     fromJson(json.value("global"_ls), d->global);
     return Success;
@@ -152,7 +152,7 @@ BaseJob::Status IsPushRuleEnabledJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
     if (!json.contains("enabled"_ls))
-        return { JsonParseError,
+        return { IncorrectResponse,
             "The key 'enabled' not found in the response" };
     fromJson(json.value("enabled"_ls), d->enabled);
     return Success;
@@ -201,7 +201,7 @@ BaseJob::Status GetPushRuleActionsJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
     if (!json.contains("actions"_ls))
-        return { JsonParseError,
+        return { IncorrectResponse,
             "The key 'actions' not found in the response" };
     fromJson(json.value("actions"_ls), d->actions);
     return Success;
diff --git a/lib/csapi/registration.cpp b/lib/csapi/registration.cpp
index 5dc9c1e5..76741a50 100644
--- a/lib/csapi/registration.cpp
+++ b/lib/csapi/registration.cpp
@@ -74,7 +74,7 @@ BaseJob::Status RegisterJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
     if (!json.contains("user_id"_ls))
-        return { JsonParseError,
+        return { IncorrectResponse,
             "The key 'user_id' not found in the response" };
     fromJson(json.value("user_id"_ls), d->userId);
     fromJson(json.value("access_token"_ls), d->accessToken);
diff --git a/lib/csapi/room_upgrades.cpp b/lib/csapi/room_upgrades.cpp
index f58fd675..f80c3aba 100644
--- a/lib/csapi/room_upgrades.cpp
+++ b/lib/csapi/room_upgrades.cpp
@@ -41,7 +41,7 @@ BaseJob::Status UpgradeRoomJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
     if (!json.contains("replacement_room"_ls))
-        return { JsonParseError,
+        return { IncorrectResponse,
             "The key 'replacement_room' not found in the response" };
     fromJson(json.value("replacement_room"_ls), d->replacementRoom);
     return Success;
diff --git a/lib/csapi/search.cpp b/lib/csapi/search.cpp
index a5f83c79..ad2c34a3 100644
--- a/lib/csapi/search.cpp
+++ b/lib/csapi/search.cpp
@@ -164,7 +164,7 @@ BaseJob::Status SearchJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
     if (!json.contains("search_categories"_ls))
-        return { JsonParseError,
+        return { IncorrectResponse,
             "The key 'search_categories' not found in the response" };
     fromJson(json.value("search_categories"_ls), d->searchCategories);
     return Success;
diff --git a/lib/csapi/users.cpp b/lib/csapi/users.cpp
index 97d8962d..0d867145 100644
--- a/lib/csapi/users.cpp
+++ b/lib/csapi/users.cpp
@@ -63,11 +63,11 @@ BaseJob::Status SearchUserDirectoryJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
     if (!json.contains("results"_ls))
-        return { JsonParseError,
+        return { IncorrectResponse,
             "The key 'results' not found in the response" };
     fromJson(json.value("results"_ls), d->results);
     if (!json.contains("limited"_ls))
-        return { JsonParseError,
+        return { IncorrectResponse,
             "The key 'limited' not found in the response" };
     fromJson(json.value("limited"_ls), d->limited);
     return Success;
diff --git a/lib/csapi/versions.cpp b/lib/csapi/versions.cpp
index 6ee6725d..4b7c4ced 100644
--- a/lib/csapi/versions.cpp
+++ b/lib/csapi/versions.cpp
@@ -50,7 +50,7 @@ BaseJob::Status GetVersionsJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
     if (!json.contains("versions"_ls))
-        return { JsonParseError,
+        return { IncorrectResponse,
             "The key 'versions' not found in the response" };
     fromJson(json.value("versions"_ls), d->versions);
     fromJson(json.value("unstable_features"_ls), d->unstableFeatures);
diff --git a/lib/csapi/whoami.cpp b/lib/csapi/whoami.cpp
index aebdf5d3..ce024c33 100644
--- a/lib/csapi/whoami.cpp
+++ b/lib/csapi/whoami.cpp
@@ -44,7 +44,7 @@ BaseJob::Status GetTokenOwnerJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
     if (!json.contains("user_id"_ls))
-        return { JsonParseError,
+        return { IncorrectResponse,
             "The key 'user_id' not found in the response" };
     fromJson(json.value("user_id"_ls), d->userId);
     return Success;
diff --git a/lib/csapi/{{base}}.cpp.mustache b/lib/csapi/{{base}}.cpp.mustache
index ff888d76..010f9116 100644
--- a/lib/csapi/{{base}}.cpp.mustache
+++ b/lib/csapi/{{base}}.cpp.mustache
@@ -115,7 +115,7 @@ BaseJob::Status {{camelCaseOperationId}}Job::parseJson(const QJsonDocument& data
 {{#inlineResponse}}    fromJson(data, d->{{paramName}});
 {{/inlineResponse}}{{^inlineResponse}}    auto json = data.object();
 {{#properties}}{{#required?}}    if (!json.contains("{{baseName}}"_ls))
-        return { JsonParseError,
+        return { IncorrectResponse,
             "The key '{{baseName}}' not found in the response" };
 {{/required?}}    fromJson(json.value("{{baseName}}"_ls), d->{{paramName}});
 {{/properties}}{{/inlineResponse}}    return Success;