kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-29 00:10:32 +05:30
Code Issues Projects Releases Wiki Activity

refactor: Simplify NetworkHelper

Browse Source
This commit is contained in:
Isira Seneviratne 2023-12-27 06:04:08 +05:30
parent 0e960e1a6c
commit f74c4394b1
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/com/github/libretube/helpers/NetworkHelper.kt
View File

@ -15,20 +15,16 @@ object NetworkHelper {
// In case we are using a VPN, we return true since we might be using reverse tethering // In case we are using a VPN, we return true since we might be using reverse tethering
val connectivityManager = context.getSystemService<ConnectivityManager>() ?: return false val connectivityManager = context.getSystemService<ConnectivityManager>() ?: return false
if (Build.VERSION.SDK_INT >= 23) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
val activeNetwork = connectivityManager.activeNetwork val activeNetwork = connectivityManager.activeNetwork
val caps = connectivityManager.getNetworkCapabilities(activeNetwork) ?: return false val caps = connectivityManager.getNetworkCapabilities(activeNetwork) ?: return false
val hasConnection = caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) return caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
val isVpn = caps.hasTransport(NetworkCapabilities.TRANSPORT_VPN) || caps.hasTransport(NetworkCapabilities.TRANSPORT_VPN)
return hasConnection || isVpn
} else { } else {
if (connectivityManager.activeNetworkInfo?.isConnected == true) {
return true
}
// activeNetworkInfo might return null instead of the VPN, so better check it explicitly // activeNetworkInfo might return null instead of the VPN, so better check it explicitly
val vpnInfo = connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_VPN) val networkInfo = connectivityManager.activeNetworkInfo
return vpnInfo?.isConnected == true ?: connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_VPN)
return networkInfo?.isConnected == true
} }
} }