diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2018-01-25 12:26:19 +0900 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2018-01-25 13:29:36 +0900 |
| commit | d1663570003b20be58d4ce87e4b1d26bdf0029a8 (patch) | |
| tree | 2ec8fe1f02ff24aaa7c5ca0ae9b3d2e644c4d5e2 | |
| parent | 84e183a70b831d1e18c373099988420f5050254b (diff) | |
| download | libquotient-d1663570003b20be58d4ce87e4b1d26bdf0029a8.tar.gz libquotient-d1663570003b20be58d4ce87e4b1d26bdf0029a8.zip | |
Room::toJson: fix invite state caching
Causes a cache version upgrade; the old cache stores the state in an
incorrect place that won't be supported. Closes #159.
| -rw-r--r-- | connection.cpp | 2 | ||||
| -rw-r--r-- | room.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/connection.cpp b/connection.cpp index f498f613..efe47f86 100644 --- a/connection.cpp +++ b/connection.cpp @@ -551,7 +551,7 @@ void Connection::setHomeserver(const QUrl& url) emit homeserverChanged(homeserver()); } -static constexpr int CACHE_VERSION_MAJOR = 1; +static constexpr int CACHE_VERSION_MAJOR = 2; static constexpr int CACHE_VERSION_MINOR = 0; void Connection::saveState(const QUrl &toFile) const @@ -1467,7 +1467,9 @@ QJsonObject Room::Private::toJson() const QJsonObject roomStateObj; roomStateObj.insert("events", stateEvents); - result.insert("state", roomStateObj); + result.insert( + joinState == JoinState::Invite ? "invite_state" : "state", + roomStateObj); } if (!q->readMarkerEventId().isEmpty()) |