From 1fceb994c58579c88c8e26a0323074cd6d15a743 Mon Sep 17 00:00:00 2001
From: Jonathan Martin <jonathan@windscribe.com>
Date: Wed, 18 Dec 2024 14:24:05 -0800
Subject: [PATCH] v2.13.5

---
 client/common/changelog.txt                    |  7 +++++++
 client/common/version/windscribe_version.h     |  6 +++---
 client/gui/commongraphics/scrollarea.cpp       |  4 ++--
 .../connectionwindow/securehotspotgroup.cpp    | 12 ++++--------
 .../generalwindow/generalwindowitem.cpp        | 18 +++---------------
 5 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/client/common/changelog.txt b/client/common/changelog.txt
index b72aadf7..13f95931 100644
--- a/client/common/changelog.txt
+++ b/client/common/changelog.txt
@@ -1,3 +1,10 @@
+2.13.5 (16/12/2024)
+All:
+   * Fixed scroll position not retained when leaving/reentering a window. #1218
+   * Fixed importing JSON may put the Secure Hotspot preference in an invalid state. #1217
+   * Fixed changelog link for many platforms in General Preferences. #1219
+
+
 2.13.4 (09/12/2024)
 All:
    * Added changelog link in preferences. #1209
diff --git a/client/common/version/windscribe_version.h b/client/common/version/windscribe_version.h
index 0943b816..616d5ba2 100644
--- a/client/common/version/windscribe_version.h
+++ b/client/common/version/windscribe_version.h
@@ -2,11 +2,11 @@
 
 #define WINDSCRIBE_MAJOR_VERSION 2
 #define WINDSCRIBE_MINOR_VERSION 13
-#define WINDSCRIBE_BUILD_VERSION 4
+#define WINDSCRIBE_BUILD_VERSION 5
 
 // only one of these should be enabled; neither -> stable
-//#define WINDSCRIBE_IS_BETA
-#define WINDSCRIBE_IS_GUINEA_PIG
+#define WINDSCRIBE_IS_BETA
+//#define WINDSCRIBE_IS_GUINEA_PIG
 
 #define STR_HELPER(x) #x
 #define STR(x) STR_HELPER(x)
diff --git a/client/gui/commongraphics/scrollarea.cpp b/client/gui/commongraphics/scrollarea.cpp
index ff67f486..ae252d25 100644
--- a/client/gui/commongraphics/scrollarea.cpp
+++ b/client/gui/commongraphics/scrollarea.cpp
@@ -141,10 +141,10 @@ void ScrollArea::setScrollOffset(int amt)
 void ScrollArea::setScrollPos(int pos)
 {
     int lowestY = height_ - static_cast<int>(curItem_->boundingRect().height());
-    if (pos > lowestY) {
+    if (pos < lowestY) {
         pos = lowestY;
     }
-    if (pos < 0) {
+    if (pos > 0) {
         pos = 0;
     }
 
diff --git a/client/gui/preferenceswindow/connectionwindow/securehotspotgroup.cpp b/client/gui/preferenceswindow/connectionwindow/securehotspotgroup.cpp
index 78fd92cd..fb565d13 100644
--- a/client/gui/preferenceswindow/connectionwindow/securehotspotgroup.cpp
+++ b/client/gui/preferenceswindow/connectionwindow/securehotspotgroup.cpp
@@ -47,7 +47,7 @@ void SecureHotspotGroup::setSecureHotspotSettings(const types::ShareSecureHotspo
     }
 
     settings_ = ss;
-    checkBoxEnable_->setState(ss.isEnabled);
+    checkBoxEnable_->setState(ss.isEnabled && supported_ == HOTSPOT_SUPPORTED);
     editBoxSSID_->setText(ss.ssid);
     editBoxPassword_->setText(ss.password);
     updateMode();
@@ -56,8 +56,7 @@ void SecureHotspotGroup::setSecureHotspotSettings(const types::ShareSecureHotspo
 void SecureHotspotGroup::setSupported(HOTSPOT_SUPPORT_TYPE supported)
 {
     supported_ = supported;
-    if (supported_ != HOTSPOT_SUPPORTED)
-    {
+    if (supported_ != HOTSPOT_SUPPORTED) {
         checkBoxEnable_->setState(false);
         settings_.isEnabled = false;
         emit secureHotspotPreferencesChanged(settings_);
@@ -114,12 +113,9 @@ void SecureHotspotGroup::updateDescription()
 
 void SecureHotspotGroup::updateMode()
 {
-    if (checkBoxEnable_->isChecked())
-    {
+    if (checkBoxEnable_->isChecked()) {
         showItems(indexOf(editBoxSSID_), indexOf(editBoxPassword_));
-    }
-    else
-    {
+    } else {
         hideItems(indexOf(editBoxSSID_), indexOf(editBoxPassword_));
     }
 }
diff --git a/client/gui/preferenceswindow/generalwindow/generalwindowitem.cpp b/client/gui/preferenceswindow/generalwindow/generalwindowitem.cpp
index f7aa402e..871bdf6a 100644
--- a/client/gui/preferenceswindow/generalwindow/generalwindowitem.cpp
+++ b/client/gui/preferenceswindow/generalwindow/generalwindowitem.cpp
@@ -405,24 +405,12 @@ void GeneralWindowItem::onAppSkinPreferencesChanged(APP_SKIN s)
 
 void GeneralWindowItem::onVersionInfoClicked()
 {
-#ifdef Q_OS_WIN
-    QString platform = "windows";
-#elif defined(Q_OS_MACOS)
+#if defined(Q_OS_MACOS)
+    // macOS platform name on website is "mac" instead of "macos"
     QString platform = "mac";
 #else
-    QString platform;
-    QString lastPlatform = LinuxUtils::getLastInstallPlatform();
-    if (lastPlatform == LinuxUtils::DEB_PLATFORM_NAME_X64 ||
-        lastPlatform == LinuxUtils::DEB_PLATFORM_NAME_ARM64) {
-        platform = "linux_deb";
-    } else if (lastPlatform == LinuxUtils::RPM_PLATFORM_NAME) {
-        platform = "linux_rpm";
-    } else {
-        // We don't have a website changelog for zst yet, go to top page instead
-        platform = "";
-    }
+    QString platform = Utils::getPlatformName();
 #endif
-
     QDesktopServices::openUrl(QUrl(
         QString("https://%1/changelog/%2")
             .arg(HardcodedSettings::instance().windscribeServerUrl())