fix: prevent lateinit property exception

embrace-io · Jun 17, 2024 · 2c66dc1 · 2c66dc1
1 parent 6f71413
commit 2c66dc1
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 6 deletions.
diff --git a/...a/io/embrace/android/embracesdk/capture/connectivity/EmbraceNetworkConnectivityService.kt b/...a/io/embrace/android/embracesdk/capture/connectivity/EmbraceNetworkConnectivityService.kt
@@ -30,10 +30,6 @@ internal class EmbraceNetworkConnectivityService(
     private val networkConnectivityListeners = mutableListOf<NetworkConnectivityListener>()
     override val ipAddress by lazy { calculateIpAddress() }
 
-    init {
-        registerConnectivityActionReceiver()
-    }
-
     override fun onReceive(context: Context, intent: Intent) = handleNetworkStatus(true)
 
     override fun networkStatusOnSessionStarted(startTime: Long) = handleNetworkStatus(false, startTime)
@@ -94,7 +90,7 @@ internal class EmbraceNetworkConnectivityService(
     private fun didNetworkStatusChange(newNetworkStatus: NetworkStatus) =
         lastNetworkStatus == null || lastNetworkStatus != newNetworkStatus
 
-    private fun registerConnectivityActionReceiver() {
+    override fun register() {
         backgroundWorker.submit {
             try {
                 context.registerReceiver(this, intentFilter)

diff --git a/...ain/java/io/embrace/android/embracesdk/capture/connectivity/NetworkConnectivityService.kt b/...ain/java/io/embrace/android/embracesdk/capture/connectivity/NetworkConnectivityService.kt
@@ -35,4 +35,9 @@ internal interface NetworkConnectivityService : Closeable {
      * Calculate the device's IP address
      */
     val ipAddress: String?
+
+    /**
+     * Start listening for network connectivity changes
+     */
+    fun register()
 }
diff --git a/...java/io/embrace/android/embracesdk/capture/connectivity/NoOpNetworkConnectivityService.kt b/...java/io/embrace/android/embracesdk/capture/connectivity/NoOpNetworkConnectivityService.kt
@@ -15,5 +15,7 @@ internal class NoOpNetworkConnectivityService : NetworkConnectivityService {
         return NetworkStatus.UNKNOWN
     }
 
+    override fun register() {}
+
     override val ipAddress: String? = null
 }
diff --git a/...droid-sdk/src/main/java/io/embrace/android/embracesdk/injection/ModuleInitBootstrapper.kt b/...droid-sdk/src/main/java/io/embrace/android/embracesdk/injection/ModuleInitBootstrapper.kt
@@ -226,6 +226,9 @@ internal class ModuleInitBootstrapper(
                             anrModule
                         )
                     }
+                    Systrace.traceSynchronous("network-connectivity-registration") {
+                        essentialServiceModule.networkConnectivityService.register()
+                    }
                     initModule.internalErrorService.internalErrorDataSource = { dataSourceModule.internalErrorDataSource.dataSource }
 
                     dataCaptureServiceModule = init(DataCaptureServiceModule::class) {

diff --git a/...-sdk/src/test/java/io/embrace/android/embracesdk/EmbraceNetworkConnectivityServiceTest.kt b/...-sdk/src/test/java/io/embrace/android/embracesdk/EmbraceNetworkConnectivityServiceTest.kt
@@ -91,6 +91,7 @@ internal class EmbraceNetworkConnectivityServiceTest {
     @Test
     @Throws(InterruptedException::class)
     fun `test connectivity broadcast receiver can register and unregister`() {
+        service.register()
         verify { context.registerReceiver(service, any()) }
         service.close()
         verify { context.unregisterReceiver(service) }

diff --git a/...d-sdk/src/test/java/io/embrace/android/embracesdk/fakes/FakeNetworkConnectivityService.kt b/...d-sdk/src/test/java/io/embrace/android/embracesdk/fakes/FakeNetworkConnectivityService.kt
@@ -17,7 +17,7 @@ internal class FakeNetworkConnectivityService(
             notifyListeners()
         }
 
-    public var networkStatusOnSessionStartedCount = 0
+    var networkStatusOnSessionStartedCount = 0
 
     override fun networkStatusOnSessionStarted(startTime: Long) {
         notifyListeners()
@@ -37,6 +37,9 @@ internal class FakeNetworkConnectivityService(
     override fun close() {
     }
 
+    override fun register() {
+    }
+
     private fun notifyListeners() {
         networkConnectivityListeners.forEach {
             it.onNetworkConnectivityStatusChanged(networkStatus)