diff options
| author | Aleksandr Granin <aleksandr@mullvad.net> | 2021-08-19 08:38:15 +0200 |
|---|---|---|
| committer | Aleksandr Granin <aleksandr@mullvad.net> | 2021-08-19 08:38:15 +0200 |
| commit | 10f11292e778c3700ac301b08a02ad9e29957166 (patch) | |
| tree | f71ea8fc222fa64b88e73dd79fae846499700237 | |
| parent | 107b4f3e1099e4fb601bbd23a44273d866152a5b (diff) | |
| parent | 58a53cc426850b0e498b6ec04b0aadc1c9b266c0 (diff) | |
| download | mullvadvpn-10f11292e778c3700ac301b08a02ad9e29957166.tar.xz mullvadvpn-10f11292e778c3700ac301b08a02ad9e29957166.zip | |
Merge branch 'Fix-wireguard-mtu-erase-value-bug'
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/MtuCell.kt | 4 | ||||
| -rw-r--r-- | android/src/main/res/layout/advanced_header.xml | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 036e26c16e..16c1fd48bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -67,6 +67,8 @@ Line wrap the file at 100 chars. Th paths were excluded. - Fix daemon not starting when a path is excluded on a drive that has since been removed. +#### Android +- Fix erasing wireguard MTU value in some scenarious. ## [2021.4] - 2021-06-30 This release is for desktop only. diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/MtuCell.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/MtuCell.kt index 5c2e97bf20..93daba0856 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/MtuCell.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/MtuCell.kt @@ -35,10 +35,10 @@ class MtuCell : Cell { var onSubmit: ((Int?) -> Unit)? = null var hasFocus by observable(false) { _, oldValue, newValue -> - if (oldValue == true && newValue == false) { + if (oldValue && !newValue) { val mtu = value - if (mtu == null || (mtu >= MIN_MTU_VALUE && mtu <= MAX_MTU_VALUE)) { + if (mtu == null || (mtu in MIN_MTU_VALUE..MAX_MTU_VALUE)) { onSubmit?.invoke(mtu) } } diff --git a/android/src/main/res/layout/advanced_header.xml b/android/src/main/res/layout/advanced_header.xml index 3a711d838c..eb04259b3d 100644 --- a/android/src/main/res/layout/advanced_header.xml +++ b/android/src/main/res/layout/advanced_header.xml @@ -16,6 +16,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/vertical_space" + android:focusable="true" + android:focusableInTouchMode="true" mullvad:text="@string/wireguard_mtu" /> <net.mullvad.mullvadvpn.ui.widget.NavigateCell android:id="@+id/wireguard_keys" android:layout_width="match_parent" |