diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 25077e0ac1..c3cedc2373 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -573,10 +573,6 @@ void Application::cleanupBeforeQuit() { _settingsThread.quit(); saveSettings(); _window->saveGeometry(); - - // TODO: now that this is in cleanupBeforeQuit do we really need it to stop and force - // an event loop to send the packet? - UserActivityLogger::getInstance().close(); // let the avatar mixer know we're out MyAvatar::sendKillAvatar(); diff --git a/libraries/networking/src/AccountManager.cpp b/libraries/networking/src/AccountManager.cpp index e71c80efc8..2a809f2a7c 100644 --- a/libraries/networking/src/AccountManager.cpp +++ b/libraries/networking/src/AccountManager.cpp @@ -19,7 +19,6 @@ #include #include #include -#include #include #include @@ -300,8 +299,6 @@ void AccountManager::processReply() { passErrorToCallback(requestReply); } delete requestReply; - - emit replyFinished(); } void AccountManager::passSuccessToCallback(QNetworkReply* requestReply) { @@ -342,15 +339,6 @@ void AccountManager::passErrorToCallback(QNetworkReply* requestReply) { } } -void AccountManager::waitForAllPendingReplies() { - while (_pendingCallbackMap.size() > 0) { - QEventLoop loop; - QObject::connect(this, &AccountManager::replyFinished, &loop, &QEventLoop::quit); - loop.exec(); - } -} - - void AccountManager::persistAccountToSettings() { if (_shouldPersistToSettingsFile) { // store this access token into the local settings diff --git a/libraries/networking/src/AccountManager.h b/libraries/networking/src/AccountManager.h index 22d070fbe6..2c9a441db1 100644 --- a/libraries/networking/src/AccountManager.h +++ b/libraries/networking/src/AccountManager.h @@ -72,8 +72,6 @@ public: void requestProfile(); DataServerAccountInfo& getAccountInfo() { return _accountInfo; } - - void waitForAllPendingReplies(); public slots: void requestAccessToken(const QString& login, const QString& password); @@ -95,8 +93,6 @@ signals: void loginFailed(); void logoutComplete(); void balanceChanged(qint64 newBalance); - void replyFinished(); - private slots: void processReply(); void handleKeypairGenerationError(); diff --git a/libraries/networking/src/UserActivityLogger.cpp b/libraries/networking/src/UserActivityLogger.cpp index f74ea99c1e..64828708b2 100644 --- a/libraries/networking/src/UserActivityLogger.cpp +++ b/libraries/networking/src/UserActivityLogger.cpp @@ -61,7 +61,7 @@ void UserActivityLogger::logAction(QString action, QJsonObject details, JSONCall params.errorCallbackReceiver = this; params.errorCallbackMethod = "requestError"; } - + accountManager.authenticatedRequest(USER_ACTIVITY_URL, QNetworkAccessManager::PostOperation, params, @@ -86,13 +86,6 @@ void UserActivityLogger::launch(QString applicationVersion) { logAction(ACTION_NAME, actionDetails); } -void UserActivityLogger::close() { - const QString ACTION_NAME = "close"; - logAction(ACTION_NAME, QJsonObject()); - - AccountManager::getInstance().waitForAllPendingReplies(); -} - void UserActivityLogger::changedDisplayName(QString displayName) { const QString ACTION_NAME = "changed_display_name"; QJsonObject actionDetails; diff --git a/libraries/networking/src/UserActivityLogger.h b/libraries/networking/src/UserActivityLogger.h index 295ad5ee8d..2811be86a8 100644 --- a/libraries/networking/src/UserActivityLogger.h +++ b/libraries/networking/src/UserActivityLogger.h @@ -30,7 +30,7 @@ public slots: void logAction(QString action, QJsonObject details = QJsonObject(), JSONCallbackParameters params = JSONCallbackParameters()); void launch(QString applicationVersion); - void close(); + void changedDisplayName(QString displayName); void changedModel(QString typeOfModel, QString modelURL); void changedDomain(QString domainURL);