Add more logging for initial network state

Author: valldrac

app/src/main/java/org/thoughtcrime/securesms/messages/NetworkConnectionListener.kt

@@ -75,99 +75,92 @@ class NetworkConnectionListener(
       val validated = caps?.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED) ?: false
       val httpProxy = props?.httpProxy
 
-      val initialState = NetworkState(
+      val activeNetworkState = NetworkState(
         available = hasInternet,
         validated = validated,
         httpProxy = httpProxy,
       )
 
-      onInitialConnectionState(network, initialState)
+      Log.d(TAG, "Active network snapshot: $activeNetworkState (network=$network)")
+      onInitialConnectionState(network, activeNetworkState)
     }
 
     fun stopMonitoring() {
       connectivityManager.unregisterNetworkCallback(this)
     }
 
-    private fun connectivityChangedLocked(): NetworkState? {
+    private fun updateConnectionState(): NetworkState? {
       val newState = networks.bestNetworkState()
       val oldState = connectionState
 
       return if (newState != oldState) {
         connectionState = newState
         if (oldState == null) {
-          Log.v(TAG, "Network state initialized -> $newState")
+          Log.i(TAG, "Network state initialized -> $newState")
         } else {
-          Log.v(TAG, "Network state changed: $oldState -> $newState")
+          Log.i(TAG, "Network state changed: $oldState -> $newState")
         }
         newState
       } else null
     }
 
-    private fun NetworkState.dispatch() {
-      onNetworkChange(this)
-    }
-
     private fun Map<Network, NetworkState>.bestNetworkState(): NetworkState =
       values.firstOrNull { it.validated }
         ?: values.firstOrNull { it.available }
         ?: NetworkState.DOWN
 
     private fun onInitialConnectionState(network: Network?, state: NetworkState) {
-      val maybeNew = synchronized(this) {
+      synchronized(this) {
         if (connectionState == null) {
           if (network != null) {
             networks[network] = state
           }
-          connectivityChangedLocked()
+          updateConnectionState()
         } else {
           Log.v(TAG, "Initial state skipped; already set: $connectionState")
           null
         }
-      }
-
-      maybeNew?.dispatch()
+      }?.notifyChange()
     }
 
     override fun onLinkPropertiesChanged(network: Network, linkProperties: LinkProperties) {
       Log.d(TAG, "NetworkCallback onLinkPropertiesChanged($network)")
       val httpProxy = linkProperties.httpProxy
-      val maybeNew = synchronized(this) {
+      synchronized(this) {
         val existing = networks.getOrDefault(
           network,
           NetworkState(available = true, validated = false, httpProxy = httpProxy)
         )
         val state = existing.copy(httpProxy = httpProxy)
         networks[network] = state
-        connectivityChangedLocked()
-      }
-
-      maybeNew?.dispatch()
+        updateConnectionState()
+      }?.notifyChange()
     }
 
     override fun onBlockedStatusChanged(network: Network, blocked: Boolean) {
       Log.d(TAG, "NetworkCallback onBlockedStatusChanged($network, $blocked)")
       val validated = !blocked
-      val maybeNew = synchronized(this) {
+      synchronized(this) {
         val existing = networks.getOrDefault(
           network,
           NetworkState(available = true, validated = validated, httpProxy = null)
         )
         val state = existing.copy(validated = validated)
         networks[network] = state
-        connectivityChangedLocked()
-      }
-
-      maybeNew?.dispatch()
+        updateConnectionState()
+      }?.notifyChange()
     }
 
     override fun onLost(network: Network) {
       Log.d(TAG, "NetworkCallback onLost($network)")
-      val maybeNew = synchronized(this) {
+      synchronized(this) {
         networks.remove(network)
-        connectivityChangedLocked()
-      }
+        updateConnectionState()
+      }?.notifyChange()
+    }
 
-      maybeNew?.dispatch()
+    private fun NetworkState.notifyChange() {
+      onNetworkChange(this)
     }
   }