This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

#5657 Stop service and refresh license when trial expires

  • Loading branch information...
nlyan committed Oct 25, 2016
1 parent b66043e commit 492df1f3fd66de2b0020e8444585ff33c3cc9fe2
Showing with 8 additions and 4 deletions.
  1. +5 −2 src/gui/src/LicenseManager.cpp
  2. +1 −1 src/gui/src/LicenseManager.h
  3. +2 −1 src/gui/src/MainWindow.cpp
@@ -89,10 +89,13 @@ LicenseManager::serialKey() const
return m_serialKey;
}
-void LicenseManager::refresh(bool acceptExpired)
+void LicenseManager::refresh()
{
if (!m_AppConfig->serialKey().isEmpty()) {
- setSerialKey(m_AppConfig->serialKey(), acceptExpired);
+ setSerialKey(m_AppConfig->serialKey(), true);
+ }
+ if (m_serialKey.isExpired(::time(0))) {
+ emit endTrial(true);
}
}
@@ -31,7 +31,7 @@ class LicenseManager: public QObject
public:
LicenseManager(AppConfig* appConfig);
std::pair<bool, QString> setSerialKey(QString serialKey, bool acceptExpired = false);
- void refresh(bool acceptExpired = false);
+ void refresh();
Edition activeEdition() const;
QString activeEditionName() const;
SerialKey serialKey() const;
@@ -156,7 +156,7 @@ MainWindow::MainWindow(QSettings& settings, AppConfig& appConfig,
this, SLOT(sslToggled(bool)), Qt::QueuedConnection);
setWindowTitle (m_LicenseManager->activeEditionName());
- m_LicenseManager->refresh(true);
+ m_LicenseManager->refresh();
}
MainWindow::~MainWindow()
@@ -451,6 +451,7 @@ void MainWindow::checkConnected(const QString& line)
void MainWindow::checkLicense(const QString &line)
{
if (line.contains("trial has expired")) {
+ licenseManager().refresh();
raiseActivationDialog();
}
}

0 comments on commit 492df1f

Please sign in to comment.