Merge pull request #175 from akshayr-mecha/chore-services

chore(mechanix services): removes unused code from mechanix system and desktop service
mecha-org · Jan 30, 2025 · f325caa · f325caa
2 parents ff527d8 + e95d74a
commit f325caa
Show file tree

Hide file tree

Showing 36 changed files with 54 additions and 1,597 deletions.
diff --git a/apps/Cargo.toml b/apps/Cargo.toml
@@ -38,3 +38,4 @@ tracing = "0.1.37"
 tracing-subscriber = { version = "0.3.17", features = ["env-filter"]}
 anyhow = { version = "1.0.75", features = ["backtrace"]}
 tokio = { version = "1.33", features = ["full"] }
+networkmanager = { path = "../commons/networkmanager"}
diff --git a/apps/settings-app/Cargo.toml b/apps/settings-app/Cargo.toml
@@ -46,6 +46,7 @@ thiserror = "1.0.59"
 uname = "0.1.1"
 local-ip-address="0.6.3"
 get_if_addrs = "0.5.3"
+networkmanager = { workspace = true }
 
 [build-dependencies]
 tonic-build = "0.9.2"

diff --git a/apps/settings-app/src/gui.rs b/apps/settings-app/src/gui.rs
@@ -30,7 +30,6 @@ use mctk_core::{
     Color, Node,
 };
 use mctk_macros::{component, state_component_impl};
-use mechanix_system_dbus_client::wireless::KnownNetworkResponse;
 use std::{
     any::Any,
     sync::{Arc, RwLock},

diff --git a/apps/settings-app/src/screens/network/add_network.rs b/apps/settings-app/src/screens/network/add_network.rs
@@ -18,7 +18,7 @@ use mctk_core::{
     Color, Node,
 };
 use mctk_macros::component;
-use mechanix_system_dbus_client::wireless::WirelessInfoResponse;
+use networkmanager::network_manager::WirelessInfoResponse;
 
 use super::wireless_model::WirelessModel;
 

diff --git a/apps/settings-app/src/screens/network/network_details.rs b/apps/settings-app/src/screens/network/network_details.rs
@@ -19,7 +19,7 @@ use mctk_core::{
 };
 use mctk_macros::{component, state_component_impl};
 
-use mechanix_system_dbus_client::wireless::WirelessInfoResponse;
+use networkmanager::network_manager::WirelessInfoResponse;
 
 enum NetworkDetailsMessage {
     openModel(bool),

diff --git a/apps/settings-app/src/screens/network/networking.rs b/apps/settings-app/src/screens/network/networking.rs
@@ -20,7 +20,7 @@ use mctk_core::{
     Color, Node,
 };
 use mctk_core::{event, widgets::HDivider};
-use mechanix_system_dbus_client::wireless::WirelessInfoResponse;
+use networkmanager::network_manager::WirelessInfoResponse;
 
 pub struct ClicableIconComponent {
     pub on_click: Option<Box<dyn Fn() -> Box<Message> + Send + Sync>>,

diff --git a/apps/settings-app/src/screens/network/saved_network_details.rs b/apps/settings-app/src/screens/network/saved_network_details.rs
@@ -16,7 +16,7 @@ use mctk_core::{
     Color, Node,
 };
 use mctk_macros::{component, state_component_impl};
-use mechanix_system_dbus_client::wireless::WirelessInfoResponse;
+use networkmanager::network_manager::WirelessInfoResponse;
 
 enum NetworkDetailsMessage {
     openModel(bool),

diff --git a/apps/settings-app/src/screens/network/unknown_network_details.rs b/apps/settings-app/src/screens/network/unknown_network_details.rs
@@ -17,7 +17,7 @@ use mctk_core::{
     widgets::{self, Div, IconButton, IconType, Text, Toggle},
     Color, Node,
 };
-use mechanix_system_dbus_client::wireless::WirelessInfoResponse;
+use networkmanager::network_manager::WirelessInfoResponse;
 
 #[derive(Debug)]
 pub struct NetworkDetailsState {}

diff --git a/apps/settings-app/src/screens/network/wireless_model/mod.rs b/apps/settings-app/src/screens/network/wireless_model/mod.rs
@@ -5,11 +5,7 @@ use futures::StreamExt;
 use lazy_static::lazy_static;
 use mctk_core::context::Context;
 use mctk_macros::Model;
-use mechanix_system_dbus_client::security;
-use mechanix_system_dbus_client::wireless::{
-    self, KnownNetworkListResponse, KnownNetworkResponse, NotificationStream, WirelessInfoResponse,
-    WirelessScanListResponse, WirelessService,
-};
+use networkmanager::network_manager::{self, KnownNetworkListResponse, KnownNetworkResponse, WirelessInfoResponse, WirelessScanListResponse};
 use tokio::runtime::Runtime;
 use tokio::{select, signal};
 use uuid::Uuid;
@@ -20,7 +16,6 @@ mod access_point;
 mod active_connection;
 mod connection;
 mod device;
-mod network_manager;
 mod settings;
 mod wireless_device;
 
@@ -588,13 +583,4 @@ impl WirelessModel {
         Self::stream_scan_result();
         Self::stream_known_networks();
     }
-
-    pub fn select_network(network_id: String) {
-        RUNTIME.spawn(async move {
-            WirelessService::connect_to_known_network(network_id.as_str())
-                .await
-                .unwrap();
-            WirelessModel::update();
-        });
-    }
 }
diff --git a/apps/settings-app/src/screens/network/wireless_model/network_manager.rs b/apps/settings-app/src/screens/network/wireless_model/network_manager.rs