From 79c2262cae02b513aee70943f7e07a9205316bdf Mon Sep 17 00:00:00 2001
From: Osmium Sorcerer <os@sof.beauty>
Date: Sun, 22 Mar 2026 17:57:13 +0000
Subject: Support Secure WebSocket

Add full WSS support to public server list (using wss_port, overriding
insecure port), favorite servers list, and direct connections, and show
which servers are secure.

Revert the upstream's removal of `legacy` ServerInfo field, as I use it
to filter out legacy servers. To differentiate schemes, the `scheme`
field is used, either "ws" or "wss". I don't see the reason to add "tcp"
protocol when we don't even support it.

For the UI, add icons for secure and insecure connections. Highlight
secure servers with a green background.

In the favorite server dialog, a checkbox was added to select whether
the server is using WSS.

In the direct connection dialog, support "wss" scheme and default ports:
80 for WS, 443 for WSS, as per the WebSocket specification.
---
 data/icons/https.svg              |  1 +
 data/icons/noencryption.svg       |  1 +
 data/ui/favorite_server_dialog.ui | 13 ++++++++++++-
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 data/icons/https.svg
 create mode 100644 data/icons/noencryption.svg

(limited to 'data')

diff --git a/data/icons/https.svg b/data/icons/https.svg
new file mode 100644
index 0000000..87a3c2b
--- /dev/null
+++ b/data/icons/https.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 -960 960 960" width="20px" fill="#F3F3F3"><path d="M263.72-96Q234-96 213-117.15T192-168v-384q0-29.7 21.15-50.85Q234.3-624 264-624h24v-96q0-79.68 56.23-135.84 56.22-56.16 136-56.16Q560-912 616-855.84q56 56.16 56 135.84v96h24q29.7 0 50.85 21.15Q768-581.7 768-552v384q0 29.7-21.16 50.85Q725.68-96 695.96-96H263.72Zm.28-72h432v-384H264v384Zm267-141.21q21-21.21 21-51T530.79-411q-21.21-21-51-21T429-410.79q-21 21.21-21 51T429.21-309q21.21 21 51 21T531-309.21ZM360-624h240v-96q0-50-35-85t-85-35q-50 0-85 35t-35 85v96Zm-96 456v-384 384Z"/></svg>
\ No newline at end of file
diff --git a/data/icons/noencryption.svg b/data/icons/noencryption.svg
new file mode 100644
index 0000000..91524c5
--- /dev/null
+++ b/data/icons/noencryption.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 -960 960 960" width="20px" fill="#F3F3F3"><path d="m768-294-72.13-72.13v-185.74H510.13L438-624h162v-96q0-50-34.79-85T480-840q-50 0-85 35t-35 85v18l-65-65q17-65 68-105t117-40q80.08 0 136.04 56.16Q672-799.68 672-720v96h24q29.7 0 50.85 21.19Q768-581.62 768-551.87V-294Zm34 238-58-59q-9 8-21.5 13.5T696-96H263.72Q234-96 212.5-117T192-168v-384q0-23 13.11-41.53Q218.21-612.06 239-620L56-803l51-51 746 747-51 51ZM690-168 538-320q-9 15-25 23.5t-33 8.5q-29.7 0-50.85-21.15Q408-330.3 408-360q0-17 7.5-32.5T439-419L306-552h-42v384h426ZM488-370Zm112-92Z"/></svg>
\ No newline at end of file
diff --git a/data/ui/favorite_server_dialog.ui b/data/ui/favorite_server_dialog.ui
index b90514d..1fda922 100644
--- a/data/ui/favorite_server_dialog.ui
+++ b/data/ui/favorite_server_dialog.ui
@@ -78,13 +78,24 @@
       </widget>
      </item>
      <item row="3" column="0">
+      <widget class="QLabel" name="label_6">
+       <property name="text">
+        <string>Secure:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="QCheckBox" name="secure_cb">
+      </widget>
+     </item>
+     <item row="4" column="0">
       <widget class="QLabel" name="label_2">
        <property name="text">
         <string>Description:</string>
        </property>
       </widget>
      </item>
-     <item row="3" column="1">
+     <item row="4" column="1">
       <widget class="QPlainTextEdit" name="description">
        <property name="sizePolicy">
         <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-- 
cgit