don't panic on disconnect race-condition

firezone · Mar 20, 2024 · 0ce223b · 0ce223b
1 parent 53ea466
commit 0ce223b
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/kotlin/android/app/src/main/java/dev/firezone/android/tunnel/TunnelService.kt b/kotlin/android/app/src/main/java/dev/firezone/android/tunnel/TunnelService.kt
@@ -193,7 +193,7 @@ class TunnelService : VpnService() {
         Log.d(TAG, "disconnect")
 
         // Connlib should call onDisconnect() when it's done, with no error.
-        connlibSessionPtr!!.let {
+        connlibSessionPtr?.let {
             ConnlibSession.disconnect(it)
         }
 
@@ -247,11 +247,13 @@ class TunnelService : VpnService() {
     }
 
     private fun stopNetworkMonitoring() {
-        val connectivityManager =
-            getSystemService(ConnectivityManager::class.java) as ConnectivityManager
-        connectivityManager.unregisterNetworkCallback(networkCallback!!)
+        networkCallback?.let {
+            val connectivityManager =
+                getSystemService(ConnectivityManager::class.java) as ConnectivityManager
+            connectivityManager.unregisterNetworkCallback(it)
 
-        networkCallback = null
+            networkCallback = null
+        }
     }
 
     fun setServiceStateLiveData(liveData: MutableLiveData<State>) {