Skip to content

Handle case where no bluetooth adapters available #256

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
vjr merged 2 commits into from
Sep 3, 2026
Merged

Handle case where no bluetooth adapters available #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e0b9ed
Handle case where no bluetooth adapters available
vjr Sep 2, 2026
eb28eda
Address review comments
vjr Sep 2, 2026
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
20 changes: 13 additions & 7 deletions src/MainView.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,8 @@ public class Bluetooth.MainView : Switchboard.SettingsPage {
child = box;

manager = Bluetooth.Services.ObjectManager.get_default ();
if (manager.retrieve_finished) {
complete_setup ();
} else {
manager.notify["retrieve-finished"].connect (complete_setup);
}
complete_setup ();
manager.notify["retrieve-finished"].connect (complete_setup);

list_box.row_activated.connect ((row) => {
((DeviceRow) row).on_activate.begin ();
Expand Down Expand Up @@ -152,8 +149,13 @@ public class Bluetooth.MainView : Switchboard.SettingsPage {
update_description ();
});

manager.notify["has-object"].connect (() => {
update_description ();
});

manager.bind_property ("is-discovering", discovery_spinner, "spinning", DEFAULT);
manager.bind_property ("is-powered", status_switch, "active", GLib.BindingFlags.DEFAULT);
manager.bind_property ("has-object", status_switch, "visible", GLib.BindingFlags.SYNC_CREATE);
}

private void on_device_added (Services.Device device) {
Expand Down Expand Up @@ -210,20 +212,24 @@ public class Bluetooth.MainView : Switchboard.SettingsPage {
private void update_description () {
string? name = manager.get_name ();
var powered = manager.is_powered;
if (powered && manager.discoverable) {
var available = manager.has_object;
if (powered && manager.discoverable && available) {
//TRANSLATORS: \"%s\" represents the name of the adapter
description = _("Now discoverable as \"%s\". Not discoverable when this page is closed").printf (name ?? _("Unknown"));
} else if (!powered) {
description = _("Not discoverable while Bluetooth is powered off");
} else if (!available) {
description = _("No Bluetooth adapters available");
} else {
description = _("Not discoverable");
}

if (powered) {
if (powered && available) {
icon = new ThemedIcon ("bluetooth");
} else {
icon = new ThemedIcon ("bluetooth-disabled");
}
child.visible = available;
}

private Gtk.Widget create_widget_func (Object obj) {
Expand Down
2 changes: 1 addition & 1 deletion src/Services/Manager.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ public class Bluetooth.Services.ObjectManager : Object {

public async void start_discovery () {
var adapters = get_adapters ();
is_discovering = true;
Comment thread
vjr marked this conversation as resolved.
is_discovering = adapters.size > 0;
foreach (var adapter in adapters) {
try {
yield adapter.start_discovery ();
Expand Down