CodeCow/deskflow
1
0
Fork 0
mirror of https://github.com/deskflow/deskflow.git synced 2026-07-04 21:04:59 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

SYNERGY1-1545 Accept business licenses in basic/pro builds (#7188)

Browse Source 
* SYNERGY1-1545 Accept business licenses in basic/pro builds

* Update ChangeLog
This commit is contained in:
Serhii Hadzhilov 2022-06-08 21:46:22 +03:00 committed by GitHub
parent 0d7bc0dce9
commit de48bb20b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -22,6 +22,7 @@ Bug fixes:
Enhancements:
- #7143 Ability to stop Synergy on the login screen
- #7157 Synergy Business accepts only business licenses
- #7188 Synergy Basic\Pro accepts business licenses
- #7166 Replace language notifications with warnings in logs
- #7181 Fedora 36 support to CI system

6
src/gui/src/LicenseManager.cpp
View File

@ -37,13 +37,11 @@ LicenseManager::setSerialKey(SerialKey serialKey, bool acceptExpired)
throw std::runtime_error("Serial key expired");
}
#ifdef SYNERGY_BUSINESS
if (!serialKey.isValid()) {
#ifdef SYNERGY_BUSINESS
throw std::runtime_error("The serial key is not compatible with the business version of Synergy.");
#else
throw std::runtime_error("The serial key is not compatible with the consumer version of Synergy.");
#endif
}
#endif
if (serialKey != m_serialKey) {
using std::swap;

3
src/lib/shared/SerialKeyEdition.cpp
View File

@ -23,7 +23,8 @@ const std::map<std::string, Edition>& getSerialTypes()
{SerialKeyEdition::BASIC, kBasic},
{SerialKeyEdition::PRO, kPro},
{SerialKeyEdition::BASIC_CHINA, kBasic_China},
{SerialKeyEdition::PRO_CHINA, kPro_China}
{SerialKeyEdition::PRO_CHINA, kPro_China},
{SerialKeyEdition::BUSINESS, kBusiness}
};
#endif
return serialTypes;

6
src/test/unittests/shared/SerialKeyEditionTests.cpp
View File

@ -78,8 +78,8 @@ TEST(SerialKeyEditionTests, SetEditionProChina)
TEST(SerialKeyEditionTests, NameConstructor)
{
SerialKeyEdition edition(SerialKeyEdition::BUSINESS);
EXPECT_EQ(kUnregistered, edition.getType());
EXPECT_FALSE(edition.isValid());
EXPECT_EQ(kBusiness, edition.getType());
EXPECT_TRUE(edition.isValid());
}
TEST(SerialKeyEditionTests, isValid)
@ -92,7 +92,7 @@ TEST(SerialKeyEditionTests, isValid)
EXPECT_TRUE(edition.isValid());
edition.setType(Edition::kBusiness);
EXPECT_FALSE(edition.isValid());
EXPECT_TRUE(edition.isValid());
edition.setType(Edition::kPro);
EXPECT_TRUE(edition.isValid());