less notification when using start_minimized and udp

Author: wiiznokes

RustApp/src/streamer/adb_streamer.rs

@@ -1,7 +1,10 @@
 use anyhow::Result;
 use tokio::process::Command;
 
-use crate::streamer::{StreamerMsg, tcp_streamer};
+use crate::{
+    config::ConnectionMode,
+    streamer::{StreamerMsg, tcp_streamer},
+};
 
 use super::{
     AudioStream, ConnectError, StreamerTrait,
@@ -108,6 +111,7 @@ impl StreamerTrait for AdbStreamer {
             TcpStreamerState::Streaming { .. } => StreamerMsg::Connected {
                 ip: None,
                 port: None,
+                mode: ConnectionMode::Adb,
             },
         }
     }

RustApp/src/streamer/streamer_runner.rs

@@ -12,6 +12,7 @@ use std::net::IpAddr;
 use tokio::sync::mpsc::{self, Sender};
 
 use crate::audio::AudioProcessParams;
+use crate::config::ConnectionMode;
 use crate::streamer::{StreamerTrait, WriteError};
 
 use super::{AudioStream, ConnectError, DummyStreamer, Streamer, tcp_streamer, udp_streamer};
@@ -82,6 +83,7 @@ pub enum StreamerMsg {
     Connected {
         ip: Option<IpAddr>,
         port: Option<u16>,
+        mode: ConnectionMode,
     },
     Ready(Sender<StreamerCommand>),
 }

RustApp/src/streamer/tcp_streamer.rs

@@ -5,7 +5,10 @@ use prost::Message;
 use tokio::net::{TcpListener, TcpStream};
 use tokio_util::codec::{Framed, LengthDelimitedCodec};
 
-use crate::streamer::{DEFAULT_PC_PORT, MAX_PORT, StreamerMsg, WriteError};
+use crate::{
+    config::ConnectionMode,
+    streamer::{DEFAULT_PC_PORT, MAX_PORT, StreamerMsg, WriteError},
+};
 
 use super::{AudioPacketMessage, AudioStream, ConnectError, StreamerTrait};
 
@@ -76,6 +79,7 @@ impl StreamerTrait for TcpStreamer {
             TcpStreamerState::Streaming { .. } => StreamerMsg::Connected {
                 ip: Some(self.ip),
                 port: Some(self.port),
+                mode: ConnectionMode::Tcp,
             },
         }
     }
@@ -100,6 +104,7 @@ impl StreamerTrait for TcpStreamer {
                 Ok(Some(StreamerMsg::Connected {
                     ip: Some(self.ip),
                     port: Some(self.port),
+                    mode: ConnectionMode::Tcp,
                 }))
             }
             TcpStreamerState::Streaming {

RustApp/src/streamer/udp_streamer.rs

@@ -5,7 +5,10 @@ use prost::Message;
 use tokio::net::UdpSocket;
 use tokio_util::{codec::LengthDelimitedCodec, udp::UdpFramed};
 
-use crate::streamer::{AudioPacketMessage, DEFAULT_PC_PORT, MAX_PORT, WriteError};
+use crate::{
+    config::ConnectionMode,
+    streamer::{AudioPacketMessage, DEFAULT_PC_PORT, MAX_PORT, WriteError},
+};
 
 use super::{AudioPacketMessageOrdered, AudioStream, ConnectError, StreamerMsg, StreamerTrait};
 
@@ -62,6 +65,7 @@ impl StreamerTrait for UdpStreamer {
         StreamerMsg::Connected {
             ip: Some(self.ip),
             port: Some(self.port),
+            mode: ConnectionMode::Udp,
         }
     }
 

RustApp/src/streamer/usb_streamer.rs

@@ -12,7 +12,7 @@ use super::{
         frame::UsbStream,
     },
 };
-use crate::streamer::WriteError;
+use crate::{config::ConnectionMode, streamer::WriteError};
 
 use super::{AudioPacketMessage, ConnectError, StreamerMsg, StreamerTrait};
 
