diff options
| author | David Lönnhager <david.l@mullvad.net> | 2021-03-18 11:12:48 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2021-03-18 11:12:48 +0100 |
| commit | 35c5e29341c15f70e358b54c0e536255edaa654e (patch) | |
| tree | 8b7171adbceb1e08d43ac84d62f7a45763927a8c /android/src | |
| parent | d3502c1f820f2fe5093b06405ac3a1309e304187 (diff) | |
| parent | f9c8da56193b11b4034f7cdf77507661a16c95b2 (diff) | |
| download | mullvadvpn-35c5e29341c15f70e358b54c0e536255edaa654e.tar.xz mullvadvpn-35c5e29341c15f70e358b54c0e536255edaa654e.zip | |
Merge branch 'refactor-rotation-interval'
Diffstat (limited to 'android/src')
3 files changed, 6 insertions, 3 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelOptions.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelOptions.kt index 7e3bdef2b3..1a960e1396 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelOptions.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelOptions.kt @@ -1,5 +1,3 @@ package net.mullvad.mullvadvpn.model -import net.mullvad.talpid.net.wireguard.TunnelOptions as WireguardTunnelOptions - data class TunnelOptions(val wireguard: WireguardTunnelOptions, val dnsOptions: DnsOptions) diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/WireguardTunnelOptions.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/WireguardTunnelOptions.kt new file mode 100644 index 0000000000..f9b7b314d5 --- /dev/null +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/WireguardTunnelOptions.kt @@ -0,0 +1,5 @@ +package net.mullvad.mullvadvpn.model + +import net.mullvad.talpid.net.wireguard.TunnelOptions as TalpidWireguardTunnelOptions + +data class WireguardTunnelOptions(val options: TalpidWireguardTunnelOptions) diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt index 4f4210be70..8e241ace49 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt @@ -118,7 +118,7 @@ class AdvancedFragment : ServiceDependentFragment(OnNoService.GoBack) { private fun updateUi(settings: Settings) { jobTracker.newUiJob("updateUi") { if (!wireguardMtuInput.hasFocus) { - wireguardMtuInput.value = settings.tunnelOptions.wireguard.mtu + wireguardMtuInput.value = settings.tunnelOptions.wireguard.options.mtu } } } |