Merge pull request #20763 from guilherme-pg/bug1027429-honor-track-du…

…ration Bug1027429 - Honor duration for track command in Find My Device
mozilla-b2g · Jun 27, 2014 · e0e5910 · e0e5910
1 parent a2771cb
commit e0e5910
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 17 deletions.
diff --git a/apps/findmydevice/js/commands.js b/apps/findmydevice/js/commands.js
@@ -92,19 +92,26 @@ var Commands = {
 
   _trackIntervalId: null,
 
+  _trackTimeoutId: null,
+
   _commands: {
     track: function fmdc_track(duration, reply) {
-      // We actually ignore duration if it's nonzero. If zero, stop
-      // tracking.
+      var self = this;
 
-      SettingsHelper('findmydevice.tracking').set(!!duration);
-      if (this._trackIntervalId !== null) {
-        if (duration === 0) {
-          // stop tracking
-          clearInterval(this._trackIntervalId);
-          this._trackIntervalId = null;
-        }
+      function stop() {
+        clearInterval(self._trackIntervalId);
+        self._trackIntervalId = null;
+        clearInterval(self._trackTimeoutId);
+        self._trackTimeoutId = null;
+        SettingsHelper('findmydevice.tracking').set(false);
+      }
+
+      if (this._trackIntervalId !== null || this._trackTimeoutId !== null) {
+        // already tracking
+        stop();
+      }
 
+      if (duration === 0) {
         reply(true);
         return;
       }
@@ -116,9 +123,12 @@ var Commands = {
 
       // set geolocation permission to true, and start requesting
       // the current position every TRACK_UPDATE_INTERVAL_MS milliseconds
-      var self = this;
       this._setGeolocationPermission(function fmdc_permission_success() {
+        SettingsHelper('findmydevice.tracking').set(true);
         self._trackIntervalId = setInterval(function fmdc_track_interval() {
+          duration = (isNaN(duration) || duration < 0) ? 1 : duration;
+          self._trackTimeoutId = setTimeout(stop, duration * 1000);
+
           navigator.geolocation.getCurrentPosition(
             function fmdc_gcp_success(position) {
               DUMP('updating location to (' +

diff --git a/apps/findmydevice/test/unit/findmydevice_test.js b/apps/findmydevice/test/unit/findmydevice_test.js
@@ -178,19 +178,21 @@ suite('FindMyDevice >', function() {
     MockPermissionSettings.permissions.geolocation = 'deny';
 
     var times = 0;
-    subject.invokeCommand('track', [30, function(retval, position) {
+    var duration = (3 * subject.TRACK_UPDATE_INTERVAL_MS)/ 1000;
+    subject.invokeCommand('track', [duration, function(retval, position) {
       assert.equal(retval, true);
       assert.equal(MockPermissionSettings.permissions.geolocation, 'allow');
       assert.equal(position.coords.latitude, MockGeolocation.latitude);
       assert.equal(position.coords.longitude, MockGeolocation.longitude);
 
       if (times++ === 3) {
-        // stop tracking after a few positions
-        subject.invokeCommand('track', [0, function(retval) {
-          assert.equal(retval, true);
-          assert.deepEqual(MockGeolocation.activeWatches, []);
-          done();
-        }]);
+        assert.notEqual(subject._trackIntervalId, null);
+        assert.notEqual(subject._trackTimeoutId, null);
+        fakeClock.tick(subject.TRACK_UPDATE_INTERVAL_MS);
+        assert.equal(retval, true);
+        assert.equal(subject._trackTimeoutId, null);
+        assert.equal(subject._trackIntervalId, null);
+        done();
       }
 
       fakeClock.tick(subject.TRACK_UPDATE_INTERVAL_MS);
@@ -199,6 +201,51 @@ suite('FindMyDevice >', function() {
     fakeClock.tick(subject.TRACK_UPDATE_INTERVAL_MS);
   });
 
+  test('Track command should update its duration if invoked while running',
+    function(done) {
+      var duration = 10 * subject.TRACK_UPDATE_INTERVAL_MS / 1000;
+
+      var positions = 0;
+      subject.invokeCommand('track', [duration, function(retval, position) {
+        positions++;
+      }]);
+
+      fakeClock.tick(subject.TRACK_UPDATE_INTERVAL_MS);
+
+      duration = (subject.TRACK_UPDATE_INTERVAL_MS - 1000)/ 1000;
+      subject.invokeCommand('track', [duration, function(retval, position) {
+        positions++;
+      }]);
+
+      fakeClock.tick(2 * subject.TRACK_UPDATE_INTERVAL_MS);
+
+      assert.equal(positions, 2);
+      assert.equal(subject._trackTimeoutId, null);
+      assert.equal(subject._trackIntervalId, null);
+      done();
+  });
+
+  test('Track command should stop if duration is zero',
+    function(done) {
+      var duration = 10 * subject.TRACK_UPDATE_INTERVAL_MS / 1000;
+
+      var positions = 0;
+      subject.invokeCommand('track', [duration, function(retval, position) {
+        positions++;
+      }]);
+
+      fakeClock.tick(subject.TRACK_UPDATE_INTERVAL_MS);
+
+      subject.invokeCommand('track', [0, function(retval) {
+        assert.equal(retval, true);
+        fakeClock.tick(2 * subject.TRACK_UPDATE_INTERVAL_MS);
+        assert.equal(positions, 1);
+        assert.equal(subject._trackTimeoutId, null);
+        assert.equal(subject._trackIntervalId, null);
+        done();
+      }]);
+  });
+
   test('Bug 1027325 - correctly check that passcode lock is set', function() {
     MockSettingsListener.mTriggerCallback('lockscreen.enabled', true);
     MockSettingsListener.mTriggerCallback('lockscreen.passcode-lock.enabled',