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

Use InetAddress.isNumeric.

Browse Source 
Bug: 3073384
Change-Id: I22b03efd7fe267f8b20c06cfc15aa5f0db487ca8
This commit is contained in:
Elliott Hughes
2010-11-04 15:26:22 -07:00
parent 96938b29bb
commit a9a2481dfd
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -375,7 +375,7 @@ public class WifiConfigController implements TextWatcher,
private int validateIpConfigFields(LinkProperties linkProperties) { private int validateIpConfigFields(LinkProperties linkProperties) {
try { try {
String ipAddr = mIpAddressView.getText().toString(); String ipAddr = mIpAddressView.getText().toString();
if (!NetworkUtils.isIpAddress(ipAddr)) { if (!InetAddress.isNumeric(ipAddr)) {
return R.string.wifi_ip_settings_invalid_ip_address; return R.string.wifi_ip_settings_invalid_ip_address;
} }
InetAddress inetAddr = InetAddress.getByName(ipAddr); InetAddress inetAddr = InetAddress.getByName(ipAddr);
@@ -389,19 +389,19 @@ public class WifiConfigController implements TextWatcher,
linkProperties.addLinkAddress(new LinkAddress(inetAddr, networkPrefixLength)); linkProperties.addLinkAddress(new LinkAddress(inetAddr, networkPrefixLength));
String gateway = mGatewayView.getText().toString(); String gateway = mGatewayView.getText().toString();
if (!NetworkUtils.isIpAddress(gateway)) { if (!InetAddress.isNumeric(gateway)) {
return R.string.wifi_ip_settings_invalid_gateway; return R.string.wifi_ip_settings_invalid_gateway;
} }
linkProperties.setGateway(InetAddress.getByName(gateway)); linkProperties.setGateway(InetAddress.getByName(gateway));
String dns = mDns1View.getText().toString(); String dns = mDns1View.getText().toString();
if (!NetworkUtils.isIpAddress(dns)) { if (!InetAddress.isNumeric(dns)) {
return R.string.wifi_ip_settings_invalid_dns; return R.string.wifi_ip_settings_invalid_dns;
} }
linkProperties.addDns(InetAddress.getByName(dns)); linkProperties.addDns(InetAddress.getByName(dns));
if (mDns2View.length() > 0) { if (mDns2View.length() > 0) {
dns = mDns2View.getText().toString(); dns = mDns2View.getText().toString();
if (!NetworkUtils.isIpAddress(dns)) { if (!InetAddress.isNumeric(dns)) {
return R.string.wifi_ip_settings_invalid_dns; return R.string.wifi_ip_settings_invalid_dns;
} }
linkProperties.addDns(InetAddress.getByName(dns)); linkProperties.addDns(InetAddress.getByName(dns));