ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

logic: Rewrote license checking logic for trial and app merge

Browse Source
This commit is contained in:
Eberhard Graether
2016-10-08 13:42:40 +02:00
parent ee7bf4e9b7
commit 1b8736a6e1
26 changed files with 228 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/LicenseChecker.cpp
+15 -19
View File
@@ -4,7 +4,6 @@
#include "utility/messaging/type/MessageForceEnterLicense.h"
#include "utility/messaging/type/MessageStatus.h"
#include "isTrial.h"
#include "License.h"
#include "PublicKey.h"
#include "settings/ApplicationSettings.h"
@@ -118,29 +117,26 @@ LicenseChecker::LicenseChecker()
void LicenseChecker::handleMessage(MessageDispatchWhenLicenseValid* message)
{
if (!isTrial())
MessageStatus("preparing...", false, true).dispatch();
LicenseState state = checkCurrentLicense();
MessageStatus("ready").dispatch();
if (state == LICENSE_VALID || message->allowTrial)
{
MessageStatus("preparing...", false, true).dispatch();
message->content->dispatch();
}
else
{
m_pendingMessage = message->content;
LicenseState state = checkCurrentLicense();
MessageStatus("ready").dispatch();
if (state != LICENSE_VALID)
if (!m_forcedLicenseEntering)
{
m_pendingMessage = message->content;
if (!m_forcedLicenseEntering)
{
m_forcedLicenseEntering = true;
MessageForceEnterLicense(state == LICENSE_EXPIRED).dispatch();
}
return;
m_forcedLicenseEntering = true;
MessageForceEnterLicense(state == LICENSE_EXPIRED).dispatch();
}
}
message->content->dispatch();
}
void LicenseChecker::handleMessage(MessageEnteredLicense* message)