From 7750e86c135185cbd7b637e9de295ccb477a0801 Mon Sep 17 00:00:00 2001 From: David Kelly Date: Tue, 20 Dec 2016 13:47:58 -0800 Subject: [PATCH] Only send machine fingerprint when not logged in While at it, no longer grabbing it at all when starting up, as that was just a dev thing. Should consider not sending MAC address too, but we may revisit that later. --- interface/src/Application.cpp | 4 ---- libraries/networking/src/NodeList.cpp | 5 ++--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 691c5051b1..9598e81299 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -66,7 +66,6 @@ #include #include #include -#include #include #include #include @@ -614,9 +613,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo Model::setAbstractViewStateInterface(this); // The model class will sometimes need to know view state details from us - // TODO: This is temporary, while developing - FingerprintUtils::getMachineFingerprint(); - // End TODO auto nodeList = DependencyManager::get(); // Set up a watchdog thread to intentionally crash the application on deadlocks diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp index 98798ba1b5..4c3ff29270 100644 --- a/libraries/networking/src/NodeList.cpp +++ b/libraries/networking/src/NodeList.cpp @@ -373,9 +373,8 @@ void NodeList::sendDomainServerCheckIn() { packetStream << hardwareAddress; - // add in machine fingerprint - QUuid machineFingerprint = FingerprintUtils::getMachineFingerprint(); - packetStream << machineFingerprint; + auto accountManager = DependencyManager::get(); + packetStream << (accountManager->isLoggedIn() ? QUuid() : FingerprintUtils::getMachineFingerprint()); } // pack our data to send to the domain-server including