reload bluetooth model when enabling

2 files changed, 22 insertions, 3 deletions

diff --git a/extension.js b/extension.js
index ff210f9..19b15de 100644
--- a/extension.js
+++ b/extension.js
@@ -59,26 +59,43 @@ class BluetoothDevice {
 
 class BluetoothQuickConnect {
     constructor(bluetooth) {
-        this._model = bluetooth._model;
-        this._getDefaultAdapter = bluetooth._getDefaultAdapter;
         this._menu = bluetooth._item.menu;
 
         this._signals = [];
     }
 
     enable() {
+        this._loadBluetoothModel();
         let signal = this._menu.connect('open-state-changed', (menu, isOpen) => {
             if (isOpen)
                 this._sync();
         });
 
         this._signals.push(signal);
+        this._sync();
     }
 
     disable() {
         this._destroy();
     }
 
+    _loadBluetoothModel() {
+        this._client = new GnomeBluetooth.Client();
+        this._model = this._client.get_model();
+    }
+
+    _getDefaultAdapter() {
+        let [ret, iter] = this._model.get_iter_first();
+        while (ret) {
+            let isDefault = this._model.get_value(iter, GnomeBluetooth.Column.DEFAULT);
+            let isPowered = this._model.get_value(iter, GnomeBluetooth.Column.POWERED);
+            if (isDefault && isPowered)
+                return iter;
+            ret = this._model.iter_next(iter);
+        }
+        return null;
+    }
+
     _getPairedDevices() {
         let adapter = this._getDefaultAdapter();
         if (!adapter)
@@ -126,6 +143,7 @@ class BluetoothQuickConnect {
     }
 }
 
+let bluetoothQuickConnect = null;
 
 function init() {
     let bluetooth = Main.panel.statusArea.aggregateMenu._bluetooth;
diff --git a/metadata.json b/metadata.json
index 2230e23..884be9d 100644
--- a/metadata.json
+++ b/metadata.json
@@ -4,6 +4,7 @@
   "uuid": "bluetooth-quick-connect@bjarosze.gmail.com",
   "url": "https://github.com/bjarosze/gnome-bluetooth-quick-connect",
   "shell-version": [
-    "3.26.2"
+    "3.26.2",
+    "3.28"
   ]
 }