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

if WifiManager fails to return netmask, directly query net interfaces

Browse Source 
Google broke returning the netmask somewhere around android-21. This could
be done using more official APIs, but this reuses stuff that needs to be
there anyway.

closes #577
https://code.google.com/p/android/issues/detail?id=82477#c5
https://issuetracker.google.com/issues/37015180
This commit is contained in:
Hans-Christoph Steiner 2018-04-18 10:50:09 +02:00
parent 3fd1b055b3
commit b9c247e2b1
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/fdroid/fdroid/FDroidApp.java
View File

@ -114,6 +114,8 @@ public class FDroidApp extends Application {
public static volatile int networkState = ConnectivityMonitorService.FLAG_NET_UNAVAILABLE;
public static final SubnetUtils.SubnetInfo UNSET_SUBNET_INFO = new SubnetUtils("0.0.0.0/32").getInfo();
private static volatile LongSparseArray<String> lastWorkingMirrorArray = new LongSparseArray<>(1);
private static volatile int numTries = Integer.MAX_VALUE;
private static volatile int timeout = 10000;
@ -231,7 +233,7 @@ public class FDroidApp extends Application {
public static void initWifiSettings() {
port = 8888;
ipAddressString = null;
subnetInfo = new SubnetUtils("0.0.0.0/32").getInfo();
subnetInfo = UNSET_SUBNET_INFO;
ssid = "";
bssid = "";
repo = new Repo();

14
app/src/main/java/org/fdroid/fdroid/net/WifiStateChangeService.java
View File

@ -121,6 +121,10 @@ public class WifiStateChangeService extends IntentService {
}
}
}
if (FDroidApp.ipAddressString == null
|| FDroidApp.subnetInfo == FDroidApp.UNSET_SUBNET_INFO) {
setIpInfoFromNetworkInterface();
}
} else if (wifiState == WifiManager.WIFI_STATE_DISABLED
|| wifiState == WifiManager.WIFI_STATE_DISABLING) {
// try once to see if its a hotspot
@ -210,6 +214,16 @@ public class WifiStateChangeService extends IntentService {
}
}
/**
* Search for known Wi-Fi, Hotspot, and local network interfaces and get
* the IP Address info from it. This is necessary because network
* interfaces in Hotspot/AP mode do not show up in the regular
* {@link WifiManager} queries, and also on
* {@link android.os.Build.VERSION_CODES#LOLLIPOP Android 5.0} and newer,
* {@link WifiManager#getDhcpInfo()} returns an invalid netmask.
*
* @see <a href="https://issuetracker.google.com/issues/37015180">netmask of WifiManager.getDhcpInfo() is always zero on Android 5.0</a>
*/
private void setIpInfoFromNetworkInterface() {
try {
Enumeration<NetworkInterface> networkInterfaces = NetworkInterface.getNetworkInterfaces();