v2.8.5

YerongAI · Dec 7, 2023 · 7a34e16 · 7a34e16
1 parent c9ba1b7
commit 7a34e16
Show file tree

Hide file tree

Showing 52 changed files with 184 additions and 185 deletions.
diff --git a/backend/linux/helper/split_tunneling/hostnames_manager/dns_resolver.cpp b/backend/linux/helper/split_tunneling/hostnames_manager/dns_resolver.cpp
@@ -71,7 +71,7 @@ void DnsResolver::resolveDomains(const std::vector<std::string> &hostnames)
         int optmask = 0;
         memset(&options, 0, sizeof(options));
         optmask |= ARES_OPT_TRIES;
-        options.tries = 1;
+        options.tries = 3;
 
         int status = ares_init_options(&channel_, &options, optmask);
         if (status != ARES_SUCCESS)

diff --git a/backend/windows/windscribe_service/split_tunneling/hostnames_manager/dns_resolver.cpp b/backend/windows/windscribe_service/split_tunneling/hostnames_manager/dns_resolver.cpp
@@ -70,7 +70,7 @@ void DnsResolver::resolveDomains(const std::vector<std::string> &hostnames)
         int optmask = 0;
         memset(&options, 0, sizeof(options));
         optmask |= ARES_OPT_TRIES;
-        options.tries = 1;
+        options.tries = 3;
 
         int status = ares_init_options(&channel_, &options, optmask);
         if (status != ARES_SUCCESS)

diff --git a/client/common/changelog.txt b/client/common/changelog.txt
@@ -1,14 +1,29 @@
+2.8.5 (04/12/2023)
+All:
+   * Fixed some text in preferences not matching with mobile. #826
+   * Fixed auto-connect not triggering when reconnecting to the same network. #821
+Windows:
+   * Fixed installer sometimes exiting during updates. #772
+   * Fixed misspelling in installer error message. #776
+   * Fixed "logging in" screen background color not matching with other OSes.
+   * Fixed DNS queries for hostname split tunnels sometimes not resolving. #822
+macOS:
+   * Fixed ctrld binary was not marked executable. #823
+Linux:
+   * Fixed DNS queries for hostname split tunnels sometimes not resolving. #822
+
+
 2.8.4 (28/11/2023)
 All:
+   * Updated OpenVPN to 2.6.8. #759
    * Fixed UI issue where search tab may overlay other tabs. #811
    * Fixed UI screen transition issues when anti-abuse is triggered. #817
-   * Upgraded to OpenVPN 2.6.8. #759
 Windows:
    * Fixed custom OpenVPN configs fail to connect.  This was due to a bug in OpenVPN 2.6.7. #759
 macOS:
-   * Fixed firewall not blocking traffic while disconnected in split inclusive mode #748
+   * Fixed firewall not blocking traffic while disconnected in split inclusive mode. #748
 Linux:
-   * Fixed firewall not blocking traffic while disconnected in split inclusive mode #748
+   * Fixed firewall not blocking traffic while disconnected in split inclusive mode. #748
    * Removed "Docked"/"Pinned" feature from preferences. #241
 
 
@@ -47,7 +62,7 @@ All:
    * Fixed UI issue when the hotspot feature is enabled and a SSL error occurs. #692
    * Fixed app may not reconnect after Internet is restored when using OpenVPN. #794
    * Fixed app gets stuck on the logging in screen after accepting the 'ignore SSL errors' prompt. #801
-   * Upgraded app dependencies to latest available version. #759
+   * Updated app dependencies to latest available version. #759
 Windows:
    * Fixed installer fails to launch if Windows version is incompatible. #789
 macOS:
@@ -97,7 +112,7 @@ All:
    * Fixed incorrect padding in 'out of data' screen. #750
    * Fixed load indicator for bottom-most location is slightly clipped. #765
    * Fixed clicking the blog link in the About menu doesn't do anything. #771
-   * Upgraded bundled ctrld utility to v1.3.1. #709
+   * Updated bundled ctrld utility to v1.3.1. #709
 Windows:
    * Added language localization to the installer. #726
    * Added language localization to the uninstaller. #754
@@ -564,15 +579,15 @@ All:
    * Fixed Proxy Gateway IP display goes blank when the proxy is connected to. #506
    * Fixed a crash caused by a bug in the failover logic. #507
 Windows:
-   * Detect failure to set up the WireGuard adapter and abort the connection attempt.  Notify the user of the failure if connection mode is manual. #489
+   * Improved failure detection when setting up the WireGuard adapter. #489
 
 
 2.5.9 (01/11/2022)
 All:
    * Fixed bottom info widget hidden when something connects to proxy/hotspot #455
    * Fixed signing into an expired account. #500
    * Fixed the working connection setting isn't saved. #202
