summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
authorJonatan Rhodin <jonatan.rhodin@mullvad.net>2024-02-08 11:17:02 +0100
committerJonatan Rhodin <jonatan.rhodin@mullvad.net>2024-02-08 11:17:02 +0100
commitec4c473c5c08e30e16822a8a82531d3ff5a1135f (patch)
treead2ced90d3ece795a71a004a6006c377c04c1bf0 /android
parent1b80203504f58fab47dc6dbe53f223084acecc6a (diff)
parentaf3df963648d4cc535b552f75cf3abdfe936b395 (diff)
downloadmullvadvpn-ec4c473c5c08e30e16822a8a82531d3ff5a1135f.tar.xz
mullvadvpn-ec4c473c5c08e30e16822a8a82531d3ff5a1135f.zip
Merge branch 'add-support-for-custom-list-in-the-app-layer-droid-653'
Diffstat (limited to 'android')
-rw-r--r--android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt66
-rw-r--r--android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreenTest.kt6
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/RelayLocationCell.kt43
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt4
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt30
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/ConnectUiState.kt4
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/SelectLocationUiState.kt3
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/UiModule.kt2
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/CustomListExtensions.kt19
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/Relay.kt16
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayCity.kt19
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayCountry.kt19
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItem.kt68
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItemExtensions.kt12
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayList.kt6
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayListExtensions.kt78
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayNameComparator.kt4
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/CustomListsRepository.kt28
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/RelayListListener.kt4
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/usecase/RelayListUseCase.kt36
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModel.kt6
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SelectLocationViewModel.kt10
-rw-r--r--android/app/src/test/kotlin/net/mullvad/mullvadvpn/relaylist/RelayNameComparatorTest.kt99
-rw-r--r--android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModelTest.kt15
-rw-r--r--android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SelectLocationViewModelTest.kt70
-rw-r--r--android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/LocationConstraintExtensions.kt23
-rw-r--r--android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/Event.kt2
-rw-r--r--android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/Request.kt12
-rw-r--r--android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/CustomList.kt11
-rw-r--r--android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/CustomListsSettings.kt6
-rw-r--r--android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/Settings.kt1
-rw-r--r--android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt20
-rw-r--r--android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/CustomLists.kt49
-rw-r--r--android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/RelayListListener.kt8
-rw-r--r--android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/ServiceEndpoint.kt2
35 files changed, 515 insertions, 286 deletions
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt
index 39e11a3c14..2e568676e8 100644
--- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt
+++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt
@@ -78,7 +78,7 @@ class ConnectScreenTest {
uiState =
ConnectUiState(
location = null,
- relayLocation = null,
+ selectedRelayItem = null,
tunnelUiState = TunnelState.Connecting(null, null),
tunnelRealState = TunnelState.Connecting(null, null),
inAddress = null,
@@ -112,7 +112,7 @@ class ConnectScreenTest {
uiState =
ConnectUiState(
location = null,
- relayLocation = null,
+ selectedRelayItem = null,
tunnelUiState =
TunnelState.Connecting(endpoint = mockTunnelEndpoint, null),
tunnelRealState =
@@ -147,7 +147,7 @@ class ConnectScreenTest {
uiState =
ConnectUiState(
location = null,
- relayLocation = null,
+ selectedRelayItem = null,
tunnelUiState = TunnelState.Connected(mockTunnelEndpoint, null),
tunnelRealState = TunnelState.Connected(mockTunnelEndpoint, null),
inAddress = null,
@@ -179,7 +179,7 @@ class ConnectScreenTest {
uiState =
ConnectUiState(
location = null,
- relayLocation = null,
+ selectedRelayItem = null,
tunnelUiState = TunnelState.Connected(mockTunnelEndpoint, null),
tunnelRealState = TunnelState.Connected(mockTunnelEndpoint, null),
inAddress = null,
@@ -204,15 +204,15 @@ class ConnectScreenTest {
fun testDisconnectingState() {
composeExtension.use {
// Arrange
- val mockRelayLocation: RelayItem = mockk(relaxed = true)
+ val mockSelectedLocation: RelayItem = mockk(relaxed = true)
val mockLocationName = "Home"
- every { mockRelayLocation.locationName } returns mockLocationName
+ every { mockSelectedLocation.locationName } returns mockLocationName
setContentWithTheme {
ConnectScreen(
uiState =
ConnectUiState(
location = null,
- relayLocation = mockRelayLocation,
+ selectedRelayItem = mockSelectedLocation,
tunnelUiState =
TunnelState.Disconnecting(ActionAfterDisconnect.Nothing),
tunnelRealState =
@@ -239,15 +239,15 @@ class ConnectScreenTest {
fun testDisconnectedState() {
composeExtension.use {
// Arrange
- val mockRelayLocation: RelayItem = mockk(relaxed = true)
+ val mockSelectedLocation: RelayItem = mockk(relaxed = true)
val mockLocationName = "Home"
- every { mockRelayLocation.locationName } returns mockLocationName
+ every { mockSelectedLocation.locationName } returns mockLocationName
setContentWithTheme {
ConnectScreen(
uiState =
ConnectUiState(
location = null,
- relayLocation = mockRelayLocation,
+ selectedRelayItem = mockSelectedLocation,
tunnelUiState = TunnelState.Disconnected(),
tunnelRealState = TunnelState.Disconnected(),
inAddress = null,
@@ -272,15 +272,15 @@ class ConnectScreenTest {
fun testErrorStateBlocked() {
composeExtension.use {
// Arrange
- val mockRelayLocation: RelayItem = mockk(relaxed = true)
+ val mockSelectedLocation: RelayItem = mockk(relaxed = true)
val mockLocationName = "Home"
- every { mockRelayLocation.locationName } returns mockLocationName
+ every { mockSelectedLocation.locationName } returns mockLocationName
setContentWithTheme {
ConnectScreen(
uiState =
ConnectUiState(
location = null,
- relayLocation = mockRelayLocation,
+ selectedRelayItem = mockSelectedLocation,
tunnelUiState =
TunnelState.Error(
ErrorState(ErrorStateCause.StartTunnelError, true)
@@ -315,15 +315,15 @@ class ConnectScreenTest {
fun testErrorStateNotBlocked() {
composeExtension.use {
// Arrange
- val mockRelayLocation: RelayItem = mockk(relaxed = true)
+ val mockSelectedLocation: RelayItem = mockk(relaxed = true)
val mockLocationName = "Home"
- every { mockRelayLocation.locationName } returns mockLocationName
+ every { mockSelectedLocation.locationName } returns mockLocationName
setContentWithTheme {
ConnectScreen(
uiState =
ConnectUiState(
location = null,
- relayLocation = mockRelayLocation,
+ selectedRelayItem = mockSelectedLocation,
tunnelUiState =
TunnelState.Error(
ErrorState(ErrorStateCause.StartTunnelError, false)
@@ -364,7 +364,7 @@ class ConnectScreenTest {
uiState =
ConnectUiState(
location = null,
- relayLocation = null,
+ selectedRelayItem = null,
tunnelUiState =
TunnelState.Disconnecting(ActionAfterDisconnect.Reconnect),
tunnelRealState =
@@ -393,15 +393,15 @@ class ConnectScreenTest {
fun testDisconnectingBlockState() {
composeExtension.use {
// Arrange
- val mockRelayLocation: RelayItem = mockk(relaxed = true)
+ val mockSelectedLocation: RelayItem = mockk(relaxed = true)
val mockLocationName = "Home"
- every { mockRelayLocation.locationName } returns mockLocationName
+ every { mockSelectedLocation.locationName } returns mockLocationName
setContentWithTheme {
ConnectScreen(
uiState =
ConnectUiState(
location = null,
- relayLocation = mockRelayLocation,
+ selectedRelayItem = mockSelectedLocation,
tunnelUiState = TunnelState.Disconnecting(ActionAfterDisconnect.Block),
tunnelRealState =
TunnelState.Disconnecting(ActionAfterDisconnect.Block),
@@ -428,16 +428,16 @@ class ConnectScreenTest {
fun testClickSelectLocationButton() {
composeExtension.use {
// Arrange
- val mockRelayLocation: RelayItem = mockk(relaxed = true)
+ val mockSelectedLocation: RelayItem = mockk(relaxed = true)
val mockLocationName = "Home"
- every { mockRelayLocation.locationName } returns mockLocationName
+ every { mockSelectedLocation.name } returns mockLocationName
val mockedClickHandler: () -> Unit = mockk(relaxed = true)
setContentWithTheme {
ConnectScreen(
uiState =
ConnectUiState(
location = null,
- relayLocation = mockRelayLocation,
+ selectedRelayItem = mockSelectedLocation,
tunnelUiState = TunnelState.Disconnected(),
tunnelRealState = TunnelState.Disconnected(),
inAddress = null,
@@ -471,7 +471,7 @@ class ConnectScreenTest {
uiState =
ConnectUiState(
location = null,
- relayLocation = null,
+ selectedRelayItem = null,
tunnelUiState = TunnelState.Connected(mockTunnelEndpoint, null),
tunnelRealState = TunnelState.Connected(mockTunnelEndpoint, null),
inAddress = null,
@@ -505,7 +505,7 @@ class ConnectScreenTest {
uiState =
ConnectUiState(
location = null,
- relayLocation = null,
+ selectedRelayItem = null,
tunnelUiState = TunnelState.Connected(mockTunnelEndpoint, null),
tunnelRealState = TunnelState.Connected(mockTunnelEndpoint, null),
inAddress = null,
@@ -538,7 +538,7 @@ class ConnectScreenTest {
uiState =
ConnectUiState(
location = null,
- relayLocation = null,
+ selectedRelayItem = null,
tunnelUiState = TunnelState.Disconnected(),
tunnelRealState = TunnelState.Disconnected(),
inAddress = null,
@@ -571,7 +571,7 @@ class ConnectScreenTest {
uiState =
ConnectUiState(
location = null,
- relayLocation = null,
+ selectedRelayItem = null,
tunnelUiState = TunnelState.Connecting(null, null),
tunnelRealState = TunnelState.Connecting(null, null),
inAddress = null,
@@ -612,7 +612,7 @@ class ConnectScreenTest {
uiState =
ConnectUiState(
location = mockLocation,
- relayLocation = null,
+ selectedRelayItem = null,
tunnelUiState = TunnelState.Connected(mockTunnelEndpoint, null),
tunnelRealState = TunnelState.Connected(mockTunnelEndpoint, null),
inAddress = mockInAddress,
@@ -653,7 +653,7 @@ class ConnectScreenTest {
uiState =
ConnectUiState(
location = null,
- relayLocation = null,
+ selectedRelayItem = null,
tunnelUiState = TunnelState.Connecting(null, null),
tunnelRealState = TunnelState.Connecting(null, null),
inAddress = null,
@@ -689,7 +689,7 @@ class ConnectScreenTest {
uiState =
ConnectUiState(
location = null,
- relayLocation = null,
+ selectedRelayItem = null,
tunnelUiState = TunnelState.Connecting(null, null),
tunnelRealState = TunnelState.Connecting(null, null),
inAddress = null,
@@ -722,7 +722,7 @@ class ConnectScreenTest {
uiState =
ConnectUiState(
location = null,
- relayLocation = null,
+ selectedRelayItem = null,
tunnelUiState = TunnelState.Connecting(null, null),
tunnelRealState = TunnelState.Connecting(null, null),
inAddress = null,
@@ -760,7 +760,7 @@ class ConnectScreenTest {
uiState =
ConnectUiState(
location = null,
- relayLocation = null,
+ selectedRelayItem = null,
tunnelUiState = TunnelState.Connecting(null, null),
tunnelRealState = TunnelState.Connecting(null, null),
inAddress = null,
@@ -794,7 +794,7 @@ class ConnectScreenTest {
uiState =
ConnectUiState(
location = null,
- relayLocation = null,
+ selectedRelayItem = null,
tunnelUiState = TunnelState.Connecting(null, null),
tunnelRealState = TunnelState.Connecting(null, null),
inAddress = null,
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreenTest.kt
index bb64adc8a6..12f4b10323 100644
--- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreenTest.kt
+++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreenTest.kt
@@ -59,7 +59,7 @@ class SelectLocationScreenTest {
relayListState =
RelayListState.RelayList(
countries = DUMMY_RELAY_COUNTRIES,
- selectedRelay = null
+ selectedItem = null
),
selectedOwnership = null,
selectedProvidersCount = 0,
@@ -99,7 +99,7 @@ class SelectLocationScreenTest {
relayListState =
RelayListState.RelayList(
countries = updatedDummyList,
- selectedRelay = updatedDummyList[0].cities[0].relays[0]
+ selectedItem = updatedDummyList[0].cities[0].relays[0]
),
selectedOwnership = null,
selectedProvidersCount = 0,
@@ -129,7 +129,7 @@ class SelectLocationScreenTest {
relayListState =
RelayListState.RelayList(
countries = emptyList(),
- selectedRelay = null
+ selectedItem = null
),
selectedOwnership = null,
selectedProvidersCount = 0,
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/RelayLocationCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/RelayLocationCell.kt
index acd963fa61..d6adf33b83 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/RelayLocationCell.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/RelayLocationCell.kt
@@ -38,11 +38,7 @@ import net.mullvad.mullvadvpn.lib.theme.color.AlphaInvisible
import net.mullvad.mullvadvpn.lib.theme.color.AlphaVisible
import net.mullvad.mullvadvpn.lib.theme.color.selected
import net.mullvad.mullvadvpn.model.GeographicLocationConstraint
-import net.mullvad.mullvadvpn.relaylist.Relay
-import net.mullvad.mullvadvpn.relaylist.RelayCity
-import net.mullvad.mullvadvpn.relaylist.RelayCountry
import net.mullvad.mullvadvpn.relaylist.RelayItem
-import net.mullvad.mullvadvpn.relaylist.RelayItemType
@Composable
@Preview
@@ -50,20 +46,20 @@ private fun PreviewRelayLocationCell() {
AppTheme {
Column(Modifier.background(color = MaterialTheme.colorScheme.background)) {
val countryActive =
- RelayCountry(
+ RelayItem.Country(
name = "Relay country Active",
code = "RC1",
expanded = false,
cities =
listOf(
- RelayCity(
+ RelayItem.City(
name = "Relay city 1",
code = "RI1",
expanded = false,
location = GeographicLocationConstraint.City("RC1", "RI1"),
relays =
listOf(
- Relay(
+ RelayItem.Relay(
name = "Relay 1",
active = true,
locationName = "",
@@ -76,14 +72,14 @@ private fun PreviewRelayLocationCell() {
)
)
),
- RelayCity(
+ RelayItem.City(
name = "Relay city 2",
code = "RI2",
expanded = true,
location = GeographicLocationConstraint.City("RC1", "RI2"),
relays =
listOf(
- Relay(
+ RelayItem.Relay(
name = "Relay 2",
active = true,
locationName = "",
@@ -94,7 +90,7 @@ private fun PreviewRelayLocationCell() {
"NER"
)
),
- Relay(
+ RelayItem.Relay(
name = "Relay 3",
active = true,
locationName = "",
@@ -110,20 +106,20 @@ private fun PreviewRelayLocationCell() {
)
)
val countryNotActive =
- RelayCountry(
+ RelayItem.Country(
name = "Not Enabled Relay country",
code = "RC3",
expanded = true,
cities =
listOf(
- RelayCity(
+ RelayItem.City(
name = "Not Enabled city",
code = "RI3",
expanded = true,
location = GeographicLocationConstraint.City("RC3", "RI3"),
relays =
listOf(
- Relay(
+ RelayItem.Relay(
name = "Not Enabled Relay",
active = false,
locationName = "",
@@ -158,10 +154,11 @@ fun RelayLocationCell(
onSelectRelay: (item: RelayItem) -> Unit = {}
) {
val startPadding =
- when (relay.type) {
- RelayItemType.Country -> Dimens.countryRowPadding
- RelayItemType.City -> Dimens.cityRowPadding
- RelayItemType.Relay -> Dimens.relayRowPadding
+ when (relay) {
+ is RelayItem.Country,
+ is RelayItem.CustomList -> Dimens.countryRowPadding
+ is RelayItem.City -> Dimens.cityRowPadding
+ is RelayItem.Relay -> Dimens.relayRowPadding
}
val selected = selectedItem?.code == relay.code
val expanded =
@@ -169,12 +166,12 @@ fun RelayLocationCell(
val backgroundColor =
when {
selected -> MaterialTheme.colorScheme.inversePrimary
- relay.type == RelayItemType.Country -> MaterialTheme.colorScheme.primary
- relay.type == RelayItemType.City ->
+ relay is RelayItem.Country -> MaterialTheme.colorScheme.primary
+ relay is RelayItem.City ->
MaterialTheme.colorScheme.primary
.copy(alpha = Alpha40)
.compositeOver(MaterialTheme.colorScheme.background)
- relay.type == RelayItemType.Relay -> MaterialTheme.colorScheme.secondaryContainer
+ relay is RelayItem.Relay -> MaterialTheme.colorScheme.secondaryContainer
else -> MaterialTheme.colorScheme.primary
}
Column(
@@ -273,7 +270,7 @@ fun RelayLocationCell(
}
if (expanded.value) {
when (relay) {
- is RelayCountry -> {
+ is RelayItem.Country -> {
relay.cities.forEach { relayCity ->
RelayLocationCell(
relay = relayCity,
@@ -283,7 +280,7 @@ fun RelayLocationCell(
)
}
}
- is RelayCity -> {
+ is RelayItem.City -> {
relay.relays.forEach { relay ->
RelayLocationCell(
relay = relay,
@@ -293,6 +290,8 @@ fun RelayLocationCell(
)
}
}
+ is RelayItem.Relay,
+ is RelayItem.CustomList -> {}
}
}
}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt
index f626191b4c..84d2a0418e 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt
@@ -264,8 +264,8 @@ fun ConnectScreen(
onClick = onSwitchLocationClick,
showChevron = uiState.showLocation,
text =
- if (uiState.showLocation) {
- uiState.relayLocation?.locationName ?: ""
+ if (uiState.showLocation && uiState.selectedRelayItem != null) {
+ uiState.selectedRelayItem.locationName
} else {
stringResource(id = R.string.switch_location)
}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt
index cf5d4f02c7..e024ae3132 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt
@@ -53,7 +53,6 @@ import net.mullvad.mullvadvpn.compose.transitions.SelectLocationTransition
import net.mullvad.mullvadvpn.lib.theme.AppTheme
import net.mullvad.mullvadvpn.lib.theme.Dimens
import net.mullvad.mullvadvpn.lib.theme.color.AlphaScrollbar
-import net.mullvad.mullvadvpn.relaylist.RelayCountry
import net.mullvad.mullvadvpn.relaylist.RelayItem
import net.mullvad.mullvadvpn.viewmodel.SelectLocationSideEffect
import net.mullvad.mullvadvpn.viewmodel.SelectLocationViewModel
@@ -69,8 +68,9 @@ private fun PreviewSelectLocationScreen() {
selectedProvidersCount = 0,
relayListState =
RelayListState.RelayList(
- countries = listOf(RelayCountry("Country 1", "Code 1", false, emptyList())),
- selectedRelay = null,
+ countries =
+ listOf(RelayItem.Country("Country 1", "Code 1", false, emptyList())),
+ selectedItem = null,
)
)
AppTheme {
@@ -172,14 +172,10 @@ fun SelectLocationScreen(
if (
uiState is SelectLocationUiState.Data &&
uiState.relayListState is RelayListState.RelayList &&
- uiState.relayListState.selectedRelay != null
+ uiState.relayListState.selectedItem != null
) {
- LaunchedEffect(uiState.relayListState.selectedRelay) {
- val index =
- uiState.relayListState.countries.indexOfFirst { relayCountry ->
- relayCountry.location.location.country ==
- uiState.relayListState.selectedRelay.location.location.country
- }
+ LaunchedEffect(uiState.relayListState.selectedItem) {
+ val index = uiState.relayListState.indexOfSelectedRelayItem()
if (index >= 0) {
lazyListState.scrollToItem(index)
@@ -235,7 +231,7 @@ private fun LazyListScope.relayList(
val country = relayListState.countries[index]
RelayLocationCell(
relay = country,
- selectedItem = relayListState.selectedRelay,
+ selectedItem = relayListState.selectedItem,
onSelectRelay = onSelectRelay,
modifier = Modifier.animateContentSize()
)
@@ -279,6 +275,18 @@ private fun LazyListScope.relayList(
}
}
+private fun RelayListState.RelayList.indexOfSelectedRelayItem(): Int =
+ countries.indexOfFirst { relayCountry ->
+ relayCountry.location.location.country ==
+ when (selectedItem) {
+ is RelayItem.Country -> selectedItem.code
+ is RelayItem.City -> selectedItem.location.countryCode
+ is RelayItem.Relay -> selectedItem.location.countryCode
+ is RelayItem.CustomList,
+ null -> null
+ }
+ }
+
suspend fun LazyListState.animateScrollAndCentralizeItem(index: Int) {
val itemInfo = this.layoutInfo.visibleItemsInfo.firstOrNull { it.index == index }
if (itemInfo != null) {
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/ConnectUiState.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/ConnectUiState.kt
index dc26e24741..988ae914e9 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/ConnectUiState.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/ConnectUiState.kt
@@ -8,7 +8,7 @@ import net.mullvad.talpid.net.TransportProtocol
data class ConnectUiState(
val location: GeoIpLocation?,
- val relayLocation: RelayItem?,
+ val selectedRelayItem: RelayItem?,
val tunnelUiState: TunnelState,
val tunnelRealState: TunnelState,
val inAddress: Triple<String, Int, TransportProtocol>?,
@@ -23,7 +23,7 @@ data class ConnectUiState(
val INITIAL =
ConnectUiState(
location = null,
- relayLocation = null,
+ selectedRelayItem = null,
tunnelUiState = TunnelState.Disconnected(),
tunnelRealState = TunnelState.Disconnected(),
inAddress = null,
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/SelectLocationUiState.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/SelectLocationUiState.kt
index 3152ed1a34..fd775fa1bb 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/SelectLocationUiState.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/SelectLocationUiState.kt
@@ -1,7 +1,6 @@
package net.mullvad.mullvadvpn.compose.state
import net.mullvad.mullvadvpn.model.Ownership
-import net.mullvad.mullvadvpn.relaylist.RelayCountry
import net.mullvad.mullvadvpn.relaylist.RelayItem
sealed interface SelectLocationUiState {
@@ -21,6 +20,6 @@ sealed interface SelectLocationUiState {
sealed interface RelayListState {
data object Empty : RelayListState
- data class RelayList(val countries: List<RelayCountry>, val selectedRelay: RelayItem?) :
+ data class RelayList(val countries: List<RelayItem.Country>, val selectedItem: RelayItem?) :
RelayListState
}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/UiModule.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/UiModule.kt
index 5e51cc99d4..c62cf03851 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/UiModule.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/UiModule.kt
@@ -15,6 +15,7 @@ import net.mullvad.mullvadvpn.lib.ipc.MessageHandler
import net.mullvad.mullvadvpn.lib.payment.PaymentProvider
import net.mullvad.mullvadvpn.repository.AccountRepository
import net.mullvad.mullvadvpn.repository.ChangelogRepository
+import net.mullvad.mullvadvpn.repository.CustomListsRepository
import net.mullvad.mullvadvpn.repository.DeviceRepository
import net.mullvad.mullvadvpn.repository.InAppNotificationController
import net.mullvad.mullvadvpn.repository.PrivacyDisclaimerRepository
@@ -98,6 +99,7 @@ val uiModule = module {
}
single { SettingsRepository(get()) }
single { MullvadProblemReport(get()) }
+ single { CustomListsRepository(get()) }
single { AccountExpiryNotificationUseCase(get()) }
single { TunnelStateNotificationUseCase(get()) }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/CustomListExtensions.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/CustomListExtensions.kt
new file mode 100644
index 0000000000..9ad0c220e9
--- /dev/null
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/CustomListExtensions.kt
@@ -0,0 +1,19 @@
+package net.mullvad.mullvadvpn.relaylist
+
+import net.mullvad.mullvadvpn.model.CustomList
+
+fun CustomList.toRelayItemCustomList(
+ relayCountries: List<RelayItem.Country>
+): RelayItem.CustomList =
+ RelayItem.CustomList(
+ code = this.id,
+ id = this.id,
+ name = this.name,
+ expanded = false,
+ locations =
+ this.locations.mapNotNull { relayCountries.findItemForGeographicLocationConstraint(it) }
+ )
+
+fun List<CustomList>.toRelayItemLists(
+ relayCountries: List<RelayItem.Country>
+): List<RelayItem.CustomList> = this.map { it.toRelayItemCustomList(relayCountries) }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/Relay.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/Relay.kt
deleted file mode 100644
index 9bdb59168b..0000000000
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/Relay.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package net.mullvad.mullvadvpn.relaylist
-
-import net.mullvad.mullvadvpn.model.GeographicLocationConstraint
-
-data class Relay(
- override val name: String,
- override val location: GeographicLocationConstraint,
- override val locationName: String,
- override val active: Boolean
-) : RelayItem {
- override val code = name
- override val type = RelayItemType.Relay
- override val hasChildren = false
-
- override val expanded = false
-}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayCity.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayCity.kt
deleted file mode 100644
index e3693963f8..0000000000
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayCity.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package net.mullvad.mullvadvpn.relaylist
-
-import net.mullvad.mullvadvpn.model.GeographicLocationConstraint
-
-data class RelayCity(
- override val name: String,
- override val code: String,
- override val location: GeographicLocationConstraint,
- override val expanded: Boolean,
- val relays: List<Relay>
-) : RelayItem {
- override val type = RelayItemType.City
-
- override val active
- get() = relays.any { relay -> relay.active }
-
- override val hasChildren
- get() = relays.isNotEmpty()
-}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayCountry.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayCountry.kt
deleted file mode 100644
index 3ad1d5962f..0000000000
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayCountry.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package net.mullvad.mullvadvpn.relaylist
-
-import net.mullvad.mullvadvpn.model.GeographicLocationConstraint
-
-data class RelayCountry(
- override val name: String,
- override val code: String,
- override val expanded: Boolean,
- val cities: List<RelayCity>
-) : RelayItem {
- override val type = RelayItemType.Country
- override val location = GeographicLocationConstraint.Country(code)
-
- override val active
- get() = cities.any { city -> city.active }
-
- override val hasChildren
- get() = cities.isNotEmpty()
-}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItem.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItem.kt
index 3d38d6b068..03ba7a02f3 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItem.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItem.kt
@@ -1,12 +1,11 @@
package net.mullvad.mullvadvpn.relaylist
+import net.mullvad.mullvadvpn.model.GeoIpLocation
import net.mullvad.mullvadvpn.model.GeographicLocationConstraint
-interface RelayItem {
- val type: RelayItemType
+sealed interface RelayItem {
val name: String
val code: String
- val location: GeographicLocationConstraint
val active: Boolean
val hasChildren: Boolean
@@ -14,4 +13,67 @@ interface RelayItem {
get() = name
val expanded: Boolean
+
+ data class CustomList(
+ override val name: String,
+ override val code: String,
+ override val expanded: Boolean,
+ val id: String,
+ val locations: List<RelayItem>,
+ ) : RelayItem {
+ override val active
+ get() = locations.any { location -> location.active }
+
+ override val hasChildren
+ get() = locations.isNotEmpty()
+ }
+
+ data class Country(
+ override val name: String,
+ override val code: String,
+ override val expanded: Boolean,
+ val cities: List<City>
+ ) : RelayItem {
+ val location = GeographicLocationConstraint.Country(code)
+ override val active
+ get() = cities.any { city -> city.active }
+
+ override val hasChildren
+ get() = cities.isNotEmpty()
+ }
+
+ data class City(
+ override val name: String,
+ override val code: String,
+ override val expanded: Boolean,
+ val location: GeographicLocationConstraint.City,
+ val relays: List<Relay>
+ ) : RelayItem {
+
+ override val active
+ get() = relays.any { relay -> relay.active }
+
+ override val hasChildren
+ get() = relays.isNotEmpty()
+ }
+
+ data class Relay(
+ override val name: String,
+ override val locationName: String,
+ override val active: Boolean,
+ val location: GeographicLocationConstraint.Hostname,
+ ) : RelayItem {
+ override val code = name
+ override val hasChildren = false
+ override val expanded = false
+ }
+
+ fun location(): GeoIpLocation? {
+ return when (this) {
+ is CustomList -> null
+ is Country -> location.location
+ is City -> location.location
+ is Relay -> location.location
+ }
+ }
}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItemExtensions.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItemExtensions.kt
new file mode 100644
index 0000000000..6808d707b2
--- /dev/null
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItemExtensions.kt
@@ -0,0 +1,12 @@
+package net.mullvad.mullvadvpn.relaylist
+
+import net.mullvad.mullvadvpn.model.LocationConstraint
+
+fun RelayItem.toLocationConstraint(): LocationConstraint {
+ return when (this) {
+ is RelayItem.Country -> LocationConstraint.Location(location)
+ is RelayItem.City -> LocationConstraint.Location(location)
+ is RelayItem.Relay -> LocationConstraint.Location(location)
+ is RelayItem.CustomList -> LocationConstraint.CustomList(id)
+ }
+}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayList.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayList.kt
index c74c74ba43..30e4146245 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayList.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayList.kt
@@ -1,3 +1,7 @@
package net.mullvad.mullvadvpn.relaylist
-data class RelayList(val country: List<RelayCountry>, val selectedItem: RelayItem?)
+data class RelayList(
+ val customLists: List<RelayItem.CustomList>,
+ val country: List<RelayItem.Country>,
+ val selectedItem: RelayItem?,
+)
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayListExtensions.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayListExtensions.kt
index 6462ed9f41..06e00a022a 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayListExtensions.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayListExtensions.kt
@@ -15,17 +15,17 @@ import net.mullvad.mullvadvpn.model.RelayList
fun RelayList.toRelayCountries(
ownership: Constraint<Ownership>,
providers: Constraint<Providers>
-): List<RelayCountry> {
+): List<RelayItem.Country> {
val relayCountries =
this.countries
.map { country ->
- val cities = mutableListOf<RelayCity>()
- val relayCountry = RelayCountry(country.name, country.code, false, cities)
+ val cities = mutableListOf<RelayItem.City>()
+ val relayCountry = RelayItem.Country(country.name, country.code, false, cities)
for (city in country.cities) {
- val relays = mutableListOf<Relay>()
+ val relays = mutableListOf<RelayItem.Relay>()
val relayCity =
- RelayCity(
+ RelayItem.City(
name = city.name,
code = city.code,
location = GeographicLocationConstraint.City(country.code, city.code),
@@ -38,7 +38,7 @@ fun RelayList.toRelayCountries(
for (relay in validCityRelays) {
relays.add(
- Relay(
+ RelayItem.Relay(
name = relay.hostname,
location =
GeographicLocationConstraint.Hostname(
@@ -69,32 +69,26 @@ fun RelayList.toRelayCountries(
return relayCountries.toList()
}
-fun List<RelayCountry>.findItemForLocation(
- constraint: Constraint<GeographicLocationConstraint>
-): RelayItem? {
- return when (constraint) {
- is Constraint.Any -> null
- is Constraint.Only -> {
- when (val location = constraint.value) {
- is GeographicLocationConstraint.Country -> {
- this.find { country -> country.code == location.countryCode }
- }
- is GeographicLocationConstraint.City -> {
- val country = this.find { country -> country.code == location.countryCode }
+fun List<RelayItem.Country>.findItemForGeographicLocationConstraint(
+ constraint: GeographicLocationConstraint
+) =
+ when (constraint) {
+ is GeographicLocationConstraint.Country -> {
+ this.find { country -> country.code == constraint.countryCode }
+ }
+ is GeographicLocationConstraint.City -> {
+ val country = this.find { country -> country.code == constraint.countryCode }
- country?.cities?.find { city -> city.code == location.cityCode }
- }
- is GeographicLocationConstraint.Hostname -> {
- val country = this.find { country -> country.code == location.countryCode }
+ country?.cities?.find { city -> city.code == constraint.cityCode }
+ }
+ is GeographicLocationConstraint.Hostname -> {
+ val country = this.find { country -> country.code == constraint.countryCode }
- val city = country?.cities?.find { city -> city.code == location.cityCode }
+ val city = country?.cities?.find { city -> city.code == constraint.cityCode }
- city?.relays?.find { relay -> relay.name == location.hostname }
- }
- }
+ city?.relays?.find { relay -> relay.name == constraint.hostname }
}
}
-}
/**
* Filter and expand the list based on search terms If a country is matched, that country and all
@@ -102,14 +96,15 @@ fun List<RelayCountry>.findItemForLocation(
* parent country is added and expanded if needed and its children are added, but the city is not
* expanded If a relay is matched, its parents are added and expanded and itself is also added.
*/
-fun List<RelayCountry>.filterOnSearchTerm(
+@Suppress("NestedBlockDepth")
+fun List<RelayItem.Country>.filterOnSearchTerm(
searchTerm: String,
selectedItem: RelayItem?
-): List<RelayCountry> {
+): List<RelayItem.Country> {
return if (searchTerm.length >= MIN_SEARCH_LENGTH) {
- val filteredCountries = mutableMapOf<String, RelayCountry>()
+ val filteredCountries = mutableMapOf<String, RelayItem.Country>()
this.forEach { relayCountry ->
- val cities = mutableListOf<RelayCity>()
+ val cities = mutableListOf<RelayItem.City>()
// Try to match the search term with a country
// If we match a country, add that country and all cities and relays in that country
@@ -122,7 +117,7 @@ fun List<RelayCountry>.filterOnSearchTerm(
// Go through and try to match the search term with every city
relayCountry.cities.forEach { relayCity ->
- val relays = mutableListOf<Relay>()
+ val relays = mutableListOf<RelayItem.Relay>()
// If we match and we already added the country to the filtered list just expand the
// country.
// If the country is not currently in the filtered list, add it and expand it.
@@ -200,31 +195,31 @@ private fun List<DaemonRelay>.filterValidRelays(
}
/** Expand the parent(s), if any, for the current selected item */
-private fun List<RelayCountry>.expandItemForSelection(
+private fun List<RelayItem.Country>.expandItemForSelection(
selectedItem: RelayItem?
-): List<RelayCountry> {
+): List<RelayItem.Country> {
return selectedItem?.let {
- when (val location = selectedItem.location) {
- is GeographicLocationConstraint.Country -> {
+ when (selectedItem) {
+ is RelayItem.Country -> {
this
}
- is GeographicLocationConstraint.City -> {
+ is RelayItem.City -> {
this.map { country ->
- if (country.code == location.countryCode) {
+ if (country.code == selectedItem.location.countryCode) {
country.copy(expanded = true)
} else {
country
}
}
}
- is GeographicLocationConstraint.Hostname -> {
+ is RelayItem.Relay -> {
this.map { country ->
- if (country.code == location.countryCode) {
+ if (country.code == selectedItem.location.countryCode) {
country.copy(
expanded = true,
cities =
country.cities.map { city ->
- if (city.code == location.cityCode) {
+ if (city.code == selectedItem.location.cityCode) {
city.copy(expanded = true)
} else {
city
@@ -236,6 +231,7 @@ private fun List<RelayCountry>.expandItemForSelection(
}
}
}
+ is RelayItem.CustomList -> this
}
} ?: this
}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayNameComparator.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayNameComparator.kt
index 92a3c9c1d6..c062fd1466 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayNameComparator.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayNameComparator.kt
@@ -1,7 +1,7 @@
package net.mullvad.mullvadvpn.relaylist
-internal object RelayNameComparator : Comparator<Relay> {
- override fun compare(o1: Relay, o2: Relay): Int {
+internal object RelayNameComparator : Comparator<RelayItem.Relay> {
+ override fun compare(o1: RelayItem.Relay, o2: RelayItem.Relay): Int {
val partitions1 = o1.name.split(regex)
val partitions2 = o2.name.split(regex)
return if (partitions1.size > partitions2.size) partitions1 compareWith partitions2
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/CustomListsRepository.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/CustomListsRepository.kt
new file mode 100644
index 0000000000..9660981688
--- /dev/null
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/CustomListsRepository.kt
@@ -0,0 +1,28 @@
+package net.mullvad.mullvadvpn.repository
+
+import kotlinx.coroutines.flow.first
+import net.mullvad.mullvadvpn.lib.ipc.Event
+import net.mullvad.mullvadvpn.lib.ipc.MessageHandler
+import net.mullvad.mullvadvpn.lib.ipc.Request
+import net.mullvad.mullvadvpn.lib.ipc.events
+import net.mullvad.mullvadvpn.model.CustomList
+
+class CustomListsRepository(private val messageHandler: MessageHandler) {
+ suspend fun createCustomList(name: String): String? {
+ val result = messageHandler.trySendRequest(Request.CreateCustomList(name))
+
+ return if (result) {
+ messageHandler.events<Event.CreateCustomListResult>().first().listId
+ } else {
+ null
+ }
+ }
+
+ fun deleteCustomList(id: String) {
+ messageHandler.trySendRequest(Request.DeleteCustomList(id))
+ }
+
+ fun updateCustomList(customList: CustomList) {
+ messageHandler.trySendRequest(Request.UpdateCustomList(customList))
+ }
+}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/RelayListListener.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/RelayListListener.kt
index 2d6ce332f6..841c9e0c59 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/RelayListListener.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/RelayListListener.kt
@@ -13,7 +13,7 @@ import net.mullvad.mullvadvpn.lib.ipc.MessageHandler
import net.mullvad.mullvadvpn.lib.ipc.Request
import net.mullvad.mullvadvpn.lib.ipc.events
import net.mullvad.mullvadvpn.model.Constraint
-import net.mullvad.mullvadvpn.model.GeographicLocationConstraint
+import net.mullvad.mullvadvpn.model.LocationConstraint
import net.mullvad.mullvadvpn.model.Ownership
import net.mullvad.mullvadvpn.model.Providers
import net.mullvad.mullvadvpn.model.RelayList
@@ -38,7 +38,7 @@ class RelayListListener(
defaultRelayList()
)
- fun updateSelectedRelayLocation(value: GeographicLocationConstraint) {
+ fun updateSelectedRelayLocation(value: LocationConstraint) {
messageHandler.trySendRequest(Request.SetRelayLocation(value))
}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/usecase/RelayListUseCase.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/usecase/RelayListUseCase.kt
index 8db90b9390..ab3d93e06e 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/usecase/RelayListUseCase.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/usecase/RelayListUseCase.kt
@@ -3,16 +3,15 @@ package net.mullvad.mullvadvpn.usecase
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.map
-import net.mullvad.mullvadvpn.lib.common.util.toGeographicLocationConstraint
import net.mullvad.mullvadvpn.model.Constraint
-import net.mullvad.mullvadvpn.model.GeographicLocationConstraint
+import net.mullvad.mullvadvpn.model.LocationConstraint
import net.mullvad.mullvadvpn.model.RelaySettings
import net.mullvad.mullvadvpn.model.WireguardConstraints
-import net.mullvad.mullvadvpn.relaylist.RelayCountry
import net.mullvad.mullvadvpn.relaylist.RelayItem
import net.mullvad.mullvadvpn.relaylist.RelayList
-import net.mullvad.mullvadvpn.relaylist.findItemForLocation
+import net.mullvad.mullvadvpn.relaylist.findItemForGeographicLocationConstraint
import net.mullvad.mullvadvpn.relaylist.toRelayCountries
+import net.mullvad.mullvadvpn.relaylist.toRelayItemLists
import net.mullvad.mullvadvpn.repository.SettingsRepository
import net.mullvad.mullvadvpn.ui.serviceconnection.RelayListListener
@@ -21,7 +20,7 @@ class RelayListUseCase(
private val settingsRepository: SettingsRepository
) {
- fun updateSelectedRelayLocation(value: GeographicLocationConstraint) {
+ fun updateSelectedRelayLocation(value: LocationConstraint) {
relayListListener.updateSelectedRelayLocation(value)
}
@@ -39,11 +38,15 @@ class RelayListUseCase(
settings?.relaySettings?.relayConstraints()?.providers ?: Constraint.Any()
val relayCountries =
relayList.toRelayCountries(ownership = ownership, providers = providers)
+ val customLists =
+ settings?.customLists?.customLists?.toRelayItemLists(relayCountries) ?: emptyList()
val selectedItem =
- relayCountries.findSelectedRelayItem(
+ findSelectedRelayItem(
relaySettings = settings?.relaySettings,
+ relayCountries = relayCountries,
+ customLists = customLists
)
- RelayList(relayCountries, selectedItem)
+ RelayList(customLists, relayCountries, selectedItem)
}
fun selectedRelayItem(): Flow<RelayItem?> = relayListWithSelection().map { it.selectedItem }
@@ -52,10 +55,23 @@ class RelayListUseCase(
relayListListener.fetchRelayList()
}
- private fun List<RelayCountry>.findSelectedRelayItem(
+ private fun findSelectedRelayItem(
relaySettings: RelaySettings?,
+ relayCountries: List<RelayItem.Country>,
+ customLists: List<RelayItem.CustomList>
): RelayItem? {
- val location = relaySettings?.relayConstraints()?.location
- return location?.let { this.findItemForLocation(location.toGeographicLocationConstraint()) }
+ val locationConstraint = relaySettings?.relayConstraints()?.location
+ return if (locationConstraint is Constraint.Only) {
+ when (val location = locationConstraint.value) {
+ is LocationConstraint.CustomList -> {
+ customLists.firstOrNull { it.id == location.listId }
+ }
+ is LocationConstraint.Location -> {
+ relayCountries.findItemForGeographicLocationConstraint(location.location)
+ }
+ }
+ } else {
+ null
+ }
}
}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModel.kt
index 9b5a6c1e00..bee5b1ad00 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModel.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModel.kt
@@ -84,7 +84,7 @@ class ConnectViewModel(
accountRepository.accountExpiryState,
deviceRepository.deviceState.map { it.deviceName() }
) {
- relayLocation,
+ selectedRelayItem,
notifications,
tunnelUiState,
tunnelRealState,
@@ -97,12 +97,12 @@ class ConnectViewModel(
is TunnelState.Disconnected ->
tunnelRealState.location() ?: lastKnownDisconnectedLocation
is TunnelState.Connecting ->
- tunnelRealState.location ?: relayLocation?.location?.location
+ tunnelRealState.location ?: selectedRelayItem?.location()
is TunnelState.Connected -> tunnelRealState.location
is TunnelState.Disconnecting -> lastKnownDisconnectedLocation
is TunnelState.Error -> null
},
- relayLocation = relayLocation,
+ selectedRelayItem = selectedRelayItem,
tunnelUiState = tunnelUiState,
tunnelRealState = tunnelRealState,
inAddress =
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SelectLocationViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SelectLocationViewModel.kt
index d3c5977e27..fc46441de1 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SelectLocationViewModel.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SelectLocationViewModel.kt
@@ -20,6 +20,7 @@ import net.mullvad.mullvadvpn.model.Ownership
import net.mullvad.mullvadvpn.relaylist.Provider
import net.mullvad.mullvadvpn.relaylist.RelayItem
import net.mullvad.mullvadvpn.relaylist.filterOnSearchTerm
+import net.mullvad.mullvadvpn.relaylist.toLocationConstraint
import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionManager
import net.mullvad.mullvadvpn.ui.serviceconnection.connectionProxy
import net.mullvad.mullvadvpn.usecase.RelayListFilterUseCase
@@ -40,7 +41,7 @@ class SelectLocationViewModel(
relayListFilterUseCase.availableProviders(),
relayListFilterUseCase.selectedProviders()
) {
- (relayCountries, relayItem),
+ (customList, relayCountries, selectedItem),
searchTerm,
selectedOwnership,
allProviders,
@@ -54,7 +55,7 @@ class SelectLocationViewModel(
?.size
val filteredRelayCountries =
- relayCountries.filterOnSearchTerm(searchTerm, relayItem)
+ relayCountries.filterOnSearchTerm(searchTerm, selectedItem)
SelectLocationUiState.Data(
searchTerm = searchTerm,
@@ -64,7 +65,7 @@ class SelectLocationViewModel(
if (filteredRelayCountries.isNotEmpty()) {
RelayListState.RelayList(
countries = filteredRelayCountries,
- selectedRelay = relayItem
+ selectedItem = selectedItem
)
} else {
RelayListState.Empty
@@ -85,7 +86,8 @@ class SelectLocationViewModel(
}
fun selectRelay(relayItem: RelayItem) {
- relayListUseCase.updateSelectedRelayLocation(relayItem.location)
+ val locationConstraint = relayItem.toLocationConstraint()
+ relayListUseCase.updateSelectedRelayLocation(locationConstraint)
serviceConnectionManager.connectionProxy()?.connect()
viewModelScope.launch { _uiSideEffect.send(SelectLocationSideEffect.CloseScreen) }
}
diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/relaylist/RelayNameComparatorTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/relaylist/RelayNameComparatorTest.kt
index dc9c141f28..6fe71ae443 100644
--- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/relaylist/RelayNameComparatorTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/relaylist/RelayNameComparatorTest.kt
@@ -16,9 +16,14 @@ class RelayNameComparatorTest {
@Test
fun test_compare_respect_numbers_in_name() {
val relay9 =
- Relay(name = "se9-wireguard", location = mockk(), locationName = "mock", active = false)
+ RelayItem.Relay(
+ name = "se9-wireguard",
+ location = mockk(),
+ locationName = "mock",
+ active = false
+ )
val relay10 =
- Relay(
+ RelayItem.Relay(
name = "se10-wireguard",
location = mockk(),
locationName = "mock",
@@ -31,9 +36,19 @@ class RelayNameComparatorTest {
@Test
fun test_compare_same_name() {
val relay9a =
- Relay(name = "se9-wireguard", location = mockk(), locationName = "mock", active = false)
+ RelayItem.Relay(
+ name = "se9-wireguard",
+ location = mockk(),
+ locationName = "mock",
+ active = false
+ )
val relay9b =
- Relay(name = "se9-wireguard", location = mockk(), locationName = "mock", active = false)
+ RelayItem.Relay(
+ name = "se9-wireguard",
+ location = mockk(),
+ locationName = "mock",
+ active = false
+ )
assertTrue(RelayNameComparator.compare(relay9a, relay9b) == 0)
assertTrue(RelayNameComparator.compare(relay9b, relay9a) == 0)
@@ -42,11 +57,13 @@ class RelayNameComparatorTest {
@Test
fun test_compare_only_numbers_in_name() {
val relay001 =
- Relay(name = "001", location = mockk(), locationName = "mock", active = false)
- val relay1 = Relay(name = "1", location = mockk(), locationName = "mock", active = false)
- val relay3 = Relay(name = "3", location = mockk(), locationName = "mock", active = false)
+ RelayItem.Relay(name = "001", location = mockk(), locationName = "mock", active = false)
+ val relay1 =
+ RelayItem.Relay(name = "1", location = mockk(), locationName = "mock", active = false)
+ val relay3 =
+ RelayItem.Relay(name = "3", location = mockk(), locationName = "mock", active = false)
val relay100 =
- Relay(name = "100", location = mockk(), locationName = "mock", active = false)
+ RelayItem.Relay(name = "100", location = mockk(), locationName = "mock", active = false)
relay001 assertOrderBothDirection relay1
relay001 assertOrderBothDirection relay3
@@ -57,9 +74,19 @@ class RelayNameComparatorTest {
@Test
fun test_compare_without_numbers_in_name() {
val relay9a =
- Relay(name = "se-wireguard", location = mockk(), locationName = "mock", active = false)
+ RelayItem.Relay(
+ name = "se-wireguard",
+ location = mockk(),
+ locationName = "mock",
+ active = false
+ )
val relay9b =
- Relay(name = "se-wireguard", location = mockk(), locationName = "mock", active = false)
+ RelayItem.Relay(
+ name = "se-wireguard",
+ location = mockk(),
+ locationName = "mock",
+ active = false
+ )
assertTrue(RelayNameComparator.compare(relay9a, relay9b) == 0)
assertTrue(RelayNameComparator.compare(relay9b, relay9a) == 0)
@@ -68,14 +95,14 @@ class RelayNameComparatorTest {
@Test
fun test_compare_with_trailing_zeros_in_name() {
val relay001 =
- Relay(
+ RelayItem.Relay(
name = "se001-wireguard",
location = mockk(),
locationName = "mock",
active = false
)
val relay005 =
- Relay(
+ RelayItem.Relay(
name = "se005-wireguard",
location = mockk(),
locationName = "mock",
@@ -88,13 +115,28 @@ class RelayNameComparatorTest {
@Test
fun test_compare_prefix_and_numbers() {
val relayAr2 =
- Relay(name = "ar2-wireguard", location = mockk(), locationName = "mock", active = false)
+ RelayItem.Relay(
+ name = "ar2-wireguard",
+ location = mockk(),
+ locationName = "mock",
+ active = false
+ )
val relayAr8 =
- Relay(name = "ar8-wireguard", location = mockk(), locationName = "mock", active = false)
+ RelayItem.Relay(
+ name = "ar8-wireguard",
+ location = mockk(),
+ locationName = "mock",
+ active = false
+ )
val relaySe5 =
- Relay(name = "se5-wireguard", location = mockk(), locationName = "mock", active = false)
+ RelayItem.Relay(
+ name = "se5-wireguard",
+ location = mockk(),
+ locationName = "mock",
+ active = false
+ )
val relaySe10 =
- Relay(
+ RelayItem.Relay(
name = "se10-wireguard",
location = mockk(),
locationName = "mock",
@@ -109,9 +151,19 @@ class RelayNameComparatorTest {
@Test
fun test_compare_suffix_and_numbers() {
val relay2c =
- Relay(name = "se2-cloud", location = mockk(), locationName = "mock", active = false)
+ RelayItem.Relay(
+ name = "se2-cloud",
+ location = mockk(),
+ locationName = "mock",
+ active = false
+ )
val relay2w =
- Relay(name = "se2-wireguard", location = mockk(), locationName = "mock", active = false)
+ RelayItem.Relay(
+ name = "se2-wireguard",
+ location = mockk(),
+ locationName = "mock",
+ active = false
+ )
relay2c assertOrderBothDirection relay2w
}
@@ -119,9 +171,14 @@ class RelayNameComparatorTest {
@Test
fun test_compare_different_length() {
val relay22a =
- Relay(name = "se22", location = mockk(), locationName = "mock", active = false)
+ RelayItem.Relay(
+ name = "se22",
+ location = mockk(),
+ locationName = "mock",
+ active = false
+ )
val relay22b =
- Relay(
+ RelayItem.Relay(
name = "se22-wireguard",
location = mockk(),
locationName = "mock",
@@ -131,7 +188,7 @@ class RelayNameComparatorTest {
relay22a assertOrderBothDirection relay22b
}
- private infix fun Relay.assertOrderBothDirection(other: Relay) {
+ private infix fun RelayItem.Relay.assertOrderBothDirection(other: RelayItem.Relay) {
assertTrue(RelayNameComparator.compare(this, other) < 0)
assertTrue(RelayNameComparator.compare(other, this) > 0)
}
diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModelTest.kt
index a1e3ce57e5..57eeef5ca4 100644
--- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModelTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModelTest.kt
@@ -22,7 +22,6 @@ import net.mullvad.mullvadvpn.model.AccountExpiry
import net.mullvad.mullvadvpn.model.DeviceState
import net.mullvad.mullvadvpn.model.GeoIpLocation
import net.mullvad.mullvadvpn.model.TunnelState
-import net.mullvad.mullvadvpn.relaylist.RelayCountry
import net.mullvad.mullvadvpn.relaylist.RelayItem
import net.mullvad.mullvadvpn.repository.AccountRepository
import net.mullvad.mullvadvpn.repository.DeviceRepository
@@ -96,7 +95,7 @@ class ConnectViewModelTest {
EventNotifier<TunnelState>(TunnelState.Disconnected())
// Flows
- private val selectedRelayFlow = MutableStateFlow<RelayItem?>(null)
+ private val selectedRelayItemFlow = MutableStateFlow<RelayItem?>(null)
// Out Of Time Use Case
private val outOfTimeUseCase: OutOfTimeUseCase = mockk()
@@ -131,7 +130,7 @@ class ConnectViewModelTest {
every { mockAppVersionInfoCache.onUpdate = any() } answers {}
// Flows
- every { mockRelayListUseCase.selectedRelayItem() } returns selectedRelayFlow
+ every { mockRelayListUseCase.selectedRelayItem() } returns selectedRelayItemFlow
every { outOfTimeUseCase.isOutOfTime() } returns outOfTimeViewFlow
viewModel =
@@ -188,17 +187,17 @@ class ConnectViewModelTest {
}
@Test
- fun testRelayItemUpdate() = runTest {
- val relayTestItem =
- RelayCountry(name = "Name", code = "Code", expanded = false, cities = emptyList())
- selectedRelayFlow.value = relayTestItem
+ fun testSelectedLocationUpdate() = runTest {
+ val selectedRelayItem =
+ RelayItem.Country(name = "Name", code = "Code", expanded = false, cities = emptyList())
+ selectedRelayItemFlow.value = selectedRelayItem
viewModel.uiState.test {
assertEquals(ConnectUiState.INITIAL, awaitItem())
serviceConnectionState.value =
ServiceConnectionState.ConnectedReady(mockServiceConnectionContainer)
val result = awaitItem()
- assertEquals(relayTestItem, result.relayLocation)
+ assertEquals(selectedRelayItem, result.selectedRelayItem)
}
}
diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SelectLocationViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SelectLocationViewModelTest.kt
index fc6408d8ab..4224563d3b 100644
--- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SelectLocationViewModelTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SelectLocationViewModelTest.kt
@@ -20,13 +20,14 @@ import net.mullvad.mullvadvpn.lib.common.test.TestCoroutineRule
import net.mullvad.mullvadvpn.lib.common.test.assertLists
import net.mullvad.mullvadvpn.model.Constraint
import net.mullvad.mullvadvpn.model.GeographicLocationConstraint
+import net.mullvad.mullvadvpn.model.LocationConstraint
import net.mullvad.mullvadvpn.model.Ownership
import net.mullvad.mullvadvpn.model.Providers
import net.mullvad.mullvadvpn.relaylist.Provider
-import net.mullvad.mullvadvpn.relaylist.RelayCountry
import net.mullvad.mullvadvpn.relaylist.RelayItem
import net.mullvad.mullvadvpn.relaylist.RelayList
import net.mullvad.mullvadvpn.relaylist.filterOnSearchTerm
+import net.mullvad.mullvadvpn.relaylist.toLocationConstraint
import net.mullvad.mullvadvpn.ui.serviceconnection.ConnectionProxy
import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionManager
import net.mullvad.mullvadvpn.ui.serviceconnection.connectionProxy
@@ -43,7 +44,8 @@ class SelectLocationViewModelTest {
private val mockRelayListFilterUseCase: RelayListFilterUseCase = mockk(relaxed = true)
private val mockServiceConnectionManager: ServiceConnectionManager = mockk()
private lateinit var viewModel: SelectLocationViewModel
- private val relayListWithSelectionFlow = MutableStateFlow(RelayList(emptyList(), null))
+ private val relayListWithSelectionFlow =
+ MutableStateFlow(RelayList(emptyList(), emptyList(), null))
private val mockRelayListUseCase: RelayListUseCase = mockk()
private val selectedOwnership = MutableStateFlow<Constraint<Ownership>>(Constraint.Any())
private val selectedProvider = MutableStateFlow<Constraint<Providers>>(Constraint.Any())
@@ -60,6 +62,7 @@ class SelectLocationViewModelTest {
mockkStatic(SERVICE_CONNECTION_MANAGER_EXTENSIONS)
mockkStatic(RELAY_LIST_EXTENSIONS)
+ mockkStatic(RELAY_ITEM_EXTENSIONS)
viewModel =
SelectLocationViewModel(
mockServiceConnectionManager,
@@ -82,10 +85,11 @@ class SelectLocationViewModelTest {
@Test
fun testUpdateLocations() = runTest {
// Arrange
- val mockCountries = listOf<RelayCountry>(mockk(), mockk())
- val selectedRelay: RelayItem = mockk()
- every { mockCountries.filterOnSearchTerm(any(), selectedRelay) } returns mockCountries
- relayListWithSelectionFlow.value = RelayList(mockCountries, selectedRelay)
+ val mockCountries = listOf<RelayItem.Country>(mockk(), mockk())
+ val mockCustomList = listOf<RelayItem.CustomList>(mockk())
+ val selectedItem: RelayItem = mockk()
+ every { mockCountries.filterOnSearchTerm(any(), selectedItem) } returns mockCountries
+ relayListWithSelectionFlow.value = RelayList(mockCustomList, mockCountries, selectedItem)
// Act, Assert
viewModel.uiState.test {
@@ -97,8 +101,8 @@ class SelectLocationViewModelTest {
(actualState.relayListState as RelayListState.RelayList).countries
)
assertEquals(
- selectedRelay,
- (actualState.relayListState as RelayListState.RelayList).selectedRelay
+ selectedItem,
+ (actualState.relayListState as RelayListState.RelayList).selectedItem
)
}
}
@@ -106,10 +110,11 @@ class SelectLocationViewModelTest {
@Test
fun testUpdateLocationsNoSelectedRelay() = runTest {
// Arrange
- val mockCountries = listOf<RelayCountry>(mockk(), mockk())
- val selectedRelay: RelayItem? = null
- every { mockCountries.filterOnSearchTerm(any(), selectedRelay) } returns mockCountries
- relayListWithSelectionFlow.value = RelayList(mockCountries, selectedRelay)
+ val mockCustomList = listOf<RelayItem.CustomList>(mockk())
+ val mockCountries = listOf<RelayItem.Country>(mockk(), mockk())
+ val selectedItem: RelayItem? = null
+ every { mockCountries.filterOnSearchTerm(any(), selectedItem) } returns mockCountries
+ relayListWithSelectionFlow.value = RelayList(mockCustomList, mockCountries, selectedItem)
// Act, Assert
viewModel.uiState.test {
@@ -121,8 +126,8 @@ class SelectLocationViewModelTest {
(actualState.relayListState as RelayListState.RelayList).countries
)
assertEquals(
- selectedRelay,
- (actualState.relayListState as RelayListState.RelayList).selectedRelay
+ selectedItem,
+ (actualState.relayListState as RelayListState.RelayList).selectedItem
)
}
}
@@ -130,12 +135,15 @@ class SelectLocationViewModelTest {
@Test
fun testSelectRelayAndClose() = runTest {
// Arrange
- val mockRelayItem: RelayItem = mockk()
+ val mockRelayItem: RelayItem.Country = mockk()
val mockLocation: GeographicLocationConstraint.Country = mockk(relaxed = true)
+ val mockLocationConstraint: LocationConstraint = mockk()
val connectionProxyMock: ConnectionProxy = mockk(relaxUnitFun = true)
every { mockRelayItem.location } returns mockLocation
every { mockServiceConnectionManager.connectionProxy() } returns connectionProxyMock
- every { mockRelayListUseCase.updateSelectedRelayLocation(mockLocation) } returns Unit
+ every { mockRelayListUseCase.updateSelectedRelayLocation(mockLocationConstraint) } returns
+ Unit
+ every { mockRelayItem.toLocationConstraint() } returns mockLocationConstraint
// Act, Assert
viewModel.uiSideEffect.test {
@@ -144,7 +152,7 @@ class SelectLocationViewModelTest {
assertEquals(SelectLocationSideEffect.CloseScreen, awaitItem())
verify {
connectionProxyMock.connect()
- mockRelayListUseCase.updateSelectedRelayLocation(mockLocation)
+ mockRelayListUseCase.updateSelectedRelayLocation(mockLocationConstraint)
}
}
}
@@ -152,13 +160,14 @@ class SelectLocationViewModelTest {
@Test
fun testFilterRelay() = runTest {
// Arrange
- val mockCountries = listOf<RelayCountry>(mockk(), mockk())
- val selectedRelay: RelayItem? = null
- val mockRelayList: List<RelayCountry> = mockk(relaxed = true)
+ val mockCustomList = listOf<RelayItem.CustomList>(mockk())
+ val mockCountries = listOf<RelayItem.Country>(mockk(), mockk())
+ val selectedItem: RelayItem? = null
+ val mockRelayList: List<RelayItem.Country> = mockk(relaxed = true)
val mockSearchString = "SEARCH"
- every { mockRelayList.filterOnSearchTerm(mockSearchString, selectedRelay) } returns
+ every { mockRelayList.filterOnSearchTerm(mockSearchString, selectedItem) } returns
mockCountries
- relayListWithSelectionFlow.value = RelayList(mockRelayList, selectedRelay)
+ relayListWithSelectionFlow.value = RelayList(mockCustomList, mockRelayList, selectedItem)
// Act, Assert
viewModel.uiState.test {
@@ -177,8 +186,8 @@ class SelectLocationViewModelTest {
(actualState.relayListState as RelayListState.RelayList).countries
)
assertEquals(
- selectedRelay,
- (actualState.relayListState as RelayListState.RelayList).selectedRelay
+ selectedItem,
+ (actualState.relayListState as RelayListState.RelayList).selectedItem
)
}
}
@@ -186,13 +195,14 @@ class SelectLocationViewModelTest {
@Test
fun testFilterNotFound() = runTest {
// Arrange
- val mockCountries = emptyList<RelayCountry>()
- val selectedRelay: RelayItem? = null
- val mockRelayList: List<RelayCountry> = mockk(relaxed = true)
+ val mockCustomList = listOf<RelayItem.CustomList>(mockk())
+ val mockCountries = emptyList<RelayItem.Country>()
+ val selectedItem: RelayItem? = null
+ val mockRelayList: List<RelayItem.Country> = mockk(relaxed = true)
val mockSearchString = "SEARCH"
- every { mockRelayList.filterOnSearchTerm(mockSearchString, selectedRelay) } returns
+ every { mockRelayList.filterOnSearchTerm(mockSearchString, selectedItem) } returns
mockCountries
- relayListWithSelectionFlow.value = RelayList(mockRelayList, selectedRelay)
+ relayListWithSelectionFlow.value = RelayList(mockCustomList, mockRelayList, selectedItem)
// Act, Assert
viewModel.uiState.test {
@@ -250,5 +260,7 @@ class SelectLocationViewModelTest {
"net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionManagerExtensionsKt"
private const val RELAY_LIST_EXTENSIONS =
"net.mullvad.mullvadvpn.relaylist.RelayListExtensionsKt"
+ private const val RELAY_ITEM_EXTENSIONS =
+ "net.mullvad.mullvadvpn.relaylist.RelayItemExtensionsKt"
}
}
diff --git a/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/LocationConstraintExtensions.kt b/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/LocationConstraintExtensions.kt
deleted file mode 100644
index d845e3aba9..0000000000
--- a/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/LocationConstraintExtensions.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package net.mullvad.mullvadvpn.lib.common.util
-
-import net.mullvad.mullvadvpn.model.Constraint
-import net.mullvad.mullvadvpn.model.GeographicLocationConstraint
-import net.mullvad.mullvadvpn.model.LocationConstraint
-
-fun LocationConstraint.toGeographicLocationConstraint(): GeographicLocationConstraint? =
- when (this) {
- is LocationConstraint.Location -> this.location
- is LocationConstraint.CustomList -> null
- }
-
-fun Constraint<LocationConstraint>.toGeographicLocationConstraint():
- Constraint<GeographicLocationConstraint> =
- when (this) {
- is Constraint.Only ->
- when (value) {
- is LocationConstraint.Location ->
- Constraint.Only((value as LocationConstraint.Location).location)
- is LocationConstraint.CustomList -> Constraint.Any()
- }
- is Constraint.Any -> Constraint.Any()
- }
diff --git a/android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/Event.kt b/android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/Event.kt
index 69c28bb379..1136ae8c55 100644
--- a/android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/Event.kt
+++ b/android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/Event.kt
@@ -65,6 +65,8 @@ sealed class Event : Message.EventMessage() {
@Parcelize object VpnPermissionRequest : Event()
+ @Parcelize data class CreateCustomListResult(val listId: String) : Event()
+
companion object {
private const val MESSAGE_KEY = "event"
diff --git a/android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/Request.kt b/android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/Request.kt
index 267f1f2619..fe9d3b46d9 100644
--- a/android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/Request.kt
+++ b/android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/Request.kt
@@ -5,8 +5,9 @@ import android.os.Messenger
import java.net.InetAddress
import kotlinx.parcelize.Parcelize
import net.mullvad.mullvadvpn.model.Constraint
+import net.mullvad.mullvadvpn.model.CustomList
import net.mullvad.mullvadvpn.model.DnsOptions
-import net.mullvad.mullvadvpn.model.GeographicLocationConstraint
+import net.mullvad.mullvadvpn.model.LocationConstraint
import net.mullvad.mullvadvpn.model.ObfuscationSettings
import net.mullvad.mullvadvpn.model.Ownership
import net.mullvad.mullvadvpn.model.PlayPurchase
@@ -77,8 +78,7 @@ sealed class Request : Message.RequestMessage() {
@Parcelize data class SetEnableSplitTunneling(val enable: Boolean) : Request()
- @Parcelize
- data class SetRelayLocation(val relayLocation: GeographicLocationConstraint) : Request()
+ @Parcelize data class SetRelayLocation(val locationConstraint: LocationConstraint) : Request()
@Parcelize data class SetWireGuardMtu(val mtu: Int?) : Request()
@@ -111,6 +111,12 @@ sealed class Request : Message.RequestMessage() {
val providers: Constraint<Providers>
) : Request()
+ @Parcelize data class CreateCustomList(val name: String) : Request()
+
+ @Parcelize data class DeleteCustomList(val id: String) : Request()
+
+ @Parcelize data class UpdateCustomList(val customList: CustomList) : Request()
+
companion object {
private const val MESSAGE_KEY = "request"
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/CustomList.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/CustomList.kt
new file mode 100644
index 0000000000..cdfa1b9687
--- /dev/null
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/CustomList.kt
@@ -0,0 +1,11 @@
+package net.mullvad.mullvadvpn.model
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class CustomList(
+ val id: String,
+ val name: String,
+ val locations: ArrayList<GeographicLocationConstraint>
+) : Parcelable
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/CustomListsSettings.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/CustomListsSettings.kt
new file mode 100644
index 0000000000..8a8c03ef05
--- /dev/null
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/CustomListsSettings.kt
@@ -0,0 +1,6 @@
+package net.mullvad.mullvadvpn.model
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize data class CustomListsSettings(val customLists: ArrayList<CustomList>) : Parcelable
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/Settings.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/Settings.kt
index 0d45b38179..304edc404a 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/Settings.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/Settings.kt
@@ -7,6 +7,7 @@ import kotlinx.parcelize.Parcelize
data class Settings(
val relaySettings: RelaySettings,
val obfuscationSettings: ObfuscationSettings,
+ val customLists: CustomListsSettings,
val allowLan: Boolean,
val autoConnect: Boolean,
val tunnelOptions: TunnelOptions,
diff --git a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
index 52e662c771..d09287fbf2 100644
--- a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
+++ b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
@@ -5,6 +5,7 @@ import kotlinx.coroutines.flow.asSharedFlow
import net.mullvad.mullvadvpn.lib.endpoint.ApiEndpoint
import net.mullvad.mullvadvpn.lib.endpoint.ApiEndpointConfiguration
import net.mullvad.mullvadvpn.model.AppVersionInfo
+import net.mullvad.mullvadvpn.model.CustomList
import net.mullvad.mullvadvpn.model.Device
import net.mullvad.mullvadvpn.model.DeviceEvent
import net.mullvad.mullvadvpn.model.DeviceListEvent
@@ -189,6 +190,18 @@ class MullvadDaemon(
setQuantumResistantTunnel(daemonInterfaceAddress, quantumResistant)
}
+ fun createCustomList(name: String): String {
+ return createCustomList(daemonInterfaceAddress, name)
+ }
+
+ fun deleteCustomList(id: String) {
+ deleteCustomList(daemonInterfaceAddress, id)
+ }
+
+ fun updateCustomList(customList: CustomList) {
+ updateCustomList(daemonInterfaceAddress, customList)
+ }
+
fun onDestroy() {
onSettingsChange.unsubscribeAll()
onTunnelStateChange.unsubscribeAll()
@@ -297,6 +310,13 @@ class MullvadDaemon(
)
// Used by JNI
+
+ private external fun createCustomList(daemonInterfaceAddress: Long, name: String): String
+
+ private external fun deleteCustomList(daemonInterfaceAddress: Long, id: String)
+
+ private external fun updateCustomList(daemonInterfaceAddress: Long, customList: CustomList)
+
@Suppress("unused")
private fun notifyAppVersionInfoEvent(appVersionInfo: AppVersionInfo) {
onAppVersionInfoChange?.invoke(appVersionInfo)
diff --git a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/CustomLists.kt b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/CustomLists.kt
new file mode 100644
index 0000000000..d80bcf04ff
--- /dev/null
+++ b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/CustomLists.kt
@@ -0,0 +1,49 @@
+package net.mullvad.mullvadvpn.service.endpoint
+
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.flow.filterIsInstance
+import kotlinx.coroutines.launch
+import net.mullvad.mullvadvpn.lib.ipc.Event
+import net.mullvad.mullvadvpn.lib.ipc.Request
+
+class CustomLists(
+ private val endpoint: ServiceEndpoint,
+ dispatcher: CoroutineDispatcher = Dispatchers.IO
+) {
+ private val scope: CoroutineScope = CoroutineScope(SupervisorJob() + dispatcher)
+ private val daemon
+ get() = endpoint.intermittentDaemon
+
+ init {
+ scope.launch {
+ endpoint.dispatcher.parsedMessages
+ .filterIsInstance<Request.CreateCustomList>()
+ .collect { createCustomList(it.name) }
+ }
+
+ scope.launch {
+ endpoint.dispatcher.parsedMessages
+ .filterIsInstance<Request.DeleteCustomList>()
+ .collect { daemon.await().deleteCustomList(it.id) }
+ }
+
+ scope.launch {
+ endpoint.dispatcher.parsedMessages
+ .filterIsInstance<Request.UpdateCustomList>()
+ .collect { daemon.await().updateCustomList(it.customList) }
+ }
+ }
+
+ private suspend fun createCustomList(name: String) {
+ val result = daemon.await().createCustomList(name)
+ endpoint.sendEvent(Event.CreateCustomListResult(result))
+ }
+
+ fun onDestroy() {
+ scope.cancel()
+ }
+}
diff --git a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/RelayListListener.kt b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/RelayListListener.kt
index 2f18c09064..8ba6234cf6 100644
--- a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/RelayListListener.kt
+++ b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/RelayListListener.kt
@@ -11,7 +11,6 @@ import kotlinx.coroutines.launch
import net.mullvad.mullvadvpn.lib.ipc.Event
import net.mullvad.mullvadvpn.lib.ipc.Request
import net.mullvad.mullvadvpn.model.Constraint
-import net.mullvad.mullvadvpn.model.LocationConstraint
import net.mullvad.mullvadvpn.model.RelayConstraints
import net.mullvad.mullvadvpn.model.RelayList
import net.mullvad.mullvadvpn.model.RelaySettings
@@ -45,12 +44,7 @@ class RelayListListener(
.collect { request ->
val update =
getCurrentRelayConstraints()
- .copy(
- location =
- Constraint.Only(
- LocationConstraint.Location(request.relayLocation)
- )
- )
+ .copy(location = Constraint.Only(request.locationConstraint))
daemon.await().setRelaySettings(RelaySettings.Normal(update))
}
}
diff --git a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/ServiceEndpoint.kt b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/ServiceEndpoint.kt
index 09fc73e5d3..5485c528b0 100644
--- a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/ServiceEndpoint.kt
+++ b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/ServiceEndpoint.kt
@@ -51,6 +51,7 @@ class ServiceEndpoint(
val voucherRedeemer = VoucherRedeemer(this, accountCache)
private val playPurchaseHandler = PlayPurchaseHandler(this)
+ private val customLists = CustomLists(this)
private val deviceRepositoryBackend = DaemonDeviceDataSource(this)
@@ -81,6 +82,7 @@ class ServiceEndpoint(
splitTunneling.onDestroy()
voucherRedeemer.onDestroy()
playPurchaseHandler.onDestroy()
+ customLists.onDestroy()
}
internal fun sendEvent(event: Event) {
Copyright © 2025 - 2026 Wayne Cole. WTFPL. Attribution appreciated. No warranty. Not liable for bodily damages.