+ Geolocation handling

pplaquette · Jul 26, 2012 · 8275861 · 8275861
1 parent 7f1420d
commit 8275861
Showing 1 changed file with 21 additions and 4 deletions.
diff --git a/apps/system/js/airplane_mode.js b/apps/system/js/airplane_mode.js
@@ -14,18 +14,20 @@ var AirplaneMode = {
       mobileDataEnabled = value;
     });
 
+    var geolocationEnabled = false;
+    SettingsListener.observe('geolocation.enabled', false, function(value) {
+      geolocationEnabled = value;
+    });
+
     var bluetooth = window.navigator.mozBluetooth;
     var wifiManager = window.navigator.mozWifiManager;
     var mobileData = window.navigator.mozMobileConnection &&
       window.navigator.mozMobileConnection.data;
 
-    // XXX: need a way to toggle Geolocation here
-    // https://github.com/mozilla-b2g/gaia/issues/2833
-    // https://bugzilla.mozilla.org/show_bug.cgi?id=777594
-
     var restoreMobileData = false;
     var restoreBluetooth = false;
     var restoreWifi = false;
+    var restoreGeolocation = false;
 
     SettingsListener.observe('ril.radio.disabled', false, function(value) {
       if (value) {
@@ -64,6 +66,14 @@ var AirplaneMode = {
           }
         }
 
+        // Turn off Geolocation
+        restoreGeolocation = geolocationEnabled;
+        if (geolocationEnabled) {
+          settings.getLock().set({
+            'geolocation.enabled': false
+          });
+        }
+
       } else {
         // Leaving airplane mode.
 
@@ -87,6 +97,13 @@ var AirplaneMode = {
             'wifi.enabled': true
           });
         }
+
+        // Don't attempt to turn on Geolocation if it's already on
+        if (!geolocationEnabled && restoreGeolocation) {
+          settings.getLock().set({
+            'geolocation.enabled': true
+          });
+        }
       }
     });
   }