ppn/wgtunnel-android
3
0
Fork 0
mirror of https://github.com/wgtunnel/android.git synced 2026-06-02 00:29:08 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

fix: add network capability checks to properly detect network connectivity

Browse Source 
NOT_SUSPENDED needed for mobile to properly detect signal loss
This commit is contained in:
zaneschepke
2026-05-26 03:24:20 -04:00
parent c18b3b7ba0
commit 7e264a6f19
1 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
networkmonitor/src/main/java/com/zaneschepke/networkmonitor/AndroidNetworkMonitor.kt
+34 -10
View File
@@ -512,14 +512,25 @@ class AndroidNetworkMonitor(
val physicalNetwork: ActiveNetwork =
when {
// Ethernet
networkData.ethernetEvent is TransportEvent.CapabilitiesChanged &&
networkData.ethernetEvent.networkCapabilities?.hasTransport(
NetworkCapabilities.TRANSPORT_ETHERNET
) == true -> ActiveNetwork.Ethernet(networkData.ethernetEvent.network)
networkData.ethernetEvent.networkCapabilities?.let { caps ->
caps.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) &&
caps.hasCapability(
NetworkCapabilities.NET_CAPABILITY_INTERNET
) &&
caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
} == true -> {
ActiveNetwork.Ethernet(networkData.ethernetEvent.network)
}
// WiFi
networkData.wifiNetworkEvent is TransportEvent.CapabilitiesChanged -> {
networkData.wifiNetworkEvent is TransportEvent.CapabilitiesChanged &&
networkData.wifiNetworkEvent.networkCapabilities?.let { caps ->
caps.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) &&
caps.hasCapability(
NetworkCapabilities.NET_CAPABILITY_INTERNET
) &&
caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
} == true -> {
val wifiEvent = networkData.wifiNetworkEvent
val ssid =
getSsidByDetectionMethod(
@@ -535,12 +546,25 @@ class AndroidNetworkMonitor(
)
}
// only count cellular as connected if validated AND not in airplane mode
networkData.cellularEvent is TransportEvent.CapabilitiesChanged &&
networkData.cellularEvent.networkCapabilities?.hasTransport(
NetworkCapabilities.TRANSPORT_CELLULAR
) == true &&
!isAirplaneOn ->
networkData.cellularEvent.networkCapabilities?.let { caps ->
caps.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) &&
caps.hasCapability(
NetworkCapabilities.NET_CAPABILITY_INTERNET
) &&
caps.hasCapability(
NetworkCapabilities.NET_CAPABILITY_VALIDATED
) &&
caps.hasCapability(
NetworkCapabilities.NET_CAPABILITY_NOT_SUSPENDED
)
// NOT_SUSPENDED need to properly tell when we've lost mobile data
// connectivity
} == true &&
!isAirplaneOn -> {
ActiveNetwork.Cellular(networkData.cellularEvent.network)
}
else -> ActiveNetwork.Disconnected
}