move network listener to plugin and rename to offline

amplitude · Jan 9, 2024 · 9c5702f · 9c5702f
1 parent ea4753e
commit 9c5702f
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 22 deletions.
diff --git a/android/src/main/java/com/amplitude/android/Amplitude.kt b/android/src/main/java/com/amplitude/android/Amplitude.kt
@@ -1,6 +1,5 @@
 package com.amplitude.android
 
-import AndroidNetworkListener
 import android.content.Context
 import com.amplitude.android.migration.ApiKeyStorageMigration
 import com.amplitude.android.migration.RemnantDataMigration
@@ -23,18 +22,6 @@ open class Amplitude(
 
     internal var inForeground = false
     private lateinit var androidContextPlugin: AndroidContextPlugin
-    private var networkListener: AndroidNetworkListener
-    private val networkChangeHandler =
-        object : AndroidNetworkListener.NetworkChangeCallback {
-            override fun onNetworkAvailable() {
-                configuration.isNetworkConnected = true
-                flush()
-            }
-
-            override fun onNetworkUnavailable() {
-                configuration.isNetworkConnected = false
-            }
-        }
 
     val sessionId: Long
         get() {
@@ -43,9 +30,6 @@ open class Amplitude(
 
     init {
         registerShutdownHook()
-        networkListener = AndroidNetworkListener((this.configuration as Configuration).context)
-        networkListener.setNetworkChangeCallback(networkChangeHandler)
-        networkListener.startListening()
     }
 
     override fun createTimeline(): Timeline {
@@ -134,7 +118,6 @@ open class Amplitude(
         Runtime.getRuntime().addShutdownHook(object : Thread() {
             override fun run() {
                 (this@Amplitude.timeline as Timeline).stop()
-                this@Amplitude.networkListener.stopListening()
             }
         })
     }

diff --git a/...id/src/main/java/com/amplitude/android/plugins/AndroidNetworkConnectivityCheckerPlugin.kt b/...id/src/main/java/com/amplitude/android/plugins/AndroidNetworkConnectivityCheckerPlugin.kt
@@ -1,5 +1,6 @@
 package com.amplitude.android.plugins
 
+import AndroidNetworkListener
 import com.amplitude.android.Configuration
 import com.amplitude.android.utilities.AndroidNetworkConnectivityChecker
 import com.amplitude.core.Amplitude
@@ -11,15 +12,32 @@ class AndroidNetworkConnectivityCheckerPlugin : Plugin {
     override val type: Plugin.Type = Plugin.Type.Before
     override lateinit var amplitude: Amplitude
     private lateinit var networkConnectivityChecker: AndroidNetworkConnectivityChecker
+    private lateinit var networkListener: AndroidNetworkListener
+    private val networkChangeHandler =
+        object : AndroidNetworkListener.NetworkChangeCallback {
+            override fun onNetworkAvailable() {
+                println("AndroidNetworkListener, onNetworkAvailable")
+                amplitude.configuration.offline = false
+                amplitude.flush()
+            }
+
+            override fun onNetworkUnavailable() {
+                println("AndroidNetworkListener, onNetworkUnavailable")
+                amplitude.configuration.offline = true
+            }
+        }
 
     override fun setup(amplitude: Amplitude) {
         super.setup(amplitude)
         networkConnectivityChecker = AndroidNetworkConnectivityChecker((amplitude.configuration as Configuration).context, amplitude.logger)
+        networkListener = AndroidNetworkListener((amplitude.configuration as Configuration).context)
+        networkListener.setNetworkChangeCallback(networkChangeHandler)
+        networkListener.startListening()
     }
 
     override fun execute(event: BaseEvent): BaseEvent? {
         amplitude.amplitudeScope.launch(amplitude.storageIODispatcher) {
-            amplitude.configuration.isNetworkConnected = networkConnectivityChecker.isConnected()
+            amplitude.configuration.offline = !networkConnectivityChecker.isConnected()
         }
         return super.execute(event)
     }

diff --git a/core/src/main/java/com/amplitude/core/Configuration.kt b/core/src/main/java/com/amplitude/core/Configuration.kt
@@ -32,7 +32,7 @@ open class Configuration @JvmOverloads constructor(
     open var identityStorageProvider: IdentityStorageProvider = IMIdentityStorageProvider(),
 ) {
 
-    var isNetworkConnected: Boolean = true
+    var offline: Boolean = false
 
     companion object {
         const val FLUSH_QUEUE_SIZE = 30

diff --git a/core/src/main/java/com/amplitude/core/platform/EventPipeline.kt b/core/src/main/java/com/amplitude/core/platform/EventPipeline.kt
@@ -100,7 +100,7 @@ class EventPipeline(
             }
 
             // Skip flush when offline
-            if (!amplitude.configuration.isNetworkConnected) {
+            if (amplitude.configuration.offline) {
                 continue
             }
 

diff --git a/core/src/test/kotlin/com/amplitude/core/platform/EventPipelineTest.kt b/core/src/test/kotlin/com/amplitude/core/platform/EventPipelineTest.kt
@@ -43,7 +43,7 @@ class EventPipelineTest {
     fun `should not flush when put and offline`() =
         runTest(testDispatcher) {
             amplitude.isBuilt.await()
-            amplitude.configuration.isNetworkConnected = false
+            amplitude.configuration.offline = true
             val eventPipeline = spyk(EventPipeline(amplitude))
             val event = BaseEvent().apply { eventType = "test_event" }
 
@@ -58,7 +58,7 @@ class EventPipelineTest {
     fun `should flush when put and online`() =
         runTest(testDispatcher) {
             amplitude.isBuilt.await()
-            amplitude.configuration.isNetworkConnected = true
+            amplitude.configuration.offline = false
             val eventPipeline = spyk(EventPipeline(amplitude))
             val event = BaseEvent().apply { eventType = "test_event" }