Merge pull request #17506 from azasypkin/bug_936729

Bug 936729 - [Messages][Sharing]MMS does not return to original app after cancelling or sending message
mozilla-b2g · Apr 24, 2014 · 4b5a10e · 4b5a10e
2 parents 3557372 + 224a6f4
commit 4b5a10e
Show file tree

Hide file tree

Showing 10 changed files with 405 additions and 313 deletions.
diff --git a/apps/sms/index.html b/apps/sms/index.html
@@ -137,6 +137,9 @@ <h1 id="threads-edit-mode" data-l10n-id="deleteMessages-title">Delete messages</
           <a role="link" id="messages-back-button">
             <span class="icon icon-back"></span>
           </a>
+          <a role="link" id="messages-close-button">
+            <span class="icon icon-close"></span>
+          </a>
           <menu type="toolbar">
             <a id="messages-attach-button">
               <span class="icon icon-attachment"></span>

diff --git a/apps/sms/js/activity_handler.js b/apps/sms/js/activity_handler.js
@@ -9,16 +9,26 @@
 'use strict';
 
 var ActivityHandler = {
+  // CSS class applied to the body element when app requested via activity
+  REQUEST_ACTIVITY_MODE_CLASS_NAME: 'request-activity-mode',
+
   isLocked: false,
 
   // Will hold current activity object
-  currentActivity: { new: null },
+  _activity: null,
 
   init: function() {
     if (!window.navigator.mozSetMessageHandler) {
       return;
     }
-    window.navigator.mozSetMessageHandler('activity', this.global.bind(this));
+
+    // A mapping of MozActivity names to their associated event handler
+    window.navigator.mozSetMessageHandler('activity',
+      this._onActivity.bind(this, {
+        'new': this._onNewActivity,
+        'share': this._onShareActivity
+      })
+    );
 
     // We want to register the handler only when we're on the launch path
     if (!window.location.hash.length) {
@@ -30,108 +40,124 @@ var ActivityHandler = {
     }
   },
 
+  isInActivity: function isInActivity() {
+    return !!this._activity;
+  },
+
+  setActivity: function setActivity(value) {
+    if (!value) {
+      throw new Error('Activity should be defined!');
+    }
+    this._toggleActivityRequestMode(true);
+    this._activity = value;
+  },
+
   // The Messaging application's global Activity handler. Delegates to specific
   // handler based on the Activity name.
-  global: function activityHandler(activity) {
-
+  _onActivity: function activityHandler(handlers, activity) {
     var name = activity.source.name;
-    var handler = this._handlers[name];
+    var handler = handlers[name];
 
     if (typeof handler === 'function') {
-      handler.apply(this, arguments);
+      this.setActivity(activity);
+
+      handler.call(this, activity);
     } else {
       console.error('Unrecognized activity: "' + name + '"');
     }
   },
 
-  // A mapping of MozActivity names to their associated event handler
-  _handlers: {
-    'new': function newHandler(activity) {
-
-      // This lock is for avoiding several calls at the same time.
-      if (this.isLocked) {
-        return;
-      }
-
-      this.currentActivity.new = activity;
-      this.isLocked = true;
+  _onNewActivity: function newHandler(activity) {
+    // This lock is for avoiding several calls at the same time.
+    if (this.isLocked) {
+      return;
+    }
 
-      var number = activity.source.data.number;
-      var body = activity.source.data.body;
+    this.isLocked = true;
 
-      Contacts.findByPhoneNumber(number, function findContact(results) {
-        var record, details, name, contact;
+    var number = activity.source.data.number;
+    var body = activity.source.data.body;
 
-        // Bug 867948: results null is a legitimate case
-        if (results && results.length) {
-          record = results[0];
-          details = Utils.getContactDetails(number, record);
-          name = record.name.length && record.name[0];
-          contact = {
-            number: number,
-            name: name,
-            source: 'contacts'
-          };
-        }
+    Contacts.findByPhoneNumber(number, function findContact(results) {
+      var record, details, name, contact;
 
-        ActivityHandler.toView({
-          body: body,
+      // Bug 867948: results null is a legitimate case
+      if (results && results.length) {
+        record = results[0];
+        details = Utils.getContactDetails(number, record);
+        name = record.name.length && record.name[0];
+        contact = {
           number: number,
-          contact: contact || null
-        });
-      });
+          name: name,
+          source: 'contacts'
+        };
+      }
 
-      ThreadUI.enableActivityRequestMode();
-    },
-    share: function shareHandler(activity) {
-      var blobs = activity.source.data.blobs,
-        names = activity.source.data.filenames;
+      ActivityHandler.toView({
+        body: body,
+        number: number,
+        contact: contact || null
+      });
+    });
+  },
 
-      function insertAttachments() {
-        window.removeEventListener('hashchange', insertAttachments);
+  _onShareActivity: function shareHandler(activity) {
+    var activityData = activity.source.data;
 
-        var attachments = blobs.map(function(blob, idx) {
-          var attachment = new Attachment(blob, {
-            name: names[idx],
-            isDraft: true
-          });
+    var attachments = activityData.blobs.map(function(blob, idx) {
+      var attachment = new Attachment(blob, {
+        name: activityData.filenames[idx],
+        isDraft: true
+      });
 
-          return attachment;
-        });
+      return attachment;
+    });
 
-        var size = attachments.reduce(function(size, attachment) {
-          if (attachment.type !== 'img') {
-            size += attachment.size;
-          }
+    var size = attachments.reduce(function(size, attachment) {
+      if (attachment.type !== 'img') {
+        size += attachment.size;
+      }
 
-          return size;
-        }, 0);
+      return size;
+    }, 0);
 
-        if (size > Settings.mmsSizeLimitation) {
-          alert(navigator.mozL10n.get('files-too-large', { n: blobs.length }));
-          return;
-        }
+    if (size > Settings.mmsSizeLimitation) {
+      alert(navigator.mozL10n.get('files-too-large', {
+        n: activityData.blobs.length
+      }));
+      this.leaveActivity();
+      return;
+    }
 
-        ThreadUI.cleanFields(true);
+    // Navigating to the 'New Message' page is an asynchronous operation that
+    // clears the Composition field. If the application is not already in the
+    // 'New Message' page, delay attachment insertion until after the
+    // navigation is complete.
+    if (window.location.hash !== '#new') {
+      window.addEventListener('hashchange', function onHashChanged() {
+        window.removeEventListener('hashchange', onHashChanged);
         Compose.append(attachments);
-      }
-
-      // Navigating to the 'New Message' page is an asynchronous operation that
-      // clears the Composition field. If the application is not already in the
-      // 'New Message' page, delay attachment insertion until after the
-      // navigation is complete.
-      if (window.location.hash !== '#new') {
-        window.addEventListener('hashchange', insertAttachments);
-        window.location.hash = '#new';
-      } else {
-        insertAttachments();
-      }
+      });
+      window.location.hash = '#new';
+    } else {
+      Compose.append(attachments);
     }
   },
 
-  resetActivity: function ah_resetActivity() {
-    this.currentActivity.new = null;
-    ThreadUI.resetActivityRequestMode();
+  _toggleActivityRequestMode: function(toggle) {
+    document.body.classList.toggle(
+      this.REQUEST_ACTIVITY_MODE_CLASS_NAME,
+      toggle
+    );
+  },
+
+  leaveActivity: function ah_leaveActivity() {
+    if (this.isInActivity()) {
+      this._activity.postResult({ success: true });
+      this._activity = null;
+
+      this._toggleActivityRequestMode(false);
+    }
   },
 
   handleMessageNotification: function ah_handleMessageNotification(message) {