Merge pull request #20162 from nullaus/bug1009780

bug 1009780 - Improve open mechanism for downloads.
mozilla-b2g · Jun 8, 2014 · 3553e4f · 3553e4f
2 parents 0874095 + 5248b80
commit 3553e4f
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 9 deletions.
diff --git a/apps/pdfjs/content/web/viewer.js b/apps/pdfjs/content/web/viewer.js
@@ -5378,12 +5378,14 @@ window.addEventListener('afterprint', function afterPrint(evt) {
 })();
 
   window.navigator.mozSetMessageHandler('activity', function(activity) {
-    var url = activity.source.data.url;
+    var blob = activity.source.data.blob;
     PDFJS.maxImageSize = 1024 * 1024;
+
+    var url = URL.createObjectURL(blob);
     PDFView.open(url);
+
     var cancelButton = document.getElementById('activityClose');
     cancelButton.addEventListener('click', function() {
       activity.postResult('close');
     });
   });
-
diff --git a/apps/pdfjs/manifest.webapp b/apps/pdfjs/manifest.webapp
@@ -20,6 +20,14 @@
   },
   "orientation": "default",
   "activities": {
+    "open" : {
+      "filters": {
+        "type": "application/pdf"
+      },
+      "disposition": "window",
+      "href": "/content/web/viewer.html",
+      "returnValue": true
+    },
     "view" : {
       "filters": {
         "type": "application/pdf"

diff --git a/apps/settings/test/unit/download_helper_test.js b/apps/settings/test/unit/download_helper_test.js
@@ -180,15 +180,16 @@ suite('DownloadHelper', function() {
 
       var req = DownloadHelper.open(download);
 
+      // We should always attempt to 'open' all content types.
       req.onsuccess = function() {
-        assert.ok(false);
+        assert.ok(true);
+        stubFormatter.restore();
         done();
       };
 
       req.onerror = function(evt) {
-        assert.equal(evt.target.error.code,
-          DownloadHelper.CODE.MIME_TYPE_NOT_SUPPORTED);
-        stubFormatter.restore();
+        assert.ok(false,
+                  'All content types should be openable via third party apps.');
         done();
       };
     });

diff --git a/shared/js/download/download_helper.js b/shared/js/download/download_helper.js
@@ -308,10 +308,23 @@ var DownloadHelper = (function() {
                         function loaded() {
           var type = getType(download);
 
+          //
+          // The 'open' action will always launch an activity using the original
+          // content type to allow for third party applications to handle
+          // arbitrary types of content.
+          //
+          // The 'share' action on the other hand only works with known mime
+          // types at this time.
+          //
+
           if (type.length === 0) {
-            sendError(req, 'Mime type not supported: ' + type,
-                      CODE.MIME_TYPE_NOT_SUPPORTED);
-            return;
+            type = download.contentType;
+
+            if (actionType !== ActionsFactory.TYPE.OPEN) {
+              sendError(req, 'Mime type not supported: ' + type,
+                        CODE.MIME_TYPE_NOT_SUPPORTED);
+              return;
+            }
           }
 
           var blobReq = getBlob(download);