Bug 1136777 - Enable LogShake by default and listen for new content events. r=fabrice, r=gerard-majax

b2g/chrome/content/settings.js

@@ -196,19 +196,20 @@ SettingsListener.observe('devtools.overlay', false, (value) => {
 });
 
 #ifdef MOZ_WIDGET_GONK
+
 let LogShake;
-SettingsListener.observe('devtools.logshake', false, (value) => {
+(function() {
+  let scope = {};
+  Cu.import('resource://gre/modules/LogShake.jsm', scope);
+  LogShake = scope.LogShake;
+  LogShake.init();
+})();
+
+SettingsListener.observe('devtools.logshake', false, value => {
   if (value) {
-    if (!LogShake) {
-      let scope = {};
-      Cu.import('resource://gre/modules/LogShake.jsm', scope);
-      LogShake = scope.LogShake;
-    }
-    LogShake.init();
+    LogShake.enableDeviceMotionListener();
   } else {
-    if (LogShake) {
-      LogShake.uninit();
-    }
+    LogShake.disableDeviceMotionListener();
   }
 });
 #endif

b2g/components/LogShake.jsm

@@ -56,6 +56,7 @@ function debug(msg) {
 const EXCITEMENT_THRESHOLD = 500;
 const DEVICE_MOTION_EVENT = "devicemotion";
 const SCREEN_CHANGE_EVENT = "screenchange";
+const CAPTURE_LOGS_CONTENT_EVENT = "requestSystemLogs";
 const CAPTURE_LOGS_START_EVENT = "capture-logs-start";
 const CAPTURE_LOGS_ERROR_EVENT = "capture-logs-error";
 const CAPTURE_LOGS_SUCCESS_EVENT = "capture-logs-success";
@@ -69,6 +70,18 @@ let LogShake = {
    */
   deviceMotionEnabled: false,
 
+  /**
+   * We only listen to motion events when the screen is enabled, keep track
+   * of its state.
+   */
+  screenEnabled: true,
+
+  /**
+   * Flag monitoring if the preference to enable shake to capture is
+   * enabled in gaia.
+   */
+  listenToDeviceMotion: true,
+
   /**
    * If a capture has been requested and is waiting for reads/parsing. Used for
    * debouncing.
@@ -109,6 +122,7 @@ let LogShake = {
       screenEnabled: true
     }});
 
+    SystemAppProxy.addEventListener(CAPTURE_LOGS_CONTENT_EVENT, this, false);
     SystemAppProxy.addEventListener(SCREEN_CHANGE_EVENT, this, false);
 
     Services.obs.addObserver(this, "xpcom-shutdown", false);
@@ -129,6 +143,10 @@ let LogShake = {
     case SCREEN_CHANGE_EVENT:
       this.handleScreenChangeEvent(event);
       break;
+
+    case CAPTURE_LOGS_CONTENT_EVENT:
+      this.startCapture();
+      break;
     }
   },
 
@@ -141,8 +159,20 @@ let LogShake = {
     }
   },
 
+  enableDeviceMotionListener: function() {
+    this.listenToDeviceMotion = true;
+    this.startDeviceMotionListener();
+  },
+
+  disableDeviceMotionListener: function() {
+    this.listenToDeviceMotion = false;
+    this.stopDeviceMotionListener();
+  },
+
   startDeviceMotionListener: function() {
-    if (!this.deviceMotionEnabled) {
+    if (!this.deviceMotionEnabled &&
+        this.listenToDeviceMotion &&
+        this.screenEnabled) {
       SystemAppProxy.addEventListener(DEVICE_MOTION_EVENT, this, false);
       this.deviceMotionEnabled = true;
     }
@@ -169,28 +199,33 @@ let LogShake = {
     var excitement = acc.x * acc.x + acc.y * acc.y + acc.z * acc.z;
 
     if (excitement > EXCITEMENT_THRESHOLD) {
-      if (!this.captureRequested) {
-        this.captureRequested = true;
-        SystemAppProxy._sendCustomEvent(CAPTURE_LOGS_START_EVENT, {});
-        this.captureLogs().then(logResults => {
-          // On resolution send the success event to the requester
-          SystemAppProxy._sendCustomEvent(CAPTURE_LOGS_SUCCESS_EVENT, {
-            logFilenames: logResults.logFilenames,
-            logPrefix: logResults.logPrefix
-          });
-          this.captureRequested = false;
-        },
-        error => {
-          // On an error send the error event
-          SystemAppProxy._sendCustomEvent(CAPTURE_LOGS_ERROR_EVENT, {error: error});
-          this.captureRequested = false;
-        });
-      }
+      this.startCapture();
     }
   },
 
+  startCapture: function() {
+    if (this.captureRequested) {
+      return;
+    }
+    this.captureRequested = true;
+    SystemAppProxy._sendCustomEvent(CAPTURE_LOGS_START_EVENT, {});
+    this.captureLogs().then(logResults => {
+      // On resolution send the success event to the requester
+      SystemAppProxy._sendCustomEvent(CAPTURE_LOGS_SUCCESS_EVENT, {
+        logFilenames: logResults.logFilenames,
+        logPrefix: logResults.logPrefix
+      });
+      this.captureRequested = false;
+    }, error => {
+      // On an error send the error event
+      SystemAppProxy._sendCustomEvent(CAPTURE_LOGS_ERROR_EVENT, {error: error});
+      this.captureRequested = false;
+    });
+  },
+
   handleScreenChangeEvent: function(event) {
-    if (event.detail.screenEnabled) {
+    this.screenEnabled = event.detail.screenEnabled;
+    if (this.screenEnabled) {
       this.startDeviceMotionListener();
     } else {
       this.stopDeviceMotionListener();