diff options
| author | David Göransson <david.goransson@mullvad.net> | 2024-03-21 10:05:30 +0100 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2024-03-21 10:05:30 +0100 |
| commit | 7c0baef67673bafd8195ae192e6ac90a63afb98f (patch) | |
| tree | 5797b6a3db6e7de62078518de886f2a14e2dc34f /android | |
| parent | ab1424d3e9a4deaae190022a7bce282ca4733bb3 (diff) | |
| parent | a69b26131baa0b92370431dd31b29628105e8806 (diff) | |
| download | mullvadvpn-7c0baef67673bafd8195ae192e6ac90a63afb98f.tar.xz mullvadvpn-7c0baef67673bafd8195ae192e6ac90a63afb98f.zip | |
Merge branch 'reset-to-default-inconsistency-droid-764'
Diffstat (limited to 'android')
| -rw-r--r-- | android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/MtuDialogTest.kt | 1 | ||||
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/MtuDialog.kt | 13 |
2 files changed, 9 insertions, 5 deletions
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/MtuDialogTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/MtuDialogTest.kt index 26babe9245..0641998f9b 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/MtuDialogTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/MtuDialogTest.kt @@ -125,6 +125,7 @@ class MtuDialogTest { val mockedClickHandler: () -> Unit = mockk(relaxed = true) setContentWithTheme { testMtuDialog( + mtuInitial = VALID_DUMMY_MTU_VALUE, onResetMtu = mockedClickHandler, ) } diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/MtuDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/MtuDialog.kt index e4a790fdb4..4644a1aa95 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/MtuDialog.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/MtuDialog.kt @@ -18,6 +18,7 @@ import com.ramcosta.composedestinations.navigation.DestinationsNavigator import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator import com.ramcosta.composedestinations.spec.DestinationStyle import net.mullvad.mullvadvpn.R +import net.mullvad.mullvadvpn.compose.button.NegativeButton import net.mullvad.mullvadvpn.compose.button.PrimaryButton import net.mullvad.mullvadvpn.compose.textfield.MtuTextField import net.mullvad.mullvadvpn.compose.util.LaunchedEffectCollect @@ -119,11 +120,13 @@ fun MtuDialog( } ) - PrimaryButton( - modifier = Modifier.fillMaxWidth(), - text = stringResource(R.string.reset_to_default_button), - onClick = onResetMtu - ) + if (mtuInitial != null) { + NegativeButton( + modifier = Modifier.fillMaxWidth(), + text = stringResource(R.string.reset_to_default_button), + onClick = onResetMtu + ) + } PrimaryButton( modifier = Modifier.fillMaxWidth(), |