leyoda/cosmic-applets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(bluetooth): use rfkill for blocking bluetooth

Browse source 
this state will be persisted after reboot
This commit is contained in:
Ashley Wulber 2025-03-06 14:35:49 -05:00 • committed by Michael Murphy
parent 7ba2ed0c53
commit 115e526528
1 changed files with 35 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

39
cosmic-applet-bluetooth/src/bluetooth.rs
View file

@ -18,6 +18,7 @@ use cosmic::{
iced_futures::stream,
};
use futures::executor::block_on;
use rand::Rng;
use tokio::{
spawn,
@ -664,13 +665,43 @@ impl BluerSessionState {
let mut err_msg = None;
match &req_clone {
BluerRequest::SetBluetoothEnabled(enabled) => {
let res = adapter_clone.set_powered(*enabled).await;
if let Err(e) = adapter_clone.set_powered(*enabled).await {
tracing::error!("Failed to power off bluetooth adapter. {e:?}")
}
// rfkill will be persisted after reboot
let name = adapter_clone.name();
if let Some(id) = tokio::process::Command::new("rfkill")
.arg("list")
.arg("-n")
.arg("--output")
.arg("ID,DEVICE")
.output()
.await
.ok()
.and_then(|o| {
let lines = String::from_utf8(o.stdout).ok()?;
lines.split("\n").into_iter().find_map(|row| {
let (id, cname) = row.trim().split_once(" ")?;
(name == cname).then_some(id.to_string())
})
})
{
if let Err(err) = tokio::process::Command::new("rfkill")
.arg(if *enabled { "unblock" } else { "block" })
.arg(id)
.output()
.await
{
tracing::error!(
"Failed to set bluetooth state using rfkill. {err:?}"
);
}
}
if *enabled {
_ = wake_up_tx.send(()).await;
}
if let Err(e) = res {
err_msg = Some(e.to_string());
}
}
BluerRequest::PairDevice(address) => {
let res = adapter_clone.device(*address);