From 1a7920f80d86295b7e23017537250fc550632eb5 Mon Sep 17 00:00:00 2001
From: Andrew Nelless <andrew@symless.com>
Date: Tue, 1 Nov 2016 17:29:25 +0000
Subject: [PATCH 1/2] #5722 Make LicenseManager accept SerialKey object instead
 of string

---
 src/gui/src/ActivationDialog.cpp |  3 ++-
 src/gui/src/LicenseManager.cpp   | 14 ++++++++++----
 src/gui/src/LicenseManager.h     |  3 ++-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/gui/src/ActivationDialog.cpp b/src/gui/src/ActivationDialog.cpp
index 253ec3ee..6035dfa8 100644
--- a/src/gui/src/ActivationDialog.cpp
+++ b/src/gui/src/ActivationDialog.cpp
@@ -71,7 +71,8 @@ void ActivationDialog::accept()
 
 	std::pair<bool, QString> result;
 	try {
-		QString serialKey = ui->m_pTextEditSerialKey->toPlainText().trimmed();
+		SerialKey serialKey (ui->m_pTextEditSerialKey->toPlainText().
+							 trimmed().toStdString());
 		result = m_LicenseManager->setSerialKey(serialKey);
 	}
 	catch (std::exception& e) {
diff --git a/src/gui/src/LicenseManager.cpp b/src/gui/src/LicenseManager.cpp
index 221fd16d..cd0b6eb9 100644
--- a/src/gui/src/LicenseManager.cpp
+++ b/src/gui/src/LicenseManager.cpp
@@ -29,11 +29,10 @@ LicenseManager::LicenseManager(AppConfig* appConfig) :
 }
 
 std::pair<bool, QString>
-LicenseManager::setSerialKey(QString serialKeyString, bool acceptExpired)
+LicenseManager::setSerialKey(SerialKey serialKey, bool acceptExpired)
 {
 	std::pair<bool, QString> ret (true, "");
 	time_t currentTime = ::time(0);
-	SerialKey serialKey (serialKeyString.toStdString());
 
 	if (!acceptExpired && serialKey.isExpired(currentTime)) {
 		ret.first = false;
@@ -44,7 +43,8 @@ LicenseManager::setSerialKey(QString serialKeyString, bool acceptExpired)
 	if (serialKey != m_serialKey) {
 		using std::swap;
 		swap (serialKey, m_serialKey);
-		m_AppConfig->setSerialKey(serialKeyString);
+		m_AppConfig->setSerialKey(QString::fromStdString
+									(serialKey.toString()));
 		emit serialKeyChanged(m_serialKey);
 
 		if (serialKey.isTrial()) {
@@ -114,7 +114,13 @@ LicenseManager::serialKey() const
 void LicenseManager::refresh()
 {
 	if (!m_AppConfig->serialKey().isEmpty()) {
-		setSerialKey(m_AppConfig->serialKey(), true);
+		try {
+			SerialKey serialKey (m_AppConfig->serialKey().toStdString());
+			setSerialKey(serialKey, true);
+		} catch (...) {
+			m_AppConfig->setSerialKey("");
+			m_AppConfig->saveSettings();
+		}
 	}
 	if (m_serialKey.isExpired(::time(0))) {
 		emit endTrial(true);
diff --git a/src/gui/src/LicenseManager.h b/src/gui/src/LicenseManager.h
index 2dc89cd8..7ece4e23 100644
--- a/src/gui/src/LicenseManager.h
+++ b/src/gui/src/LicenseManager.h
@@ -30,7 +30,8 @@ class LicenseManager: public QObject
 
 public:
 	LicenseManager(AppConfig* appConfig);
-	std::pair<bool, QString> setSerialKey(QString serialKey, bool acceptExpired = false);
+	std::pair<bool, QString> setSerialKey(SerialKey serialKey,
+										  bool acceptExpired = false);
 	void refresh();
 	Edition activeEdition() const;
 	QString activeEditionName() const;

From 24a548273edbcaceddba1d3e2085049189b65c07 Mon Sep 17 00:00:00 2001
From: Andrew Nelless <andrew@symless.com>
Date: Wed, 2 Nov 2016 11:28:04 +0000
Subject: [PATCH 2/2] #5722 Trim serial keys already stored

---
 src/gui/src/AppConfig.cpp      | 2 +-
 src/gui/src/LicenseManager.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/src/AppConfig.cpp b/src/gui/src/AppConfig.cpp
index 06f9f43d..e6d15e63 100644
--- a/src/gui/src/AppConfig.cpp
+++ b/src/gui/src/AppConfig.cpp
@@ -161,7 +161,7 @@ void AppConfig::loadSettings()
 	m_ActivateEmail = settings().value("activateEmail", "").toString();
 	m_CryptoEnabled = settings().value("cryptoEnabled", true).toBool();
 	m_AutoHide = settings().value("autoHide", false).toBool();
-	m_Serialkey = settings().value("serialKey", "").toString();
+	m_Serialkey = settings().value("serialKey", "").toString().trimmed();
 	m_lastVersion = settings().value("lastVersion", "Unknown").toString();
 	m_LastExpiringWarningTime = settings().value("lastExpiringWarningTime", 0).toInt();
 	m_ActivationHasRun = settings().value("activationHasRun", false).toBool();
diff --git a/src/gui/src/LicenseManager.cpp b/src/gui/src/LicenseManager.cpp
index cd0b6eb9..335dd821 100644
--- a/src/gui/src/LicenseManager.cpp
+++ b/src/gui/src/LicenseManager.cpp
@@ -118,7 +118,7 @@ void LicenseManager::refresh()
 			SerialKey serialKey (m_AppConfig->serialKey().toStdString());
 			setSerialKey(serialKey, true);
 		} catch (...) {
-			m_AppConfig->setSerialKey("");
+			m_AppConfig->clearSerialKey();
 			m_AppConfig->saveSettings();
 		}
 	}