summaryrefslogtreecommitdiffhomepage
path: root/android/lib
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2024-11-19 18:17:06 +0100
committerDavid Lönnhager <david.l@mullvad.net>2024-11-22 13:38:22 +0100
commit168c9afb19e9bec61b40ecfb5ab12ed7983f35e0 (patch)
treeee9dfd5c1fa6b515cf97acd5b2d03bb61de50e56 /android/lib
parentf4db85b3a552f60d2454bfa69912c7ced51b41b1 (diff)
downloadmullvadvpn-168c9afb19e9bec61b40ecfb5ab12ed7983f35e0.tar.xz
mullvadvpn-168c9afb19e9bec61b40ecfb5ab12ed7983f35e0.zip
Simplify ConnectivityListener
Diffstat (limited to 'android/lib')
-rw-r--r--android/lib/talpid/src/main/kotlin/net/mullvad/talpid/ConnectivityListener.kt13
1 files changed, 5 insertions, 8 deletions
diff --git a/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/ConnectivityListener.kt b/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/ConnectivityListener.kt
index c2f0aef20f..f1fe3ca807 100644
--- a/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/ConnectivityListener.kt
+++ b/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/ConnectivityListener.kt
@@ -75,15 +75,12 @@ class ConnectivityListener {
fun unregister() {
connectivityManager.unregisterNetworkCallback(callback)
connectivityManager.unregisterNetworkCallback(defaultNetworkCallback)
- }
- // DROID-1401
- // This function has never been used and should most likely be merged into unregister(),
- // along with ensuring that the lifecycle of it is correct.
- @Suppress("UnusedPrivateMember")
- private fun finalize() {
- destroySender(senderAddress)
- senderAddress = 0L
+ if (senderAddress != 0L) {
+ var oldSender = senderAddress
+ senderAddress = 0L
+ destroySender(oldSender)
+ }
}
private external fun notifyConnectivityChange(isConnected: Boolean, senderAddress: Long)