Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-22 11:53:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Closer than ever

Browse source
This commit is contained in:
Zach Fox 2017-10-12 16:29:05 -07:00
parent 6a47884fcf
commit d75c0a00bb
5 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
assignment-client/src/entities/EntityServer.cpp
View file

@ -478,14 +478,8 @@ void EntityServer::startDynamicDomainVerification() {
QJsonObject jsonObject = QJsonDocument::fromJson(networkReply->readAll()).object();
jsonObject = jsonObject["data"].toObject();
// ZRF FIXME Remove these two lines
QJsonDocument doc(jsonObject);
qCDebug(entities) << "ZRF FIXME" << doc.toJson(QJsonDocument::Compact);
if (networkReply->error() == QNetworkReply::NoError) {
// ZRF FIXME!!!
//if (jsonObject["place_name"].toString() != thisPlaceName) {
if (false) {
if (jsonObject["location"].toArray().first().toString() != thisPlaceName) {
qCDebug(entities) << "Entity's cert's place name" << jsonObject["place_name"].toString()
<< "isn't the current place name" << thisPlaceName << "; deleting entity" << i.value();
tree->deleteEntity(i.value(), true);

1
assignment-client/src/entities/EntityServer.h
View file

@ -19,6 +19,7 @@
#include "EntityItem.h"
#include "EntityServerConsts.h"
#include "EntityTree.h"
#include <QJsonArray>
/// Handles assignments of type EntityServer - sending entities to various clients.

2
interface/src/commerce/Wallet.cpp
View file

@ -739,7 +739,7 @@ void Wallet::handleChallengeOwnershipPacket(QSharedPointer<ReceivedMessage> pack
if (decryptionStatus != -1) {
auto nodeList = DependencyManager::get<NodeList>();
QByteArray decryptedTextByteArray = QByteArray(reinterpret_cast<char*>(decryptedText), (int)strlen((char*)decryptedText));
QByteArray decryptedTextByteArray = QByteArray(reinterpret_cast<char*>(decryptedText), decryptionStatus);
int decryptedTextByteArraySize = decryptedTextByteArray.size();
int certIDSize = certID.size();
// setup the packet

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

@ -1229,18 +1229,14 @@ void EntityTree::validatePop(const QString& certID, const EntityItemID& entityIt
QJsonObject jsonObject = QJsonDocument::fromJson(networkReply->readAll()).object();
jsonObject = jsonObject["data"].toObject();
// ZRF FIXME Remove these two lines
QJsonDocument doc(jsonObject);
qCDebug(entities) << "ZRF FIXME" << doc.toJson(QJsonDocument::Compact);
if (networkReply->error() == QNetworkReply::NoError) {
if (!jsonObject["invalid_reason"].toString().isEmpty()) {
qCDebug(entities) << "invalid_reason not empty, deleting entity" << entityItemID;
deleteEntity(entityItemID, true);
} else if (jsonObject["transfer_status"].toString() == "failed") {
} else if (jsonObject["transfer_status"].toArray().first().toString() == "failed") {
qCDebug(entities) << "'transfer_status' is 'failed', deleting entity" << entityItemID;
deleteEntity(entityItemID, true);
} else if (jsonObject["transfer_status"].toString() == "pending") {
} else if (jsonObject["transfer_status"].toArray().first().toString() == "pending") {
if (isRetryingValidation) {
qCDebug(entities) << "'transfer_status' is 'pending' after retry, deleting entity" << entityItemID;
deleteEntity(entityItemID, true);

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

@ -18,6 +18,7 @@
#include "AccountManager.h"
#include <QJsonObject>
#include <QJsonDocument>
#include <QJsonArray>
#include <NetworkingConstants.h>
#include <Octree.h>