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

Display all link IP addresses, on different lines

Browse Source 
Currently, the "IP address" field in the status page of the
settings app displays only the IP addesses on the base link.
Make it display the stacked link IP addresses as well.

Also, separate IP addresses via newlines instead of commas.
For example, display:

2a00:f40:e000:11c:cf93:ee9:5ad3:6686
192.0.0.4

instead of:

2a00:f40:e000:11c:cf93:ee9:5ad3:6686, 192.0.0.4

Change-Id: Ie78da142fea87735139adcefcfed7154b4f7fefb
This commit is contained in:
Lorenzo Colitti
2013-08-01 17:30:07 +09:00
parent fc86f69d3b
commit 769f069a47
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/Utils.java
View File

@@ -330,7 +330,7 @@ public class Utils {
/** /**
* Returns the WIFI IP Addresses, if any, taking into account IPv4 and IPv6 style addresses. * Returns the WIFI IP Addresses, if any, taking into account IPv4 and IPv6 style addresses.
* @param context the application context * @param context the application context
* @return the formatted and comma-separated IP addresses, or null if none. * @return the formatted and newline-separated IP addresses, or null if none.
*/ */
public static String getWifiIpAddresses(Context context) { public static String getWifiIpAddresses(Context context) {
ConnectivityManager cm = (ConnectivityManager) ConnectivityManager cm = (ConnectivityManager)
@@ -343,7 +343,7 @@ public class Utils {
* Returns the default link's IP addresses, if any, taking into account IPv4 and IPv6 style * Returns the default link's IP addresses, if any, taking into account IPv4 and IPv6 style
* addresses. * addresses.
* @param context the application context * @param context the application context
* @return the formatted and comma-separated IP addresses, or null if none. * @return the formatted and newline-separated IP addresses, or null if none.
*/ */
public static String getDefaultIpAddresses(Context context) { public static String getDefaultIpAddresses(Context context) {
ConnectivityManager cm = (ConnectivityManager) ConnectivityManager cm = (ConnectivityManager)
@@ -354,14 +354,14 @@ public class Utils {
private static String formatIpAddresses(LinkProperties prop) { private static String formatIpAddresses(LinkProperties prop) {
if (prop == null) return null; if (prop == null) return null;
Iterator<InetAddress> iter = prop.getAddresses().iterator(); Iterator<InetAddress> iter = prop.getAllAddresses().iterator();
// If there are no entries, return null // If there are no entries, return null
if (!iter.hasNext()) return null; if (!iter.hasNext()) return null;
// Concatenate all available addresses, comma separated // Concatenate all available addresses, comma separated
String addresses = ""; String addresses = "";
while (iter.hasNext()) { while (iter.hasNext()) {
addresses += iter.next().getHostAddress(); addresses += iter.next().getHostAddress();
if (iter.hasNext()) addresses += ", "; if (iter.hasNext()) addresses += "\n";
} }
return addresses; return addresses;
} }