diff options
| author | Markus Pettersson <markus.pettersson@mullvad.net> | 2025-06-05 16:24:39 +0200 |
|---|---|---|
| committer | Markus Pettersson <markus.pettersson@mullvad.net> | 2025-06-05 16:24:39 +0200 |
| commit | 3880b3bd4ec82699e9fca7fd9f22636ced31779d (patch) | |
| tree | a3719f7afc5b9004af683b540ddcce2cdf7911c2 /android | |
| parent | 6f05ce41a5cf9edd5b8e3a734bcf2eb89b53a44a (diff) | |
| parent | 73fcc2275c1a0bccb9e849d352e2bbd637f141e6 (diff) | |
| download | mullvadvpn-3880b3bd4ec82699e9fca7fd9f22636ced31779d.tar.xz mullvadvpn-3880b3bd4ec82699e9fca7fd9f22636ced31779d.zip | |
Merge remote-tracking branch 'omahs/patch-1'
Diffstat (limited to 'android')
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/NegativeConfirmationDialog.kt | 2 | ||||
| -rw-r--r-- | android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Cipher.kt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/NegativeConfirmationDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/NegativeConfirmationDialog.kt index dab6142c89..927d241038 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/NegativeConfirmationDialog.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/NegativeConfirmationDialog.kt @@ -45,7 +45,7 @@ private fun PreviewDeleteConfirmationDialogError() { AppTheme { NegativeConfirmationDialog( message = "Do you want to delete Cookie?", - errorMessage = "An error occured", + errorMessage = "An error occurred", onConfirm = {}, onBack = {}, ) diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Cipher.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Cipher.kt index 4571c824dd..ce4ecb132e 100644 --- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Cipher.kt +++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Cipher.kt @@ -1,6 +1,6 @@ package net.mullvad.mullvadvpn.lib.model -// All suppported shadowsocks ciphers +// All supported shadowsocks ciphers enum class Cipher(val label: String) { AES_128_CFB("aes-128-cfb"), AES_128_CFB1("aes-128-cfb1"), |