diff options
| author | David Lönnhager <david.l@mullvad.net> | 2023-02-21 11:07:22 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2023-02-21 11:07:22 +0100 |
| commit | 00aeed11ab5870158622108c7ac17a3a10a60d3a (patch) | |
| tree | b8c33f1957400bb4cc6429cfd91165018ada6237 /android | |
| parent | a83211930c6473776d2e838e357cc5583000aa9f (diff) | |
| parent | ec8a7e1e729d9e25f363c3a7394acd39ddb36f42 (diff) | |
| download | mullvadvpn-00aeed11ab5870158622108c7ac17a3a10a60d3a.tar.xz mullvadvpn-00aeed11ab5870158622108c7ac17a3a10a60d3a.zip | |
Merge branch 'make-pq-optional'
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 |