diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2023-08-30 13:12:43 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2023-09-05 11:27:08 +0200 |
| commit | 9ec48833ea119c910136d3c6a878f2e01a20f4a5 (patch) | |
| tree | 40af7e2d6ac15bc3670696f37e44a04dd3f0d3d4 /android/app/src | |
| parent | 7444ac28c93fbdc6cfbbae648fa19eec70e57077 (diff) | |
| download | mullvadvpn-9ec48833ea119c910136d3c6a878f2e01a20f4a5.tar.xz mullvadvpn-9ec48833ea119c910136d3c6a878f2e01a20f4a5.zip | |
Remove Android code dealing with forwarded ports
Diffstat (limited to 'android/app/src')
3 files changed, 3 insertions, 12 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DeviceRemovalDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DeviceRemovalDialog.kt index 80ffa2d1cd..e7564d248f 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DeviceRemovalDialog.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DeviceRemovalDialog.kt @@ -50,16 +50,9 @@ fun ShowDeviceRemovalDialog(onDismiss: () -> Unit, onConfirm: () -> Unit, device text = { val htmlFormattedDialogText = textResource( - id = R.string.max_devices_confirm_removal_description, - device.name.capitalizeFirstCharOfEachWord() - ) - .let { introText -> - if (device.ports.isNotEmpty()) { - introText.plus(" " + stringResource(id = R.string.port_removal_notice)) - } else { - introText - } - } + id = R.string.max_devices_confirm_removal_description, + device.name.capitalizeFirstCharOfEachWord() + ) HtmlText(htmlFormattedString = htmlFormattedDialogText, textSize = 16.sp.value) }, diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt index 48e7ef2a0b..7bbd7a7cd5 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt @@ -59,7 +59,6 @@ fun PreviewDeviceListScreen() { id = "ID", name = "Name", pubkey = ByteArray(10), - ports = ArrayList(), created = "2002-12-12" ), isLoading = false diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/AccountViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/AccountViewModelTest.kt index e5a3f2b397..9d93912a28 100644 --- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/AccountViewModelTest.kt +++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/AccountViewModelTest.kt @@ -42,7 +42,6 @@ class AccountViewModelTest { id = "fake_id", name = "fake_name", pubkey = byteArrayOf(), - ports = ArrayList(), created = "mock_date" ) ) |