Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 12:54:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

adding user activity logging

Browse source
This commit is contained in:
Wayne Chen 2018-09-10 23:04:50 -07:00
parent 5ece8d8707
commit 69ae475787
4 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
interface/resources/qml/LoginDialog.qml
View file

@ -85,13 +85,4 @@ ModalWindow {
break break
} }
} }
Component.onDestruction: {
if (closeButtonVisible && clickedCloseButton && Settings.getValue("loginDialogPoppedUp", false)) {
var data = {
"action": "opted out"
};
UserActivityLogger.logAction("encourageLoginDialog", data);
}
Settings.setValue("loginDialogPoppedUp", false);
}
} }

12
interface/resources/qml/LoginDialog/LinkAccountBody.qml
View file

@ -350,11 +350,23 @@ Item {
bodyLoader.item.width = root.pane.width bodyLoader.item.width = root.pane.width
bodyLoader.item.height = root.pane.height bodyLoader.item.height = root.pane.height
} }
if (Settings.getValue("loginDialogPoppedUp", false)) {
var data = {
"action": "user logged in"
};
UserActivityLogger.logAction("encourageLoginDialog", data);
}
} }
onHandleLoginFailed: { onHandleLoginFailed: {
console.log("Login Failed") console.log("Login Failed")
mainTextContainer.visible = true mainTextContainer.visible = true
toggleLoading(false) toggleLoading(false)
if (Settings.getValue("loginDialogPoppedUp", false)) {
var data = {
"action": "user failed logging in"
};
UserActivityLogger.logAction("encourageLoginDialog", data);
}
} }
onHandleLinkCompleted: { onHandleLinkCompleted: {
console.log("Link Succeeded") console.log("Link Succeeded")

11
interface/src/Application.cpp
View file

@ -2309,16 +2309,14 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
auto accountManager = DependencyManager::get<AccountManager>(); auto accountManager = DependencyManager::get<AccountManager>();
auto dialogsManager = DependencyManager::get<DialogsManager>(); auto dialogsManager = DependencyManager::get<DialogsManager>();
if (!accountManager->isLoggedIn() && !qApp->isHMDMode()) { if (!accountManager->isLoggedIn() && !qApp->isHMDMode()) {
Settings settings; Setting::Handle<bool>{"loginDialogPoppedUp", false}.set(true);
settings.setValue("loginDialogPoppedUp", true);
dialogsManager->showLoginDialog(); dialogsManager->showLoginDialog();
QJsonObject loginData = {}; QJsonObject loginData = {};
loginData["action"] = "login dialog shown"; loginData["action"] = "login dialog shown";
UserActivityLogger::getInstance().logAction("encourageLoginDialog", loginData); UserActivityLogger::getInstance().logAction("encourageLoginDialog", loginData);
} }
}); });
Settings settings; Setting::Handle<bool>{"loginDialogPoppedUp", false}.set(false);
settings.setValue("loginDialogPoppedUp", false);
checkLoginTimer->start(); checkLoginTimer->start();
} }
@ -2453,6 +2451,8 @@ void Application::onAboutToQuit() {
// so its persisted explicitly here // so its persisted explicitly here
Setting::Handle<QString>{ ACTIVE_DISPLAY_PLUGIN_SETTING_NAME }.set(getActiveDisplayPlugin()->getName()); Setting::Handle<QString>{ ACTIVE_DISPLAY_PLUGIN_SETTING_NAME }.set(getActiveDisplayPlugin()->getName());
Setting::Handle<bool>{"loginDialogPoppedUp", false}.set(false);
getActiveDisplayPlugin()->deactivate(); getActiveDisplayPlugin()->deactivate();
if (_autoSwitchDisplayModeSupportedHMDPlugin if (_autoSwitchDisplayModeSupportedHMDPlugin
&& _autoSwitchDisplayModeSupportedHMDPlugin->isSessionActive()) { && _autoSwitchDisplayModeSupportedHMDPlugin->isSessionActive()) {
@ -4949,9 +4949,6 @@ void Application::loadSettings() {
} }
void Application::saveSettings() const { void Application::saveSettings() const {
Settings settings;
settings.setValue("loginDialogPoppedUp", false);
sessionRunTime.set(_sessionRunTimer.elapsed() / MSECS_PER_SECOND); sessionRunTime.set(_sessionRunTimer.elapsed() / MSECS_PER_SECOND);
DependencyManager::get<AudioClient>()->saveSettings(); DependencyManager::get<AudioClient>()->saveSettings();
DependencyManager::get<LODManager>()->saveSettings(); DependencyManager::get<LODManager>()->saveSettings();

3
interface/src/ui/LoginDialog.cpp
View file

@ -43,7 +43,6 @@ LoginDialog::LoginDialog(QQuickItem *parent) : OffscreenQmlDialog(parent) {
} }
LoginDialog::~LoginDialog() { LoginDialog::~LoginDialog() {
Settings settings;
Setting::Handle<bool> loginDialogPoppedUp{ "loginDialogPoppedUp", false }; Setting::Handle<bool> loginDialogPoppedUp{ "loginDialogPoppedUp", false };
auto poppedUp = loginDialogPoppedUp.get(); auto poppedUp = loginDialogPoppedUp.get();
if (poppedUp) { if (poppedUp) {
@ -51,7 +50,7 @@ LoginDialog::~LoginDialog() {
data["action"] = "user opted out"; data["action"] = "user opted out";
UserActivityLogger::getInstance().logAction("encourageLoginDialog", data); UserActivityLogger::getInstance().logAction("encourageLoginDialog", data);
} }
settings.setValue("loginDialogPoppedUp", false); loginDialogPoppedUp.set(false);
} }
void LoginDialog::showWithSelection() void LoginDialog::showWithSelection()