Bug 836737 - we should not launch the app when we close a notificatio…

…n r=vingtetun a=tef+

We'll receive a notification if the user clicks on the notif or if he closes it,
but we want to do stuff only when the user clicks on it.

The gecko patch needs to land first.

apps/communications/dialer/js/dialer.js

@@ -49,7 +49,11 @@ var CallHandler = (function callHandler() {
   window.navigator.mozSetMessageHandler('activity', handleActivity);
 
   /* === Notifications support === */
-  function handleNotification() {
+  function handleNotification(evt) {
+    if (!evt.clicked) {
+      return;
+    }
+
     navigator.mozApps.getSelf().onsuccess = function gotSelf(evt) {
       var app = evt.target.result;
       app.launch('dialer');

apps/costcontrol/js/app.js

@@ -114,7 +114,12 @@ var CostControlApp = (function() {
     // When a notification is received
     window.navigator.mozSetMessageHandler('notification',
       function _onNotification(notification) {
-        debug('Notification received!');
+        if (!notification.clicked) {
+          return;
+        }
+
+        debug('Notification was clicked!');
+
         navigator.mozApps.getSelf().onsuccess = function _onAppReady(evt) {
           var app = evt.target.result;
           app.launch();

apps/sms/js/sms.js

@@ -1745,23 +1745,28 @@ if (!window.location.hash.length) {
 
   window.navigator.mozSetMessageHandler('notification',
     function notificationClick(message) {
-    navigator.mozApps.getSelf().onsuccess = function(evt) {
-      var app = evt.target.result;
-      app.launch();
-
-      // Getting back the number form the icon URL
-      var notificationType = message.imageURL.split('?')[1];
-      // Case regular 'sms-received'
-      if (notificationType == 'sms-received') {
-        var number = message.imageURL.split('?')[2];
-        showThreadFromSystemMessage(number);
+      if (!message.clicked) {
         return;
       }
-      var number = message.title;
-      // Class 0 message
-      var messageBody = number + '\n' + message.body;
-      alert(messageBody);
-    };
-  });
+
+      navigator.mozApps.getSelf().onsuccess = function(evt) {
+        var app = evt.target.result;
+        app.launch();
+
+        // Getting back the number form the icon URL
+        var notificationType = message.imageURL.split('?')[1];
+        // Case regular 'sms-received'
+        if (notificationType == 'sms-received') {
+          var number = message.imageURL.split('?')[2];
+          showThreadFromSystemMessage(number);
+          return;
+        }
+        var number = message.title;
+        // Class 0 message
+        var messageBody = number + '\n' + message.body;
+        alert(messageBody);
+      };
+    }
+  );
 }