From df8864f9b096da9448c480586a0edfa861ed0e0a Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 12 Mar 2015 15:04:51 -0700
Subject: [PATCH] Revert "make sure UserActivityLogger::close() waits for the
 pending log message to complete"

This reverts commit 3bd3f5a6d22ca68d508c90a541015ab6c122c581.
---
 libraries/networking/src/AccountManager.cpp     | 12 ------------
 libraries/networking/src/AccountManager.h       |  4 ----
 libraries/networking/src/UserActivityLogger.cpp |  4 +---
 3 files changed, 1 insertion(+), 19 deletions(-)

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 <QtCore/QUrlQuery>
 #include <QtNetwork/QHttpMultiPart>
 #include <QtNetwork/QNetworkRequest>
-#include <QEventLoop>
 #include <qthread.h>
 
 #include <SettingHandle.h>
@@ -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..f2646369c1 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,
@@ -89,8 +89,6 @@ void UserActivityLogger::launch(QString applicationVersion) {
 void UserActivityLogger::close() {
     const QString ACTION_NAME = "close";
     logAction(ACTION_NAME, QJsonObject());
-    
-    AccountManager::getInstance().waitForAllPendingReplies();
 }
 
 void UserActivityLogger::changedDisplayName(QString displayName) {