Migrate SchedulingServiceImpl to ConnectivityStatus

Author: bidetofevil

embrace-android-core/src/test/kotlin/io/embrace/android/embracesdk/internal/capture/connectivity/EmbraceNetworkConnectivityServiceTest.kt

@@ -77,6 +77,10 @@ internal class EmbraceNetworkConnectivityServiceTest {
             override fun onNetworkConnectivityStatusChanged(status: NetworkStatus) {
                 networkStatus = status
             }
+
+            override fun onNetworkConnectivityStatusChanged(status: ConnectivityStatus) {
+                networkStatus = status.toNetworkStatus()
+            }
         }
         service.addNetworkConnectivityListener(testListener)
     }

embrace-android-core/src/test/kotlin/io/embrace/android/embracesdk/internal/capture/connectivity/NetworkCallbackConnectivityServiceTest.kt

@@ -15,7 +15,6 @@ import android.os.Build
 import androidx.test.core.app.ApplicationProvider.getApplicationContext
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.embrace.android.embracesdk.fakes.fakeBackgroundWorker
-import io.embrace.android.embracesdk.internal.comms.delivery.NetworkStatus
 import io.embrace.android.embracesdk.internal.logging.InternalLoggerImpl
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
@@ -41,9 +40,6 @@ internal class NetworkCallbackConnectivityServiceTest {
     private lateinit var receivedConnectivityStatuses: MutableList<ConnectivityStatus>
 
     private val networkConnectivityListener = object : NetworkConnectivityListener {
-        override fun onNetworkConnectivityStatusChanged(status: NetworkStatus) {
-        }
-
         override fun onNetworkConnectivityStatusChanged(status: ConnectivityStatus) {
             receivedConnectivityStatuses.add(status)
         }
@@ -249,22 +245,6 @@ internal class NetworkCallbackConnectivityServiceTest {
         assertFalse(shadowConnectivityManager.networkCallbacks.contains(service))
     }
 
-    @Test
-    fun `legacy listener receives bridged NetworkStatus via default overload`() {
-        val receivedStatuses = mutableListOf<NetworkStatus>()
-        val legacyListener = object : NetworkConnectivityListener {
-            override fun onNetworkConnectivityStatusChanged(status: NetworkStatus) {
-                receivedStatuses.add(status)
-            }
-        }
-        service.register()
-        service.addNetworkConnectivityListener(legacyListener)
-        val newNetwork = setActiveNetwork(connectedWifi)
-        service.onAvailable(newNetwork)
-        service.onCapabilitiesChanged(newNetwork, connectedWifi.getNetworkCapabilities())
-        assertEquals(listOf(NetworkStatus.UNKNOWN, NetworkStatus.WIFI), receivedStatuses)
-    }
-
     private fun initWithNetwork(network: NetworkInfo): Network {
         val newNetwork = setActiveNetwork(network)
         initService()

embrace-android-delivery-fakes/src/main/kotlin/io/embrace/android/embracesdk/fakes/FakeSchedulingService.kt

@@ -1,6 +1,6 @@
 package io.embrace.android.embracesdk.fakes
 
-import io.embrace.android.embracesdk.internal.comms.delivery.NetworkStatus
+import io.embrace.android.embracesdk.internal.capture.connectivity.ConnectivityStatus
 import io.embrace.android.embracesdk.internal.delivery.scheduling.SchedulingService
 
 class FakeSchedulingService : SchedulingService {
@@ -21,6 +21,6 @@ class FakeSchedulingService : SchedulingService {
         resurrectionCompleteCount++
     }
 
-    override fun onNetworkConnectivityStatusChanged(status: NetworkStatus) {
+    override fun onNetworkConnectivityStatusChanged(status: ConnectivityStatus) {
     }
 }

embrace-android-delivery/src/main/kotlin/io/embrace/android/embracesdk/internal/delivery/scheduling/SchedulingServiceImpl.kt

@@ -1,8 +1,8 @@
 package io.embrace.android.embracesdk.internal.delivery.scheduling
 
+import io.embrace.android.embracesdk.internal.capture.connectivity.ConnectivityStatus
 import io.embrace.android.embracesdk.internal.clock.Clock
 import io.embrace.android.embracesdk.internal.comms.api.Endpoint
-import io.embrace.android.embracesdk.internal.comms.delivery.NetworkStatus
 import io.embrace.android.embracesdk.internal.delivery.StoredTelemetryMetadata
 import io.embrace.android.embracesdk.internal.delivery.SupportedEnvelopeType
 import io.embrace.android.embracesdk.internal.delivery.debug.DeliveryTracer
@@ -74,11 +74,11 @@ class SchedulingServiceImpl(
         deliveryWorker.shutdownAndWait(0)
     }
 
-    override fun onNetworkConnectivityStatusChanged(status: NetworkStatus) {
-        val networkAcquired = connectionStatus.updateNetworkStatus(status.isReachable)
-        // Schedule an unblock of the connection and schedule a delivery if we have recently connected
-        // to a potentially connected network OR if the connection was previously blocked
-        if (networkAcquired || connectionStatus.isBlocked()) {
+    override fun onNetworkConnectivityStatusChanged(status: ConnectivityStatus) {
+        val networkAcquired = connectionStatus.updateConnectivityStatus(status.isConnected)
+        // Schedule a delivery attempt if we got confirmation the current connection is connected to the internet
+        // OR if the connection is currently blocked and the new connectivity status indicates that we are connected to the internet
+        if (networkAcquired || (connectionStatus.isBlocked() && status.isConnected)) {
             schedulingWorker.submit {
                 connectionStatus.unblock()
                 queueDeliveryAttempt()
@@ -331,7 +331,7 @@ class SchedulingServiceImpl(
          *
          * Called on main thread
          */
-        fun updateNetworkStatus(newStatus: Boolean): Boolean =
+        fun updateConnectivityStatus(newStatus: Boolean): Boolean =
             if (!hasNetworkConnection.getAndSet(newStatus)) {
                 newStatus
             } else {