logic: Rewrote license checking logic for trial and app merge

src/lib/Application.cpp

@@ -5,7 +5,6 @@
 #include "utility/logging/logging.h"
 #include "utility/logging/LogManager.h"
 #include "utility/messaging/MessageQueue.h"
-#include "utility/messaging/type/MessageDispatchWhenLicenseValid.h"
 #include "utility/messaging/type/MessageStatus.h"
 #include "utility/messaging/type/MessageShowStartScreen.h"
 #include "utility/scheduling/TaskScheduler.h"
@@ -20,7 +19,6 @@
 #include "component/view/MainView.h"
 #include "component/view/ViewFactory.h"
 #include "data/StorageCache.h"
-#include "isTrial.h"
 #include "LicenseChecker.h"
 #include "settings/ApplicationSettings.h"
 #include "settings/ColorScheme.h"
@@ -46,10 +44,10 @@ void Application::createInstance(
 		s_instance->m_mainView = viewFactory->createMainView();
 		s_instance->m_mainView->setTitle("Coati");
 
-		MessageDispatchWhenLicenseValid(std::make_shared<MessageShowStartScreen>()).dispatch();
-
 		s_instance->m_componentManager->setup(s_instance->m_mainView.get());
 		s_instance->m_mainView->loadLayout();
+
+		MessageShowStartScreen().dispatch();
 	}
 
 	if (networkFactory != nullptr)
@@ -107,6 +105,7 @@ std::shared_ptr<Application> Application::s_instance;
 
 Application::Application(bool withGUI)
 	: m_hasGUI(withGUI)
+	, m_isInTrial(false)
 {
 	LicenseChecker::createInstance();
 }
@@ -151,6 +150,11 @@ void Application::setTitle(const std::string& title)
 	m_mainView->setTitle(title);
 }
 
+bool Application::isInTrial() const
+{
+	return m_isInTrial;
+}
+
 void Application::createAndLoadProject(const FilePath& projectSettingsFilePath)
 {
 	MessageStatus("Loading Project: " + projectSettingsFilePath.str(), false, true).dispatch();
@@ -210,6 +214,11 @@ void Application::handleMessage(MessageActivateWindow* message)
 	}
 }
 
+void Application::handleMessage(MessageEnteredLicense* message)
+{
+	m_isInTrial = false;
+}
+
 void Application::handleMessage(MessageFinishedParsing* message)
 {
 	m_project->logStats();