summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-09-10 18:29:58 -0300
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-09-10 18:29:58 -0300
commit2586a6f063d16c365fa785f451d2e6031438b98a (patch)
tree11dc640ac574e6a661b132aa59f723b9b4ef18d0
parente9c32c276eb68a6a1ea65214367600f5a47a1418 (diff)
parentb70a185d5de4e5aa05b2210fca5b91a1684da37e (diff)
downloadmullvadvpn-2586a6f063d16c365fa785f451d2e6031438b98a.tar.xz
mullvadvpn-2586a6f063d16c365fa785f451d2e6031438b98a.zip
Merge branch 'mark-vpn-connection-as-unmetered'
-rw-r--r--CHANGELOG.md2
-rw-r--r--android/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt1
2 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a527310da8..087c993271 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,6 +47,8 @@ Line wrap the file at 100 chars. Th
- Fix app reopening after pressing the Quit button because app was running multiple tasks.
- Fix inconsistent behavior of the quick-settings tile when logged out. It would sometimes enter the
blocking state and sometimes open the UI for the user to login. Now it always opens the UI.
+- Mark the VPN connection as not metered, so that Android properly reports if the connection is or
+ isn't metered based solely on the underlying network, and not on the VPN connection.
#### Linux
- Fix split tunneling rules preventing `systemd-resolved` from performing DNS lookups for excluded
diff --git a/android/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt b/android/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
index 3ad9809928..921e61dd2f 100644
--- a/android/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
+++ b/android/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
@@ -109,6 +109,7 @@ open class TalpidVpnService : VpnService() {
}
setMtu(config.mtu)
+ setMetered(false)
setBlocking(false)
}