diff options
Diffstat (limited to 'android')
4 files changed, 6 insertions, 14 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/WireguardTunnelOptions.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/WireguardTunnelOptions.kt index 251571021a..85a5ebc894 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/WireguardTunnelOptions.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/WireguardTunnelOptions.kt @@ -2,7 +2,9 @@ package net.mullvad.mullvadvpn.model import android.os.Parcelable import kotlinx.parcelize.Parcelize -import net.mullvad.talpid.net.wireguard.TunnelOptions as TalpidWireguardTunnelOptions @Parcelize -data class WireguardTunnelOptions(val options: TalpidWireguardTunnelOptions) : Parcelable +data class WireguardTunnelOptions( + val mtu: Int?, + val quantumResistant: Boolean? +) : Parcelable diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt index 011e9fdc15..10a4f2b5d7 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt @@ -229,7 +229,7 @@ class AdvancedFragment : BaseFragment() { private fun updateUi(settings: Settings) { if (this::wireguardMtuInput.isInitialized && wireguardMtuInput.hasFocus == false) { - wireguardMtuInput.value = settings.tunnelOptions.wireguard.options.mtu + wireguardMtuInput.value = settings.tunnelOptions.wireguard.mtu } } diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/SettingsListener.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/SettingsListener.kt index a1464a7745..1cb1cf2986 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/SettingsListener.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/SettingsListener.kt @@ -29,7 +29,7 @@ class SettingsListener(private val connection: Messenger, eventDispatcher: Event } var wireguardMtu: Int? - get() = settingsNotifier.latestEvent?.tunnelOptions?.wireguard?.options?.mtu + get() = settingsNotifier.latestEvent?.tunnelOptions?.wireguard?.mtu set(value) { connection.send(Request.SetWireGuardMtu(value).message) } diff --git a/android/app/src/main/kotlin/net/mullvad/talpid/net/wireguard/TunnelOptions.kt b/android/app/src/main/kotlin/net/mullvad/talpid/net/wireguard/TunnelOptions.kt deleted file mode 100644 index 79e8ce544c..0000000000 --- a/android/app/src/main/kotlin/net/mullvad/talpid/net/wireguard/TunnelOptions.kt +++ /dev/null @@ -1,10 +0,0 @@ -package net.mullvad.talpid.net.wireguard - -import android.os.Parcelable -import kotlinx.parcelize.Parcelize - -@Parcelize -data class TunnelOptions( - val mtu: Int?, - val usePqSafePsk: Boolean -) : Parcelable |