diff options
Diffstat (limited to 'android/src/main')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SelectLocationFragment.kt | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SelectLocationFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SelectLocationFragment.kt index 8d30001f2c..73d5e9d3f5 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SelectLocationFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SelectLocationFragment.kt @@ -15,11 +15,7 @@ import androidx.recyclerview.widget.LinearLayoutManager import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.flow.collect import net.mullvad.mullvadvpn.R -import net.mullvad.mullvadvpn.model.Constraint import net.mullvad.mullvadvpn.model.KeygenEvent -import net.mullvad.mullvadvpn.model.LocationConstraint -import net.mullvad.mullvadvpn.model.RelayConstraintsUpdate -import net.mullvad.mullvadvpn.model.RelaySettingsUpdate import net.mullvad.mullvadvpn.relaylist.RelayItem import net.mullvad.mullvadvpn.relaylist.RelayList import net.mullvad.mullvadvpn.relaylist.RelayListAdapter @@ -46,7 +42,7 @@ class SelectLocationFragment : relayListAdapter = RelayListAdapter(context.resources).apply { onSelect = { relayItem -> jobTracker.newBackgroundJob("selectRelay") { - updateLocationConstraint(relayItem) + relayListListener.selectedRelayLocation = relayItem?.location maybeConnect() jobTracker.newUiJob("close") { @@ -152,13 +148,6 @@ class SelectLocationFragment : activity?.onBackPressed() } - private fun updateLocationConstraint(relayItem: RelayItem?) { - val constraint: Constraint<LocationConstraint> = - relayItem?.run { Constraint.Only(location) } ?: Constraint.Any() - - daemon.updateRelaySettings(RelaySettingsUpdate.Normal(RelayConstraintsUpdate(constraint))) - } - private fun updateRelayList(relayList: RelayList, selectedItem: RelayItem?) { relayListAdapter.onRelayListChange(relayList, selectedItem) } |