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

Merge tag 'epoch-1.8.0' into yoda-dock-magnification

Browse source 
Epoch 1.8.0

# Conflicts:
#	Cargo.lock
This commit is contained in:
Lionel DARNIS 2026-09-10 17:57:28 +02:00
commit 1f736cdb30
22 changed files with 391 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -275,10 +275,9 @@ const DEFAULT_DEVICE_ICON: &str = "bluetooth-symbolic";
impl BluerDevice {
#[inline(never)]
pub async fn from_device(device: &bluer::Device) -> Self {
let (mut name, is_paired, is_trusted, is_connected, battery_percent, icon) = futures::join!(
device
.name()
.map(|res| res.ok().flatten().unwrap_or(device.address().to_string())),
let (alias, name, is_paired, is_trusted, is_connected, battery_percent, icon) = futures::join!(
device.alias().map(|res| res.ok()),
device.name().map(|res| res.ok().flatten()),
device.is_paired().map(Result::unwrap_or_default),
device.is_trusted().map(Result::unwrap_or_default),
device.is_connected().map(Result::unwrap_or_default),
@ -287,10 +286,11 @@ impl BluerDevice {
.icon()
.map(|res| device_type_to_icon(&res.ok().flatten().unwrap_or_default()))
);
if name.is_empty() {
name = device.address().to_string();
}
let address_string = device.address().to_string();
let name = alias
.filter(|name| !name.is_empty() && *name != address_string.replace(':', "-"))
.or(name.filter(|name| !name.is_empty()))
.unwrap_or(address_string);
let status = if is_connected {
BluerDeviceStatus::Connected