-   * Sync settings immediately. #476.
+   * Fixed settings not syncing immediately. #476.
 Windows:
    * Reverted inclusive split tunneled apps unable to access localhost. #464
 Linux:

diff --git a/client/common/types/enums.cpp b/client/common/types/enums.cpp
@@ -145,7 +145,7 @@ QString TAP_ADAPTER_TYPE_toString(TAP_ADAPTER_TYPE t)
 QString FIREWALL_MODE_toString(FIREWALL_MODE t)
 {
     if (t == FIREWALL_MODE_MANUAL) return QObject::tr("Manual");
-    else if (t == FIREWALL_MODE_AUTOMATIC) return QObject::tr("Automatic");
+    else if (t == FIREWALL_MODE_AUTOMATIC) return QObject::tr("Auto");
     else if (t == FIREWALL_MODE_ALWAYS_ON) return QObject::tr("Always On");
     else {
         WS_ASSERT(false);
@@ -263,7 +263,7 @@ QList<QPair<QString, QVariant>> UPDATE_CHANNEL_toList()
 
 QString DNS_MANAGER_TYPE_toString(DNS_MANAGER_TYPE t)
 {
-    if (t == DNS_MANAGER_AUTOMATIC) return QObject::tr("Automatic");
+    if (t == DNS_MANAGER_AUTOMATIC) return QObject::tr("Auto");
     else if (t == DNS_MANAGER_RESOLV_CONF) return "resolvconf";
     else if (t == DNS_MANAGER_SYSTEMD_RESOLVED) return "systemd-resolved";
     else if (t == DNS_MANAGER_NETWORK_MANAGER) return "NetworkManager";

diff --git 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 8
-#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/backend/backend.cpp b/client/gui/backend/backend.cpp
@@ -676,42 +676,35 @@ void Backend::handleNetworkChange(types::NetworkInterface networkInterface, bool
     QString friendlyName = networkInterface.networkOrSsid;
 
     QVector<types::NetworkInterface> networkListOld = PersistentState::instance().networkWhitelist();
-    for (int i = 0; i < networkListOld.size(); i++)
-    {
-        if (networkListOld[i].networkOrSsid== networkInterface.networkOrSsid)
-        {
+    for (int i = 0; i < networkListOld.size(); i++) {
+        if (networkListOld[i].networkOrSsid== networkInterface.networkOrSsid) {
             friendlyName = networkListOld[i].friendlyName;
             newNetwork = false;
             break;
         }
     }
 
-    if (friendlyName == "") friendlyName = networkInterface.networkOrSsid;
+    if (friendlyName == "") {
+        friendlyName = networkInterface.networkOrSsid;
+    }
     networkInterface.friendlyName = friendlyName;
 
-    if (networkInterface.networkOrSsid != "") // not a disconnect
-    {
+    if (networkInterface.networkOrSsid != "") { // not a disconnect
         // Add a new network as secured
-        if (newNetwork)
-        {
-
+        if (newNetwork) {
 #ifdef Q_OS_MAC
             // generate friendly name for MacOS Ethernet
-            if (networkInterface.interfaceType == NETWORK_INTERFACE_ETH)
-            {
+            if (networkInterface.interfaceType == NETWORK_INTERFACE_ETH) {
                 friendlyName = generateNewFriendlyName();
                 networkInterface.friendlyName = friendlyName;
 
             }
 #endif
             types::NetworkInterface newEntry;
             newEntry = networkInterface;
-            if (preferences_.isAutoSecureNetworks())
-            {
+            if (preferences_.isAutoSecureNetworks()) {
                 newEntry.trustType = NETWORK_TRUST_SECURED;
-            }
-            else
-            {
+            } else {
                 newEntry.trustType = NETWORK_TRUST_UNSECURED;
             }
             networkListOld << newEntry;
@@ -721,32 +714,24 @@ void Backend::handleNetworkChange(types::NetworkInterface networkInterface, bool
         // GUI-side persistent list holds trustiness
         QVector<types::NetworkInterface> networkList = PersistentState::instance().networkWhitelist();
         types::NetworkInterface foundInterface;
-        for (int i = 0; i < networkList.size(); i++)
-        {
-            if (networkList[i].networkOrSsid == networkInterface.networkOrSsid)
-            {
+        for (int i = 0; i < networkList.size(); i++) {
+            if (networkList[i].networkOrSsid == networkInterface.networkOrSsid) {
                 foundInterface = networkList[i];
                 break;
             }
         }
 
-        if (!Utils::sameNetworkInterface(networkInterface, currentNetworkInterface_) || manual)
-            // actual network change or explicit trigger from preference change
-            // prevents brief/rare network loss during CONNECTING from triggering network change
-        {
+        // actual network change or explicit trigger from preference change
+        // prevents brief/rare network loss during CONNECTING from triggering network change
+        if (!Utils::sameNetworkInterface(networkInterface, currentNetworkInterface_) || manual) {
             // disconnect VPN on an unsecured network -- connect VPN on a secured network if auto-connect is on
-            if (foundInterface.trustType == NETWORK_TRUST_UNSECURED)
-            {
-                if (!connectStateHelper_.isDisconnected())
-                {
+            if (foundInterface.trustType == NETWORK_TRUST_UNSECURED) {
+                if (!connectStateHelper_.isDisconnected()) {
                     qCDebug(LOG_BASIC) << "Network Whitelisting detected UNSECURED network -- Disconnecting..";
                     sendDisconnect();
                 }
-            }
-            else // SECURED
-            {
-                if (preferences_.isAutoConnect() && connectStateHelper_.isDisconnected())
-                {
+            } else { // SECURED
+                if (preferences_.isAutoConnect() && connectStateHelper_.isDisconnected()) {
                     qCDebug(LOG_BASIC) << "Network Whitelisting detected SECURED network -- Connecting..";
                     sendConnect(PersistentState::instance().lastLocation());
                 }
@@ -757,12 +742,11 @@ void Backend::handleNetworkChange(types::NetworkInterface networkInterface, bool
 
         // Even if not a real network change we want to update the UI with current network info.
         types::NetworkInterface protoInterface = networkInterface;
-        protoInterface.trustType =foundInterface.trustType;
+        protoInterface.trustType = foundInterface.trustType;
         emit networkChanged(protoInterface);
+    } else {
+        currentNetworkInterface_ = networkInterface;
 
-    }
-    else
-    {
         // inform UI no network
         emit networkChanged(networkInterface);
     }

diff --git a/client/gui/loginwindow/logginginwindowitem.cpp b/client/gui/loginwindow/logginginwindowitem.cpp
@@ -32,13 +32,13 @@ void LoggingInWindowItem::paint(QPainter *painter, const QStyleOptionGraphicsIte
 
     painter->setRenderHint(QPainter::Antialiasing);
 
+    QColor color = FontManager::instance().getMidnightColor();
 #ifdef Q_OS_WIN
-    painter->fillRect(boundingRect(), QBrush(QColor(0, 0, 0)));
+    painter->fillRect(boundingRect(), QBrush(color));
 #else
     //todo scale
-    QColor black = FontManager::instance().getMidnightColor();
-    painter->setPen(black);
-    painter->setBrush(black);
+    painter->setPen(color);
+    painter->setBrush(color);
     painter->drawRoundedRect(boundingRect().adjusted(0,0,0,0), 5*G_SCALE, 5*G_SCALE);
 #endif
 

diff --git a/client/gui/preferenceswindow/advancedwindow/apiresolutiongroup.cpp b/client/gui/preferenceswindow/advancedwindow/apiresolutiongroup.cpp
@@ -73,7 +73,7 @@ void ApiResolutionGroup::onLanguageChanged()
 {
     resolutionModeItem_->setLabelCaption(tr("API Resolution"));
     QList<QPair<QString, QVariant>> list;
-    list << qMakePair(tr("Automatic"), 0);
+    list << qMakePair(tr("Auto"), 0);
     list << qMakePair(tr("Manual"), 1);
 
     resolutionModeItem_->setItems(list, settings_.getIsAutomatic() ? 0 : 1);

diff --git a/client/gui/preferenceswindow/connectionwindow/packetsizegroup.cpp b/client/gui/preferenceswindow/connectionwindow/packetsizegroup.cpp
@@ -137,7 +137,7 @@ void PacketSizeGroup::onLanguageChanged()
 {
     packetSizeModeItem_->setLabelCaption(tr("Packet Size"));
     QList<QPair<QString, QVariant>> list;
-    list << qMakePair(tr("Automatic"), 0);
+    list << qMakePair(tr("Auto"), 0);
     list << qMakePair(tr("Manual"), 1);
     packetSizeModeItem_->setItems(list, settings_.isAutomatic ? 0 : 1);
 

diff --git a/client/gui/preferenceswindow/protocolgroup.cpp b/client/gui/preferenceswindow/protocolgroup.cpp
@@ -140,7 +140,7 @@ void ProtocolGroup::onLanguageChanged()
     if (type_ == SelectionType::COMBO_BOX) {
         connectionModeItem_->setLabelCaption(title_);
         QList<QPair<QString, QVariant>> list;
-        list << qMakePair(tr("Automatic"), 0);
+        list << qMakePair(tr("Auto"), 0);
         list << qMakePair(tr("Manual"), 1);
 
         connectionModeItem_->setItems(list, settings_.isAutomatic() ? 0 : 1);

diff --git a/client/gui/translations/ws_desktop_ar.ts b/client/gui/translations/ws_desktop_ar.ts
@@ -966,7 +966,7 @@ If the problem persists after a restart, please send a debug log and open a supp
         <translation>دقة واجهة برمجة التطبيقات</translation>
     </message>
     <message>
-        <source>Automatic</source>
+        <source>Auto</source>
         <translation>تلقائي</translation>
     </message>
     <message>
@@ -1526,7 +1526,7 @@ Connect to a network first</source>
         <translation>حجم الحزمة</translation>
     </message>
     <message>
-        <source>Automatic</source>
+        <source>Auto</source>
         <translation>تلقائي</translation>
     </message>
     <message>
@@ -1603,7 +1603,7 @@ Connect to a network first</source>
 <context>
     <name>PreferencesWindow::ProtocolGroup</name>
     <message>
-        <source>Automatic</source>
+        <source>Auto</source>
         <translation>تلقائي</translation>
     </message>
     <message>
@@ -1993,7 +1993,7 @@ If the reinstall does not help, please contact Windscribe support for assistance
         <translation>يدوي</translation>
     </message>
     <message>
-        <source>Automatic</source>
+        <source>Auto</source>
         <translation>تلقائي</translation>
     </message>
     <message>

diff --git a/client/gui/translations/ws_desktop_cs.ts b/client/gui/translations/ws_desktop_cs.ts
@@ -966,7 +966,7 @@ Pokud problém přetrvává i po restartování, odešlete protokol ladění, ot
         <translation>Rozlišení rozhraní API</translation>
     </message>
     <message>
-        <source>Automatic</source>
+        <source>Auto</source>
         <translation>Automatický</translation>
     </message>
     <message>
@@ -1526,7 +1526,7 @@ Nejprve se připojte k síti</translation>
         <translation>Velikost paketu</translation>
     </message>
     <message>
-        <source>Automatic</source>
+        <source>Auto</source>
         <translation>Automatický</translation>
     </message>
     <message>
@@ -1603,7 +1603,7 @@ Nejprve se připojte k síti</translation>
 <context>
     <name>PreferencesWindow::ProtocolGroup</name>
     <message>
-        <source>Automatic</source>
+        <source>Auto</source>
         <translation>Automatický</translation>
     </message>
     <message>
@@ -1993,7 +1993,7 @@ Pokud přeinstalace nepomůže, obraťte se na podporu Windscribe a požádejte
         <translation>Manuál</translation>
     </message>
     <message>
-        <source>Automatic</source>
+        <source>Auto</source>
         <translation>Automatický</translation>
     </message>
     <message>

diff --git a/client/gui/translations/ws_desktop_de.ts b/client/gui/translations/ws_desktop_de.ts
@@ -966,7 +966,7 @@ Wenn das Problem nach einem Neustart weiterhin besteht, senden Sie bitte ein Deb
         <translation>API-Auflösung</translation>
     </message>
     <message>
-        <source>Automatic</source>
+        <source>Auto</source>
         <translation>Automatisch</translation>
     </message>
     <message>
@@ -1526,7 +1526,7 @@ Zuerst eine Verbindung mit einem Netzwerk herstellen</translation>
         <translation>Paketgröße</translation>
     </message>
     <message>
-        <source>Automatic</source>
+        <source>Auto</source>
         <translation>Automatisch</translation>
     </message>
     <message>
@@ -1603,7 +1603,7 @@ Zuerst eine Verbindung mit einem Netzwerk herstellen</translation>
 <context>
     <name>PreferencesWindow::ProtocolGroup</name>
     <message>
-        <source>Automatic</source>
+        <source>Auto</source>
         <translation>Automatisch</translation>
     </message>
     <message>
@@ -1993,7 +1993,7 @@ Wenn die Neuinstallation nicht hilft, wenden Sie sich bitte an den Windscribe-Su
         <translation>Manuell</translation>
     </message>
     <message>
-        <source>Automatic</source>
+        <source>Auto</source>
         <translation>Automatisch</translation>
     </message>
     <message>