Skip to content

Commit ab0ab0e

Browse files
committed
Merge branch 'fix/no-network-false-negative-restricted-regions' into 'develop'
avoid checking internet validation probe in censored countries. See merge request ws/client/androidapp!506
2 parents a75be36 + 4a6ffd6 commit ab0ab0e

1 file changed

Lines changed: 14 additions & 2 deletions

File tree

base/src/main/java/com/windscribe/vpn/commonutils/WindUtilities.kt

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,20 @@ object WindUtilities {
121121
val capabilities =
122122
connectivityManager.getNetworkCapabilities(connectivityManager.activeNetwork)
123123
?: return false
124-
return capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) &&
125-
capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
124+
if (!capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)) {
125+
return false
126+
}
127+
if (capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)) {
128+
return true
129+
}
130+
return appContext.isRegionRestricted &&
131+
!capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL) &&
132+
(
133+
capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) ||
134+
capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) ||
135+
capabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) ||
136+
capabilities.hasTransport(NetworkCapabilities.TRANSPORT_VPN)
137+
)
126138
}
127139

128140
/**

0 commit comments

Comments
 (0)