From 743e96f2778f31247771ac07dbf3e4634ff7f40a Mon Sep 17 00:00:00 2001
From: Andrew Nelless <andrew@symless.com>
Date: Thu, 13 Oct 2016 15:13:12 +0100
Subject: [PATCH] #5657 Don't store activation email

---
 src/gui/gui.pro                  | 6 ++++--
 src/gui/src/ActivationDialog.cpp | 2 +-
 src/gui/src/AppConfig.cpp        | 8 --------
 src/gui/src/AppConfig.h          | 2 --
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index c0bf4fad..836e5ec5 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -64,7 +64,8 @@ SOURCES += src/main.cpp \
     src/ActivationNotifier.cpp \
     src/ActivationDialog.cpp \
     src/CancelActivationDialog.cpp \
-    src/FailedLoginDialog.cpp
+    src/FailedLoginDialog.cpp \
+    ../lib/shared/SerialKey.cpp
 HEADERS += src/MainWindow.h \
     src/AboutDialog.h \
     src/ServerConfig.h \
@@ -112,7 +113,8 @@ HEADERS += src/MainWindow.h \
     src/ElevateMode.h \
     src/ActivationDialog.h \
     src/CancelActivationDialog.h \
-    src/FailedLoginDialog.h
+    src/FailedLoginDialog.h \
+    ../lib/shared/SerialKey.h
 RESOURCES += res/Synergy.qrc
 RC_FILE = res/win/Synergy.rc
 macx { 
diff --git a/src/gui/src/ActivationDialog.cpp b/src/gui/src/ActivationDialog.cpp
index 9f2e3d51..fc671501 100644
--- a/src/gui/src/ActivationDialog.cpp
+++ b/src/gui/src/ActivationDialog.cpp
@@ -77,7 +77,7 @@ void ActivationDialog::accept()
 		if (!subscriptionManager.activateSerial(serialKey)) {
 			return;
 		}
-		m_appConfig->setActivateEmail("");
+
 		notifyActivation("serial:" + m_appConfig->serialKey());
 
 	}
diff --git a/src/gui/src/AppConfig.cpp b/src/gui/src/AppConfig.cpp
index 9848e6b4..059cca59 100644
--- a/src/gui/src/AppConfig.cpp
+++ b/src/gui/src/AppConfig.cpp
@@ -184,7 +184,6 @@ void AppConfig::saveSettings()
 	settings().setValue("elevateModeEnum", static_cast<int>(m_ElevateMode));
 	settings().setValue("autoConfigPrompted", m_AutoConfigPrompted);
 	settings().setValue("edition", m_Edition);
-	settings().setValue("activateEmail", m_ActivateEmail);
 	settings().setValue("cryptoEnabled", m_CryptoEnabled);
 	settings().setValue("autoHide", m_AutoHide);
 	settings().setValue("serialKey", m_Serialkey);
@@ -245,13 +244,6 @@ void AppConfig::setEdition(int e) {
 
 int AppConfig::edition() const { return m_Edition; }
 
-bool AppConfig::setActivateEmail(QString e) {
-	m_ActivateEmail = e;
-	return true; 
-}
-
-QString AppConfig::activateEmail() { return m_ActivateEmail; }
-
 bool AppConfig::setSerialKey(QString serial, QString& errorOut) {
 	if (serial.isEmpty()) {
 		errorOut = "Your serial key cannot be blank.";
diff --git a/src/gui/src/AppConfig.h b/src/gui/src/AppConfig.h
index 271ef683..9ebf2c99 100644
--- a/src/gui/src/AppConfig.h
+++ b/src/gui/src/AppConfig.h
@@ -79,8 +79,6 @@ class AppConfig: public QObject
 		void setAutoConfigPrompted(bool prompted);
 		void setEdition(int e);
 		int edition() const;
-		bool setActivateEmail(QString e);
-		QString activateEmail();
 		bool setSerialKey(QString serial, QString& error);
 		void clearSerialKey();
 		QString serialKey();