Migrate tray integration to ksni and improve hotspot configuration

Cargo.toml

@@ -12,8 +12,8 @@ tokio = { version = "1", features = ["full"] }
 tracing = "0.1"
 tracing-subscriber = "0.3"
 
-tray-icon = "0.14"
-gtk = "0.18"
+ksni = "0.3"
+gio = "0.20"
 
 zbus = "4"
 uuid = { version = "1", features = ["v4"] }

data/io.github.AghastyGD.Wiretray.gschema.xml

@@ -10,9 +10,9 @@
       <summary>Hotspot SSID</summary>
     </key>
 
-    <key name="password" type="s">
+    <key name="passphrase" type="s">
       <default>''</default>
-      <summary>Hotspot password</summary>
+      <summary>Hotspot passphrase</summary>
     </key>
   </schema>
 </schemalist>

src/main.rs

@@ -2,20 +2,13 @@ use anyhow::Result;
 
 use wiretray::tray;
 
-fn main() -> Result<()> {
+#[tokio::main]
+async fn main() -> Result<()> {
     setup_logging();
 
-    tracing::info!("Starting wiretray...");
+    tracing::info!("Starting Wiretray...");
 
-    gtk::init()?;
-
-    let rt = tokio::runtime::Builder::new_multi_thread()
-        .enable_all()
-        .build()?;
-
-    tray::run(rt.handle().clone())?;
-
-    Ok(())
+    tray::run().await
 }
 
 fn setup_logging() {

src/models/hotspot.rs

@@ -7,7 +7,7 @@ pub enum HotspotBackend {
 }
 
 #[derive(Debug, Clone, PartialEq, Eq)]
-pub struct HotspotStartRequest {
+pub struct HotspotConfig {
     pub interface: String,
     pub ssid: String,
     pub passphrase: Option<String>,

src/services/hotspot_service.rs

@@ -7,8 +7,8 @@ use zbus::zvariant::Value;
 use crate::models::{
     device::Device,
     hotspot::{
-        ActiveHotspot, HotspotBackend, HotspotCapability, HotspotConnectionState,
-        HotspotRadioState, HotspotStartRequest,
+        ActiveHotspot, HotspotBackend, HotspotCapability, HotspotConfig, HotspotConnectionState,
+        HotspotRadioState,
     },
 };
 
@@ -75,7 +75,7 @@ impl HotspotService {
         }
     }
 
-    pub async fn start(&self, request: HotspotStartRequest) -> Result<ActiveHotspot> {
+    pub async fn start(&self, request: HotspotConfig) -> Result<ActiveHotspot> {
         validate_start_request(&request)?;
 
         match &self.backend {
@@ -227,7 +227,7 @@ async fn find_active_hotspot(
     Ok(None)
 }
 
-fn validate_start_request(request: &HotspotStartRequest) -> Result<()> {
+fn validate_start_request(request: &HotspotConfig) -> Result<()> {
     if request.interface.trim().is_empty() {
         bail!("Hotspot interface is required");
     }
@@ -257,7 +257,7 @@ fn hotspot_connection_id(interface: &str) -> String {
 }
 
 fn build_hotspot_settings(
-    request: &HotspotStartRequest,
+    request: &HotspotConfig,
     connection_id: &str,
     connection_uuid: &str,
 ) -> crate::dbus::network_manager::ConnectionSettings {

src/settings/hotspot_settings.rs

@@ -1,5 +1,5 @@
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct HotspotSettings {
     pub ssid: String,
-    pub password: String,
+    pub passphrase: String,
 }

src/settings/service.rs

@@ -1,13 +1,13 @@
 use anyhow::Result;
-use gtk::gio::Settings;
-use gtk::prelude::SettingsExt;
+use gio::Settings;
+use gio::prelude::SettingsExt;
 
 use super::hotspot_settings::HotspotSettings;
 
 const SCHEMA_ID: &str = "io.github.AghastyGD.Wiretray";
 
 const KEY_SSID: &str = "ssid";
-const KEY_PASSWORD: &str = "password";
+const KEY_PASSPHRASE: &str = "passphrase";
 
 pub struct SettingsService {
     settings: Settings,
@@ -29,13 +29,14 @@ impl SettingsService {
     pub fn load(&self) -> Result<HotspotSettings> {
         Ok(HotspotSettings {
             ssid: self.settings.string(KEY_SSID).to_string(),
-            password: self.settings.string(KEY_PASSWORD).to_string(),
+            passphrase: self.settings.string(KEY_PASSPHRASE).to_string(),
         })
     }
     pub fn save(&self, settings: &HotspotSettings) -> Result<()> {
         self.settings.set_string(KEY_SSID, &settings.ssid)?;
 
-        self.settings.set_string(KEY_PASSWORD, &settings.password)?;
+        self.settings
+            .set_string(KEY_PASSPHRASE, &settings.passphrase)?;
 
         Ok(())
     }