Merge pull request #9843 from cmaglie/fix-proxy-prefs

Fixed user/pass preferences save for "manual" proxy settings.

Author: facchinm

Diff for: app/src/cc/arduino/view/preferences/Preferences.java

@@ -840,10 +840,14 @@ private void savePreferencesData() {
     PreferencesData.set(Constants.PREF_PROXY_MANUAL_TYPE, manualProxyTypeButtonGroup.getSelection().getActionCommand());
     PreferencesData.set(Constants.PREF_PROXY_MANUAL_HOSTNAME, manualProxyHostName.getText());
     PreferencesData.set(Constants.PREF_PROXY_MANUAL_PORT, manualProxyPort.getText());
-    PreferencesData.set(Constants.PREF_PROXY_MANUAL_USERNAME, manualProxyUsername.getText());
-    PreferencesData.set(Constants.PREF_PROXY_MANUAL_PASSWORD, String.valueOf(manualProxyPassword.getPassword()));
-    PreferencesData.set(Constants.PREF_PROXY_AUTO_USERNAME, autoProxyUsername.getText());
-    PreferencesData.set(Constants.PREF_PROXY_AUTO_PASSWORD, String.valueOf(autoProxyPassword.getPassword()));
+    if (PreferencesData.get(Constants.PREF_PROXY_TYPE).equals(Constants.PROXY_TYPE_MANUAL)) {
+      PreferencesData.set(Constants.PREF_PROXY_USERNAME, manualProxyUsername.getText());
+      PreferencesData.set(Constants.PREF_PROXY_PASSWORD, String.valueOf(manualProxyPassword.getPassword()));
+    }
+    if (PreferencesData.get(Constants.PREF_PROXY_TYPE).equals(Constants.PROXY_TYPE_AUTO)) {
+      PreferencesData.set(Constants.PREF_PROXY_USERNAME, autoProxyUsername.getText());
+      PreferencesData.set(Constants.PREF_PROXY_PASSWORD, String.valueOf(autoProxyPassword.getPassword()));
+    }
   }
 
   private void showPreferencesData() {
@@ -924,16 +928,16 @@ private void showPreferencesData() {
       if (!PreferencesData.get(Constants.PREF_PROXY_PAC_URL, "").isEmpty()) {
         autoProxyUsePAC.setSelected(true);
         autoProxyPACURL.setText(PreferencesData.get(Constants.PREF_PROXY_PAC_URL));
-        autoProxyUsername.setText(PreferencesData.get(Constants.PREF_PROXY_AUTO_USERNAME));
-        autoProxyPassword.setText(PreferencesData.get(Constants.PREF_PROXY_AUTO_PASSWORD));
+        autoProxyUsername.setText(PreferencesData.get(Constants.PREF_PROXY_USERNAME));
+        autoProxyPassword.setText(PreferencesData.get(Constants.PREF_PROXY_PASSWORD));
       }
     } else {
       manualProxy.setSelected(true);
       manualProxyFieldsSetEnabled(true);
       manualProxyHostName.setText(PreferencesData.get(Constants.PREF_PROXY_MANUAL_HOSTNAME));
       manualProxyPort.setText(PreferencesData.get(Constants.PREF_PROXY_MANUAL_PORT));
-      manualProxyUsername.setText(PreferencesData.get(Constants.PREF_PROXY_MANUAL_USERNAME));
-      manualProxyPassword.setText(PreferencesData.get(Constants.PREF_PROXY_MANUAL_PASSWORD));
+      manualProxyUsername.setText(PreferencesData.get(Constants.PREF_PROXY_USERNAME));
+      manualProxyPassword.setText(PreferencesData.get(Constants.PREF_PROXY_PASSWORD));
     }
 
     String selectedManualProxyType = PreferencesData.get(Constants.PREF_PROXY_MANUAL_TYPE, Constants.PROXY_MANUAL_TYPE_HTTP);

Diff for: app/test/cc/arduino/net/CustomProxySelectorTest.java

@@ -83,8 +83,8 @@ public void testProxyPACHTTP() throws Exception {
   public void testProxyPACHTTPWithLogin() throws Exception {
     preferences.put(Constants.PREF_PROXY_TYPE, Constants.PROXY_TYPE_AUTO);
     preferences.put(Constants.PREF_PROXY_PAC_URL, CustomProxySelectorTest.class.getResource("proxy_http.pac").toExternalForm());
-    preferences.put(Constants.PREF_PROXY_AUTO_USERNAME, "auto");
-    preferences.put(Constants.PREF_PROXY_AUTO_PASSWORD, "autopassword");
+    preferences.put(Constants.PREF_PROXY_USERNAME, "auto");
+    preferences.put(Constants.PREF_PROXY_PASSWORD, "autopassword");
     CustomProxySelector proxySelector = new CustomProxySelector(preferences);
     Proxy proxy = proxySelector.getProxyFor(uri);
 
@@ -154,8 +154,8 @@ public void testManualProxyWithLogin() throws Exception {
     preferences.put(Constants.PREF_PROXY_MANUAL_TYPE, Constants.PROXY_MANUAL_TYPE_HTTP);
     preferences.put(Constants.PREF_PROXY_MANUAL_HOSTNAME, "localhost");
     preferences.put(Constants.PREF_PROXY_MANUAL_PORT, "8080");
-    preferences.put(Constants.PREF_PROXY_MANUAL_USERNAME, "username");
-    preferences.put(Constants.PREF_PROXY_MANUAL_PASSWORD, "pwd");
+    preferences.put(Constants.PREF_PROXY_USERNAME, "username");
+    preferences.put(Constants.PREF_PROXY_PASSWORD, "pwd");
 
     CustomProxySelector proxySelector = new CustomProxySelector(preferences);
     Proxy proxy = proxySelector.getProxyFor(uri);

Diff for: arduino-core/src/cc/arduino/Constants.java

@@ -58,10 +58,8 @@ public class Constants {
   public static final String PREF_PROXY_PAC_URL = "proxy.pac.url";
   public static final String PREF_PROXY_MANUAL_HOSTNAME = "proxy.manual.hostname";
   public static final String PREF_PROXY_MANUAL_PORT = "proxy.manual.port";
-  public static final String PREF_PROXY_MANUAL_USERNAME = "proxy.manual.username";
-  public static final String PREF_PROXY_MANUAL_PASSWORD = "proxy.manual.password";
-  public static final String PREF_PROXY_AUTO_USERNAME = "proxy.manual.username";
-  public static final String PREF_PROXY_AUTO_PASSWORD = "proxy.manual.password";
+  public static final String PREF_PROXY_USERNAME = "proxy.manual.username";
+  public static final String PREF_PROXY_PASSWORD = "proxy.manual.password";
 
   public static final String PACKAGE_INDEX_URL;
   public static final String LIBRARY_INDEX_URL;

Diff for: arduino-core/src/cc/arduino/net/CustomProxySelector.java

@@ -75,7 +75,7 @@ public Proxy getProxyFor(URI uri) throws IOException, ScriptException, NoSuchMet
   }
 
   private Proxy pacProxy(String pac, URI uri) throws IOException, ScriptException, NoSuchMethodException {
-    setAuthenticator(preferences.get(Constants.PREF_PROXY_AUTO_USERNAME), preferences.get(Constants.PREF_PROXY_AUTO_PASSWORD));
+    setAuthenticator(preferences.get(Constants.PREF_PROXY_USERNAME), preferences.get(Constants.PREF_PROXY_PASSWORD));
 
     URLConnection urlConnection = new URL(pac).openConnection();
     urlConnection.connect();
@@ -141,7 +141,7 @@ private URL toUrl(URI uri) {
   }
 
   private Proxy manualProxy() {
-    setAuthenticator(preferences.get(Constants.PREF_PROXY_MANUAL_USERNAME), preferences.get(Constants.PREF_PROXY_MANUAL_PASSWORD));
+    setAuthenticator(preferences.get(Constants.PREF_PROXY_USERNAME), preferences.get(Constants.PREF_PROXY_PASSWORD));
     Proxy.Type type = Proxy.Type.valueOf(preferences.get(Constants.PREF_PROXY_MANUAL_TYPE));
     return new Proxy(type, new InetSocketAddress(preferences.get(Constants.PREF_PROXY_MANUAL_HOSTNAME), Integer.valueOf(preferences.get(Constants.PREF_PROXY_MANUAL_PORT))));
   }