New autoupdate channels for non-deprecated systems.

desktop-app · Aug 17, 2023 · 0919789 · 0919789
1 parent 9c68fbe
commit 0919789
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/base/platform/linux/base_info_linux.cpp b/base/platform/linux/base_info_linux.cpp
@@ -67,6 +67,18 @@ constexpr auto kMaxDeviceModelLength = 15;
 	}
 }
 
+[[nodiscard]] bool IsGlibcLess228() {
+	static const auto result = [] {
+		const auto libcName = GetLibcName();
+		const auto libcVersion = GetLibcVersion();
+		return (libcName == qstr("glibc"))
+			&& !libcVersion.isEmpty()
+			&& (QVersionNumber::fromString(libcVersion)
+				< QVersionNumber(2, 28));
+	}();
+	return result;
+}
+
 } // namespace
 
 QString DeviceModelPretty() {
@@ -185,16 +197,17 @@ QDate WhenSystemBecomesOutdated() {
 	const auto libcName = GetLibcName();
 	const auto libcVersion = GetLibcVersion();
 
-	if (libcName == qstr("glibc") && !libcVersion.isEmpty()) {
-		if (QVersionNumber::fromString(libcVersion) < QVersionNumber(2, 28)) {
-			return QDate(2023, 7, 1); // Older than CentOS 8.
-		}
+	if (IsGlibcLess228()) {
+		return QDate(2023, 7, 1); // Older than CentOS 8.
 	}
 	return QDate();
 }
 
 int AutoUpdateVersion() {
-	return 2;
+	if (IsGlibcLess228()) {
+		return 2;
+	}
+	return 4;
 }
 
 QString AutoUpdateKey() {

diff --git a/base/platform/mac/base_info_mac.mm b/base/platform/mac/base_info_mac.mm
@@ -207,7 +207,10 @@ QDate WhenSystemBecomesOutdated() {
 }
 
 int AutoUpdateVersion() {
-	return 2;
+	if (!IsMac10_13OrGreater()) {
+		return 2;
+	}
+	return 4;
 }
 
 QString AutoUpdateKey() {

diff --git a/base/platform/win/base_info_win.cpp b/base/platform/win/base_info_win.cpp
@@ -251,7 +251,7 @@ QDate WhenSystemBecomesOutdated() {
 }
 
 int AutoUpdateVersion() {
-	return 2;
+	return 4;
 }
 
 QString AutoUpdateKey() {