Notify activation when skipping or using serial #4932

This commit is contained in:
Xinyu Hou
2015-10-27 16:31:09 -07:00
parent 4d20a3ce91
commit a4c799c285
9 changed files with 56 additions and 5 deletions

View File

@@ -71,6 +71,12 @@ QString CoreInterface::checkSubscription()
return run(args);
}
QString CoreInterface::notifyActivation(const QString& input)
{
QStringList args("--notify-activation");
return run(args, input);
}
QString CoreInterface::run(const QStringList& args, const QString& input)
{
QString program(

View File

@@ -31,5 +31,6 @@ public:
QString getSubscriptionFilename();
QString activateSerial(const QString& serial);
QString checkSubscription();
QString notifyActivation(const QString& input);
QString run(const QStringList& args, const QString& input = "");
};

View File

@@ -216,6 +216,17 @@ void SetupWizard::accept()
if (m_pRadioButtonSubscription->isChecked())
{
appConfig.setSerialKey(m_pLineEditSerialKey->text());
QString info("serial:" + hash(getFirstMacAddress()) + "\n");
CoreInterface coreInterface;
coreInterface.notifyActivation(info);
}
if (m_pRadioButtonSkip->isChecked())
{
QString info("skip:" + hash(getFirstMacAddress()) + "\n");
CoreInterface coreInterface;
coreInterface.notifyActivation(info);
}
m_MainWindow.setEdition(m_Edition);

View File

@@ -94,6 +94,6 @@ QString WebClient::request(
{
QStringList args("--login-auth");
// hash password in case it contains interesting chars.
QString credentials(email + ":" + hash(password) + "\n");
QString credentials(email + ":" + hash(password) + ":" + hash(getFirstMacAddress()) + "\n");
return m_CoreInterface.run(args, credentials);
}