Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: Simplify NetworkHelper #5484

Merged
merged 1 commit into from
Jan 13, 2024
Merged

refactor: Simplify NetworkHelper #5484

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions app/src/main/java/com/github/libretube/helpers/NetworkHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,16 @@ object NetworkHelper {
// In case we are using a VPN, we return true since we might be using reverse tethering
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 caps = connectivityManager.getNetworkCapabilities(activeNetwork) ?: return false
val hasConnection = caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
val isVpn = caps.hasTransport(NetworkCapabilities.TRANSPORT_VPN)
return hasConnection || isVpn
return caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
|| caps.hasTransport(NetworkCapabilities.TRANSPORT_VPN)
} else {
if (connectivityManager.activeNetworkInfo?.isConnected == true) {
return true
}

// activeNetworkInfo might return null instead of the VPN, so better check it explicitly
val vpnInfo = connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_VPN)
return vpnInfo?.isConnected == true
val networkInfo = connectivityManager.activeNetworkInfo
?: connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_VPN)
return networkInfo?.isConnected == true
}
}

Expand Down
Loading