[tracking] Rename "neon" tracking

KDE neon does not do this kind of tracking -- although it was originally
requested by KDE neon, no server roll-out was done once the
privacy policy was thought out.
main
Adriaan de Groot 5 years ago
parent 4d6a5d0cb5
commit cb2909f6d8

@ -129,7 +129,7 @@ MachineTrackingConfig::MachineTrackingConfig( QObject* parent )
static bool
isValidMachineTrackingStyle( const QString& s )
{
static QStringList knownStyles { "neon" };
static QStringList knownStyles { "updatemanager" };
return knownStyles.contains( s );
}

@ -118,7 +118,7 @@ private:
*
* When machine tracking is on, the installed system will report
* back ("call home") at some point. This can mean Debian pop-con,
* or KDE neon maching tracking, or something else. The kind
* or updatemanager maching tracking, or something else. The kind
* of configuration depends on the style of tracking that is enabled.
*/
class MachineTrackingConfig : public TrackingStyleConfig

@ -101,9 +101,9 @@ TrackingMachineJob::addJob( Calamares::JobList& list, MachineTrackingConfig* con
if ( config->isEnabled() )
{
const auto style = config->machineTrackingStyle();
if ( style == "neon" )
if ( style == "updatemanager" )
{
list.append( Calamares::job_ptr( new TrackingMachineNeonJob() ) );
list.append( Calamares::job_ptr( new TrackingMachineUpdateManagerJob() ) );
}
else
{
@ -114,25 +114,25 @@ TrackingMachineJob::addJob( Calamares::JobList& list, MachineTrackingConfig* con
QString
TrackingMachineNeonJob::prettyName() const
TrackingMachineUpdateManagerJob::prettyName() const
{
return tr( "Machine feedback" );
}
QString
TrackingMachineNeonJob::prettyDescription() const
TrackingMachineUpdateManagerJob::prettyDescription() const
{
return prettyName();
}
QString
TrackingMachineNeonJob::prettyStatusMessage() const
TrackingMachineUpdateManagerJob::prettyStatusMessage() const
{
return tr( "Configuring machine feedback." );
}
Calamares::JobResult
TrackingMachineNeonJob::exec()
TrackingMachineUpdateManagerJob::exec()
{
static const auto script = QStringLiteral(
R"x(

@ -76,13 +76,13 @@ public:
static void addJob( Calamares::JobList& list, MachineTrackingConfig* config );
};
/** @brief Tracking machines, KDE neon style
/** @brief Tracking machines, update-manager style
*
* The machine has a machine-id, and this is sed(1)'ed into the
* update-manager configuration, to report the machine-id back
* to KDE neon servers.
* to distro servers.
*/
class TrackingMachineNeonJob : public TrackingMachineJob
class TrackingMachineUpdateManagerJob : public TrackingMachineJob
{
Q_OBJECT
public:

@ -34,14 +34,6 @@
CALAMARES_PLUGIN_FACTORY_DEFINITION( TrackingViewStepFactory, registerPlugin< TrackingViewStep >(); )
/** @brief Is @p s a valid machine-tracking style. */
static bool
isValidStyle( const QString& s )
{
static QStringList knownStyles { "neon" };
return knownStyles.contains( s );
}
TrackingViewStep::TrackingViewStep( QObject* parent )
: Calamares::ViewStep( parent )
, m_config( new Config( this ) )

@ -77,11 +77,11 @@ install:
# The machine area has one specific configuration key:
# style: This string specifies what kind of tracking configuration
# needs to be done. There is currently only one valid
# style, "neon", which edits two files in the installed
# style, "updatemanager", which edits two files in the installed
# system to enable system-tracking.
machine:
enabled: false
style: neon
style: updatemanager
# The user area is not yet implemented, and has no specific configuration.
user:

Loading…
Cancel
Save