Remove `GetCurrentLocation`.

Make the daemon send two tunnel state updates, one with out IP being
empty, and another with it being filled when am.i.mullvad.net responds.

Update CLI for this change. Other front ends are left out.

3 files changed, 15 insertions, 27 deletions

diff --git a/mullvad-management-interface/proto/management_interface.proto b/mullvad-management-interface/proto/management_interface.proto
index d66707b79f..97507ca8a2 100644
--- a/mullvad-management-interface/proto/management_interface.proto
+++ b/mullvad-management-interface/proto/management_interface.proto
@@ -28,7 +28,6 @@ service ManagementService {
   // Relays and tunnel constraints
   rpc UpdateRelayLocations(google.protobuf.Empty) returns (google.protobuf.Empty) {}
   rpc GetRelayLocations(google.protobuf.Empty) returns (RelayList) {}
-  rpc GetCurrentLocation(google.protobuf.Empty) returns (GeoIpLocation) {}
   rpc SetRelaySettings(RelaySettings) returns (google.protobuf.Empty) {}
   rpc SetBridgeSettings(BridgeSettings) returns (google.protobuf.Empty) {}
   rpc SetBridgeState(BridgeState) returns (google.protobuf.Empty) {}
@@ -172,7 +171,7 @@ message ErrorState {
 }
 
 message TunnelState {
-  message Disconnected {}
+  message Disconnected { GeoIpLocation disconnected_location = 1; }
   message Connecting { TunnelStateRelayInfo relay_info = 1; }
   message Connected { TunnelStateRelayInfo relay_info = 1; }
   message Disconnecting { AfterDisconnect after_disconnect = 1; }
diff --git a/mullvad-management-interface/src/client.rs b/mullvad-management-interface/src/client.rs
index 1c9d80b2e8..85048e29e7 100644
--- a/mullvad-management-interface/src/client.rs
+++ b/mullvad-management-interface/src/client.rs
@@ -7,7 +7,6 @@ use mullvad_types::{
     account::{AccountData, AccountToken, VoucherSubmission},
     custom_list::{CustomList, Id},
     device::{Device, DeviceEvent, DeviceId, DeviceState, RemoveDeviceEvent},
-    location::GeoIpLocation,
     relay_constraints::{
         BridgeSettings, BridgeState, ObfuscationSettings, RelayOverride, RelaySettings,
     },
@@ -234,16 +233,6 @@ impl MullvadProxyClient {
         Ok(())
     }
 
-    pub async fn get_current_location(&mut self) -> Result<GeoIpLocation> {
-        let location = self
-            .0
-            .get_current_location(())
-            .await
-            .map_err(map_location_error)?
-            .into_inner();
-        GeoIpLocation::try_from(location).map_err(Error::InvalidResponse)
-    }
-
     pub async fn set_bridge_settings(&mut self, settings: BridgeSettings) -> Result<()> {
         let settings = types::BridgeSettings::from(settings);
         self.0
@@ -571,10 +560,9 @@ impl MullvadProxyClient {
     /// Set the [`AccessMethod`] which [`ApiConnectionModeProvider`] should
     /// pick.
     ///
-    /// - `access_method`: If `Some(access_method)`, [`ApiConnectionModeProvider`] will skip
-    ///     ahead and return `access_method` when asked for a new access method.
-    ///     If `None`, [`ApiConnectionModeProvider`] will pick the next access
-    ///     method "randomly"
+    /// - `access_method`: If `Some(access_method)`, [`ApiConnectionModeProvider`] will skip ahead
+    ///   and return `access_method` when asked for a new access method. If `None`,
+    ///   [`ApiConnectionModeProvider`] will pick the next access method "randomly"
     ///
     /// [`ApiConnectionModeProvider`]: mullvad_daemon::api::ApiConnectionModeProvider
     pub async fn set_access_method(&mut self, api_access_method: access_method::Id) -> Result<()> {
@@ -696,13 +684,6 @@ fn map_device_error(status: Status) -> Error {
     }
 }
 
-fn map_location_error(status: Status) -> Error {
-    match status.code() {
-        Code::NotFound => Error::NoLocationData,
-        _other => Error::Rpc(status),
-    }
-}
-
 fn map_custom_list_error(status: Status) -> Error {
     match status.code() {
         Code::NotFound => {
diff --git a/mullvad-management-interface/src/types/conversions/states.rs b/mullvad-management-interface/src/types/conversions/states.rs
index b742aa7b00..2541859e27 100644
--- a/mullvad-management-interface/src/types/conversions/states.rs
+++ b/mullvad-management-interface/src/types/conversions/states.rs
@@ -32,8 +32,10 @@ impl From<mullvad_types::states::TunnelState> for proto::TunnelState {
             };
 
         let state = match state {
-            MullvadTunnelState::Disconnected => {
-                proto::tunnel_state::State::Disconnected(proto::tunnel_state::Disconnected {})
+            MullvadTunnelState::Disconnected(disconnected_location) => {
+                proto::tunnel_state::State::Disconnected(proto::tunnel_state::Disconnected {
+                    disconnected_location: disconnected_location.map(proto::GeoIpLocation::from),
+                })
             }
             MullvadTunnelState::Connecting { endpoint, location } => {
                 proto::tunnel_state::State::Connecting(proto::tunnel_state::Connecting {
@@ -189,7 +191,13 @@ impl TryFrom<proto::TunnelState> for mullvad_types::states::TunnelState {
         use talpid_types::{net as talpid_net, tunnel as talpid_tunnel};
 
         let state = match state.state {
-            Some(proto::tunnel_state::State::Disconnected(_)) => MullvadState::Disconnected,
+            Some(proto::tunnel_state::State::Disconnected(proto::tunnel_state::Disconnected {
+                disconnected_location,
+            })) => MullvadState::Disconnected(
+                disconnected_location
+                    .map(mullvad_types::location::GeoIpLocation::try_from)
+                    .transpose()?,
+            ),
             Some(proto::tunnel_state::State::Connecting(proto::tunnel_state::Connecting {
                 relay_info:
                     Some(proto::TunnelStateRelayInfo {