Skip to content

refactor: remove current_bluetooth_info #497

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cachebag merged 1 commit into from
Jul 13, 2026
Merged

refactor: remove current_bluetooth_info #497

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 0 additions & 45 deletions nmrs/src/monitoring/bluetooth.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,51 +83,6 @@ pub(crate) async fn current_bluetooth_bdaddr(conn: &Connection) -> Option<String
None
}

/// Returns detailed information about the current Bluetooth connection.
///
/// Similar to `current_bluetooth_bdaddr` but also returns the Bluetooth
/// capabilities (DUN or PANU) of the connected device.
///
/// Returns `Some((bdaddr, capabilities))` if connected, `None` otherwise.
#[allow(dead_code)]
pub(crate) async fn current_bluetooth_info(conn: &Connection) -> Option<(String, u32)> {
let nm = try_log!(NMProxy::new(conn).await, "Failed to create NM proxy");
let devices = try_log!(nm.get_devices().await, "Failed to get devices");

for dp in devices {
let dev_builder = try_log!(
NMDeviceProxy::builder(conn).path(dp.clone()),
"Failed to create device proxy builder"
);
let dev = try_log!(dev_builder.build().await, "Failed to build device proxy");

let dev_type = try_log!(dev.device_type().await, "Failed to get device type");
if dev_type != device_type::BLUETOOTH {
continue;
}

// Check if device is in an active/connected state
let state = try_log!(dev.state().await, "Failed to get device state");
// State 100 = Activated (connected)
if state != device_state::ACTIVATED {
continue;
}

// Get the Bluetooth MAC address and capabilities
let bt_builder = try_log!(
NMBluetoothProxy::builder(conn).path(dp.clone()),
"Failed to create Bluetooth proxy builder"
);
let bt = try_log!(bt_builder.build().await, "Failed to build Bluetooth proxy");

if let (Ok(bdaddr), Ok(capabilities)) = (bt.hw_address().await, bt.bt_capabilities().await)
{
return Some((bdaddr, capabilities));
}
}
None
}

#[cfg(test)]
mod tests {
use super::*;
Expand Down