Skip to content

Fix AppTP unregister crash #9114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joshliebe wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix AppTP unregister crash #9114

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ...ion/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/service/DnsChangeCallback.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ class DnsChangeCallback @Inject constructor(
context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager?
}
private var lastDns: List<InetAddress>? = null
private var registered: Boolean = false

override fun onLinkPropertiesChanged(network: Network, linkProperties: LinkProperties) {
logcat { "onLinkPropertiesChanged: $linkProperties" }
Expand All @@ -68,22 +69,27 @@ class DnsChangeCallback @Inject constructor(
}

internal fun register() {
if (registered) return
kotlin.runCatching {
val request = NetworkRequest.Builder().apply {
addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)
addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
}.build()
connectivityManager?.registerNetworkCallback(request, this)
registered = true
}.onFailure {
logcat(ERROR) { it.asLog() }
}
}

internal fun unregister() {
if (!registered) return
kotlin.runCatching {
connectivityManager?.unregisterNetworkCallback(this)
}.onFailure {
logcat(ERROR) { it.asLog() }
}.also {
registered = false
}
}

Expand Down
Loading