s

apps/system/js/bluetooth.js

@@ -71,6 +71,11 @@ var Bluetooth = {
     if (!window.navigator.mozSettings || !window.navigator.mozBluetooth) {
       return;
     }
+    // not observe or listen states in APIv2
+    if (typeof(window.navigator.mozBluetooth.onattributechanged) !==
+        'undefined') {
+      return;
+    }
 
     var bluetooth = window.navigator.mozBluetooth;
     var self = this;
@@ -137,6 +142,26 @@ var Bluetooth = {
         window.dispatchEvent(evt);
       }
     );
+
+    window.addEventListener('bluetooth-enable', this);
+    window.addEventListener('bluetooth-disable', this);
+  },
+
+  handleEvent: function bt_handleEvent(evt) {
+    switch (evt.type) {
+      // to enable bluetooth hardware and update settings value
+      case 'bluetooth-enable':
+        SettingsListener.getSettingsLock().set({
+          'bluetooth.enabled': true
+        });
+        break;
+      // to disable bluetooth hardware and update settings value
+      case 'bluetooth-disable':
+        SettingsListener.getSettingsLock().set({
+          'bluetooth.enabled': false
+        });
+        break;
+    }
   },
 
   // Get adapter for BluetoothTransfer when everytime bluetooth is enabled
@@ -211,18 +236,6 @@ var Bluetooth = {
     return this.defaultAdapter;
   },
 
-  enable: function bt_enable() {
-    SettingsListener.getSettingsLock().set({
-      'bluetooth.enabled': true
-    });
-  },
-
-  disable: function bt_disable() {
-    SettingsListener.getSettingsLock().set({
-      'bluetooth.enabled': false
-    });
-  },
-
   /**
    * maintain bluetooth enable/disable stat.
    */

apps/system/js/power_save.js

@@ -1,6 +1,6 @@
 'use strict';
-/* global batteryOverlay, MozActivity, NotificationHelper, SettingsListener,
-   Bluetooth */
+/* global batteryOverlay, MozActivity, NotificationHelper,
+   SettingsListener */
 
 (function(exports) {
 
@@ -75,7 +75,7 @@
 
       this.setMozSettings(settingsToSet);
       // Turn off Bluetooth
-      Bluetooth.disable();
+      window.dispatchEvent(new CustomEvent('bluetooth-disable'));
 
       this._powerSaveEnabledLock = false;
     },
@@ -89,7 +89,7 @@
           settingsToSet[state] = true;
         }
       }
-      Bluetooth.enable();
+      window.dispatchEvent(new CustomEvent('bluetooth-enable'));
 
       this.setMozSettings(settingsToSet);
     },

apps/system/js/quick_settings.js

@@ -1,6 +1,6 @@
 /* jshint loopfunc: true */
 /* global SettingsHelper, SettingsListener, AirplaneMode, applications,
-          UtilityTray, MozActivity, Bluetooth */
+          UtilityTray, MozActivity */
 
 'use strict';
 
@@ -331,9 +331,9 @@
 
               enabled = !!this.bluetooth.dataset.enabled;
               if (enabled) {
-                Bluetooth.disable();
+                window.dispatchEvent(new CustomEvent('bluetooth-disable'));
               } else {
-                Bluetooth.enable();
+                window.dispatchEvent(new CustomEvent('bluetooth-enable'));
               }
               break;
 

apps/system/test/unit/mock_bluetooth.js

@@ -62,14 +62,6 @@ var MockBluetooth = {
     return this.mExpectedProfile === profile;
   },
 
-  enable: function mbt_enable() {
-    this.enabled = true;
-  },
-
-  disable: function mbt_disable() {
-    this.enabled = false;
-  },
-
   get isEnabled() {
     return this.enabled;
   }

apps/system/test/unit/power_save_test.js

@@ -30,8 +30,7 @@ suite('power save >', function() {
 
   suite('restores state >', function() {
     test('restores all states', function() {
-      sinon.stub(window.Bluetooth, 'enable');
-      sinon.stub(window.Bluetooth, 'disable');
+      sinon.spy(window, 'dispatchEvent');
       subject.start();
       var state;
       for (state in subject._states) {
@@ -40,7 +39,7 @@ suite('power save >', function() {
 
       MockSettingsListener.mCallbacks['powersave.enabled'](true);
 
-      assert.ok(window.Bluetooth.disable.called);
+      assert.ok(window.dispatchEvent.calledOnce);
       // States should be false now.
       for (state in subject._states) {
         if ('bluetooth.enabled' !== state) {
@@ -50,7 +49,7 @@ suite('power save >', function() {
 
       MockSettingsListener.mCallbacks['powersave.enabled'](false);
 
-      assert.ok(window.Bluetooth.enable.called);
+      assert.ok(window.dispatchEvent.calledTwice);
       // States should be restored.
       for (state in subject._states) {
         if ('bluetooth.enabled' !== state) {