Merge pull request #14353 from eric30/Bug-945631

Bug 945631 - Listen to event discoverystatechanged, r=arthurcc
mozilla-b2g · May 27, 2014 · 1c30a76 · 1c30a76
1 parent 9f72c3d
commit 1c30a76
Showing 1 changed file with 17 additions and 9 deletions.
diff --git a/apps/settings/js/bluetooth.js b/apps/settings/js/bluetooth.js
@@ -411,6 +411,20 @@ navigator.mozL10n.ready(function bluetoothSettings() {
         showDevicePaired(evt.status, 'Authentication Failed');
       };
 
+      defaultAdapter.ondiscoverystatechanged =
+        function bt_discoveryStateChanged(evt) {
+          if (!evt.discovering) {
+            searchAgainBtn.disabled = false;
+            searchingItem.hidden = true;
+
+            clearTimeout(discoverTimeout);
+            discoverTimeout = null;
+          } else {
+            searchAgainBtn.disabled = true;
+            searchingItem.hidden = false;
+          }
+        };
+
       defaultAdapter.onhfpstatuschanged = function bt_hfpStatusChanged(evt) {
         showDeviceConnected(evt.address, evt.status, Profiles.HFP);
       };
@@ -844,13 +858,11 @@ navigator.mozL10n.ready(function bluetoothSettings() {
 
       var req = defaultAdapter.startDiscovery();
       req.onsuccess = function bt_discoveryStart() {
-        searchAgainBtn.disabled = true;
         if (!discoverTimeout)
           discoverTimeout = setTimeout(stopDiscovery, discoverTimeoutTime);
       };
       req.onerror = function bt_discoveryFailed() {
-        searchingItem.hidden = true;
-        searchAgainBtn.disabled = false;
+        console.error('Can not discover nearby device');
       };
     }
 
@@ -864,16 +876,12 @@ navigator.mozL10n.ready(function bluetoothSettings() {
     function stopDiscovery() {
       if (!bluetooth.enabled || !defaultAdapter || !discoverTimeout)
         return;
+
       var req = defaultAdapter.stopDiscovery();
-      req.onsuccess = function bt_discoveryStopped() {
-        searchAgainBtn.disabled = false;
-        searchingItem.hidden = true;
-      };
       req.onerror = function bt_discoveryStopFailed() {
         console.error('Can not stop discover nearby device');
-        searchAgainBtn.disabled = true;
-        searchingItem.hidden = false;
       };
+
       clearTimeout(discoverTimeout);
       discoverTimeout = null;
     }