diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2018-04-29 18:29:56 +0900 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2018-04-29 18:29:56 +0900 |
| commit | b5d962b0f5dcd3497db8a4b3bada46bb666d08e1 (patch) | |
| tree | 10d6e3add6b73cf9e4cecdeca08c72b490c50f7a /lib/connection.cpp | |
| parent | 4ced9792f27ed3d891c1f7772ae30d9fe452dd79 (diff) | |
| parent | f5af25428212f139c59941bb294a184242c8b5e0 (diff) | |
| download | libquotient-b5d962b0f5dcd3497db8a4b3bada46bb666d08e1.tar.gz libquotient-b5d962b0f5dcd3497db8a4b3bada46bb666d08e1.zip | |
Merge branch 'master' into kitsune-gtad
Diffstat (limited to 'lib/connection.cpp')
| -rw-r--r-- | lib/connection.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/connection.cpp b/lib/connection.cpp index 600ab396..5f930d57 100644 --- a/lib/connection.cpp +++ b/lib/connection.cpp @@ -84,7 +84,7 @@ class Connection::Private QVector<QString> roomIdsToForget; QMap<QString, User*> userMap; DirectChatsMap directChats; - QHash<QString, QVariantHash> accountData; + QHash<QString, AccountDataMap> accountData; QString userId; SyncJob* syncJob = nullptr; @@ -336,7 +336,7 @@ void Connection::onSyncSuccess(SyncData &&data) { continue; } d->accountData[accountEvent->jsonType()] = - accountEvent->contentJson().toVariantHash(); + fromJson<AccountDataMap>(accountEvent->contentJson()); emit accountDataChanged(accountEvent->jsonType()); } } @@ -590,6 +590,7 @@ Room* Connection::invitation(const QString& roomId) const User* Connection::user(const QString& userId) { + Q_ASSERT(userId.startsWith('@') && userId.contains(':')); if( d->userMap.contains(userId) ) return d->userMap.value(userId); auto* user = userFactory(this, userId); @@ -657,7 +658,7 @@ bool Connection::hasAccountData(const QString& type) const return d->accountData.contains(type); } -QVariantHash Connection::accountData(const QString& type) const +Connection::AccountDataMap Connection::accountData(const QString& type) const { return d->accountData.value(type); } @@ -847,7 +848,7 @@ void Connection::setHomeserver(const QUrl& url) emit homeserverChanged(homeserver()); } -static constexpr int CACHE_VERSION_MAJOR = 7; +static constexpr int CACHE_VERSION_MAJOR = 8; static constexpr int CACHE_VERSION_MINOR = 0; void Connection::saveState(const QUrl &toFile) const @@ -909,7 +910,7 @@ void Connection::saveState(const QUrl &toFile) const for (auto it = d->accountData.begin(); it != d->accountData.end(); ++it) accountDataEvents.append(QJsonObject { {"type", it.key()}, - {"content", QJsonObject::fromVariantHash(it.value())} + {"content", QMatrixClient::toJson(it.value())} }); rootObj.insert("account_data", QJsonObject {{ QStringLiteral("events"), accountDataEvents }}); |