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

Move IP config from WifiConfiguration to IpConfiguration.

Browse Source 
Change-Id: I5d1189682b13f1088848809604690648d8d9ecca
This commit is contained in:
Lorenzo Colitti
2014-05-16 01:55:14 -07:00
parent 38f2b27c0d
commit 93068f4c15
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,9 @@ import static android.net.wifi.WifiConfiguration.INVALID_NETWORK_ID;
import android.content.Context; import android.content.Context;
import android.content.res.Resources; import android.content.res.Resources;
import android.net.IpConfiguration;
import android.net.IpConfiguration.IpAssignment;
import android.net.IpConfiguration.ProxySettings;
import android.net.LinkAddress; import android.net.LinkAddress;
import android.net.LinkProperties; import android.net.LinkProperties;
import android.net.NetworkInfo.DetailedState; import android.net.NetworkInfo.DetailedState;
@@ -28,9 +31,7 @@ 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;
import android.net.wifi.WifiConfiguration.IpAssignment;
import android.net.wifi.WifiConfiguration.KeyMgmt; import android.net.wifi.WifiConfiguration.KeyMgmt;
import android.net.wifi.WifiConfiguration.ProxySettings;
import android.net.wifi.WifiEnterpriseConfig; import android.net.wifi.WifiEnterpriseConfig;
import android.net.wifi.WifiEnterpriseConfig.Eap; import android.net.wifi.WifiEnterpriseConfig.Eap;
import android.net.wifi.WifiEnterpriseConfig.Phase2; import android.net.wifi.WifiEnterpriseConfig.Phase2;
@@ -240,27 +241,27 @@ public class WifiConfigController implements TextWatcher,
boolean showAdvancedFields = false; boolean showAdvancedFields = false;
if (mAccessPoint.networkId != INVALID_NETWORK_ID) { if (mAccessPoint.networkId != INVALID_NETWORK_ID) {
WifiConfiguration config = mAccessPoint.getConfig(); WifiConfiguration config = mAccessPoint.getConfig();
if (config.ipAssignment == IpAssignment.STATIC) { if (config.getIpAssignment() == IpAssignment.STATIC) {
mIpSettingsSpinner.setSelection(STATIC_IP); mIpSettingsSpinner.setSelection(STATIC_IP);
showAdvancedFields = true; showAdvancedFields = true;
} else { } else {
mIpSettingsSpinner.setSelection(DHCP); mIpSettingsSpinner.setSelection(DHCP);
} }
//Display IP addresses //Display IP addresses
for(InetAddress a : config.linkProperties.getAddresses()) { for(InetAddress a : config.getLinkProperties().getAddresses()) {
addRow(group, R.string.wifi_ip_address, a.getHostAddress()); addRow(group, R.string.wifi_ip_address, a.getHostAddress());
} }
if (config.proxySettings == ProxySettings.STATIC) { if (config.getProxySettings() == ProxySettings.STATIC) {
mProxySettingsSpinner.setSelection(PROXY_STATIC); mProxySettingsSpinner.setSelection(PROXY_STATIC);
showAdvancedFields = true; showAdvancedFields = true;
} else if (config.proxySettings == ProxySettings.PAC) { } else if (config.getProxySettings() == ProxySettings.PAC) {
mProxySettingsSpinner.setVisibility(View.GONE); mProxySettingsSpinner.setVisibility(View.GONE);
TextView textView = (TextView)mView.findViewById(R.id.proxy_pac_info); TextView textView = (TextView)mView.findViewById(R.id.proxy_pac_info);
textView.setVisibility(View.VISIBLE); textView.setVisibility(View.VISIBLE);
textView.setText(context.getString(R.string.proxy_url) + textView.setText(context.getString(R.string.proxy_url) +
config.linkProperties.getHttpProxy().getPacFileUrl()); config.getLinkProperties().getHttpProxy().getPacFileUrl());
showAdvancedFields = true; showAdvancedFields = true;
} else { } else {
mProxySettingsSpinner.setSelection(PROXY_NONE); mProxySettingsSpinner.setSelection(PROXY_NONE);
@@ -446,9 +447,8 @@ public class WifiConfigController implements TextWatcher,
return null; return null;
} }
config.proxySettings = mProxySettings; config.setIpConfiguration(
config.ipAssignment = mIpAssignment; new IpConfiguration(mIpAssignment, mProxySettings, mLinkProperties));
config.linkProperties = new LinkProperties(mLinkProperties);
return config; return config;
} }
@@ -772,7 +772,7 @@ public class WifiConfigController implements TextWatcher,
mDns2View.addTextChangedListener(this); mDns2View.addTextChangedListener(this);
} }
if (config != null) { if (config != null) {
LinkProperties linkProperties = config.linkProperties; LinkProperties linkProperties = config.getLinkProperties();
Iterator<LinkAddress> iterator = linkProperties.getLinkAddresses().iterator(); Iterator<LinkAddress> iterator = linkProperties.getLinkAddresses().iterator();
if (iterator.hasNext()) { if (iterator.hasNext()) {
LinkAddress linkAddress = iterator.next(); LinkAddress linkAddress = iterator.next();
@@ -822,7 +822,7 @@ public class WifiConfigController implements TextWatcher,
mProxyExclusionListView.addTextChangedListener(this); mProxyExclusionListView.addTextChangedListener(this);
} }
if (config != null) { if (config != null) {
ProxyInfo proxyProperties = config.linkProperties.getHttpProxy(); ProxyInfo proxyProperties = config.getLinkProperties().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()));