improve(bluetooth): ignore devices with unknown type and without alias

pop-os · Feb 8, 2025 · cda1230 · cda1230
1 parent fd15399
commit cda1230
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/cosmic-applet-bluetooth/src/app.rs b/cosmic-applet-bluetooth/src/app.rs
@@ -528,6 +528,7 @@ impl cosmic::Application for CosmicBluetoothApplet {
                     .request_confirmation
                     .as_ref()
                     .map_or(false, |(dev, _, _)| d.address == dev.address)
+                && (d.has_name() || d.is_known_device_type())
             }) {
                 let row = row![
                     icon::from_name(dev.icon.as_str()).size(16).symbolic(true),

diff --git a/cosmic-applet-bluetooth/src/bluetooth.rs b/cosmic-applet-bluetooth/src/bluetooth.rs
@@ -222,6 +222,8 @@ impl PartialEq for BluerDevice {
     }
 }
 
+const default_device_icon: &str = "bluetooth-symbolic";
+
 impl BluerDevice {
     pub async fn from_device(device: &bluer::Device) -> Self {
         let mut name = device
@@ -251,7 +253,7 @@ impl BluerDevice {
                     None
                 }
             })
-            .unwrap_or_else(|| "bluetooth-symbolic".into());
+            .unwrap_or_else(|| default_device_icon.into());
 
         Self {
             name,
@@ -274,6 +276,16 @@ impl BluerDevice {
             .count()
             == 2
     }
+
+    #[must_use]
+    pub fn is_known_device_type(&self) -> bool {
+        self.icon != default_device_icon
+    }
+
+    #[must_use]
+    pub fn has_name(&self) -> bool {
+        self.name != self.address.to_string()
+    }
 }
 
 #[derive(Debug, Clone)]