PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support renaming of ProxyProperties to ProxyInfo

Browse Source 
Change-Id: I60621a7155ac2938a54ff466501db9a1013e621b
This commit is contained in:
Jason Monk
2014-05-05 12:36:10 -04:00
parent a0ceb908bf
commit e86790c838
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/ProxySelector.java
View File

@@ -28,7 +28,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.Proxy; import android.net.Proxy;
import android.net.ProxyProperties; import android.net.ProxyInfo;
import android.os.Bundle; import android.os.Bundle;
import android.provider.Settings; import android.provider.Settings;
import android.text.Selection; import android.text.Selection;
@@ -149,11 +149,11 @@ public class ProxySelector extends Fragment implements DialogCreatable {
ConnectivityManager cm = ConnectivityManager cm =
(ConnectivityManager)getActivity().getSystemService(Context.CONNECTIVITY_SERVICE); (ConnectivityManager)getActivity().getSystemService(Context.CONNECTIVITY_SERVICE);
ProxyProperties proxy = cm.getGlobalProxy(); ProxyInfo proxy = cm.getGlobalProxy();
if (proxy != null) { if (proxy != null) {
hostname = proxy.getHost(); hostname = proxy.getHost();
port = proxy.getPort(); port = proxy.getPort();
exclList = proxy.getExclusionList(); exclList = proxy.getExclusionListAsList();
} }
if (hostname == null) { if (hostname == null) {
@@ -229,7 +229,7 @@ public class ProxySelector extends Fragment implements DialogCreatable {
return false; return false;
} }
} }
ProxyProperties p = new ProxyProperties(hostname, port, exclList); ProxyInfo p = new ProxyInfo(hostname, port, exclList);
// FIXME: The best solution would be to make a better UI that would // 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 // 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 // default settings. i.e. checking a box to always use the default

8
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -24,7 +24,7 @@ import android.net.LinkAddress;
import android.net.LinkProperties; import android.net.LinkProperties;
import android.net.NetworkInfo.DetailedState; import android.net.NetworkInfo.DetailedState;
import android.net.NetworkUtils; import android.net.NetworkUtils;
import android.net.ProxyProperties; import android.net.ProxyInfo;
import android.net.RouteInfo; import android.net.RouteInfo;
import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiConfiguration.AuthAlgorithm; import android.net.wifi.WifiConfiguration.AuthAlgorithm;
@@ -483,7 +483,7 @@ public class WifiConfigController implements TextWatcher,
result = R.string.proxy_error_invalid_port; result = R.string.proxy_error_invalid_port;
} }
if (result == 0) { if (result == 0) {
ProxyProperties proxyProperties= new ProxyProperties(host, port, exclusionList); ProxyInfo proxyProperties= new ProxyInfo(host, port, exclusionList);
mLinkProperties.setHttpProxy(proxyProperties); mLinkProperties.setHttpProxy(proxyProperties);
} else { } else {
return false; return false;
@@ -822,11 +822,11 @@ public class WifiConfigController implements TextWatcher,
mProxyExclusionListView.addTextChangedListener(this); mProxyExclusionListView.addTextChangedListener(this);
} }
if (config != null) { if (config != null) {
ProxyProperties proxyProperties = config.linkProperties.getHttpProxy(); ProxyInfo proxyProperties = config.linkProperties.getHttpProxy();
if (proxyProperties != null) { if (proxyProperties != null) {
mProxyHostView.setText(proxyProperties.getHost()); mProxyHostView.setText(proxyProperties.getHost());
mProxyPortView.setText(Integer.toString(proxyProperties.getPort())); mProxyPortView.setText(Integer.toString(proxyProperties.getPort()));
mProxyExclusionListView.setText(proxyProperties.getExclusionList()); mProxyExclusionListView.setText(proxyProperties.getExclusionListAsString());
} }
} }
} else { } else {