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

Add static ip/proxy support for hidden networks

Browse Source 
Add support for static ip and proxy. In the process, clean up the issues
that showed up during testing.

Bug: 5459872
Change-Id: I96c8fff816b6cbb485d2bb215349193e49f3d0b2
This commit is contained in:
Irfan Sheriff
2012-03-13 16:30:23 -07:00
parent db529dd66b
commit d61f7cd3aa
2 changed files with 48 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -1279,10 +1279,6 @@
<string name="wifi_disabled_generic">Disabled</string>
<!-- Status for networked disabled from a DNS or DHCP failure -->
<string name="wifi_disabled_network_failure">Avoided poor Internet connection</string>
<!-- Heading in the Wi-Fi dialog box when we display a reason for disabling a connection -->
<string name="wifi_disabled_heading"></string>
<!-- Detailed message in Wi-Fi dialog when we disable Wi-Fi due to DNS failure. -->
<string name="wifi_disabled_help">The network was avoided due to poor connection. Turn off this behavior from the Settings &gt; Wi-Fi screen, Advanced menu item.</string>
<!-- Status for networks disabled from authentication failure (wrong password
or certificate). -->
<string name="wifi_disabled_password_failure">Authentication problem</string>

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

@@ -33,6 +33,7 @@ import android.net.wifi.WifiConfiguration.KeyMgmt;
import android.net.wifi.WifiConfiguration.ProxySettings;
import android.net.wifi.WifiConfiguration.Status;
import android.net.wifi.WifiInfo;
import android.os.Handler;
import android.security.Credentials;
import android.security.KeyStore;
import android.text.Editable;
@@ -119,6 +120,8 @@ public class WifiConfigController implements TextWatcher,
// True when this instance is used in SetupWizard XL context.
private final boolean mInXlSetupWizard;
private final Handler mTextViewChangedHandler;
static boolean requireKeyStore(WifiConfiguration config) {
if (config == null) {
return false;
@@ -144,9 +147,15 @@ public class WifiConfigController implements TextWatcher,
accessPoint.security;
mEdit = edit;
mTextViewChangedHandler = new Handler();
final Context context = mConfigUi.getContext();
final Resources resources = context.getResources();
mIpSettingsSpinner = (Spinner) mView.findViewById(R.id.ip_settings);
mIpSettingsSpinner.setOnItemSelectedListener(this);
mProxySettingsSpinner = (Spinner) mView.findViewById(R.id.proxy_settings);
mProxySettingsSpinner.setOnItemSelectedListener(this);
if (mAccessPoint == null) { // new network
mConfigUi.setTitle(R.string.wifi_add_network);
@@ -166,15 +175,16 @@ public class WifiConfigController implements TextWatcher,
} else {
mView.findViewById(R.id.type).setVisibility(View.VISIBLE);
}
showIpConfigFields();
showProxyFields();
mView.findViewById(R.id.wifi_advanced_toggle).setVisibility(View.VISIBLE);
mView.findViewById(R.id.wifi_advanced_togglebox).setOnClickListener(this);
mConfigUi.setSubmitButton(context.getString(R.string.wifi_save));
} else {
mConfigUi.setTitle(mAccessPoint.ssid);
mIpSettingsSpinner = (Spinner) mView.findViewById(R.id.ip_settings);
mIpSettingsSpinner.setOnItemSelectedListener(this);
mProxySettingsSpinner = (Spinner) mView.findViewById(R.id.proxy_settings);
mProxySettingsSpinner.setOnItemSelectedListener(this);
ViewGroup group = (ViewGroup) mView.findViewById(R.id.info);
DetailedState state = mAccessPoint.getState();
@@ -216,13 +226,6 @@ public class WifiConfigController implements TextWatcher,
} else {
mProxySettingsSpinner.setSelection(PROXY_NONE);
}
if (config.status == Status.DISABLED &&
config.disableReason == WifiConfiguration.DISABLED_DNS_FAILURE) {
addRow(group, R.string.wifi_disabled_heading,
context.getString(R.string.wifi_disabled_help));
}
}
if (mAccessPoint.networkId == INVALID_NETWORK_ID || mEdit) {
@@ -269,13 +272,13 @@ public class WifiConfigController implements TextWatcher,
void enableSubmitIfAppropriate() {
Button submit = mConfigUi.getSubmitButton();
if (submit == null) return;
if (mPasswordView == null) return;
boolean enabled = false;
boolean passwordInvalid = false;
if ((mAccessPointSecurity == AccessPoint.SECURITY_WEP && mPasswordView.length() == 0) ||
(mAccessPointSecurity == AccessPoint.SECURITY_PSK && mPasswordView.length() < 8)) {
if (mPasswordView != null &&
((mAccessPointSecurity == AccessPoint.SECURITY_WEP && mPasswordView.length() == 0) ||
(mAccessPointSecurity == AccessPoint.SECURITY_PSK && mPasswordView.length() < 8))) {
passwordInvalid = true;
}
@@ -399,7 +402,7 @@ public class WifiConfigController implements TextWatcher,
mProxySettingsSpinner.getSelectedItemPosition() == PROXY_STATIC) ?
ProxySettings.STATIC : ProxySettings.NONE;
if (mProxySettings == ProxySettings.STATIC) {
if (mProxySettings == ProxySettings.STATIC && mProxyHostView != null) {
String host = mProxyHostView.getText().toString();
String portStr = mProxyPortView.getText().toString();
String exclusionList = mProxyExclusionListView.getText().toString();
@@ -422,6 +425,8 @@ public class WifiConfigController implements TextWatcher,
}
private int validateIpConfigFields(LinkProperties linkProperties) {
if (mIpAddressView == null) return 0;
String ipAddr = mIpAddressView.getText().toString();
if (TextUtils.isEmpty(ipAddr)) return R.string.wifi_ip_settings_invalid_ip_address;
@@ -435,15 +440,15 @@ public class WifiConfigController implements TextWatcher,
int networkPrefixLength = -1;
try {
networkPrefixLength = Integer.parseInt(mNetworkPrefixLengthView.getText().toString());
if (networkPrefixLength < 0 || networkPrefixLength > 32) {
return R.string.wifi_ip_settings_invalid_network_prefix_length;
}
linkProperties.addLinkAddress(new LinkAddress(inetAddr, networkPrefixLength));
} catch (NumberFormatException e) {
// Set the hint as default after user types in ip address
mNetworkPrefixLengthView.setText(mConfigUi.getContext().getString(
R.string.wifi_network_prefix_length_hint));
}
if (networkPrefixLength < 0 || networkPrefixLength > 32) {
return R.string.wifi_ip_settings_invalid_network_prefix_length;
}
linkProperties.addLinkAddress(new LinkAddress(inetAddr, networkPrefixLength));
String gateway = mGatewayView.getText().toString();
if (TextUtils.isEmpty(gateway)) {
@@ -456,28 +461,31 @@ public class WifiConfigController implements TextWatcher,
} catch (RuntimeException ee) {
} catch (java.net.UnknownHostException u) {
}
} else {
InetAddress gatewayAddr = null;
try {
gatewayAddr = NetworkUtils.numericToInetAddress(gateway);
} catch (IllegalArgumentException e) {
return R.string.wifi_ip_settings_invalid_gateway;
}
linkProperties.addRoute(new RouteInfo(gatewayAddr));
}
InetAddress gatewayAddr = null;
try {
gatewayAddr = NetworkUtils.numericToInetAddress(gateway);
} catch (IllegalArgumentException e) {
return R.string.wifi_ip_settings_invalid_gateway;
}
linkProperties.addRoute(new RouteInfo(gatewayAddr));
String dns = mDns1View.getText().toString();
InetAddress dnsAddr = null;
if (TextUtils.isEmpty(dns)) {
//If everything else is valid, provide hint as a default option
mDns1View.setText(mConfigUi.getContext().getString(R.string.wifi_dns1_hint));
} else {
try {
dnsAddr = NetworkUtils.numericToInetAddress(dns);
} catch (IllegalArgumentException e) {
return R.string.wifi_ip_settings_invalid_dns;
}
linkProperties.addDns(dnsAddr);
}
InetAddress dnsAddr = null;
try {
dnsAddr = NetworkUtils.numericToInetAddress(dns);
} catch (IllegalArgumentException e) {
return R.string.wifi_ip_settings_invalid_dns;
}
linkProperties.addDns(dnsAddr);
if (mDns2View.length() > 0) {
dns = mDns2View.getText().toString();
try {
@@ -697,7 +705,11 @@ public class WifiConfigController implements TextWatcher,
@Override
public void afterTextChanged(Editable s) {
enableSubmitIfAppropriate();
mTextViewChangedHandler.post(new Runnable() {
public void run() {
enableSubmitIfAppropriate();
}
});
}
@Override