Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 168298f4 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Replace the hidden ProxyInfo methods usage" am: 2f66e59e am: 3ad73342 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641827

Change-Id: I7e7ec3721de73523f52718665bc1763f75184a56
parents f60f9ec1 3ad73342

src/com/android/settings/ProxySelector.java

+5 −1
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ import com.android.net.module.util.ProxyUtils; 
import com.android.settings.SettingsPreferenceFragment.SettingsDialogFragment;

import com.android.settings.core.InstrumentedFragment;



import java.util.Arrays;



public class ProxySelector extends InstrumentedFragment implements DialogCreatable {

    private static final String TAG = "ProxySelector";
@@ -229,7 +231,9 @@ public class ProxySelector extends InstrumentedFragment implements DialogCreatab 
                return false;

            }

        }

        ProxyInfo p = new ProxyInfo(hostname, port, exclList);



        ProxyInfo p = ProxyInfo.buildDirectProxy(

                hostname, port, Arrays.asList(exclList.split(",")));

        // FIXME: The best solution would be to make a better UI that would

        // disable editing of the text boxes if the user chooses to use the

        // default settings. i.e. checking a box to always use the default

src/com/android/settings/vpn2/ConfigDialog.java

+1 −1
Original line number Diff line number Diff line
@@ -592,7 +592,7 @@ class ConfigDialog extends AlertDialog implements TextWatcher, 
            // 0 is a last resort default, but the interface validates that the proxy port is

            // present and non-zero.

            int port = proxyPort.isEmpty() ? 0 : Integer.parseInt(proxyPort);

            profile.proxy = new ProxyInfo(proxyHost, port, null);

            profile.proxy = ProxyInfo.buildDirectProxy(proxyHost, port);

        } else {

            profile.proxy = null;

        }

src/com/android/settings/wifi/WifiConfigController.java

+4 −2
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ import com.android.settingslib.wifi.AccessPoint; 
import java.net.Inet4Address;

import java.net.InetAddress;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collection;

import java.util.Collections;

import java.util.Iterator;
@@ -878,7 +879,8 @@ public class WifiConfigController implements TextWatcher, 
                result = R.string.proxy_error_invalid_port;

            }

            if (result == 0) {

                mHttpProxy = new ProxyInfo(host, port, exclusionList);

                mHttpProxy = ProxyInfo.buildDirectProxy(

                        host, port, Arrays.asList(exclusionList.split(",")));

            } else {

                return false;

            }
@@ -892,7 +894,7 @@ public class WifiConfigController implements TextWatcher, 
            if (uri == null) {

                return false;

            }

            mHttpProxy = new ProxyInfo(uri);

            mHttpProxy = ProxyInfo.buildPacProxy(uri);

        }

        return true;

    }

src/com/android/settings/wifi/WifiConfigController2.java

+4 −2
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ import com.android.wifitrackerlib.WifiEntry.ConnectedInfo; 
import java.net.Inet4Address;

import java.net.InetAddress;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collection;

import java.util.Collections;

import java.util.Iterator;
@@ -860,7 +861,8 @@ public class WifiConfigController2 implements TextWatcher, 
                result = R.string.proxy_error_invalid_port;

            }

            if (result == 0) {

                mHttpProxy = new ProxyInfo(host, port, exclusionList);

                mHttpProxy = ProxyInfo.buildDirectProxy(

                        host, port, Arrays.asList(exclusionList.split(",")));

            } else {

                return false;

            }
@@ -874,7 +876,7 @@ public class WifiConfigController2 implements TextWatcher, 
            if (uri == null) {

                return false;

            }

            mHttpProxy = new ProxyInfo(uri);

            mHttpProxy = ProxyInfo.buildPacProxy(uri);

        }

        return true;

    }