Skip to content

A fully functional Android app built entirely with Kotlin and Jetpack Compose

Remove API 23+ connectivity check

Andrea Severi9b1da2448ef0
diff --git a/core/data/src/main/kotlin/com/google/samples/apps/nowinandroid/core/data/util/ConnectivityManagerNetworkMonitor.kt b/core/data/src/main/kotlin/com/google/samples/apps/nowinandroid/core/data/util/ConnectivityManagerNetworkMonitor.kt
index b2a642cf9..ea9e4de52 100644
--- a/core/data/src/main/kotlin/com/google/samples/apps/nowinandroid/core/data/util/ConnectivityManagerNetworkMonitor.kt
+++ b/core/data/src/main/kotlin/com/google/samples/apps/nowinandroid/core/data/util/ConnectivityManagerNetworkMonitor.kt
@@ -23,8 +23,6 @@ import android.net.Network
import android.net.NetworkCapabilities
import android.net.NetworkRequest
import android.net.NetworkRequest.Builder
-import android.os.Build.VERSION
-import android.os.Build.VERSION_CODES
import androidx.core.content.getSystemService
import androidx.tracing.trace
import com.google.samples.apps.nowinandroid.core.network.Dispatcher
@@ -90,13 +88,8 @@ internal class ConnectivityManagerNetworkMonitor @Inject constructor(
.flowOn(ioDispatcher)
.conflate()
- @Suppress("DEPRECATION")
- private fun ConnectivityManager.isCurrentlyConnected() = when {
- VERSION.SDK_INT >= VERSION_CODES.M ->
- activeNetwork
- ?.let(::getNetworkCapabilities)
- ?.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
-
- else -> activeNetworkInfo?.isConnected
- } ?: false
+ private fun ConnectivityManager.isCurrentlyConnected(): Boolean {
+ val networkCapabilities = getNetworkCapabilities(activeNetwork) ?: return false
+ return networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+ }
}