Merge branch 'master' into SYNERGY-282-Update-Synerg-icons

ChangeLog

@@ -15,6 +15,7 @@ Enhancements:
 - #6792 License key expiry
 - #6799 Synergy "Business" edition
 - #6803 Update Synergy icons
+- #6800 Update behaviour when unregistered
 
 v1.12.0-stable
 ===========

src/gui/src/ActivationDialog.cpp

@@ -47,7 +47,6 @@ void ActivationDialog::reject()
         CancelActivationDialog cancelActivationDialog(this);
         if (QDialog::Accepted == cancelActivationDialog.exec()) {
             m_LicenseManager->skipActivation();
-            m_appConfig->activationHasRun(true);
         } else {
             return;
         }

src/gui/src/LicenseManager.cpp

@@ -47,8 +47,8 @@ LicenseManager::setSerialKey(SerialKey serialKey, bool acceptExpired)
         emit serialKeyChanged(m_serialKey);
 
         emit showLicenseNotice(getLicenseNotice());
-		if (m_serialKey.isExpired(currentTime)) {
+        if (!m_serialKey.isValid()) {
-			emit LicenseExpired();
+            emit InvalidLicense();
         }
 
         if (m_serialKey.edition() != serialKey.edition()) {
@@ -112,8 +112,8 @@ LicenseManager::refresh()
             m_AppConfig->clearSerialKey();
         }
     }
-	if (m_serialKey.isExpired(::time(0))) {
+    if (!m_serialKey.isValid()) {
-		emit LicenseExpired();
+        emit InvalidLicense();
     }
 }
 

src/gui/src/LicenseManager.h

@@ -50,7 +50,7 @@ private:
 signals:
     void serialKeyChanged (SerialKey) const;
     void editionChanged (Edition) const;
-    void LicenseExpired () const;
+    void InvalidLicense () const;
     void showLicenseNotice(const QString& notice) const;
 
 protected:

src/gui/src/MainWindow.cpp

@@ -174,8 +174,8 @@ MainWindow::MainWindow (AppConfig& appConfig,
     connect (m_LicenseManager, SIGNAL(showLicenseNotice(QString)),
              this, SLOT(showLicenseNotice(QString)), Qt::QueuedConnection);
 
-    connect (m_LicenseManager, SIGNAL(LicenseExpired()),
+    connect (m_LicenseManager, SIGNAL(InvalidLicense()),
-             this, SLOT(LicenseExpired()), Qt::QueuedConnection);
+             this, SLOT(InvalidLicense()), Qt::QueuedConnection);
 #endif
 
     connect (m_AppConfig, SIGNAL(sslToggled(bool)),
@@ -613,8 +613,7 @@ void MainWindow::startSynergy()
 {
 #ifndef SYNERGY_ENTERPRISE
     SerialKey serialKey = m_LicenseManager->serialKey();
-    time_t currentTime = ::time(0);
+    if (!serialKey.isValid()) {
-    if (serialKey.isExpired(currentTime)) {
         if (QDialog::Rejected == raiseActivationDialog()) {
             return;
         }
@@ -1152,7 +1151,7 @@ void MainWindow::setEdition(Edition edition)
 }
 
 #ifndef SYNERGY_ENTERPRISE
-void MainWindow::LicenseExpired()
+void MainWindow::InvalidLicense()
 {
    stopSynergy();
    m_AppConfig->activationHasRun(false);
@@ -1379,10 +1378,8 @@ int MainWindow::raiseActivationDialog()
 void MainWindow::on_windowShown()
 {
 #ifndef SYNERGY_ENTERPRISE
-    time_t currentTime = ::time(0);
+	if (!m_AppConfig->activationHasRun() &&
-    if (!m_AppConfig->activationHasRun()
+		!m_LicenseManager->serialKey().isValid()){
-            && ((m_AppConfig->edition() == kUnregistered) ||
-                (m_LicenseManager->serialKey().isExpired(currentTime)))) {
 			raiseActivationDialog();
 	}
 #endif

src/gui/src/MainWindow.h

@@ -132,7 +132,7 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase
 public slots:
         void setEdition(Edition edition);
 #ifndef SYNERGY_ENTERPRISE
-        void LicenseExpired();
+		void InvalidLicense();
         void showLicenseNotice(const QString& message);
 #endif
         void appendLogRaw(const QString& text);

src/lib/shared/SerialKey.cpp

@@ -96,6 +96,19 @@ SerialKey::isTemporary() const
     return m_KeyType.isTemporary();
 }
 
+bool
+SerialKey::isValid() const
+{
+    bool Valid = true;
+
+    if (m_edition.getType() == kUnregistered || isExpired(::time(0)))
+    {
+        Valid = false;
+    }
+
+    return Valid;
+}
+
 Edition
 SerialKey::edition() const
 {

src/lib/shared/SerialKey.h

@@ -37,6 +37,7 @@ public:
     bool                isExpired(time_t currentTime) const;
     bool                isTrial() const;
     bool                isTemporary() const;
+    bool                isValid() const;
     time_t                daysLeft(time_t currentTime) const;
     std::string            email() const;
     Edition                edition() const;

src/test/unittests/shared/SerialKeyTests.cpp

@@ -207,4 +207,23 @@ TEST(SerialKeyTests, toStringV1BasicSerialKey)
     EXPECT_EQ(Expected, serial.toString());
 }
 
+TEST(SerialKeyTests, IsValidKey_false)
+{
+    //{v1;basic;Bob;1;email;company name;0;0}
+    SerialKey serial(kUnregistered);
+    EXPECT_EQ(false, serial.isValid());
+}
+
+TEST(SerialKeyTests, IsValidKey_true)
+{
+    SerialKey serial(kBasic);
+    EXPECT_EQ(true, serial.isValid());
+}
+
+TEST(SerialKeyTests, IsValidExpiredKey_false)
+{
+    SerialKey serial("7B76323B737562736372697074696F6E3B62617369633B426F623B313B656D61696C3B636F6D70616E79206E616D653B303B38363430307D");
+    EXPECT_EQ(false, serial.isValid());
+}
+