connection: disabled outdated proxy settings (#13323)

Mage.Client/src/main/java/mage/client/MageFrame.java

@@ -949,11 +949,15 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
             } catch (SocketException ex) {
             }
             currentConnection.setUserIdStr(System.getProperty("user.name") + ":" + System.getProperty("os.name") + ":" + MagePreferences.getUserNames() + ":" + allMAC);
+            if (PreferencesDialog.NETWORK_ENABLE_PROXY_SUPPORT) {
                 currentConnection.setProxyType(proxyType);
                 currentConnection.setProxyHost(proxyServer);
                 currentConnection.setProxyPort(proxyPort);
                 currentConnection.setProxyUsername(proxyUsername);
                 currentConnection.setProxyPassword(proxyPassword);
+            } else {
+                currentConnection.setProxyType(ProxyType.NONE);
+            }
             setUserPrefsToConnection(currentConnection);
         }
 

Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.form

@@ -3170,7 +3170,7 @@
               <Properties>
                 <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
                   <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
-                    <TitledBorder title="Proxy for server connection and images download">
+                    <TitledBorder title="Proxy for server connection and images download (DO NOT SUPPORTED)">
                       <Border PropertyName="innerBorder" info="org.netbeans.modules.form.compat2.border.EtchedBorderInfo">
                         <EtchetBorder/>
                       </Border>

Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java

@@ -55,6 +55,8 @@ public class PreferencesDialog extends javax.swing.JDialog {
 
     private static PreferencesDialog instance; // shared dialog instance
 
+    public static final boolean NETWORK_ENABLE_PROXY_SUPPORT = false; // TODO: delete proxy at all after few releases, 2025-02-09
+
     // WARNING, do not change const values - it must be same for compatibility with user's saved settings
     public static final String KEY_SHOW_TOOLTIPS_DELAY = "showTooltipsDelay";
     public static final String KEY_SHOW_CARD_NAMES = "showCardNames";
@@ -2795,7 +2797,7 @@ public class PreferencesDialog extends javax.swing.JDialog {
 
         tabsPanel.addTab("Sounds", tabSounds);
 
-        connection_Proxy.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), "Proxy for server connection and images download"));
+        connection_Proxy.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), "Proxy for server connection and images download (DO NOT SUPPORTED)"));
 
         cbProxyType.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -3317,6 +3319,11 @@ public class PreferencesDialog extends javax.swing.JDialog {
             return;
         }
 
+        if (!NETWORK_ENABLE_PROXY_SUPPORT) {
+            connection.setProxyType(ProxyType.NONE);
+            return;
+        }
+
         connection.setProxyType(configProxyType);
         if (configProxyType != ProxyType.NONE) {
             String host = getCachedValue(KEY_PROXY_ADDRESS, "");

Mage.Server.Console/src/main/java/mage/server/console/ConnectDialog.java

@@ -365,6 +365,8 @@ public class ConnectDialog extends JDialog {
         connection.setPort(Integer.parseInt(this.txtPort.getText()));
         connection.setAdminPassword(new String(txtPassword.getPassword()));
         connection.setUsername(SessionImpl.ADMIN_NAME);
+
+        if (false) { // TODO: delete proxy at all after few releases, 2025-02-09
             connection.setProxyType((ProxyType) this.cbProxyType.getSelectedItem());
             if (!this.cbProxyType.getSelectedItem().equals(ProxyType.NONE)) {
                 connection.setProxyHost(this.txtProxyServer.getText());
@@ -372,6 +374,9 @@ public class ConnectDialog extends JDialog {
                 connection.setProxyUsername(this.txtProxyUserName.getText());
                 connection.setProxyPassword(new String(this.txtPasswordField.getPassword()));
             }
+        } else {
+            connection.setProxyType(ProxyType.NONE);
+        }
 
         logger.debug("connecting: " + connection.getProxyType() + ' ' + connection.getProxyHost() + ' ' + connection.getProxyPort());
         task = new ConnectTask();

Mage.Server.Console/src/main/java/mage/server/console/ConsoleFrame.java

@@ -101,6 +101,7 @@ public class ConsoleFrame extends javax.swing.JFrame implements MageClient {
             newConnection.setPort(ConsoleFrame.getPreferences().getInt("serverPort", 17171));
             newConnection.setUsername(SessionImpl.ADMIN_NAME);
             newConnection.setAdminPassword(ConsoleFrame.getPreferences().get("password", ""));
+            if (false) { // TODO: delete proxy at all after few releases, 2025-02-09
                 newConnection.setProxyType(Connection.ProxyType.valueOf(ConsoleFrame.getPreferences().get("proxyType", "NONE").toUpperCase(Locale.ENGLISH)));
                 if (!newConnection.getProxyType().equals(Connection.ProxyType.NONE)) {
                     newConnection.setProxyHost(ConsoleFrame.getPreferences().get("proxyAddress", ""));
@@ -108,6 +109,10 @@ public class ConsoleFrame extends javax.swing.JFrame implements MageClient {
                     newConnection.setProxyUsername(ConsoleFrame.getPreferences().get("proxyUsername", ""));
                     newConnection.setProxyPassword(ConsoleFrame.getPreferences().get("proxyPassword", ""));
                 }
+            } else {
+                newConnection.setProxyType(Connection.ProxyType.NONE);
+            }
+
             status = connect(newConnection);
         }
         return status;