Bug 1130082 - Add reporting for room creation and sharing at creation time

Author: Carmen Jimenez Cabezas

app/js/controller.js

@@ -388,9 +388,10 @@
       });
     },
 
-    onRoomCreated: function(room, navigateToDetail) {
+    onRoomCreated: function(room, navigateToDetail, roomBeingCreated) {
       CallLog.addRoom(room).then(room => {
-        navigateToDetail && Controller.showRoomDetails(room);
+        navigateToDetail && Controller.showRoomDetails(room,
+                                                       roomBeingCreated);
       });
     },
 
@@ -418,12 +419,12 @@
       return CallLog.removeRooms(token);
     },
 
-    showRoomDetails: function (room) {
+    showRoomDetails: function (room, roomBeingCreated) {
       if (!room) {
         return;
       }
       Loader.getRoomDetail().then((RoomDetail) => {
-        RoomDetail.show(room);
+        RoomDetail.show(room, roomBeingCreated);
       });
     },
 

app/js/helpers/rooms_db.js

@@ -115,6 +115,10 @@
         'usedDefaultName',
         'smsNotification',
         'smsNotificationWithSubject',
+        'smsNotificationOnCreation',
+        'smsNotificationOnCreationWithSubject',
+        'emailNotificationOnCreation',
+        'emailNotificationOnCreationWithSubject',
         'emailNotification',
         'emailNotificationWithSubject',
         'timesRoomRenamed',

app/js/helpers/share.js

@@ -56,14 +56,15 @@
 
     var token = _getToken(params.url);
     RoomsDB.get(token).then(function(room) {
+      field = field + (params.isCreation ? 'OnCreation' : '');
       var _field = room.usedDefaultName && field ||
                    (field + Telemetry.suffixSubject);
       room[_field] = room[_field] && room[_field] + 1 || 1;
       RoomsDB.update([room]).then(function() {
         DEBUG && console.log('Registered notification telemetry field:' +
-                             field);
+                             _field);
       }, function() {
-        console.error('Error updating telemetry notification field: ' + field);
+        console.error('Error updating telemetry notification field: ' + _field);
       });
     }, function() {
       console.error('[Telemetry notification] Could not find room with token ' +

app/js/helpers/telemetry.js

@@ -85,10 +85,16 @@
     roomCamera: [],
     receivedRooms: 0,
     fteLaunch: 0,
+    created: 0,
+    createdWithSubject: 0,
     smsNotification: {},
     smsNotificationWithSubject: {},
+    smsNotificationOnCreation: {},
+    smsNotificationOnCreationWithSubject: {},
     emailNotification: {},
     emailNotificationWithSubject: {},
+    emailNotificationOnCreation: {},
+    emailNotificationOnCreationWithSubject: {},
     timesRoomRenamed: {},
     backgroundMode: {},
     numberTimesIJoined: {},

app/js/screens/create_room.js

@@ -142,7 +142,12 @@
       } else {
         room.usedDefaultName = roomName === roomNameByDefault;
       }
-      Controller.onRoomCreated(room, userInteraction);
+
+      // Update the telemetry values...
+      Telemetry.updateReport(room.usedDefaultName ?
+                               'created' : 'createdWithSubject');
+
+      Controller.onRoomCreated(room, userInteraction, true);
       room.usedDefaultName && asyncStorage.setItem(ROOM_NAME_COUNTER_KEY,
                                                    ++roomNumber);
       userInteraction && hide();

app/js/screens/room_detail.js

@@ -5,6 +5,7 @@
       _showHistoryButton, _deleteButton, _backButton, _expirationUI, _urlUI;
   var _room = null, _token = null;
   var _isOwner = false;
+  var _roomBeingCreated = false;
   var _ = navigator.mozL10n.get;
 
   function _onBack(event) {
@@ -141,7 +142,8 @@
         {
           type: 'room',
           name: _room.roomName,
-          url: _room.roomUrl
+          url: _room.roomUrl,
+          isCreation: _roomBeingCreated
         },
         function onShared(contact, identity) {
           Controller.onRoomShared(_room, contact, identity);
@@ -198,9 +200,12 @@
   }
 
   var RoomDetail = {
-    show: function(room) {
+    show: function(room, roomBeingCreated) {
       // Check if we are the owners
       _isOwner = room.roomOwner === Controller.identity;
+      // If this show doesn't come from a room creation,
+      // roomBeingCreated will be falsey
+      _roomBeingCreated = !!roomBeingCreated;
 
       // Cache room object for future methods
       _room = room;

app/js/screens/share.js

@@ -56,7 +56,8 @@
                   name: room.roomName,
                   url: room.roomUrl,
                   identity: identity,
-                  contact: contact
+                  contact: contact,
+                  isCreation: true
                 };
                 Share[method](params, function onShared(contact, identity) {
                   Controller.onRoomShared(room, contact, identity);