napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[tracking] Get username from gs

Browse Source
This commit is contained in:
Adriaan de Groot 2020-06-17 15:24:21 +02:00
parent 9b8d591b5d
commit 47b0fa5d55
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/modules/tracking/TrackingJobs.cpp
View File

@ -20,6 +20,8 @@
#include "Config.h" #include "Config.h"
#include "GlobalStorage.h"
#include "JobQueue.h"
#include "network/Manager.h" #include "network/Manager.h"
#include "utils/CalamaresUtilsSystem.h" #include "utils/CalamaresUtilsSystem.h"
#include "utils/Logger.h" #include "utils/Logger.h"
@ -166,11 +168,20 @@ TrackingUserJob::addJob( Calamares::JobList& list, UserTrackingConfig* config )
{ {
if ( config->isEnabled() ) if ( config->isEnabled() )
{ {
const auto* gs = Calamares::JobQueue::instance()->globalStorage();
static const auto key = QStringLiteral( "username" );
QString username = ( gs && gs->contains( key ) ) ? gs->value( key ).toString() : QString();
if ( username.isEmpty() )
{
cWarning() << "No username is set in GlobalStorage, skipping user-tracking.";
return;
}
const auto style = config->userTrackingStyle(); const auto style = config->userTrackingStyle();
if ( style == "kuserfeedback" ) if ( style == "kuserfeedback" )
{ {
list.append( list.append( Calamares::job_ptr( new TrackingKUserFeedbackJob( username, config->userTrackingAreas() ) ) );
Calamares::job_ptr( new TrackingKUserFeedbackJob( QString( "root" ), config->userTrackingAreas() ) ) );
} }
else else
{ {