From fce3badd1d985eddc0e5fa1ee2bee19169eff8ee Mon Sep 17 00:00:00 2001
From: seefo <robbie.uvanni@gmail.com>
Date: Thu, 8 Jun 2017 10:48:38 -0700
Subject: [PATCH 1/2] Resolved FB#5005

---
 libraries/networking/src/UserActivityLogger.cpp | 10 ++++++++++
 libraries/networking/src/UserActivityLogger.h   |  5 ++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/libraries/networking/src/UserActivityLogger.cpp b/libraries/networking/src/UserActivityLogger.cpp
index 28117c0933..51445dce2a 100644
--- a/libraries/networking/src/UserActivityLogger.cpp
+++ b/libraries/networking/src/UserActivityLogger.cpp
@@ -20,6 +20,10 @@
 #include <DependencyManager.h>
 #include "AddressManager.h"
 
+UserActivityLogger::UserActivityLogger() {
+    _timer.start();
+}
+
 UserActivityLogger& UserActivityLogger::getInstance() {
     static UserActivityLogger sharedInstance;
     return sharedInstance;
@@ -42,6 +46,12 @@ void UserActivityLogger::logAction(QString action, QJsonObject details, JSONCall
     actionPart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data; name=\"action_name\"");
     actionPart.setBody(QByteArray().append(action));
     multipart->append(actionPart);
+
+    // Log the local-time that this event was logged
+    QHttpPart elapsedPart;
+    elapsedPart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data; name=\"elapsed_ms\"");
+    elapsedPart.setBody(QByteArray().append(_timer.elapsed()));
+    multipart->append(elapsedPart);
     
     // If there are action details, add them to the multipart
     if (!details.isEmpty()) {
diff --git a/libraries/networking/src/UserActivityLogger.h b/libraries/networking/src/UserActivityLogger.h
index 9fad498b86..179e8e6e66 100644
--- a/libraries/networking/src/UserActivityLogger.h
+++ b/libraries/networking/src/UserActivityLogger.h
@@ -18,6 +18,7 @@
 #include <QString>
 #include <QJsonObject>
 #include <QNetworkReply>
+#include <QElapsedTimer>
 
 #include <SettingHandle.h>
 #include "AddressManager.h"
@@ -51,8 +52,10 @@ private slots:
     void requestError(QNetworkReply& errorReply);
     
 private:
-    UserActivityLogger() {};
+    UserActivityLogger();
     Setting::Handle<bool> _disabled { "UserActivityLoggerDisabled", false };
+
+    QElapsedTimer _timer;
 };
 
 #endif // hifi_UserActivityLogger_h

From 06a5d0970c5916d7bcc78cc35a6e46cfed00f7c7 Mon Sep 17 00:00:00 2001
From: seefo <robbie.uvanni@gmail.com>
Date: Fri, 9 Jun 2017 10:58:07 -0700
Subject: [PATCH 2/2] Fixed issue with invalid time being sent when logging

---
 libraries/networking/src/UserActivityLogger.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/networking/src/UserActivityLogger.cpp b/libraries/networking/src/UserActivityLogger.cpp
index 51445dce2a..0cfd1e09e7 100644
--- a/libraries/networking/src/UserActivityLogger.cpp
+++ b/libraries/networking/src/UserActivityLogger.cpp
@@ -50,7 +50,7 @@ void UserActivityLogger::logAction(QString action, QJsonObject details, JSONCall
     // Log the local-time that this event was logged
     QHttpPart elapsedPart;
     elapsedPart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data; name=\"elapsed_ms\"");
-    elapsedPart.setBody(QByteArray().append(_timer.elapsed()));
+    elapsedPart.setBody(QString::number(_timer.elapsed()).toLocal8Bit());
     multipart->append(elapsedPart);
     
     // If there are action details, add them to the multipart