#5707 Only notify activation on user action
This commit is contained in:
parent
af9037276c
commit
af62174b59
|
@ -90,6 +90,7 @@ void ActivationDialog::accept()
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
m_LicenseManager->notifyActivation("serial:" + m_appConfig->serialKey());
|
||||||
Edition edition = m_LicenseManager->activeEdition();
|
Edition edition = m_LicenseManager->activeEdition();
|
||||||
time_t daysLeft = m_LicenseManager->serialKey().daysLeft(::time(0));
|
time_t daysLeft = m_LicenseManager->serialKey().daysLeft(::time(0));
|
||||||
if (edition != kUnregistered) {
|
if (edition != kUnregistered) {
|
||||||
|
|
|
@ -45,7 +45,6 @@ LicenseManager::setSerialKey(QString serialKeyString, bool acceptExpired)
|
||||||
using std::swap;
|
using std::swap;
|
||||||
swap (serialKey, m_serialKey);
|
swap (serialKey, m_serialKey);
|
||||||
m_AppConfig->setSerialKey(serialKeyString);
|
m_AppConfig->setSerialKey(serialKeyString);
|
||||||
notifyActivation("serial:" + serialKeyString);
|
|
||||||
emit serialKeyChanged(m_serialKey);
|
emit serialKeyChanged(m_serialKey);
|
||||||
|
|
||||||
if (serialKey.isTrial()) {
|
if (serialKey.isTrial()) {
|
||||||
|
|
|
@ -38,8 +38,6 @@ public:
|
||||||
void skipActivation();
|
void skipActivation();
|
||||||
void notifyUpdate(QString fromVersion, QString toVersion);
|
void notifyUpdate(QString fromVersion, QString toVersion);
|
||||||
static QString getEditionName(Edition edition, bool trial = false);
|
static QString getEditionName(Edition edition, bool trial = false);
|
||||||
|
|
||||||
private:
|
|
||||||
void notifyActivation(QString identity);
|
void notifyActivation(QString identity);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
Loading…
Reference in New Issue