[EMBR-631] Remove condition that inits EmbraceNetworkConnectivityServ…

…ice depending on a local config.

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/capture/connectivity/EmbraceNetworkConnectivityService.kt

@@ -23,7 +23,8 @@ internal class EmbraceNetworkConnectivityService(
  private val clock: Clock,
  private val registrationExecutorService: ExecutorService,
  private val logger: InternalEmbraceLogger,
- private val connectivityManager: ConnectivityManager?
+ private val connectivityManager: ConnectivityManager?,
+ private val isNetworkCaptureEnabled: Boolean
 ) : BroadcastReceiver(), NetworkConnectivityService {
 
  private val intentFilter = IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION)
@@ -56,8 +57,10 @@ internal class EmbraceNetworkConnectivityService(
  try {
  logger.logDeveloper("EmbraceNetworkConnectivityService", "handleNetworkStatus")
  val networkStatus = getCurrentNetworkStatus()
- val savedStatus = saveStatus(timestamp, networkStatus)
- if (savedStatus && notifyListeners) {
+ if (isNetworkCaptureEnabled) {
+ saveStatus(timestamp, networkStatus)
+ }
+ if (notifyListeners) {
  logger.logInfo("Network status changed to: " + networkStatus.name)
  notifyNetworkConnectivityListeners(networkStatus)
  }
@@ -109,14 +112,12 @@ internal class EmbraceNetworkConnectivityService(
  return networkStatus
  }
 
- private fun saveStatus(timestamp: Long, networkStatus: NetworkStatus): Boolean {
+ private fun saveStatus(timestamp: Long, networkStatus: NetworkStatus) {
  synchronized(this) {
  if (networkReachable.isEmpty() || networkReachable.lastEntry()?.value != networkStatus) {
  networkReachable[timestamp] = networkStatus
- return true
  }
  }
- return false
  }
 
  private fun registerConnectivityActionReceiver() {

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/injection/EssentialServiceModule.kt

@@ -2,7 +2,6 @@ package io.embrace.android.embracesdk.injection
 
 import io.embrace.android.embracesdk.capture.connectivity.EmbraceNetworkConnectivityService
 import io.embrace.android.embracesdk.capture.connectivity.NetworkConnectivityService
-import io.embrace.android.embracesdk.capture.connectivity.NoOpNetworkConnectivityService
 import io.embrace.android.embracesdk.capture.cpu.CpuInfoDelegate
 import io.embrace.android.embracesdk.capture.cpu.EmbraceCpuInfoDelegate
 import io.embrace.android.embracesdk.capture.metadata.EmbraceMetadataService
@@ -198,17 +197,14 @@ internal class EssentialServiceModuleImpl(
  localSupplier = { localConfig },
  remoteSupplier = { null }
  )
- if (autoDataCaptureBehavior.isNetworkConnectivityServiceEnabled()) {
- EmbraceNetworkConnectivityService(
- coreModule.context,
- initModule.clock,
- backgroundExecutorService,
- coreModule.logger,
- systemServiceModule.connectivityManager
- )
- } else {
- NoOpNetworkConnectivityService()
- }
+ EmbraceNetworkConnectivityService(
+ coreModule.context,
+ initModule.clock,
+ backgroundExecutorService,
+ coreModule.logger,
+ systemServiceModule.connectivityManager,
+ autoDataCaptureBehavior.isNetworkConnectivityServiceEnabled()
+ )
  }
 
  override val cacheService: CacheService by singleton {

embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/EmbraceNetworkConnectivityServiceTest.kt

@@ -73,7 +73,8 @@ internal class EmbraceNetworkConnectivityServiceTest {
  fakeClock,
  executor,
  logger,
- mockConnectivityManager
+ mockConnectivityManager,
+ true
  )
  }
 
@@ -99,11 +100,9 @@ internal class EmbraceNetworkConnectivityServiceTest {
  @Test
  fun `test onReceive with no connection creates an interval`() {
  val mockIntent = mockk<Intent>()
- val startTime = fakeClock.now()
  every { mockConnectivityManager.activeNetworkInfo?.isConnected } returns false
  service.onReceive(mockContext, mockIntent)
  fakeClock.tick(2000)
- val endTime = fakeClock.now()
  val intervals = service.getCapturedData()
 
  assertEquals(1, intervals.size)
@@ -164,7 +163,6 @@ internal class EmbraceNetworkConnectivityServiceTest {
  fun `test cleanCollections and getCapturedData returns no intervals`() {
  val startTime = fakeClock.now()
  fakeClock.tick(2000)
- val endTime = fakeClock.now()
  every { mockConnectivityManager.activeNetworkInfo?.isConnected } returns false
 
  service.networkStatusOnSessionStarted(startTime)