From de6545f5d7822cfa9ac3bc2263f51498863f80ca Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Mon, 8 May 2023 10:22:13 +0200 Subject: [PATCH 1/6] Simplify handling of nullability in `ConnectivityManagerNetworkMonitor` --- .../util/ConnectivityManagerNetworkMonitor.kt | 82 +++++++++---------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/util/ConnectivityManagerNetworkMonitor.kt b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/util/ConnectivityManagerNetworkMonitor.kt index 982f47c6e..001b6d4c9 100644 --- a/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/util/ConnectivityManagerNetworkMonitor.kt +++ b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/util/ConnectivityManagerNetworkMonitor.kt @@ -30,61 +30,61 @@ import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow import kotlinx.coroutines.flow.conflate +import Kotlinx.coroutines.flow.flowOf import javax.inject.Inject class ConnectivityManagerNetworkMonitor @Inject constructor( @ApplicationContext private val context: Context, ) : NetworkMonitor { - override val isOnline: Flow = callbackFlow { + override val isOnline: Flow { val connectivityManager = context.getSystemService() + ?: return flowOf(false) - /** - * The callback's methods are invoked on changes to *any* network, not just the active - * network. So to check for network connectivity, one must query the active network of the - * ConnectivityManager. - */ - val callback = object : NetworkCallback() { - override fun onAvailable(network: Network) { - channel.trySend(connectivityManager.isCurrentlyConnected()) - } + return callbackFlow { - override fun onLost(network: Network) { - channel.trySend(connectivityManager.isCurrentlyConnected()) - } + /** + * The callback's methods are invoked on changes to *any* network, not just the active + * network. So to check for network connectivity, one must query the active network of the + * ConnectivityManager. + */ + val callback = object : NetworkCallback() { + override fun onAvailable(network: Network) { + channel.trySend(connectivityManager.isCurrentlyConnected()) + } + + override fun onLost(network: Network) { + channel.trySend(connectivityManager.isCurrentlyConnected()) + } - override fun onCapabilitiesChanged( - network: Network, - networkCapabilities: NetworkCapabilities, - ) { - channel.trySend(connectivityManager.isCurrentlyConnected()) + override fun onCapabilitiesChanged( + network: Network, + networkCapabilities: NetworkCapabilities, + ) { + channel.trySend(connectivityManager.isCurrentlyConnected()) + } } - } - connectivityManager?.registerNetworkCallback( - Builder() - .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) - .build(), - callback, - ) + connectivityManager.registerNetworkCallback( + Builder() + .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) + .build(), + callback, + ) - channel.trySend(connectivityManager.isCurrentlyConnected()) + channel.trySend(connectivityManager.isCurrentlyConnected()) - awaitClose { - connectivityManager?.unregisterNetworkCallback(callback) + awaitClose { + connectivityManager.unregisterNetworkCallback(callback) + } } - } - .conflate() + .conflate() @Suppress("DEPRECATION") - private fun ConnectivityManager?.isCurrentlyConnected() = when (this) { - null -> false - else -> when { - VERSION.SDK_INT >= VERSION_CODES.M -> - activeNetwork - ?.let(::getNetworkCapabilities) - ?.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) - ?: false - else -> activeNetworkInfo?.isConnected ?: false - } - } + private fun ConnectivityManager.isCurrentlyConnected() = when { + VERSION.SDK_INT >= VERSION_CODES.M -> + activeNetwork + ?.let(::getNetworkCapabilities) + ?.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) + else -> activeNetworkInfo?.isConnected + } ?: false } From f34ee1c01bbd70e3c2c3a848d1b8a6a65bcb019d Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Mon, 8 May 2023 10:46:48 +0200 Subject: [PATCH 2/6] Update ConnectivityManagerNetworkMonitor.kt --- .../util/ConnectivityManagerNetworkMonitor.kt | 68 ++++++++++--------- 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/util/ConnectivityManagerNetworkMonitor.kt b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/util/ConnectivityManagerNetworkMonitor.kt index 001b6d4c9..a21965565 100644 --- a/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/util/ConnectivityManagerNetworkMonitor.kt +++ b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/util/ConnectivityManagerNetworkMonitor.kt @@ -36,48 +36,50 @@ import javax.inject.Inject class ConnectivityManagerNetworkMonitor @Inject constructor( @ApplicationContext private val context: Context, ) : NetworkMonitor { - override val isOnline: Flow { + override val isOnline: Flow = callbackFlow { val connectivityManager = context.getSystemService() - ?: return flowOf(false) - - return callbackFlow { + ?: run { + channel.trySend(false) + channel.close() + return@callbackFlow + } - /** - * The callback's methods are invoked on changes to *any* network, not just the active - * network. So to check for network connectivity, one must query the active network of the - * ConnectivityManager. - */ - val callback = object : NetworkCallback() { - override fun onAvailable(network: Network) { - channel.trySend(connectivityManager.isCurrentlyConnected()) - } + /** + * The callback's methods are invoked on changes to *any* network, not just the active + * network. So to check for network connectivity, one must query the active network of the + * ConnectivityManager. + */ + val callback = object : NetworkCallback() { + override fun onAvailable(network: Network) { + channel.trySend(connectivityManager.isCurrentlyConnected()) + } - override fun onLost(network: Network) { - channel.trySend(connectivityManager.isCurrentlyConnected()) - } + override fun onLost(network: Network) { + channel.trySend(connectivityManager.isCurrentlyConnected()) + } - override fun onCapabilitiesChanged( - network: Network, - networkCapabilities: NetworkCapabilities, - ) { - channel.trySend(connectivityManager.isCurrentlyConnected()) - } + override fun onCapabilitiesChanged( + network: Network, + networkCapabilities: NetworkCapabilities, + ) { + channel.trySend(connectivityManager.isCurrentlyConnected()) } + } - connectivityManager.registerNetworkCallback( - Builder() - .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) - .build(), - callback, - ) + connectivityManager.registerNetworkCallback( + Builder() + .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) + .build(), + callback, + ) - channel.trySend(connectivityManager.isCurrentlyConnected()) + channel.trySend(connectivityManager.isCurrentlyConnected()) - awaitClose { - connectivityManager.unregisterNetworkCallback(callback) - } + awaitClose { + connectivityManager.unregisterNetworkCallback(callback) } - .conflate() + } + .conflate() @Suppress("DEPRECATION") private fun ConnectivityManager.isCurrentlyConnected() = when { From 76c249a65136e707d72ad4959b26cb6c92297d7f Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Mon, 8 May 2023 10:47:37 +0200 Subject: [PATCH 3/6] Update ConnectivityManagerNetworkMonitor.kt --- .../core/data/util/ConnectivityManagerNetworkMonitor.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/util/ConnectivityManagerNetworkMonitor.kt b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/util/ConnectivityManagerNetworkMonitor.kt index a21965565..4cb4dbe70 100644 --- a/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/util/ConnectivityManagerNetworkMonitor.kt +++ b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/util/ConnectivityManagerNetworkMonitor.kt @@ -30,7 +30,6 @@ import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow import kotlinx.coroutines.flow.conflate -import Kotlinx.coroutines.flow.flowOf import javax.inject.Inject class ConnectivityManagerNetworkMonitor @Inject constructor( From def5c4e8819c966138dfec76852509d3b65c9493 Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Mon, 8 May 2023 10:50:12 +0200 Subject: [PATCH 4/6] Update ConnectivityManagerNetworkMonitor.kt --- .../data/util/ConnectivityManagerNetworkMonitor.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/util/ConnectivityManagerNetworkMonitor.kt b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/util/ConnectivityManagerNetworkMonitor.kt index 4cb4dbe70..4c68946c8 100644 --- a/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/util/ConnectivityManagerNetworkMonitor.kt +++ b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/util/ConnectivityManagerNetworkMonitor.kt @@ -37,11 +37,11 @@ class ConnectivityManagerNetworkMonitor @Inject constructor( ) : NetworkMonitor { override val isOnline: Flow = callbackFlow { val connectivityManager = context.getSystemService() - ?: run { - channel.trySend(false) - channel.close() - return@callbackFlow - } + ?: run { + channel.trySend(false) + channel.close() + return@callbackFlow + } /** * The callback's methods are invoked on changes to *any* network, not just the active From 7819a0c6bcf0e2d9cb073f2978aed9b52df85ff2 Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Mon, 8 May 2023 12:50:01 +0200 Subject: [PATCH 5/6] Extract common code to update the Flow value --- .../util/ConnectivityManagerNetworkMonitor.kt | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/util/ConnectivityManagerNetworkMonitor.kt b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/util/ConnectivityManagerNetworkMonitor.kt index 4c68946c8..4b8f049c0 100644 --- a/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/util/ConnectivityManagerNetworkMonitor.kt +++ b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/util/ConnectivityManagerNetworkMonitor.kt @@ -37,11 +37,18 @@ class ConnectivityManagerNetworkMonitor @Inject constructor( ) : NetworkMonitor { override val isOnline: Flow = callbackFlow { val connectivityManager = context.getSystemService() - ?: run { - channel.trySend(false) - channel.close() - return@callbackFlow - } + if (connectivityManager == null) { + channel.trySend(false) + channel.close() + return@callbackFlow + } + + /** + * Sends the latest connectivity status to the underlying channel. + */ + fun update() { + channel.trySend(connectivityManager.isCurrentlyConnected()) + } /** * The callback's methods are invoked on changes to *any* network, not just the active @@ -49,20 +56,14 @@ class ConnectivityManagerNetworkMonitor @Inject constructor( * ConnectivityManager. */ val callback = object : NetworkCallback() { - override fun onAvailable(network: Network) { - channel.trySend(connectivityManager.isCurrentlyConnected()) - } + override fun onAvailable(network: Network) = update() - override fun onLost(network: Network) { - channel.trySend(connectivityManager.isCurrentlyConnected()) - } + override fun onLost(network: Network) = update() override fun onCapabilitiesChanged( network: Network, networkCapabilities: NetworkCapabilities, - ) { - channel.trySend(connectivityManager.isCurrentlyConnected()) - } + ) = update() } connectivityManager.registerNetworkCallback( @@ -72,7 +73,7 @@ class ConnectivityManagerNetworkMonitor @Inject constructor( callback, ) - channel.trySend(connectivityManager.isCurrentlyConnected()) + update() awaitClose { connectivityManager.unregisterNetworkCallback(callback) From ec9155fef9c819a96f74c939aa90a47738016189 Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Mon, 8 May 2023 12:53:05 +0200 Subject: [PATCH 6/6] Update ConnectivityManagerNetworkMonitor.kt --- .../core/data/util/ConnectivityManagerNetworkMonitor.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/util/ConnectivityManagerNetworkMonitor.kt b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/util/ConnectivityManagerNetworkMonitor.kt index 4b8f049c0..b0bf9d820 100644 --- a/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/util/ConnectivityManagerNetworkMonitor.kt +++ b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/util/ConnectivityManagerNetworkMonitor.kt @@ -48,7 +48,7 @@ class ConnectivityManagerNetworkMonitor @Inject constructor( */ fun update() { channel.trySend(connectivityManager.isCurrentlyConnected()) - } + } /** * The callback's methods are invoked on changes to *any* network, not just the active