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

Messaging: Remove duplicate code

Browse Source 
* mmslib contains basically the same code as android.support.v7.mms.pdu
  does, so align them code-wise and remove the mmslib duplicates
* Since mmslib contains a few usages that are now not accessible
  anymore, make the classes or methods public where it complains

Change-Id: I10b8716c0e45079e4795fda4489dc1a9535026f3
This commit is contained in:
Michael W
2025-03-04 18:52:05 +01:00
parent f83b05ea0a
commit 47f5533a73
80 changed files with 670 additions and 7037 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/messaging/sms/DatabaseMessages.java
+2 -2
View File
@@ -29,14 +29,14 @@ import android.os.Parcel;
import android.os.Parcelable;
import android.provider.Telephony.Mms;
import android.provider.Telephony.Sms;
import android.support.v7.mms.pdu.CharacterSets;
import android.support.v7.mms.pdu.ContentType;
import android.text.TextUtils;
import android.util.Log;
import android.webkit.MimeTypeMap;
import com.android.messaging.Factory;
import com.android.messaging.datamodel.data.MessageData;
import com.android.messaging.mmslib.pdu.CharacterSets;
import com.android.messaging.util.ContentType;
import com.android.messaging.util.LogUtil;
import com.android.messaging.util.MediaMetadataRetrieverWrapper;
import com.android.messaging.util.PhoneUtils;
src/com/android/messaging/sms/MmsSender.java
+13 -13
View File
@@ -24,22 +24,22 @@ import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.support.v7.mms.MmsManager;
import android.support.v7.mms.pdu.AcknowledgeInd;
import android.support.v7.mms.pdu.EncodedStringValue;
import android.support.v7.mms.pdu.GenericPdu;
import android.support.v7.mms.pdu.InvalidHeaderValueException;
import android.support.v7.mms.pdu.NotifyRespInd;
import android.support.v7.mms.pdu.PduHeaders;
import android.support.v7.mms.pdu.PduParser;
import android.support.v7.mms.pdu.RetrieveConf;
import android.support.v7.mms.pdu.SendConf;
import android.support.v7.mms.pdu.SendReq;
import android.telephony.SmsManager;
import com.android.messaging.datamodel.MmsFileProvider;
import com.android.messaging.datamodel.action.SendMessageAction;
import com.android.messaging.datamodel.data.MessageData;
import com.android.messaging.mmslib.InvalidHeaderValueException;
import com.android.messaging.mmslib.pdu.AcknowledgeInd;
import com.android.messaging.mmslib.pdu.EncodedStringValue;
import com.android.messaging.mmslib.pdu.GenericPdu;
import com.android.messaging.mmslib.pdu.NotifyRespInd;
import com.android.messaging.mmslib.pdu.PduComposer;
import com.android.messaging.mmslib.pdu.PduHeaders;
import com.android.messaging.mmslib.pdu.PduParser;
import com.android.messaging.mmslib.pdu.RetrieveConf;
import com.android.messaging.mmslib.pdu.SendConf;
import com.android.messaging.mmslib.pdu.SendReq;
import com.android.messaging.receiver.SendStatusReceiver;
import com.android.messaging.util.Assert;
import com.android.messaging.util.LogUtil;
@@ -65,7 +65,7 @@ public class MmsSender {
* @param sendReq The SendReq PDU of the message
*/
public static void sendMms(final Context context, final int subId, final Uri messageUri,
final SendReq sendReq, final Bundle sentIntentExras) throws MmsFailureException {
final SendReq sendReq, final Bundle sentIntentExras) throws MmsFailureException {
sendMms(context,
subId,
messageUri,
@@ -139,8 +139,8 @@ public class MmsSender {
* Sending of AcknowledgeInd and NotifyRespInd are not important.
*/
private static void sendMms(final Context context, final int subId, final Uri messageUri,
final String locationUrl, final GenericPdu pdu, final boolean responseImportant,
final Bundle sentIntentExtras) throws MmsFailureException {
final String locationUrl, final GenericPdu pdu, final boolean responseImportant,
final Bundle sentIntentExtras) throws MmsFailureException {
// Write PDU to temporary file to send to platform
final Uri contentUri = writePduToTempFile(context, pdu, subId);
src/com/android/messaging/sms/MmsUtils.java
+17 -17
View File
@@ -33,6 +33,20 @@ import android.provider.Telephony;
import android.provider.Telephony.Mms;
import android.provider.Telephony.Sms;
import android.provider.Telephony.Threads;
import android.support.v7.mms.pdu.CharacterSets;
import android.support.v7.mms.pdu.ContentType;
import android.support.v7.mms.pdu.EncodedStringValue;
import android.support.v7.mms.pdu.GenericPdu;
import android.support.v7.mms.pdu.InvalidHeaderValueException;
import android.support.v7.mms.pdu.MmsException;
import android.support.v7.mms.pdu.NotificationInd;
import android.support.v7.mms.pdu.PduBody;
import android.support.v7.mms.pdu.PduHeaders;
import android.support.v7.mms.pdu.PduParser;
import android.support.v7.mms.pdu.PduPart;
import android.support.v7.mms.pdu.RetrieveConf;
import android.support.v7.mms.pdu.SendConf;
import android.support.v7.mms.pdu.SendReq;
import android.telephony.SmsMessage;
import android.text.TextUtils;
@@ -43,27 +57,13 @@ import com.android.messaging.datamodel.action.DownloadMmsAction;
import com.android.messaging.datamodel.action.SendMessageAction;
import com.android.messaging.datamodel.data.MessageData;
import com.android.messaging.datamodel.data.MessagePartData;
import com.android.messaging.mmslib.InvalidHeaderValueException;
import com.android.messaging.mmslib.MmsException;
import com.android.messaging.mmslib.SqliteWrapper;
import com.android.messaging.mmslib.pdu.CharacterSets;
import com.android.messaging.mmslib.pdu.EncodedStringValue;
import com.android.messaging.mmslib.pdu.GenericPdu;
import com.android.messaging.mmslib.pdu.NotificationInd;
import com.android.messaging.mmslib.pdu.PduBody;
import com.android.messaging.mmslib.pdu.PduComposer;
import com.android.messaging.mmslib.pdu.PduHeaders;
import com.android.messaging.mmslib.pdu.PduParser;
import com.android.messaging.mmslib.pdu.PduPart;
import com.android.messaging.mmslib.pdu.PduPersister;
import com.android.messaging.mmslib.pdu.RetrieveConf;
import com.android.messaging.mmslib.pdu.SendConf;
import com.android.messaging.mmslib.pdu.SendReq;
import com.android.messaging.sms.SmsSender.SendResult;
import com.android.messaging.util.Assert;
import com.android.messaging.util.BugleGservicesKeys;
import com.android.messaging.util.BuglePrefs;
import com.android.messaging.util.ContentType;
import com.android.messaging.util.DebugUtils;
import com.android.messaging.util.EmailAddress;
import com.android.messaging.util.ImageUtils;
@@ -917,7 +917,7 @@ public class MmsUtils {
// Persist a sent MMS message in telephony
private static Uri insertSendReq(final Context context, final GenericPdu pdu, final int subId,
final String subPhoneNumber) {
final String subPhoneNumber) {
final PduPersister persister = PduPersister.getPduPersister(context);
Uri uri = null;
try {
@@ -941,8 +941,8 @@ public class MmsUtils {
// Persist a received MMS message in telephony
public static Uri insertReceivedMmsMessage(final Context context,
final RetrieveConf retrieveConf, final int subId, final String subPhoneNumber,
final long receivedTimestampInSeconds, final long expiry, final String transactionId) {
final RetrieveConf retrieveConf, final int subId, final String subPhoneNumber,
final long receivedTimestampInSeconds, final long expiry, final String transactionId) {
final PduPersister persister = PduPersister.getPduPersister(context);
Uri uri = null;
try {