Minor things

Author: dlon

mullvad-daemon/src/lib.rs

@@ -1674,7 +1674,7 @@ where
                     //        and not have to request the list from the API.
                     event_listener.notify_remove_device_event(RemoveDeviceEvent {
                         account_token,
-                        new_devices,
+                        new_device_list: new_devices,
                     });
                 });
             Self::oneshot_send(

mullvad-daemon/src/management_interface.rs

@@ -15,7 +15,8 @@ use mullvad_types::{
     settings::Settings,
     states::{TargetState, TunnelState},
     version,
-    wireguard::{RotationInterval, RotationIntervalError}, TryFromProto,
+    wireguard::{RotationInterval, RotationIntervalError},
+    TryFromProto,
 };
 use mullvad_types::{
     proto::{
@@ -592,7 +593,8 @@ impl ManagementService for ManagementServiceImpl {
 
     async fn update_custom_list(&self, request: Request<types::CustomList>) -> ServiceResult<()> {
         log::debug!("update_custom_list");
-        let custom_list = mullvad_types::custom_list::CustomList::try_from_proto(request.into_inner())?;
+        let custom_list =
+            mullvad_types::custom_list::CustomList::try_from_proto(request.into_inner())?;
         let (tx, rx) = oneshot::channel();
         self.send_command_to_daemon(DaemonCommand::UpdateCustomList(tx, custom_list))?;
         self.wait_for_result(rx)
@@ -1032,9 +1034,7 @@ impl EventListener for ManagementInterfaceEventBroadcaster {
     fn notify_remove_device_event(&self, remove_event: mullvad_types::device::RemoveDeviceEvent) {
         log::debug!("Broadcasting remove device event");
         self.notify(types::DaemonEvent {
-            event: Some(daemon_event::Event::RemoveDevice(
-                types::RemoveDeviceEvent::from(remove_event),
-            )),
+            event: Some(daemon_event::Event::RemoveDevice(remove_event.into_proto())),
         })
     }
 

mullvad-types/src/custom_list.rs

@@ -1,10 +1,10 @@
 use crate::relay_constraints::GeographicLocationConstraint;
+use crate::{IntoProto, TryFromProto};
 #[cfg(target_os = "android")]
 use jnix::{
     jni::objects::{AutoLocal, JObject, JString},
     FromJava, IntoJava, JnixEnv,
 };
-use crate::{IntoProto, TryFromProto};
 use serde::{Deserialize, Serialize};
 use std::{
     collections::BTreeSet,

mullvad-types/src/device.rs

@@ -125,10 +125,10 @@ pub struct DeviceEvent {
 
 /// Emitted when a device is removed using the `RemoveDevice` RPC.
 /// This is not sent by a normal logout or when it is revoked remotely.
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, IntoProto, TryFromProto)]
 #[cfg_attr(target_os = "android", derive(IntoJava))]
 #[cfg_attr(target_os = "android", jnix(package = "net.mullvad.mullvadvpn.model"))]
 pub struct RemoveDeviceEvent {
     pub account_token: AccountToken,
-    pub new_devices: Vec<Device>,
+    pub new_device_list: Vec<Device>,
 }

mullvad-types/src/proto/client.rs

@@ -12,7 +12,8 @@ use crate::{
     settings::{DnsOptions, Settings},
     states::TunnelState,
     version::AppVersionInfo,
-    wireguard::{PublicKey, QuantumResistantState, RotationInterval}, IntoProto,
+    wireguard::{PublicKey, QuantumResistantState, RotationInterval},
+    IntoProto,
 };
 use crate::{proto::types, TryFromProto};
 use futures::{Stream, StreamExt};

mullvad-types/src/proto/types/conversions/custom_list.rs

@@ -1,7 +1,7 @@
-use std::collections::BTreeSet;
 use crate::proto::types;
-use crate::{IntoProto, TryFromProto};
 use crate::relay_constraints::GeographicLocationConstraint;
+use crate::{IntoProto, TryFromProto};
+use std::collections::BTreeSet;
 
 impl IntoProto<types::CustomList> for crate::custom_list::CustomList {
     fn into_proto(self) -> types::CustomList {
@@ -19,7 +19,9 @@ impl IntoProto<types::CustomList> for crate::custom_list::CustomList {
 }
 
 impl TryFromProto<types::CustomList> for crate::custom_list::CustomList {
-    fn try_from_proto(other: types::CustomList) -> Result<Self, crate::proto::types::FromProtobufTypeError> {
+    fn try_from_proto(
+        other: types::CustomList,
+    ) -> Result<Self, crate::proto::types::FromProtobufTypeError> {
         let locations = other
             .locations
             .into_iter()

mullvad-types/src/proto/types/conversions/device.rs

@@ -106,35 +106,6 @@ impl From<types::device_event::Cause> for crate::device::DeviceEventCause {
     }
 }
 
-impl From<crate::device::RemoveDeviceEvent> for types::RemoveDeviceEvent {
-    fn from(event: crate::device::RemoveDeviceEvent) -> Self {
-        types::RemoveDeviceEvent {
-            account_token: event.account_token,
-            new_device_list: event
-                .new_devices
-                .into_iter()
-                .map(|device| device.into_proto())
-                .collect(),
-        }
-    }
-}
-
-impl TryFrom<types::RemoveDeviceEvent> for crate::device::RemoveDeviceEvent {
-    type Error = FromProtobufTypeError;
-
-    fn try_from(event: types::RemoveDeviceEvent) -> Result<Self, Self::Error> {
-        let new_devices = event
-            .new_device_list
-            .into_iter()
-            .map(crate::device::Device::try_from)
-            .collect::<Result<Vec<_>, FromProtobufTypeError>>()?;
-        Ok(crate::device::RemoveDeviceEvent {
-            account_token: event.account_token,
-            new_devices,
-        })
-    }
-}
-
 impl From<crate::device::AccountAndDevice> for types::AccountAndDevice {
     fn from(device: crate::device::AccountAndDevice) -> Self {
         types::AccountAndDevice {
@@ -147,7 +118,7 @@ impl From<crate::device::AccountAndDevice> for types::AccountAndDevice {
 impl From<Vec<crate::device::Device>> for types::DeviceList {
     fn from(devices: Vec<crate::device::Device>) -> Self {
         types::DeviceList {
-            devices: devices.into_iter().map(|dev| dev.into_proto()).collect(),
+            devices: devices.into_proto(),
         }
     }
 }

mullvad-types/src/proto/types/conversions/settings.rs

@@ -1,6 +1,6 @@
 use crate::proto::types::{self, FromProtobufTypeError};
-use crate::IntoProto;
 use crate::settings::CURRENT_SETTINGS_VERSION;
+use crate::IntoProto;
 use talpid_types::ErrorExt;
 
 impl From<&crate::settings::Settings> for types::Settings {