Skip to content

Commit 32a6852

Browse files
committed
Simplify: drop unused stop() from NetworkConnectionMonitor
The monitor is registered once for the whole process lifetime and never torn down, so stop() had no callers. Removing it also lets the handlerThread and networkCallback fields go — they were only read by stop(). connectivityManager stays since hasActiveConnection() uses it.
1 parent eb05a3a commit 32a6852

1 file changed

Lines changed: 0 additions & 17 deletions

File tree

WordPress/src/main/java/org/wordpress/android/networking/NetworkConnectionMonitor.kt

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ class NetworkConnectionMonitor @Inject constructor() {
2828
private var isFirstCallback = true
2929

3030
private var connectivityManager: ConnectivityManager? = null
31-
private var handlerThread: HandlerThread? = null
32-
private var networkCallback: ConnectivityManager.NetworkCallback? = null
3331

3432
class ConnectionChangeEvent(val isConnected: Boolean)
3533

@@ -41,31 +39,16 @@ class NetworkConnectionMonitor @Inject constructor() {
4139
connectivityManager = manager
4240

4341
val thread = HandlerThread("NetworkConnectionMonitor").apply { start() }
44-
handlerThread = thread
45-
4642
val callback = object : ConnectivityManager.NetworkCallback() {
4743
override fun onAvailable(network: Network) = onConnectivityChanged(true)
4844
// onLost fires for the network that was lost, but during a handover (e.g. Wi-Fi -> cellular) the
4945
// new default has already arrived via onAvailable, so re-query rather than assuming we're offline.
5046
override fun onLost(network: Network) = onConnectivityChanged(hasActiveConnection())
5147
}
52-
networkCallback = callback
53-
5448
manager.registerDefaultNetworkCallback(callback, Handler(thread.looper))
5549
started = true
5650
}
5751

58-
@Synchronized
59-
fun stop() {
60-
if (!started) return
61-
networkCallback?.let { connectivityManager?.unregisterNetworkCallback(it) }
62-
handlerThread?.quitSafely()
63-
networkCallback = null
64-
handlerThread = null
65-
connectivityManager = null
66-
started = false
67-
}
68-
6952
/**
7053
* Called on the monitor's background thread. Posts a [ConnectionChangeEvent] on the first callback and
7154
* whenever the connected state actually changes, so subscribers aren't spammed when a network's

0 commit comments

Comments
 (0)