Merge pull request #17317 from ankit93040/943976_SMS/MMS__Attaching_V…

…ideo_MMS_Prompts_Wrong_Error_Message

Bug 943976: Attaching_Video_MMS_Prompts_Wrong_Error_Message, r=schung

apps/sms/js/activity_handler.js

@@ -98,6 +98,10 @@ var ActivityHandler = {
           // TODO: We only allow sharing one item in a single action now.
           //       Keeping the same sequence while adding the multiple items
           //       should be considered in the future.
+          if (attachment.size > Settings.mmsSizeLimitation) {
+            alert(navigator.mozL10n.get('file-too-large'));
+            return;
+          }
           Compose.append(attachment);
         });
       }

apps/sms/js/thread_ui.js

@@ -1088,7 +1088,7 @@ var ThreadUI = global.ThreadUI = {
     if (Settings.mmsSizeLimitation) {
       if (Compose.size > Settings.mmsSizeLimitation) {
         Compose.lock = true;
-        this.showMaxLengthNotice('messages-exceeded-length-text');
+        this.showMaxLengthNotice('message-exceeded-max-length');
         return false;
       } else if (Compose.size === Settings.mmsSizeLimitation) {
         Compose.lock = true;

apps/sms/locales/sms.en-US.properties

@@ -46,7 +46,7 @@ converted-to-mms           = Converting to multimedia message.
 converted-to-sms           = Converting to text message.
 messages-max-length-text   = You’ve reached the maximum length.
 messages-max-subject-length-text = Maximum length of subject reached.
-messages-exceeded-length-text = You’ve exceeded the maximum length. Remove special characters or shorten the message to send it.
+message-exceeded-max-length = You've exceeded the maximum size. Remove attachments or shorten the message to send it.
 newMessage                 = New message
 sendMessage                = Send message
 no-recipient         = (No recipient)

apps/sms/test/unit/activity_handler_test.js

@@ -1,5 +1,5 @@
 /*global Notify, Compose, mocha, MocksHelper, ActivityHandler, Contacts,
-         MessageManager, Attachment, ThreadUI */
+         MessageManager, Attachment, ThreadUI, Settings  */
 /*global MockNavigatormozSetMessageHandler, MockNavigatormozApps,
          MockNavigatorWakeLock, MockOptionMenu, Mockalert,
          MockMessages, MockNavigatorSettings, MockL10n,
@@ -120,17 +120,18 @@ suite('ActivityHandler', function() {
         source: {
           name: 'share',
           data: {
-            blobs: [new Blob(), new Blob()],
+            blobs: [
+              new Blob(['test'], { type: 'text/plain' }),
+              new Blob(['string'], { type: 'text/plain' })
+            ],
             filenames: ['testBlob1', 'testBlob2']
           }
         }
       };
-      this.prevAppend = Compose.append;
     });
 
     teardown(function() {
       window.location.hash = this.prevHash;
-      Compose.append = this.prevAppend;
     });
 
     test('modifies the URL "hash" when necessary', function() {
@@ -145,6 +146,7 @@ suite('ActivityHandler', function() {
 
         assert.instanceOf(attachment, Attachment);
         assert.ok(Compose.append.callCount < 3);
+        assert.equal(Mockalert.mLastMessage, null);
 
         if (Compose.append.callCount === 2) {
           done();
@@ -153,7 +155,17 @@ suite('ActivityHandler', function() {
 
       MockNavigatormozSetMessageHandler.mTrigger('activity', shareActivity);
     });
+    test('Attachment size over max mms should not be appended', function() {
+          // Adjust mmsSizeLimitation for verifying alert popup when size over
+          // limitation
+          Settings.mmsSizeLimitation = 1;
+          this.sinon.spy(Compose, 'append');
+          window.location.hash = '#new';
 
+          MockNavigatormozSetMessageHandler.mTrigger('activity', shareActivity);
+          sinon.assert.notCalled(Compose.append);
+          assert.equal(Mockalert.mLastMessage, 'file-too-large');
+    });
     test('share shouldn\'t change the ThreadUI back button', function() {
       this.sinon.stub(ThreadUI, 'enableActivityRequestMode');
       MockNavigatormozSetMessageHandler.mTrigger('activity', shareActivity);

apps/sms/test/unit/thread_ui_test.js

@@ -1084,7 +1084,7 @@ suite('thread_ui.js >', function() {
       test('banner localized', function() {
         assert.ok(
           localize.calledWith(banner.querySelector('p'),
-            'messages-exceeded-length-text')
+            'message-exceeded-max-length')
         );
       });