rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#5657 Don't store activation email

This commit is contained in:
Andrew Nelless 2016-10-13 15:13:12 +01:00
parent fd8e778b2a
commit 743e96f277
4 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/gui.pro
View File

@ -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 {

2
src/gui/src/ActivationDialog.cpp
View File

@ -77,7 +77,7 @@ void ActivationDialog::accept()
if (!subscriptionManager.activateSerial(serialKey)) {
return;
}
m_appConfig->setActivateEmail("");
notifyActivation("serial:" + m_appConfig->serialKey());
}

8
src/gui/src/AppConfig.cpp
View File

@ -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.";

2
src/gui/src/AppConfig.h
View File

@ -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();