This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

#5657 Removed serial key code from syntool

  • Loading branch information...
Jerry (Xinyu Hou)
Jerry (Xinyu Hou) committed Oct 13, 2016
1 parent 4be9fc1 commit 82e55702ef031f6e28fcdfe4bdfe0ee5bb6d954e
Showing with 1 addition and 53 deletions.
  1. +0 −16 src/lib/synergy/ArgParser.cpp
  2. +0 −30 src/lib/synergy/ToolApp.cpp
  3. +1 −4 src/lib/synergy/ToolArgs.cpp
  4. +0 −3 src/lib/synergy/ToolArgs.h
@@ -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;
@@ -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();
}
@@ -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)
{
}
@@ -29,8 +29,5 @@ class ToolArgs {
bool m_getInstalledDir;
bool m_getProfileDir;
bool m_getArch;
- bool m_getSubscriptionFilename;
- bool m_checkSubscription;
bool m_notifyActivation;
- String m_subscriptionSerial;
};

0 comments on commit 82e5570

Please sign in to comment.