Don't uncheck Authentication checkbox when changing proxy type

Closes #12525

src/gui/optionsdialog.cpp

@@ -1457,7 +1457,6 @@ void OptionsDialog::enableProxy(const int index)
         }
         else {
             m_ui->checkProxyAuth->setEnabled(false);
-            m_ui->checkProxyAuth->setChecked(false);
             m_ui->isProxyOnlyForTorrents->setEnabled(false);
             m_ui->isProxyOnlyForTorrents->setChecked(true);
         }
@@ -1471,7 +1470,6 @@ void OptionsDialog::enableProxy(const int index)
         m_ui->checkProxyPeerConnecs->setEnabled(false);
         m_ui->isProxyOnlyForTorrents->setEnabled(false);
         m_ui->checkProxyAuth->setEnabled(false);
-        m_ui->checkProxyAuth->setChecked(false);
     }
 }
 

src/webui/www/private/views/preferences.html

@@ -1292,26 +1292,19 @@
             $('peer_proxy_host_text').setProperty('disabled', !isPeerProxyTypeSelected);
             $('peer_proxy_port_value').setProperty('disabled', !isPeerProxyTypeSelected);
             $('use_peer_proxy_checkbox').setProperty('disabled', !isPeerProxyTypeSelected);
-            $('proxy_only_for_torrents_checkbox').setProperty('disabled', !isPeerProxyTypeSelected);
+            const isPeerProxyAuthenticatable = ($('peer_proxy_type_select').getProperty('value') === "socks5" || $('peer_proxy_type_select').getProperty('value') === "http");
+            $('proxy_only_for_torrents_checkbox').setProperty('disabled', !isPeerProxyAuthenticatable);
 
-            if (isPeerProxyTypeSelected) {
+            if ($('peer_proxy_type_select').getProperty('value') === "socks4")
-                const isPeerProxyTypeSocks5 = $('peer_proxy_type_select').getProperty('value') == "socks5";
+                $('proxy_only_for_torrents_checkbox').setProperty('checked', true);
-                $('peer_proxy_auth_checkbox').setProperty('disabled', !isPeerProxyTypeSocks5);
 
-                if (!isPeerProxyTypeSocks5) {
+            $('peer_proxy_auth_checkbox').setProperty('disabled', !isPeerProxyAuthenticatable);
-                    $('peer_proxy_auth_checkbox').setProperty('checked', isPeerProxyTypeSocks5);
+
-                    updatePeerProxyAuthSettings();
+            updatePeerProxyAuthSettings();
-                }
-            }
-            else {
-                $('peer_proxy_auth_checkbox').setProperty('disabled', !isPeerProxyTypeSelected);
-                $('peer_proxy_auth_checkbox').setProperty('checked', isPeerProxyTypeSelected);
-                updatePeerProxyAuthSettings();
-            }
         };
 
         const updatePeerProxyAuthSettings = function() {
-            const isPeerProxyAuthEnabled = $('peer_proxy_auth_checkbox').getProperty('checked');
+            const isPeerProxyAuthEnabled = (!$('peer_proxy_auth_checkbox').getProperty('disabled') && $('peer_proxy_auth_checkbox').getProperty('checked'));
             $('peer_proxy_username_text').setProperty('disabled', !isPeerProxyAuthEnabled);
             $('peer_proxy_password_text').setProperty('disabled', !isPeerProxyAuthEnabled);
         };