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

Merge "Replace the way to access StaticIpConfiguration" am: dd61e5d664 am: cda53ebeae am: f60f9ec14c

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

Change-Id: I904f5ec889d40113bf232f7935a98c6da030c9c3
This commit is contained in:
Chiachang Wang
2021-03-18 01:43:58 +00:00
committed by Automerger Merge Worker
parent a565961bf0 f60f9ec14c
commit 77dc754137
2 changed files with 146 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -319,9 +319,9 @@ public class WifiConfigController implements TextWatcher,
// Display IP address. // Display IP address.
StaticIpConfiguration staticConfig = config.getIpConfiguration() StaticIpConfiguration staticConfig = config.getIpConfiguration()
.getStaticIpConfiguration(); .getStaticIpConfiguration();
if (staticConfig != null && staticConfig.ipAddress != null) { if (staticConfig != null && staticConfig.getIpAddress() != null) {
addRow(group, R.string.wifi_ip_address, addRow(group, R.string.wifi_ip_address,
staticConfig.ipAddress.getAddress().getHostAddress()); staticConfig.getIpAddress().getAddress().getHostAddress());
} }
} else { } else {
mIpSettingsSpinner.setSelection(DHCP); mIpSettingsSpinner.setSelection(DHCP);
@@ -897,14 +897,21 @@ public class WifiConfigController implements TextWatcher,
if (inetAddr == null || inetAddr.equals(Inet4Address.ANY)) { if (inetAddr == null || inetAddr.equals(Inet4Address.ANY)) {
return R.string.wifi_ip_settings_invalid_ip_address; return R.string.wifi_ip_settings_invalid_ip_address;
} }
// Copy all fields into the builder first and set desired value later with builder.
final StaticIpConfiguration.Builder staticIPBuilder = new StaticIpConfiguration.Builder()
.setDnsServers(staticIpConfiguration.getDnsServers())
.setDomains(staticIpConfiguration.getDomains())
.setGateway(staticIpConfiguration.getGateway())
.setIpAddress(staticIpConfiguration.getIpAddress());
try {
int networkPrefixLength = -1; int networkPrefixLength = -1;
try { try {
networkPrefixLength = Integer.parseInt(mNetworkPrefixLengthView.getText().toString()); networkPrefixLength = Integer.parseInt(
mNetworkPrefixLengthView.getText().toString());
if (networkPrefixLength < 0 || networkPrefixLength > 32) { if (networkPrefixLength < 0 || networkPrefixLength > 32) {
return R.string.wifi_ip_settings_invalid_network_prefix_length; return R.string.wifi_ip_settings_invalid_network_prefix_length;
} }
staticIpConfiguration.ipAddress = new LinkAddress(inetAddr, networkPrefixLength); staticIPBuilder.setIpAddress(new LinkAddress(inetAddr, networkPrefixLength));
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
// Set the hint as default after user types in ip address // Set the hint as default after user types in ip address
mNetworkPrefixLengthView.setText(mConfigUi.getContext().getString( mNetworkPrefixLengthView.setText(mConfigUi.getContext().getString(
@@ -932,11 +939,12 @@ public class WifiConfigController implements TextWatcher,
if (gatewayAddr.isMulticastAddress()) { if (gatewayAddr.isMulticastAddress()) {
return R.string.wifi_ip_settings_invalid_gateway; return R.string.wifi_ip_settings_invalid_gateway;
} }
staticIpConfiguration.gateway = gatewayAddr; staticIPBuilder.setGateway(gatewayAddr);
} }
String dns = mDns1View.getText().toString(); String dns = mDns1View.getText().toString();
InetAddress dnsAddr = null; InetAddress dnsAddr = null;
final ArrayList<InetAddress> dnsServers = new ArrayList<>();
if (TextUtils.isEmpty(dns)) { if (TextUtils.isEmpty(dns)) {
//If everything else is valid, provide hint as a default option //If everything else is valid, provide hint as a default option
@@ -946,7 +954,7 @@ public class WifiConfigController implements TextWatcher,
if (dnsAddr == null) { if (dnsAddr == null) {
return R.string.wifi_ip_settings_invalid_dns; return R.string.wifi_ip_settings_invalid_dns;
} }
staticIpConfiguration.dnsServers.add(dnsAddr); dnsServers.add(dnsAddr);
} }
if (mDns2View.length() > 0) { if (mDns2View.length() > 0) {
@@ -955,9 +963,15 @@ public class WifiConfigController implements TextWatcher,
if (dnsAddr == null) { if (dnsAddr == null) {
return R.string.wifi_ip_settings_invalid_dns; return R.string.wifi_ip_settings_invalid_dns;
} }
staticIpConfiguration.dnsServers.add(dnsAddr); dnsServers.add(dnsAddr);
} }
staticIPBuilder.setDnsServers(dnsServers);
return 0; return 0;
} finally {
// Caller of this method may rely on staticIpConfiguration, so build the final result
// at the end of the method.
staticIpConfiguration = staticIPBuilder.build();
}
} }
private void showSecurityFields(boolean refreshEapMethods, boolean refreshCertificates) { private void showSecurityFields(boolean refreshEapMethods, boolean refreshCertificates) {

39
src/com/android/settings/wifi/WifiConfigController2.java
View File

@@ -305,9 +305,9 @@ public class WifiConfigController2 implements TextWatcher,
// Display IP address. // Display IP address.
StaticIpConfiguration staticConfig = config.getIpConfiguration() StaticIpConfiguration staticConfig = config.getIpConfiguration()
.getStaticIpConfiguration(); .getStaticIpConfiguration();
if (staticConfig != null && staticConfig.ipAddress != null) { if (staticConfig != null && staticConfig.getIpAddress() != null) {
addRow(group, R.string.wifi_ip_address, addRow(group, R.string.wifi_ip_address,
staticConfig.ipAddress.getAddress().getHostAddress()); staticConfig.getIpAddress().getAddress().getHostAddress());
} }
} else { } else {
mIpSettingsSpinner.setSelection(DHCP); mIpSettingsSpinner.setSelection(DHCP);
@@ -860,13 +860,21 @@ public class WifiConfigController2 implements TextWatcher,
return R.string.wifi_ip_settings_invalid_ip_address; return R.string.wifi_ip_settings_invalid_ip_address;
} }
// Copy all fields into the builder first and set desired value later with builder.
final StaticIpConfiguration.Builder staticIPBuilder = new StaticIpConfiguration.Builder()
.setDnsServers(staticIpConfiguration.getDnsServers())
.setDomains(staticIpConfiguration.getDomains())
.setGateway(staticIpConfiguration.getGateway())
.setIpAddress(staticIpConfiguration.getIpAddress());
try {
int networkPrefixLength = -1; int networkPrefixLength = -1;
try { try {
networkPrefixLength = Integer.parseInt(mNetworkPrefixLengthView.getText().toString()); networkPrefixLength =
Integer.parseInt(mNetworkPrefixLengthView.getText().toString());
if (networkPrefixLength < 0 || networkPrefixLength > 32) { if (networkPrefixLength < 0 || networkPrefixLength > 32) {
return R.string.wifi_ip_settings_invalid_network_prefix_length; return R.string.wifi_ip_settings_invalid_network_prefix_length;
} }
staticIpConfiguration.ipAddress = new LinkAddress(inetAddr, networkPrefixLength); staticIPBuilder.setIpAddress(new LinkAddress(inetAddr, networkPrefixLength));
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
// Set the hint as default after user types in ip address // Set the hint as default after user types in ip address
mNetworkPrefixLengthView.setText(mConfigUi.getContext().getString( mNetworkPrefixLengthView.setText(mConfigUi.getContext().getString(
@@ -894,11 +902,12 @@ public class WifiConfigController2 implements TextWatcher,
if (gatewayAddr.isMulticastAddress()) { if (gatewayAddr.isMulticastAddress()) {
return R.string.wifi_ip_settings_invalid_gateway; return R.string.wifi_ip_settings_invalid_gateway;
} }
staticIpConfiguration.gateway = gatewayAddr; staticIPBuilder.setGateway(gatewayAddr);
} }
String dns = mDns1View.getText().toString(); String dns = mDns1View.getText().toString();
InetAddress dnsAddr = null; InetAddress dnsAddr = null;
final ArrayList<InetAddress> dnsServers = new ArrayList<>();
if (TextUtils.isEmpty(dns)) { if (TextUtils.isEmpty(dns)) {
//If everything else is valid, provide hint as a default option //If everything else is valid, provide hint as a default option
@@ -908,6 +917,7 @@ public class WifiConfigController2 implements TextWatcher,
if (dnsAddr == null) { if (dnsAddr == null) {
return R.string.wifi_ip_settings_invalid_dns; return R.string.wifi_ip_settings_invalid_dns;
} }
dnsServers.add(dnsAddr);
staticIpConfiguration.dnsServers.add(dnsAddr); staticIpConfiguration.dnsServers.add(dnsAddr);
} }
@@ -917,9 +927,16 @@ public class WifiConfigController2 implements TextWatcher,
if (dnsAddr == null) { if (dnsAddr == null) {
return R.string.wifi_ip_settings_invalid_dns; return R.string.wifi_ip_settings_invalid_dns;
} }
dnsServers.add(dnsAddr);
staticIpConfiguration.dnsServers.add(dnsAddr); staticIpConfiguration.dnsServers.add(dnsAddr);
} }
staticIPBuilder.setDnsServers(dnsServers);
return 0; return 0;
} finally {
// Caller of this method may rely on staticIpConfiguration, so build the final result
// at the end of the method.
staticIpConfiguration = staticIPBuilder.build();
}
} }
private void showSecurityFields(boolean refreshEapMethods, boolean refreshCertificates) { private void showSecurityFields(boolean refreshEapMethods, boolean refreshCertificates) {
@@ -1330,18 +1347,18 @@ public class WifiConfigController2 implements TextWatcher,
StaticIpConfiguration staticConfig = config.getIpConfiguration() StaticIpConfiguration staticConfig = config.getIpConfiguration()
.getStaticIpConfiguration(); .getStaticIpConfiguration();
if (staticConfig != null) { if (staticConfig != null) {
if (staticConfig.ipAddress != null) { if (staticConfig.getIpAddress() != null) {
mIpAddressView.setText( mIpAddressView.setText(
staticConfig.ipAddress.getAddress().getHostAddress()); staticConfig.getIpAddress().getAddress().getHostAddress());
mNetworkPrefixLengthView.setText(Integer.toString(staticConfig.ipAddress mNetworkPrefixLengthView.setText(Integer.toString(
.getPrefixLength())); staticConfig.getIpAddress().getPrefixLength()));
} }
if (staticConfig.gateway != null) { if (staticConfig.gateway != null) {
mGatewayView.setText(staticConfig.gateway.getHostAddress()); mGatewayView.setText(staticConfig.getGateway().getHostAddress());
} }
Iterator<InetAddress> dnsIterator = staticConfig.dnsServers.iterator(); Iterator<InetAddress> dnsIterator = staticConfig.getDnsServers().iterator();
if (dnsIterator.hasNext()) { if (dnsIterator.hasNext()) {
mDns1View.setText(dnsIterator.next().getHostAddress()); mDns1View.setText(dnsIterator.next().getHostAddress());
} }