Merge "Send MMS with international (no NANP) destination address in CDMA/GSM network" into nyc-dev

3 files changed, 117 insertions, 14 deletions

diff --git a/src/com/android/mms/service/DownloadRequest.java b/src/com/android/mms/service/DownloadRequest.java
index 1e2530c..9463bb6 100644
--- a/src/com/android/mms/service/DownloadRequest.java
+++ b/src/com/android/mms/service/DownloadRequest.java
@@ -70,7 +70,7 @@ public class DownloadRequest extends MmsRequest {
     @Override
     protected byte[] doHttp(Context context, MmsNetworkManager netMgr, ApnSettings apn)
             throws MmsHttpException {
-        final String requestId = this.toString();
+        final String requestId = getRequestId();
         final MmsHttpClient mmsHttpClient = netMgr.getOrCreateHttpClient();
         if (mmsHttpClient == null) {
             LogUtil.e(requestId, "MMS network is not ready!");
@@ -100,7 +100,7 @@ public class DownloadRequest extends MmsRequest {
 
     @Override
     protected Uri persistIfRequired(Context context, int result, byte[] response) {
-        final String requestId = this.toString();
+        final String requestId = getRequestId();
         // Let any mms apps running as secondary user know that a new mms has been downloaded.
         notifyOfDownload(context);
 
diff --git a/src/com/android/mms/service/MmsRequest.java b/src/com/android/mms/service/MmsRequest.java
index 0542841..e4ebdc4 100644
--- a/src/com/android/mms/service/MmsRequest.java
+++ b/src/com/android/mms/service/MmsRequest.java
@@ -277,6 +277,11 @@ public abstract class MmsRequest {
         return getClass().getSimpleName() + '@' + Integer.toHexString(hashCode());
     }
 
+
+    protected String getRequestId() {
+        return this.toString();
+    }
+
     /**
      * Making the HTTP request to MMSC
      *
diff --git a/src/com/android/mms/service/SendRequest.java b/src/com/android/mms/service/SendRequest.java
index 50d6112..29e16fd 100644
--- a/src/com/android/mms/service/SendRequest.java
+++ b/src/com/android/mms/service/SendRequest.java
@@ -34,11 +34,17 @@ import android.telephony.SmsManager;
 import android.text.TextUtils;
 
 import com.android.internal.telephony.AsyncEmergencyContactNotifier;
+import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneBase;
+import com.android.internal.telephony.PhoneFactory;
+import com.android.internal.telephony.PhoneProxy;
 import com.android.internal.telephony.SmsApplication;
+import com.android.internal.telephony.SmsNumberUtils;
 import com.android.mms.service.exception.MmsHttpException;
 import com.google.android.mms.MmsException;
 import com.google.android.mms.pdu.EncodedStringValue;
 import com.google.android.mms.pdu.GenericPdu;
+import com.google.android.mms.pdu.PduComposer;
 import com.google.android.mms.pdu.PduHeaders;
 import com.google.android.mms.pdu.PduParser;
 import com.google.android.mms.pdu.PduPersister;
@@ -67,13 +73,15 @@ public class SendRequest extends MmsRequest {
     @Override
     protected byte[] doHttp(Context context, MmsNetworkManager netMgr, ApnSettings apn)
             throws MmsHttpException {
-        final String requestId = this.toString();
+        final String requestId = getRequestId();
         final MmsHttpClient mmsHttpClient = netMgr.getOrCreateHttpClient();
         if (mmsHttpClient == null) {
             LogUtil.e(requestId, "MMS network is not ready!");
             throw new MmsHttpException(0/*statusCode*/, "MMS network is not ready");
         }
-        notifyIfEmergencyContactNoThrow();
+        final GenericPdu parsedPdu = parsePdu();
+        notifyIfEmergencyContactNoThrow(parsedPdu);
+        updateDestinationAddress(parsedPdu);
         return mmsHttpClient.execute(
                 mLocationUrl != null ? mLocationUrl : apn.getMmscUrl(),
                 mPduData,
@@ -86,28 +94,40 @@ public class SendRequest extends MmsRequest {
                 requestId);
     }
 
+    private GenericPdu parsePdu() {
+        final String requestId = getRequestId();
+        try {
+            if (mPduData == null) {
+                LogUtil.w(requestId, "Empty PDU raw data");
+                return null;
+            }
+            final boolean supportContentDisposition =
+                    mMmsConfig.getBoolean(SmsManager.MMS_CONFIG_SUPPORT_MMS_CONTENT_DISPOSITION);
+            return new PduParser(mPduData, supportContentDisposition).parse();
+        } catch (final Exception e) {
+            LogUtil.w(requestId, "Failed to parse PDU raw data");
+        }
+        return null;
+    }
+
     /**
      * If the MMS is being sent to an emergency number, the blocked number provider is notified
      * so that it can disable number blocking.
      */
-    private void notifyIfEmergencyContactNoThrow() {
+    private void notifyIfEmergencyContactNoThrow(final GenericPdu parsedPdu) {
         try {
-            notifyIfEmergencyContact();
+            notifyIfEmergencyContact(parsedPdu);
         } catch (Exception e) {
-            LogUtil.w("Error in notifyIfEmergencyContact: ", e);
+            LogUtil.w(getRequestId(), "Error in notifyIfEmergencyContact", e);
         }
     }
 
-    private void notifyIfEmergencyContact() {
-        final boolean supportContentDisposition =
-                mMmsConfig.getBoolean(SmsManager.MMS_CONFIG_SUPPORT_MMS_CONTENT_DISPOSITION);
-        GenericPdu parsedPdu = new PduParser(mPduData, supportContentDisposition).parse();
-
+    private void notifyIfEmergencyContact(final GenericPdu parsedPdu) {
         if (parsedPdu != null && parsedPdu.getMessageType() == PduHeaders.MESSAGE_TYPE_SEND_REQ) {
             SendReq sendReq = (SendReq) parsedPdu;
             for (EncodedStringValue encodedStringValue : sendReq.getTo()) {
                 if (isEmergencyNumber(encodedStringValue.getString())) {
-                    LogUtil.i("Notifying emergency contact.");
+                    LogUtil.i(getRequestId(), "Notifying emergency contact");
                     new AsyncEmergencyContactNotifier(mContext).execute();
                     return;
                 }
@@ -131,7 +151,7 @@ public class SendRequest extends MmsRequest {
 
     @Override
     protected Uri persistIfRequired(Context context, int result, byte[] response) {
-        final String requestId = this.toString();
+        final String requestId = getRequestId();
         if (!SmsApplication.shouldWriteMessageForPackage(mCreator, context)) {
             // Not required to persist
             return null;
@@ -213,6 +233,84 @@ public class SendRequest extends MmsRequest {
     }
 
     /**
+     * Update the destination Address of MO MMS before sending.
+     * This is special for VZW requirement. Follow the specificaitons of assisted dialing
+     * of MO MMS while traveling on VZW CDMA, international CDMA or GSM markets.
+     */
+    private void updateDestinationAddress(final GenericPdu pdu) {
+        final String requestId = getRequestId();
+        if (pdu == null) {
+            LogUtil.e(requestId, "updateDestinationAddress: can't parse input PDU");
+            return ;
+        }
+        if (!(pdu instanceof SendReq)) {
+            LogUtil.e(requestId, "updateDestinationAddress: not SendReq");
+            return;
+        }
+
+       boolean isUpdated = updateDestinationAddressPerType((SendReq)pdu, PduHeaders.TO);
+       isUpdated = updateDestinationAddressPerType((SendReq)pdu, PduHeaders.CC) || isUpdated;
+       isUpdated = updateDestinationAddressPerType((SendReq)pdu, PduHeaders.BCC) || isUpdated;
+
+       if (isUpdated) {
+           mPduData = new PduComposer(mContext, (SendReq)pdu).make();
+       }
+   }
+
+    private boolean updateDestinationAddressPerType(SendReq pdu, int type) {
+        boolean isUpdated = false;
+        EncodedStringValue[] recipientNumbers = null;
+
+        switch (type) {
+            case PduHeaders.TO:
+                recipientNumbers = pdu.getTo();
+                break;
+            case PduHeaders.CC:
+                recipientNumbers = pdu.getCc();
+                break;
+            case PduHeaders.BCC:
+                recipientNumbers = pdu.getBcc();
+                break;
+            default:
+                return false;
+        }
+
+        if (recipientNumbers != null) {
+            int nNumberCount = recipientNumbers.length;
+            if (nNumberCount > 0) {
+                Phone phone = PhoneFactory.getDefaultPhone();
+                PhoneBase pb = (PhoneBase)((PhoneProxy)phone).getActivePhone();
+                EncodedStringValue[] newNumbers = new EncodedStringValue[nNumberCount];
+                String toNumber;
+                String newToNumber;
+                for (int i = 0; i < nNumberCount; i++) {
+                    toNumber = recipientNumbers[i].getString();
+                    newToNumber = SmsNumberUtils.filterDestAddr(pb, toNumber);
+                    if (!TextUtils.equals(toNumber, newToNumber)) {
+                        isUpdated = true;
+                        newNumbers[i] = new EncodedStringValue(newToNumber);
+                    } else {
+                        newNumbers[i] = recipientNumbers[i];
+                    }
+                }
+                switch (type) {
+                    case PduHeaders.TO:
+                        pdu.setTo(newNumbers);
+                        break;
+                    case PduHeaders.CC:
+                        pdu.setCc(newNumbers);
+                        break;
+                    case PduHeaders.BCC:
+                        pdu.setBcc(newNumbers);
+                        break;
+                }
+            }
+        }
+
+        return isUpdated;
+    }
+
+    /**
      * Read the pdu from the file descriptor and cache pdu bytes in request
      * @return true if pdu read successfully
      */