filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix X-Mms-Transaction-ID of M-Acknowledge.ind"

Browse Source
This commit is contained in:
Treehugger Robot
2019-06-12 00:12:16 +00:00
committed by Gerrit Code Review
parent 6c3770a7ea 87811542d0
commit aa5bde8dbe
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/android/messaging/sms/MmsUtils.java
View File

@@ -1915,7 +1915,7 @@ public class MmsUtils {
final String transactionId, final String contentLocation,
final boolean autoDownload, final long receivedTimestampInSeconds,
final RetrieveConf retrieveConf) {
final byte[] transactionIdBytes = stringToBytes(transactionId, "UTF-8");
final byte[] notificationTransactionId = stringToBytes(transactionId, "UTF-8");
Uri messageUri = null;
int status = MMS_REQUEST_MANUAL_RETRY;
int retrieveStatus = PDU_HEADER_VALUE_UNDEFINED;
@@ -1940,10 +1940,15 @@ public class MmsUtils {
if (status == MMS_REQUEST_SUCCEEDED) {
// Send response of the notification
if (autoDownload) {
sendNotifyResponseForMmsDownload(context, subId, transactionIdBytes,
contentLocation, PduHeaders.STATUS_RETRIEVED);
sendNotifyResponseForMmsDownload(
context,
subId,
notificationTransactionId,
contentLocation,
PduHeaders.STATUS_RETRIEVED);
} else {
sendAcknowledgeForMmsDownload(context, subId, transactionIdBytes, contentLocation);
sendAcknowledgeForMmsDownload(
context, subId, retrieveConf.getTransactionId(), contentLocation);
}
// Insert downloaded message into telephony
@@ -1954,8 +1959,12 @@ public class MmsUtils {
// For a retry do nothing
} else if (status == MMS_REQUEST_MANUAL_RETRY && autoDownload) {
// Failure from autodownload - just treat like manual download
sendNotifyResponseForMmsDownload(context, subId, transactionIdBytes,
contentLocation, PduHeaders.STATUS_DEFERRED);
sendNotifyResponseForMmsDownload(
context,
subId,
notificationTransactionId,
contentLocation,
PduHeaders.STATUS_DEFERRED);
}
return new StatusPlusUri(status, retrieveStatus, messageUri);
}