github-personal/firezone
1
0
Fork 0
mirror of https://github.com/outbackdingo/firezone.git synced 2026-01-27 18:18:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(android): apply pr feedback from #6605 (#6608)

Browse Source 
Co-authored-by: Jamil <jamilbk@users.noreply.github.com>
This commit is contained in:
Gabi
2024-09-13 11:25:49 -07:00
committed by GitHub
parent a9ed20ce09
commit ebfae06c6b
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kotlin/android/app/src/main/java/dev/firezone/android/tunnel/DisconnectMonitor.kt
View File

@@ -22,8 +22,6 @@ class DisconnectMonitor(private val tunnelService: TunnelService) : Connectivity
network: Network,
linkProperties: LinkProperties,
) {
Log.d("DisconnectMonitor", "properties: $linkProperties")
super.onLinkPropertiesChanged(network, linkProperties)
if (tunnelService.tunnelIpv4Address.isNullOrBlank() || tunnelService.tunnelIpv6Address.isNullOrBlank()) {
@@ -46,12 +44,11 @@ class DisconnectMonitor(private val tunnelService: TunnelService) : Connectivity
if (network == vpnNetwork) {
Log.d("DisconnectMonitor", "Scheduling a session disconnect for $network")
// We delay the execution of disconnecting the tunnel when the network is lost since
// when the tunnel is rebuild we get an onLost just like with disabling the VPN and we
// can't distinguish between those save for getting an onLinkProperties changed later
// We can't easily tell the difference between a user disconnecting the VPN from
// system settings, and the system "disconnecting" our VPN due to the fd being swapped out during buildVpnService. Both call onLost with the VPN network ID.
// If we're rebuilding the VPN, however, we'll expect an onLinkPropertiesChanged to happen soon after onLost, so delay the tunnel disconnect here and clear the scheduled disconnect if we "resume" the VPN within a couple seconds.
sessionStopperHandle.postDelayed(
{
Log.d("DisconnectMonitor", "Disconnect tunnel service due to network lost $network")
tunnelService.disconnect()
},
2000,