diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-01-13 17:37:20 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-04-21 12:24:47 +0000 |
| commit | 980ca3cd9d189b02625d6fdecf75bd279fcc15b1 (patch) | |
| tree | 0504fc71912a7205bbc3867de367289650817f1b /android/src/main | |
| parent | 230b9c90d20d99f5e46b1875ccc25eb89953b1be (diff) | |
| download | mullvadvpn-980ca3cd9d189b02625d6fdecf75bd279fcc15b1.tar.xz mullvadvpn-980ca3cd9d189b02625d6fdecf75bd279fcc15b1.zip | |
Change `SelectLocationFragment` to not use daemon
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) } |
