[gnome-shell/wip/snwh/appgrid-regression-fixes] status/bluetooth: Use BlueZ state to determine whether bluetooth is on

[Sam Hewitt <snwh src gnome org>]

commit 2b5ee2759cdf71f3624d0904bf5dee38853b59a4
Author: Jonas Dreßler <verdre v0yd nl>
Date:   Tue Jan 18 11:14:47 2022 +0100

    status/bluetooth: Use BlueZ state to determine whether bluetooth is on
    
    There's two ways bluetooth can be powered off/on for us: One way is to
    go via airplane mode (which uses rfkill), and the second way is to tell
    BlueZ to turn off the device. Now rfkill always has the final say on
    whether bluetooth is off, BlueZ OTOH has the final say on whether
    bluetooth is on.
    
    This means when we want to know whether bluetooth is turned on, we only
    have to ask BlueZ, so simply read this._client.default_adapter_powered
    for that.
    
    For turning bluetooth on or off we use rfkill, but when turning it on,
    make sure it's turned on in Bluez, too.
    
    FTR, this is exactly the same way the Bluetooth panel in Settings
    handles this.
    
    Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2188>

 js/ui/status/bluetooth.js | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)
---
diff --git a/js/ui/status/bluetooth.js b/js/ui/status/bluetooth.js
index 8738181223..a7768c824e 100644
--- a/js/ui/status/bluetooth.js
+++ b/js/ui/status/bluetooth.js
@@ -25,7 +25,9 @@ class Indicator extends PanelMenu.SystemIndicator {
         this._indicator = this._addIndicator();
         this._indicator.icon_name = 'bluetooth-active-symbolic';
         this._hadSetupDevices = global.settings.get_boolean(HAD_BLUETOOTH_DEVICES_SETUP);
+
         this._client = new GnomeBluetooth.Client();
+        this._client.connect('notify::default-adapter-powered', this._sync.bind(this));
 
         this._proxy = new RfkillManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH,
                                              (proxy, error) => {
@@ -43,9 +45,12 @@ class Indicator extends PanelMenu.SystemIndicator {
 
         this._toggleItem = new PopupMenu.PopupMenuItem('');
         this._toggleItem.connect('activate', () => {
-            this._proxy.BluetoothAirplaneMode = !this._proxy.BluetoothAirplaneMode;
-            if (!this._proxy.BluetoothAirplaneMode)
+            if (!this._client.default_adapter_powered) {
+                this._proxy.BluetoothAirplaneMode = false;
                 this._client.default_adapter_powered = true;
+            } else {
+                this._proxy.BluetoothAirplaneMode = true;
+            }
         });
         this._item.menu.addMenuItem(this._toggleItem);
 
@@ -138,23 +143,25 @@ class Indicator extends PanelMenu.SystemIndicator {
         this.menu.setSensitive(sensitive);
         this._indicator.visible = nConnectedDevices > 0;
 
+        const adapterPowered = this._client.default_adapter_powered;
+
         // Remember if there were setup devices and show the menu
         // if we've seen setup devices and we're not hard blocked
         if (this._hadSetupDevices)
             this._item.visible = !this._proxy.BluetoothHardwareAirplaneMode;
         else
-            this._item.visible = this._proxy.BluetoothHasAirplaneMode && !this._proxy.BluetoothAirplaneMode;
+            this._item.visible = adapterPowered;
 
         if (nConnectedDevices > 1)
             /* Translators: this is the number of connected bluetooth devices */
             this._item.label.text = ngettext('%d Connected', '%d Connected', 
nConnectedDevices).format(nConnectedDevices);
         else if (nConnectedDevices === 1)
             this._item.label.text = connectedDevices[0].name;
-        else if (this._adapter === null)
-            this._item.label.text = _('Bluetooth Off');
-        else
+        else if (adapterPowered)
             this._item.label.text = _('Bluetooth On');
+        else
+            this._item.label.text = _('Bluetooth Off');
 
-        this._toggleItem.label.text = this._client.default_adapter_powered ? _('Turn Off') : _('Turn On');
+        this._toggleItem.label.text = adapterPowered ? _('Turn Off') : _('Turn On');
     }
 });