Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not bail out of wifi settings if there is no DhcpInfo

Browse Source 
There is still much useful information to be had without DhcpInfo.
This commit is contained in:
Hans-Christoph Steiner 2016-02-15 10:54:34 +01:00
parent c5688dcdbf
commit eed0070d4b
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java
View File

@ -87,13 +87,12 @@ public class WifiStateChangeService extends Service {
wifiInfo = wifiManager.getConnectionInfo(); wifiInfo = wifiManager.getConnectionInfo();
FDroidApp.ipAddressString = formatIpAddress(wifiInfo.getIpAddress()); FDroidApp.ipAddressString = formatIpAddress(wifiInfo.getIpAddress());
DhcpInfo dhcpInfo = wifiManager.getDhcpInfo(); DhcpInfo dhcpInfo = wifiManager.getDhcpInfo();
if (dhcpInfo == null) { if (dhcpInfo != null) {
return null;
}
String netmask = formatIpAddress(dhcpInfo.netmask); String netmask = formatIpAddress(dhcpInfo.netmask);
if (!TextUtils.isEmpty(FDroidApp.ipAddressString) && netmask != null) { if (!TextUtils.isEmpty(FDroidApp.ipAddressString) && netmask != null) {
FDroidApp.subnetInfo = new SubnetUtils(FDroidApp.ipAddressString, netmask).getInfo(); FDroidApp.subnetInfo = new SubnetUtils(FDroidApp.ipAddressString, netmask).getInfo();
} }
}
} else if (wifiState == WifiManager.WIFI_STATE_DISABLED } else if (wifiState == WifiManager.WIFI_STATE_DISABLED
|| wifiState == WifiManager.WIFI_STATE_DISABLING) { || wifiState == WifiManager.WIFI_STATE_DISABLING) {
// try once to see if its a hotspot // try once to see if its a hotspot