Merge remote-tracking branch 'origin/master' into prerelease

Author: iwalton3

debian/changelog

@@ -7,6 +7,7 @@ jellyfin-media-player (1.12.0-1) unstable; urgency=medium
   * Update branding
   * Fix caching issues to prevent broken web client when the server web version updates
   * Auto fill last used server into server box if server connection fails on startup
+  * Fix SSL certificate verification issues on Linux
 
  -- Izzie Walton <izzie@iwalton.com>  Tue, 18 Mar 2025 10:50:29 -0400
 

native/find-webclient.js

@@ -1,7 +1,7 @@
 async function tryConnect(server) {
     document.getElementById('connect-button').disabled = true;
 
-    AbortSignal.timeout ??= function timeout(ms) {
+    AbortSignal.timeout = function timeout(ms) {
         const ctrl = new AbortController()
         setTimeout(() => ctrl.abort(), ms)
         return ctrl.signal

resources/meta/com.github.iwalton3.jellyfin-media-player.appdata.xml

@@ -53,6 +53,7 @@
             <li>Update branding</li>
             <li>Fix caching issues to prevent broken web client when the server web version updates</li>
             <li>Auto fill last used server into server box if server connection fails on startup</li>
+            <li>Fix SSL certificate verification issues on Linux</li>
           </ul>
         </description>
       </release>

resources/settings/settings_description.json

@@ -1,7 +1,7 @@
 [
   {
     "section": "__meta__",
-    "version": 6
+    "version": 7
   },
   {
     "section": "state",

src/settings/SettingsComponent.cpp

@@ -232,6 +232,7 @@ void SettingsComponent::loadConf(const QString& path, bool storage)
 {
   bool migrateJmpSettings4 = false;
   bool migrateJmpSettings5 = false;
+  bool migrateJmpSettings6 = false;
   QJsonObject json = loadJson(path);
 
   int version = json["version"].toInt(0);
@@ -244,6 +245,10 @@ void SettingsComponent::loadConf(const QString& path, bool storage)
   {
     migrateJmpSettings5 = true;
   }
+  else if (version == 6 && m_settingsVersion == 7)
+  {
+    migrateJmpSettings6 = true;
+  }
   else if (version != m_settingsVersion)
   {
     QString backup = path + ".broken";
@@ -295,6 +300,10 @@ void SettingsComponent::loadConf(const QString& path, bool storage)
     if (getSection(SETTINGS_SECTION_VIDEO)->value("hardwareDecoding") == "enabled") {
       getSection(SETTINGS_SECTION_VIDEO)->setValue("hardwareDecoding", "copy");
     }
+  } else if (migrateJmpSettings6) {
+    if (getSection(SETTINGS_SECTION_MAIN)->value("autodetectCertBundle") == "false") {
+      getSection(SETTINGS_SECTION_MAIN)->setValue("autodetectCertBundle", "true");
+    }
   }
 }