Showing the changes to libraries/networking/src/UserActivityLogger.cpp (1 of 6 files). Show all
Unified · Split
| @@ -11,8 +11,6 @@ · 10 unmodified lines | ||
| 11 | 11 | |
| 12 | 12 | #include "UserActivityLogger.h" |
| 13 | 13 | |
| 14 | −#include "AccountManager.h" | |
| 15 | − | |
| 16 | 14 | #include <QHttpMultiPart> |
| 17 | 15 | #include <QJsonDocument> |
| 18 | 16 | |
| @@ -26,32 +24,32 @@ UserActivityLogger& UserActivityLogger::getInstance() { · 7 unmodified lines | ||
| 26 | 24 | UserActivityLogger::UserActivityLogger() { |
| 27 | 25 | } |
| 28 | 26 | |
| 29 | −void UserActivityLogger::logAction(QString action, QJsonObject details) { | |
| 27 | +void UserActivityLogger::logAction(QString action, QJsonObject details, JSONCallbackParameters params) { | |
| 30 | 28 | AccountManager& accountManager = AccountManager::getInstance(); |
| 31 | 29 | QHttpMultiPart* multipart = new QHttpMultiPart(QHttpMultiPart::FormDataType); |
| 32 | 30 | |
| 33 | − if (action != "login") { | |
| 34 | − QHttpPart actionPart; | |
| 35 | − actionPart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data; name=\"action_name\""); | |
| 36 | − actionPart.setBody(QByteArray().append(action)); | |
| 37 | − multipart->append(actionPart); | |
| 38 | − | |
| 39 | − | |
| 40 | − if (!details.isEmpty()) { | |
| 41 | − QHttpPart detailsPart; | |
| 42 | − detailsPart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data;" | |
| 43 | − " name=\"action_details\""); | |
| 44 | − detailsPart.setBody(QJsonDocument(details).toJson(QJsonDocument::Compact)); | |
| 45 | − multipart->append(detailsPart); | |
| 46 | − } | |
| 31 | + QHttpPart actionPart; | |
| 32 | + actionPart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data; name=\"action_name\""); | |
| 33 | + actionPart.setBody(QByteArray().append(action)); | |
| 34 | + multipart->append(actionPart); | |
| 35 | + | |
| 36 | + | |
| 37 | + if (!details.isEmpty()) { | |
| 38 | + QHttpPart detailsPart; | |
| 39 | + detailsPart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data;" | |
| 40 | + " name=\"action_details\""); | |
| 41 | + detailsPart.setBody(QJsonDocument(details).toJson(QJsonDocument::Compact)); | |
| 42 | + multipart->append(detailsPart); | |
| 47 | 43 | } |
| 48 | − qDebug() << "Loging activity " << action; | |
| 44 | + qDebug() << "Loging activity" << action; | |
| 45 | + qDebug() << AccountManager::getInstance().getAuthURL() << ": " << AccountManager::getInstance().isLoggedIn(); | |
| 49 | 46 | |
| 50 | − JSONCallbackParameters params; | |
| 51 | − params.jsonCallbackReceiver = this; | |
| 52 | − params.jsonCallbackMethod = "requestFinished"; | |
| 53 | − params.errorCallbackReceiver = this; | |
| 54 | − params.errorCallbackMethod = "requestError"; | |
| 47 | + if (params.isEmpty()) { | |
| 48 | + params.jsonCallbackReceiver = this; | |
| 49 | + params.jsonCallbackMethod = "requestFinished"; | |
| 50 | + params.errorCallbackReceiver = this; | |
| 51 | + params.errorCallbackMethod = "requestError"; | |
| 52 | + } | |
| 55 | 53 | |
| 56 | 54 | accountManager.authenticatedRequest(USER_ACTIVITY_URL, |
| 57 | 55 | QNetworkAccessManager::PostOperation, |
| @@ -68,8 +66,8 @@ void UserActivityLogger::requestError(QNetworkReply::NetworkError error,const QS · 10 unmodified lines | ||
| 68 | 66 | qDebug() << error << ": " << string; |
| 69 | 67 | } |
| 70 | 68 | |
| 71 | −void UserActivityLogger::login() { | |
| 72 | − const QString ACTION_NAME = "login"; | |
| 69 | +void UserActivityLogger::launch() { | |
| 70 | + const QString ACTION_NAME = "launch"; | |
| 73 | 71 | QJsonObject actionDetails; |
| 74 | 72 | |
| 75 | 73 | QString OS_KEY = "OS"; |
| @@ -91,9 +89,9 @@ void UserActivityLogger::login() { · 15 unmodified lines | ||
| 91 | 89 | logAction(ACTION_NAME, actionDetails); |
| 92 | 90 | } |
| 93 | 91 | |
| 94 | −void UserActivityLogger::logout() { | |
| 95 | − const QString ACTION_NAME = ""; | |
| 96 | − logAction(ACTION_NAME); | |
| 92 | +void UserActivityLogger::close(JSONCallbackParameters params) { | |
| 93 | + const QString ACTION_NAME = "close"; | |
| 94 | + logAction(ACTION_NAME, QJsonObject(), params); | |
| 97 | 95 | } |
| 98 | 96 | |
| 99 | 97 | void UserActivityLogger::changedDisplayName(QString displayName) { |