Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 06:37:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Progress?

Browse source
This commit is contained in:
Zach Fox 2017-10-04 12:33:58 -07:00
parent 23245e2fb9
commit ab08dc6bd6
7 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/resources/qml/hifi/commerce/checkout/Checkout.qml
View file

@ -579,6 +579,7 @@ Rectangle {
} }
rezzedNotifContainer.visible = true; rezzedNotifContainer.visible = true;
rezzedNotifContainerTimer.start(); rezzedNotifContainerTimer.start();
commerce.updatePopLocation(root.itemId);
} }
} }
RalewaySemiBold { RalewaySemiBold {

1
interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
View file

@ -343,6 +343,7 @@ Item {
if (urlHandler.canHandleUrl(root.itemHref)) { if (urlHandler.canHandleUrl(root.itemHref)) {
urlHandler.handleUrl(root.itemHref); urlHandler.handleUrl(root.itemHref);
} }
commerce.updatePopLocation(root.itemId);
rezzedNotifContainer.visible = true; rezzedNotifContainer.visible = true;
rezzedNotifContainerTimer.start(); rezzedNotifContainerTimer.start();
} }

4
interface/src/commerce/Ledger.cpp
View file

@ -221,8 +221,8 @@ void Ledger::account() {
} }
// The api/failResponse is called just for the side effect of logging. // The api/failResponse is called just for the side effect of logging.
void Ledger::updateLocationSuccess(QNetworkReply& reply) { apiResponse("reset", reply); } void Ledger::updateLocationSuccess(QNetworkReply& reply) { apiResponse("updateLocation", reply); }
void Ledger::updateLocationFailure(QNetworkReply& reply) { failResponse("reset", reply); } void Ledger::updateLocationFailure(QNetworkReply& reply) { failResponse("updateLocation", reply); }
void Ledger::updateLocation(const QString& asset_id, const QString location, const bool controlledFailure) { void Ledger::updateLocation(const QString& asset_id, const QString location, const bool controlledFailure) {
auto wallet = DependencyManager::get<Wallet>(); auto wallet = DependencyManager::get<Wallet>();
QStringList keys = wallet->listPublicKeys(); QStringList keys = wallet->listPublicKeys();

6
interface/src/commerce/QmlCommerce.cpp
View file

@ -149,3 +149,9 @@ void QmlCommerce::account() {
auto ledger = DependencyManager::get<Ledger>(); auto ledger = DependencyManager::get<Ledger>();
ledger->account(); ledger->account();
} }
void QmlCommerce::updatePopLocation(const QString& popId, const bool controlledFailure) {
auto ledger = DependencyManager::get<Ledger>();
auto nodeList = DependencyManager::get<NodeList>();
ledger->updateLocation(popId, nodeList->getDomainHandler().getUUID().toString(), controlledFailure);
}

2
interface/src/commerce/QmlCommerce.h
View file

@ -70,6 +70,8 @@ protected:
Q_INVOKABLE void generateKeyPair(); Q_INVOKABLE void generateKeyPair();
Q_INVOKABLE void reset(); Q_INVOKABLE void reset();
Q_INVOKABLE void account(); Q_INVOKABLE void account();
Q_INVOKABLE void updatePopLocation(const QString& popId, const bool controlledFailure = false);
}; };
#endif // hifi_QmlCommerce_h #endif // hifi_QmlCommerce_h

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

@ -1107,9 +1107,6 @@ void EntityTree::popStatusSuccess(QNetworkReply& reply) {
// qCDebug(entities) << "'transfer_status' is 'failed', deleting entity" << entityItemID; // qCDebug(entities) << "'transfer_status' is 'failed', deleting entity" << entityItemID;
// deleteEntity(entityItemID, true); // deleteEntity(entityItemID, true);
//} else { //} else {
// //auto challengeOwnershipPacket = NLPacket::create(PacketType::ChallengeOwnership, NUM_BYTES_RFC4122_UUID + sizeof(encryptedText));
// //challengeOwnershipPacket->write(senderNode->getUUID());
// //challengeOwnershipPacket->writePrimitive(KillAvatarReason::TheirAvatarEnteredYourBubble);
//} //}
} }
@ -1358,9 +1355,15 @@ int EntityTree::processEditPacketData(ReceivedMessage& message, const unsigned c
qCDebug(entities) << "Sending" << endpoint << QJsonDocument(request).toJson(QJsonDocument::Compact); qCDebug(entities) << "Sending" << endpoint << QJsonDocument(request).toJson(QJsonDocument::Compact);
accountManager->sendRequest(URL + endpoint, accountManager->sendRequest(URL + endpoint,
AccountManagerAuth::None, AccountManagerAuth::None,
QNetworkAccessManager::PostOperation, QNetworkAccessManager::GetOperation,
callbackParams, callbackParams,
QJsonDocument(request).toJson()); QJsonDocument(request).toJson());
// Second, challenge ownership of the PoP cert
//auto challengeOwnershipPacket = NLPacket::create(PacketType::ChallengeOwnership, NUM_BYTES_RFC4122_UUID + sizeof(encryptedText));
//challengeOwnershipPacket->write(senderNode->getUUID());
//challengeOwnershipPacket->writePrimitive(KillAvatarReason::TheirAvatarEnteredYourBubble);
//// Kickoff a 10-second timeout timer that deletes the entity if we don't get an ownership response in time
} }
} }

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

@ -18,7 +18,6 @@
#include "AccountManager.h" #include "AccountManager.h"
#include <QJsonObject> #include <QJsonObject>
#include <QJsonDocument> #include <QJsonDocument>
#include <QtNetwork/QNetworkReply>
#include <Octree.h> #include <Octree.h>
#include <SpatialParentFinder.h> #include <SpatialParentFinder.h>