Idle detector: Fix bug preventing it from ever turning off (#2487)

signalapp · Jul 3, 2018 · 125c3fa · 125c3fa
1 parent bd13939
commit 125c3fa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/js/background.js b/js/background.js
@@ -78,6 +78,7 @@
   let isMigrationWithIndexComplete = false;
   let isMigrationWithoutIndexComplete = false;
   idleDetector.on('idle', async () => {
+    console.log('Idle processing started');
     const NUM_MESSAGES_PER_BATCH = 1;
 
     if (!isMigrationWithIndexComplete) {
@@ -108,6 +109,7 @@
     const areAllMigrationsComplete =
       isMigrationWithIndexComplete && isMigrationWithoutIndexComplete;
     if (areAllMigrationsComplete) {
+      console.log('All migrations are complete. Stopping idle detector.');
       idleDetector.stop();
     }
   });

diff --git a/js/modules/idle_detector.js b/js/modules/idle_detector.js
@@ -18,17 +18,23 @@ class IdleDetector extends EventEmitter {
   }
 
   stop() {
+    if (!this.handle) {
+      return;
+    }
+
     console.log('Stop idle detector');
     this._clearScheduledCallbacks();
   }
 
   _clearScheduledCallbacks() {
     if (this.handle) {
       cancelIdleCallback(this.handle);
+      this.handle = null;
     }
 
     if (this.timeoutId) {
       clearTimeout(this.timeoutId);
+      this.timeoutId = null;
     }
   }
 
@@ -38,13 +44,13 @@ class IdleDetector extends EventEmitter {
       const { didTimeout } = deadline;
       const timeRemaining = deadline.timeRemaining();
       const isIdle = timeRemaining >= IDLE_THRESHOLD_MS;
-      if (isIdle || didTimeout) {
-        this.emit('idle', { timestamp: Date.now(), didTimeout, timeRemaining });
-      }
       this.timeoutId = setTimeout(
         () => this._scheduleNextCallback(),
         POLL_INTERVAL_MS
       );
+      if (isIdle || didTimeout) {
+        this.emit('idle', { timestamp: Date.now(), didTimeout, timeRemaining });
+      }
     });
   }
 }