Skip to content

Prefer the live device name when labeling Bluetooth devices #10191

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

Open
njos-444-navelin wants to merge 1 commit into
base: quattro
Choose a base branch
from
+8 −3
Open

Prefer the live device name when labeling Bluetooth devices #10191

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion shell/plugins/panels/bluetooth/Model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
function deviceLabel(device) {
if (!device) return ""
return String(device.deviceName || device.name || "").trim()
return String(device.name || device.deviceName || "").trim()
}

function toArray(values) {
Expand Down
9 changes: 7 additions & 2 deletions test/shell.d/bluetooth-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,14 @@ assertDeepEqual(
'bluetooth projects device rows with primitives only'
)
assertEqual(
bluetooth.deviceLabel(bluetooth.deviceRow({ name: 'Generic', deviceName: 'MX Master 3S', address: '2', connected: true })),
bluetooth.deviceLabel(bluetooth.deviceRow({ name: 'My Headphones', deviceName: 'MX Master 3S', address: '2', connected: true })),
'My Headphones',
'bluetooth prefers name (BlueZ Alias) over deviceName (BlueZ Name) so a rename reaches the label'
)
assertEqual(
bluetooth.deviceLabel(bluetooth.deviceRow({ name: '', deviceName: 'MX Master 3S', address: '2', connected: true })),
'MX Master 3S',
'bluetooth keeps deviceName in row projections so labels survive QObject-free rows'
'bluetooth keeps deviceName in row projections as a fallback label when name is unset'
)

assertDeepEqual(
Expand Down