@@ -185,6 +185,7 @@ impl StreamerTrait for UsbStreamer {
             UsbStreamerState::Streaming => StreamerMsg::Connected {
                 ip: None,
                 port: None,
+                mode: ConnectionMode::Usb,
             },
         }
     }

RustApp/src/ui/app.rs

@@ -206,7 +206,7 @@ impl AppState {
                     let e = "no address ip found";
 
                     error!("failed to start audio stream: {e}");
-                    return self.add_log(&e.to_string());
+                    return self.add_log(e);
                 };
 
                 ConnectOption::Tcp { ip }
@@ -216,7 +216,7 @@ impl AppState {
                     let e = "no address ip found";
 
                     error!("failed to start audio stream: {e}");
-                    return self.add_log(&e.to_string());
+                    return self.add_log(e);
                 };
                 ConnectOption::Udp { ip }
             }
@@ -466,7 +466,7 @@ impl Application for AppState {
                         return self.add_log(format!("Listening on `{ip}:{port}`").as_str());
                     }
                 }
-                StreamerMsg::Connected { ip, port } => {
+                StreamerMsg::Connected { ip, port, mode } => {
                     if let Some(system_tray) = self.system_tray.as_mut() {
                         system_tray.update_menu_state(false, &fl!("state_connected"));
                     }
@@ -477,15 +477,18 @@ impl Application for AppState {
                             ip.unwrap_or(IpAddr::V4(Ipv4Addr::UNSPECIFIED)),
                             port.unwrap_or_default()
                         );
-                        // show notification when app is minimized
-                        let _ = Notification::new()
-                            .summary("AndroidMic")
-                            .body(format!("Connected on {address}").as_str())
-                            .auto_icon()
-                            .show()
-                            .map_err(|e| {
-                                error!("failed to show notification: {e}");
-                            });
+
+                        if mode != ConnectionMode::Udp {
+                            // show notification when app is minimized
+                            let _ = Notification::new()
+                                .summary("AndroidMic")
+                                .body(format!("Connected on {address}").as_str())
+                                .auto_icon()
+                                .show()
+                                .map_err(|e| {
+                                    error!("failed to show notification: {e}");
+                                });
+                        }
                     }
 
                     self.connection_state = ConnectionState::Connected;
@@ -701,7 +704,7 @@ impl Application for AppState {
                     self.about_window = None;
                 }
 
-                if !self.has_shown_minimize_notification {
+                if !self.config.data().start_minimized && !self.has_shown_minimize_notification {
                     let _ = Notification::new()
                         .summary("AndroidMic")
                         .body(&fl!("minimized_to_tray"))

RustApp/src/ui/tray.rs

@@ -77,11 +77,8 @@ impl SystemTray {
         }));
 
         let tray_sender = sender.clone();
-        TrayIconEvent::set_event_handler(Some(move |event: TrayIconEvent| match event {
-            TrayIconEvent::DoubleClick { .. } => {
-                let _ = tray_sender.send(SystemTrayMsg::Show);
-            }
-            _ => {}
+        TrayIconEvent::set_event_handler(Some(move |event: TrayIconEvent| if let TrayIconEvent::DoubleClick { .. } = event {
+            let _ = tray_sender.send(SystemTrayMsg::Show);
         }));
 
         Ok((

RustApp/src/ui/view.rs

@@ -450,7 +450,10 @@ pub fn settings_window(app: &AppState) -> Element<'_, ConfigMsg> {
                             .align_y(Vertical::Center)
                             .push(text(fl!("start_minimized")))
                             .push(horizontal_space())
-                            .push(toggler(config.start_minimized).on_toggle(ConfigMsg::StartMinimized)),
+                            .push(
+                                toggler(config.start_minimized)
+                                    .on_toggle(ConfigMsg::StartMinimized),
+                            ),
                     )
                     .add(
                         row()