From 82e55702ef031f6e28fcdfe4bdfe0ee5bb6d954e Mon Sep 17 00:00:00 2001
From: "Jerry (Xinyu Hou)" <xinyu@synergy-project.org>
Date: Thu, 13 Oct 2016 11:20:43 +0100
Subject: [PATCH] #5657 Removed serial key code from syntool

---
 src/lib/synergy/ArgParser.cpp | 16 ----------------
 src/lib/synergy/ToolApp.cpp   | 30 ------------------------------
 src/lib/synergy/ToolArgs.cpp  |  5 +----
 src/lib/synergy/ToolArgs.h    |  3 ---
 4 files changed, 1 insertion(+), 53 deletions(-)

diff --git a/src/lib/synergy/ArgParser.cpp b/src/lib/synergy/ArgParser.cpp
index 4e1dafdd..11adc2d5 100644
--- a/src/lib/synergy/ArgParser.cpp
+++ b/src/lib/synergy/ArgParser.cpp
@@ -201,22 +201,6 @@ ArgParser::parseToolArgs(ToolArgs& args, int argc, const char* const* argv)
 			args.m_getArch = true;
 			return true;
 		}
-		else if (isArg(i, argc, argv, NULL, "--subscription-serial", 1)) {
-			args.m_subscriptionSerial = argv[++i];
-			if (args.m_subscriptionSerial.empty()) {
-				LOG((CLOG_CRIT "subscription error: serial was not provided"));
-				return false;
-			}
-			return true;
-		}
-		else if (isArg(i, argc, argv, NULL, "--get-subscription-filename", 0)) {
-			args.m_getSubscriptionFilename = true;
-			return true;
-		}
-		else if (isArg(i, argc, argv, NULL, "--check-subscription", 0)) {
-			args.m_checkSubscription = true;
-			return true;
-		}
 		else if (isArg(i, argc, argv, NULL, "--notify-activation", 0)) {
 			args.m_notifyActivation = true;
 			return true;
diff --git a/src/lib/synergy/ToolApp.cpp b/src/lib/synergy/ToolApp.cpp
index 2aafdea1..444997d8 100644
--- a/src/lib/synergy/ToolApp.cpp
+++ b/src/lib/synergy/ToolApp.cpp
@@ -81,36 +81,6 @@ ToolApp::run(int argc, char** argv)
 		else if (m_args.m_getArch) {
 			std::cout << ARCH->getPlatformName() << std::endl;
 		}
-		else if (!m_args.m_subscriptionSerial.empty()) {
-			try {
-				SubscriptionManager subscriptionManager;
-				subscriptionManager.activate(m_args.m_subscriptionSerial);
-			}
-			catch (XSubscription& e) {
-				LOG((CLOG_CRIT "subscription error: %s", e.what()));
-				return kExitSubscription;
-			}
-		}
-		else if (m_args.m_getSubscriptionFilename) {
-			try {
-				SubscriptionManager subscriptionManager;
-				subscriptionManager.printFilename();
-			}
-			catch (XSubscription& e) {
-				LOG((CLOG_CRIT "subscription error: %s", e.what()));
-				return kExitSubscription;
-			}
-		}
-		else if (m_args.m_checkSubscription) {
-			try {
-				SubscriptionManager subscriptionManager;
-				subscriptionManager.checkFile("");
-			}
-			catch (XSubscription& e) {
-				LOG((CLOG_CRIT "subscription error: %s", e.what()));
-				return kExitSubscription;
-			}
-		}
 		else if (m_args.m_notifyActivation) {
 			notifyActivation();
 		}
diff --git a/src/lib/synergy/ToolArgs.cpp b/src/lib/synergy/ToolArgs.cpp
index 500a1692..5f67c666 100644
--- a/src/lib/synergy/ToolArgs.cpp
+++ b/src/lib/synergy/ToolArgs.cpp
@@ -23,9 +23,6 @@ ToolArgs::ToolArgs() :
 	m_getInstalledDir(false),
 	m_getProfileDir(false),
 	m_getArch(false),
-	m_getSubscriptionFilename(false),
-	m_checkSubscription(false),
-	m_notifyActivation(false),
-	m_subscriptionSerial()
+	m_notifyActivation(false)
 {
 }
diff --git a/src/lib/synergy/ToolArgs.h b/src/lib/synergy/ToolArgs.h
index df126d89..5febab9e 100644
--- a/src/lib/synergy/ToolArgs.h
+++ b/src/lib/synergy/ToolArgs.h
@@ -29,8 +29,5 @@ public:
 	bool				m_getInstalledDir;
 	bool				m_getProfileDir;
 	bool				m_getArch;
-	bool				m_getSubscriptionFilename;
-	bool				m_checkSubscription;
 	bool				m_notifyActivation;
-	String				m_subscriptionSerial;
 };