tests

amplitude · Dec 29, 2023 · 51bdfa5 · 51bdfa5
1 parent 2c29fff
commit 51bdfa5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/android/src/main/java/com/amplitude/android/Amplitude.kt b/android/src/main/java/com/amplitude/android/Amplitude.kt
@@ -136,7 +136,7 @@ open class Amplitude(
             object : Thread() {
                 override fun run() {
                     (this@Amplitude.timeline as Timeline).stop()
-                    networkListener.stopListening()
+                    (this@Amplitude.networkListener as AndroidNetworkListener).stopListening()
                 }
             },
         )

diff --git a/android/src/main/java/com/amplitude/android/utilities/AndroidNetworkListener.kt b/android/src/main/java/com/amplitude/android/utilities/AndroidNetworkListener.kt
@@ -8,6 +8,7 @@ import android.net.Network
 import android.net.NetworkCapabilities
 import android.net.NetworkRequest
 import android.os.Build
+import java.lang.IllegalArgumentException
 
 class AndroidNetworkListener(private val context: Context) {
     private var networkCallback: NetworkChangeCallback? = null
@@ -80,11 +81,17 @@ class AndroidNetworkListener(private val context: Context) {
     }
 
     fun stopListening() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-            networkCallbackForHigherApiLevels?.let { connectivityManager.unregisterNetworkCallback(it) }
-        } else {
-            networkCallbackForLowerApiLevels?.let { context.unregisterReceiver(it) }
+        try {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+                networkCallbackForHigherApiLevels?.let { connectivityManager.unregisterNetworkCallback(it) }
+            } else {
+                networkCallbackForLowerApiLevels?.let { context.unregisterReceiver(it) }
+            }
+        } catch (e: IllegalArgumentException) {
+            // callback was already unregistered.
+        } catch (e: IllegalStateException) {
+            // shutdown process is in progress and certain operations are not allowed.
         }
     }
 }