Bug 810067 - Support automatic/manual/never retrieval modes. r=vyang

b2g/chrome/content/settings.js

@@ -155,6 +155,11 @@ SettingsListener.observe('language.current', 'en-US', function(value) {
     });
   });
 
+  SettingsListener.observe('ril.mms.retrieval_mode', 'manual',
+    function(value) {
+      Services.prefs.setCharPref('dom.mms.retrieval_mode', value);
+  });
+
   SettingsListener.observe('ril.sms.strict7BitEncoding.enabled', false,
     function(value) {
       Services.prefs.setBoolPref('dom.sms.strict7BitEncoding', value);

dom/mms/src/ril/MmsPduHelper.jsm

@@ -1580,6 +1580,9 @@ const MMS_PDU_TYPES = (function () {
                                          "to",
                                          "date",
                                          "x-mms-status"]);
+  add(MMS_PDU_TYPE_ACKNOWLEDGE_IND, false, ["x-mms-message-type",
+                                            "x-mms-transaction-id",
+                                            "x-mms-mms-version"]);
 
   return pdus;
 })();

dom/mms/src/ril/MmsService.js

@@ -34,6 +34,12 @@ const CONFIG_SEND_REPORT_ALWAYS      = 3;
 const TIME_TO_BUFFER_MMS_REQUESTS    = 30000;
 const TIME_TO_RELEASE_MMS_CONNECTION = 30000;
 
+
+const PREF_RETRIEVAL_MODE = 'dom.mms.retrieval_mode';
+const RETRIEVAL_MODE_MANUAL = "manual";
+const RETRIEVAL_MODE_AUTOMATIC = "automatic";
+const RETRIEVAL_MODE_NEVER = "never";
+
 XPCOMUtils.defineLazyServiceGetter(this, "gpps",
                                    "@mozilla.org/network/protocol-proxy-service;1",
                                    "nsIProtocolProxyService");
@@ -683,6 +689,48 @@ SendTransaction.prototype = {
   }
 };
 
+/**
+ * Send M-acknowledge.ind back to MMSC.
+ *
+ * @param transactionId
+ *        X-Mms-Transaction-ID of the message.
+ * @param reportAllowed
+ *        X-Mms-Report-Allowed of the response.
+ *
+ * @see OMA-TS-MMS_ENC-V1_3-20110913-A section 6.4
+ */
+function AcknowledgeTransaction(transactionId, reportAllowed) {
+  let headers = {};
+
+  // Mandatory fields
+  headers["x-mms-message-type"] = MMS.MMS_PDU_TYPE_ACKNOWLEDGE_IND;
+  headers["x-mms-transaction-id"] = transactionId;
+  headers["x-mms-mms-version"] = MMS.MMS_VERSION;
+  // Optional fields
+  headers["x-mms-report-allowed"] = reportAllowed;
+
+  this.istream = MMS.PduHelper.compose(null, {headers: headers});
+}
+AcknowledgeTransaction.prototype = {
+  /**
+   * @param callback [optional]
+   *        A callback function that takes one argument -- the http status.
+   */
+  run: function run(callback) {
+    let requestCallback;
+    if (callback) {
+      requestCallback = function (httpStatus, data) {
+        // `The MMS Client SHOULD ignore the associated HTTP POST response
+        // from the MMS Proxy-Relay.` ~ OMA-TS-MMS_CTR-V1_3-20110913-A
+        // section 8.2.3 "Retrieving an MM".
+        callback(httpStatus);
+      };
+    }
+    gMmsTransactionHelper.sendRequest("POST", gMmsConnection.mmsc,
+                                      this.istream, requestCallback);
+  }
+};
+
 /**
  * MmsService
  */
@@ -755,34 +803,53 @@ MmsService.prototype = {
    */
   handleNotificationIndication: function handleNotificationIndication(notification) {
     // TODO: bug 839436 - make DB be able to save MMS messages
-    // TODO: bug 810067 - support automatic/manual/never retrieval modes
 
     let url = notification.headers["x-mms-content-location"].uri;
     // TODO: bug 810091 - don't download message twice on receiving duplicated
     //                     notification
-    this.retrieveMessage(url, (function (mmsStatus, retrievedMsg) {
-      debug("retrievedMsg = " + JSON.stringify(retrievedMsg));
-      if (this.isTransientError(mmsStatus)) {
-        // TODO: remove this check after bug 810097 is landed.
-        return;
-      }
 
-      let transactionId = notification.headers["x-mms-transaction-id"];
+    let retrievalMode = RETRIEVAL_MODE_MANUAL;
+    try {
+      retrievalMode = Services.prefs.getCharPref(PREF_RETRIEVAL_MODE);
+    } catch (e) {}
 
-      // For X-Mms-Report-Allowed
-      let wish = notification.headers["x-mms-delivery-report"];
-      // `The absence of the field does not indicate any default value.`
-      // So we go checking the same field in retrieved message instead.
-      if ((wish == null) && retrievedMsg) {
-        wish = retrievedMsg.headers["x-mms-delivery-report"];
-      }
-      let reportAllowed =
-        this.getReportAllowed(this.confSendDeliveryReport, wish);
+    if (RETRIEVAL_MODE_AUTOMATIC === retrievalMode) {
+      this.retrieveMessage(url, (function responseNotify(mmsStatus, retrievedMsg) {
+        debug("retrievedMsg = " + JSON.stringify(retrievedMsg));
+        if (this.isTransientError(mmsStatus)) {
+          // TODO: remove this check after bug 810097 is landed.
+          return;
+        }
 
-      let transaction =
-        new NotifyResponseTransaction(transactionId, mmsStatus, reportAllowed);
-      transaction.run();
-    }).bind(this));
+        let transactionId = notification.headers["x-mms-transaction-id"];
+
+        // For X-Mms-Report-Allowed
+        let wish = notification.headers["x-mms-delivery-report"];
+        // `The absence of the field does not indicate any default value.`
+        // So we go checking the same field in retrieved message instead.
+        if ((wish == null) && retrievedMsg) {
+          wish = retrievedMsg.headers["x-mms-delivery-report"];
+        }
+        let reportAllowed = this.getReportAllowed(this.confSendDeliveryReport, wish);
+
+        let transaction =
+          new NotifyResponseTransaction(transactionId, mmsStatus, reportAllowed);
+        transaction.run();
+      }).bind(this));
+      return;
+    }
+
+    let transactionId = notification.headers["x-mms-transaction-id"];
+    let mmsStatus = RETRIEVAL_MODE_NEVER === retrievalMode ?
+        MMS.MMS_PDU_STATUS_REJECTED : MMS.MMS_PDU_STATUS_DEFERRED;
+    // For X-Mms-Report-Allowed
+    let wish = notification.headers["x-mms-delivery-report"];
+    let reportAllowed = this.getReportAllowed(this.confSendDeliveryReport, wish);
+
+    let transaction = new NotifyResponseTransaction(transactionId,
+                                                    mmsStatus,
+                                                    reportAllowed);
+    transaction.run();
   },
 
   /**

modules/libpref/src/init/all.js

@@ -4110,6 +4110,12 @@ pref("dom.placeholder.show_on_focus", true);
 pref("wap.UAProf.url", "");
 pref("wap.UAProf.tagname", "x-wap-profile");
 
+//Retrieval mode for MMS
+//manual: Manual retrieval mode.
+//automatic: Automatic retrieval mode.
+//never: Never retrieval mode.
+pref("dom.mms.retrieval_mode", "manual");
+
 // If the user puts a finger down on an element and we think the user
 // might be executing a pan gesture, how long do we wait before
 // tentatively deciding the gesture is actually a tap and activating