Skip to content

Fix android#1982: Improved ConnectivityManagerNetworkMonitor #2036

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

Open
Syedovaiss wants to merge 1 commit into
base: main
Choose a base branch
from
+32 −6
Open

Fix android#1982: Improved ConnectivityManagerNetworkMonitor #2036

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
38 changes: 32 additions & 6 deletions .../com/google/samples/apps/nowinandroid/core/data/util/ConnectivityManagerNetworkMonitor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import android.net.ConnectivityManager.NetworkCallback
import android.net.Network
import android.net.NetworkCapabilities
import android.net.NetworkRequest
import android.net.NetworkRequest.Builder
import androidx.core.content.getSystemService
import androidx.tracing.trace
import com.google.samples.apps.nowinandroid.core.network.Dispatcher
Expand All @@ -33,12 +32,13 @@ import kotlinx.coroutines.channels.awaitClose
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.callbackFlow
import kotlinx.coroutines.flow.conflate
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.flowOn
import javax.inject.Inject

internal class ConnectivityManagerNetworkMonitor @Inject constructor(
@ApplicationContext private val context: Context,
@Dispatcher(IO) private val ioDispatcher: CoroutineDispatcher,
@param:ApplicationContext private val context: Context,
@param:Dispatcher(IO) private val ioDispatcher: CoroutineDispatcher,
) : NetworkMonitor {
override val isOnline: Flow<Boolean> = callbackFlow {
trace("NetworkMonitor.callbackFlow") {
Expand Down Expand Up @@ -69,8 +69,12 @@ internal class ConnectivityManagerNetworkMonitor @Inject constructor(
}

trace("NetworkMonitor.registerNetworkCallback") {
val request = Builder()
val request = NetworkRequest.Builder()
.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
.addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)
.addTransportType(NetworkCapabilities.TRANSPORT_ETHERNET)
.build()
connectivityManager.registerNetworkCallback(request, callback)
}
Expand All @@ -87,9 +91,31 @@ internal class ConnectivityManagerNetworkMonitor @Inject constructor(
}
.flowOn(ioDispatcher)
.conflate()
.distinctUntilChanged()

private fun ConnectivityManager.isCurrentlyConnected(): Boolean {
val networkCapabilities = getNetworkCapabilities(activeNetwork) ?: return false
return networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
val network = activeNetwork ?: return false
val capabilities = getNetworkCapabilities(network) ?: return false

return hasInternetCapability(capabilities) &&
isValidated(capabilities) &&
hasSupportedTransport(capabilities)
}

private fun hasInternetCapability(capabilities: NetworkCapabilities): Boolean {
return capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
}

private fun isValidated(capabilities: NetworkCapabilities): Boolean {
return capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
}

private fun hasSupportedTransport(capabilities: NetworkCapabilities): Boolean {
val supportedTransports = setOf(
NetworkCapabilities.TRANSPORT_WIFI,
NetworkCapabilities.TRANSPORT_CELLULAR,
NetworkCapabilities.TRANSPORT_ETHERNET,
)
return supportedTransports.any(capabilities::hasTransport)
}
}