Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix prtotocol incompatilibility after removing wallet

Browse source
This commit is contained in:
ksuprynowicz 2023-06-03 12:27:24 +02:00
parent 3c1c81e3ac
commit 514c63ed90
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/entities/src/EntityTree.cpp
View file

@ -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;
}

7
libraries/networking/src/DataServerAccountInfo.cpp
View file

@ -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;
}