From d102795314d3bb780e1ca031d62a3c12b0b9f64c Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Mon, 30 Jun 2014 17:18:49 -0700
Subject: [PATCH] Added application version to logger

---
 interface/src/Application.cpp                 |  2 +-
 .../networking/src/UserActivityLogger.cpp     | 19 +++++++++++--------
 libraries/networking/src/UserActivityLogger.h |  2 +-
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 26f4d25eb7..c6be40d89e 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -269,7 +269,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
 
     // set the account manager's root URL and trigger a login request if we don't have the access token
     accountManager.setAuthURL(DEFAULT_NODE_AUTH_URL);
-    UserActivityLogger::getInstance().launch();
+    UserActivityLogger::getInstance().launch(applicationVersion());
 
     // once the event loop has started, check and signal for an access token
     QMetaObject::invokeMethod(&accountManager, "checkAndSignalForAccessToken", Qt::QueuedConnection);
diff --git a/libraries/networking/src/UserActivityLogger.cpp b/libraries/networking/src/UserActivityLogger.cpp
index b797a1b7eb..2b5a4ee31a 100644
--- a/libraries/networking/src/UserActivityLogger.cpp
+++ b/libraries/networking/src/UserActivityLogger.cpp
@@ -66,26 +66,29 @@ void UserActivityLogger::requestError(QNetworkReply::NetworkError error,const QS
     qDebug() << error << ": " << string;
 }
 
-void UserActivityLogger::launch() {
+void UserActivityLogger::launch(QString applicationVersion) {
     const QString ACTION_NAME = "launch";
     QJsonObject actionDetails;
     
-    QString OS_KEY = "OS";
-    QString VERSION_KEY = "Version";
+    QString APP_VERION = "application_version";
+    QString OS_KEY = "os";
+    QString VERSION_KEY = "version";
 #ifdef Q_OS_MAC
-    actionDetails.insert(OS_KEY, QJsonValue(QString("Mac")));
+    actionDetails.insert(OS_KEY, QJsonValue(QString("osx")));
     actionDetails.insert(VERSION_KEY, QJsonValue(QSysInfo::macVersion()));
 #elif Q_OS_LINUX
-    actionDetails.insert(OS_KEY, QJsonValue(QString("Linux")));
+    actionDetails.insert(OS_KEY, QJsonValue(QString("linux")));
 #elif Q_OS_WIN
-    actionDetails.insert(OS_KEY, QJsonValue(QString("Windows")));
+    actionDetails.insert(OS_KEY, QJsonValue(QString("windows")));
     actionDetails.insert(VERSION_KEY, QJsonValue(QSysInfo::windowsVersion()));
 #elif Q_OS_UNIX
-    actionDetails.insert(OS_KEY, QJsonValue(QString("Unknown UNIX")));
+    actionDetails.insert(OS_KEY, QJsonValue(QString("unknown unix")));
 #else
-    actionDetails.insert(OS_KEY, QJsonValue(QString("Unknown system")));
+    actionDetails.insert(OS_KEY, QJsonValue(QString("unknown system")));
 #endif
     
+    actionDetails.insert(APP_VERION, applicationVersion);
+    
     logAction(ACTION_NAME, actionDetails);
 }
 
diff --git a/libraries/networking/src/UserActivityLogger.h b/libraries/networking/src/UserActivityLogger.h
index 3a36974128..1474107ff3 100644
--- a/libraries/networking/src/UserActivityLogger.h
+++ b/libraries/networking/src/UserActivityLogger.h
@@ -28,7 +28,7 @@ public:
 public slots:
     void logAction(QString action, QJsonObject details = QJsonObject(), JSONCallbackParameters params = JSONCallbackParameters());
     
-    void launch();
+    void launch(QString applicationVersion);
     void close(JSONCallbackParameters params = JSONCallbackParameters());
     void changedDisplayName(QString displayName);
     void changedModel(QString typeOfModel, QString modelURL);