From 514c63ed906724291937d90b3bd8fbf13dbe0757 Mon Sep 17 00:00:00 2001 From: ksuprynowicz Date: Sat, 3 Jun 2023 12:27:24 +0200 Subject: [PATCH] Fix prtotocol incompatilibility after removing wallet --- libraries/entities/src/EntityTree.cpp | 1 + libraries/networking/src/DataServerAccountInfo.cpp | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp index 8a5a95e6ae..5d23cf704b 100644 --- a/libraries/entities/src/EntityTree.cpp +++ b/libraries/entities/src/EntityTree.cpp @@ -2708,6 +2708,7 @@ bool EntityTree::readFromMap(QVariantMap& map, const bool isImport) { ScriptEnginePointer scriptEngine = newScriptEngine(); if (entitiesQList.length() == 0) { + qCDebug(entities) << "EntityTree::readFromMap: entitiesQList.length() == 0, Empty map or invalidly formed file"; // Empty map or invalidly formed file. return false; } diff --git a/libraries/networking/src/DataServerAccountInfo.cpp b/libraries/networking/src/DataServerAccountInfo.cpp index 3fd322f852..aaea422c44 100644 --- a/libraries/networking/src/DataServerAccountInfo.cpp +++ b/libraries/networking/src/DataServerAccountInfo.cpp @@ -148,15 +148,18 @@ QByteArray DataServerAccountInfo::signPlaintext(const QByteArray& plaintext) { } QDataStream& operator<<(QDataStream &out, const DataServerAccountInfo& info) { + // Placeholder QUuid can be removed during protocol change out << info._accessToken << info._username << info._xmppPassword << info._discourseApiKey - << info._privateKey << info._domainID + << QUuid() << info._privateKey << info._domainID << info._temporaryDomainID << info._temporaryDomainApiKey; return out; } QDataStream& operator>>(QDataStream &in, DataServerAccountInfo& info) { + // Placeholder QUuid can be removed during protocol change + QUuid placeholder; in >> info._accessToken >> info._username >> info._xmppPassword >> info._discourseApiKey - >> info._privateKey >> info._domainID + >> placeholder >> info._privateKey >> info._domainID >> info._temporaryDomainID >> info._temporaryDomainApiKey; return in; }