filab/packages_apps_Messaging
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/datamodel/BugleDatabaseOperations.java
+1 -1
View File
@@ -24,6 +24,7 @@ import android.database.sqlite.SQLiteDoneException;
import android.database.sqlite.SQLiteStatement;
import android.net.Uri;
import android.os.ParcelFileDescriptor;
import android.support.v7.mms.pdu.ContentType;
import android.text.TextUtils;
import androidx.collection.ArrayMap;
@@ -45,7 +46,6 @@ import com.android.messaging.ui.UIIntents;
import com.android.messaging.util.Assert;
import com.android.messaging.util.Assert.DoesNotRunOnMainThread;
import com.android.messaging.util.AvatarUriUtil;
import com.android.messaging.util.ContentType;
import com.android.messaging.util.LogUtil;
import com.android.messaging.util.PhoneUtils;
import com.android.messaging.util.UriUtil;
src/com/android/messaging/datamodel/BugleNotifications.java
+1 -1
View File
@@ -34,6 +34,7 @@ import android.os.Bundle;
import android.os.SystemClock;
import android.provider.ContactsContract;
import android.provider.ContactsContract.Contacts;
import android.support.v7.mms.pdu.ContentType;
import android.text.Spannable;
import android.text.SpannableStringBuilder;
import android.text.TextUtils;
@@ -70,7 +71,6 @@ import com.android.messaging.util.AvatarUriUtil;
import com.android.messaging.util.BugleGservicesKeys;
import com.android.messaging.util.BuglePrefs;
import com.android.messaging.util.BuglePrefsKeys;
import com.android.messaging.util.ContentType;
import com.android.messaging.util.ConversationIdSet;
import com.android.messaging.util.ImageUtils;
import com.android.messaging.util.LogUtil;
src/com/android/messaging/datamodel/ConversationImagePartsView.java
+1 -2
View File
@@ -18,13 +18,12 @@
package com.android.messaging.datamodel;
import android.provider.BaseColumns;
import android.support.v7.mms.pdu.ContentType;
import com.android.ex.photo.provider.PhotoContract.PhotoViewColumns;
import com.android.messaging.datamodel.DatabaseHelper.MessageColumns;
import com.android.messaging.datamodel.DatabaseHelper.PartColumns;
import com.android.messaging.datamodel.DatabaseHelper.ParticipantColumns;
import com.android.messaging.util.ContentType;
/**
* View for the image parts for the conversation. It is used to provide the photoviewer with a
src/com/android/messaging/datamodel/MessageNotificationState.java
+1 -1
View File
@@ -23,6 +23,7 @@ import android.content.res.Resources;
import android.database.Cursor;
import android.graphics.Typeface;
import android.net.Uri;
import android.support.v7.mms.pdu.ContentType;
import android.text.Html;
import android.text.Spannable;
import android.text.SpannableString;
@@ -52,7 +53,6 @@ import com.android.messaging.ui.UIIntents;
import com.android.messaging.util.Assert;
import com.android.messaging.util.AvatarUriUtil;
import com.android.messaging.util.BugleGservicesKeys;
import com.android.messaging.util.ContentType;
import com.android.messaging.util.ConversationIdSet;
import com.android.messaging.util.LogUtil;
import com.android.messaging.util.NotificationsUtil;
src/com/android/messaging/datamodel/action/ProcessDownloadedMmsAction.java
+2 -2
View File
@@ -25,6 +25,8 @@ import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable;
import android.provider.Telephony.Mms;
import android.support.v7.mms.pdu.PduHeaders;
import android.support.v7.mms.pdu.RetrieveConf;
import android.telephony.SmsManager;
import android.text.TextUtils;
@@ -41,8 +43,6 @@ import com.android.messaging.datamodel.SyncManager;
import com.android.messaging.datamodel.data.MessageData;
import com.android.messaging.datamodel.data.ParticipantData;
import com.android.messaging.mmslib.SqliteWrapper;
import com.android.messaging.mmslib.pdu.PduHeaders;
import com.android.messaging.mmslib.pdu.RetrieveConf;
import com.android.messaging.sms.DatabaseMessages;
import com.android.messaging.sms.MmsSender;
import com.android.messaging.sms.MmsUtils;
src/com/android/messaging/datamodel/action/ProcessSentMessageAction.java
+1 -1
View File
@@ -23,6 +23,7 @@ import android.net.Uri;
import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.v7.mms.pdu.SendConf;
import android.telephony.PhoneNumberUtils;
import android.telephony.SmsManager;
@@ -37,7 +38,6 @@ import com.android.messaging.datamodel.MmsFileProvider;
import com.android.messaging.datamodel.data.MessageData;
import com.android.messaging.datamodel.data.MessagePartData;
import com.android.messaging.datamodel.data.ParticipantData;
import com.android.messaging.mmslib.pdu.SendConf;
import com.android.messaging.sms.MmsConfig;
import com.android.messaging.sms.MmsSender;
import com.android.messaging.sms.MmsUtils;
src/com/android/messaging/datamodel/action/ReceiveMmsMessageAction.java
+1 -1
View File
@@ -21,6 +21,7 @@ import android.content.Context;
import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.v7.mms.pdu.PduHeaders;
import androidx.annotation.NonNull;
@@ -33,7 +34,6 @@ import com.android.messaging.datamodel.MessagingContentProvider;
import com.android.messaging.datamodel.SyncManager;
import com.android.messaging.datamodel.data.MessageData;
import com.android.messaging.datamodel.data.ParticipantData;
import com.android.messaging.mmslib.pdu.PduHeaders;
import com.android.messaging.sms.DatabaseMessages;
import com.android.messaging.sms.MmsUtils;
import com.android.messaging.util.LogUtil;
src/com/android/messaging/datamodel/action/SyncMessageBatch.java
+1 -1
View File
@@ -22,6 +22,7 @@ import android.database.sqlite.SQLiteConstraintException;
import android.provider.Telephony;
import android.provider.Telephony.Mms;
import android.provider.Telephony.Sms;
import android.support.v7.mms.pdu.PduHeaders;
import android.text.TextUtils;
import com.android.messaging.datamodel.BugleDatabaseOperations;
@@ -33,7 +34,6 @@ import com.android.messaging.datamodel.DatabaseWrapper;
import com.android.messaging.datamodel.SyncManager.ThreadInfoCache;
import com.android.messaging.datamodel.data.MessageData;
import com.android.messaging.datamodel.data.ParticipantData;
import com.android.messaging.mmslib.pdu.PduHeaders;
import com.android.messaging.sms.DatabaseMessages.LocalDatabaseMessage;
import com.android.messaging.sms.DatabaseMessages.MmsMessage;
import com.android.messaging.sms.DatabaseMessages.SmsMessage;
src/com/android/messaging/datamodel/action/SyncMessagesAction.java
+1 -1
View File
@@ -25,6 +25,7 @@ import android.os.Parcel;
import android.os.Parcelable;
import android.os.SystemClock;
import android.provider.Telephony.Mms;
import android.support.v7.mms.pdu.ContentType;
import androidx.annotation.NonNull;
import androidx.collection.LongSparseArray;
@@ -46,7 +47,6 @@ import com.android.messaging.util.Assert;
import com.android.messaging.util.BugleGservicesKeys;
import com.android.messaging.util.BuglePrefs;
import com.android.messaging.util.BuglePrefsKeys;
import com.android.messaging.util.ContentType;
import com.android.messaging.util.LogUtil;
import com.android.messaging.util.OsUtil;
src/com/android/messaging/datamodel/data/ConversationMessageData.java
+1 -1
View File
@@ -20,6 +20,7 @@ import android.database.Cursor;
import android.net.Uri;
import android.provider.BaseColumns;
import android.provider.ContactsContract;
import android.support.v7.mms.pdu.ContentType;
import android.text.TextUtils;
import android.text.format.DateUtils;
@@ -31,7 +32,6 @@ import com.android.messaging.datamodel.DatabaseHelper.PartColumns;
import com.android.messaging.datamodel.DatabaseHelper.ParticipantColumns;
import com.android.messaging.util.Assert;
import com.android.messaging.util.BugleGservicesKeys;
import com.android.messaging.util.ContentType;
import com.android.messaging.util.Dates;
import com.android.messaging.util.LogUtil;
import com.google.common.base.Predicate;
src/com/android/messaging/datamodel/data/MessagePartData.java
+1 -1
View File
@@ -24,6 +24,7 @@ import android.graphics.Rect;
import android.net.Uri;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.v7.mms.pdu.ContentType;
import android.text.TextUtils;
import androidx.annotation.NonNull;
@@ -39,7 +40,6 @@ import com.android.messaging.datamodel.media.ImageRequest;
import com.android.messaging.sms.MmsUtils;
import com.android.messaging.util.Assert;
import com.android.messaging.util.Assert.DoesNotRunOnMainThread;
import com.android.messaging.util.ContentType;
import com.android.messaging.util.GifTranscoder;
import com.android.messaging.util.ImageUtils;
import com.android.messaging.util.LogUtil;
src/com/android/messaging/datamodel/data/PendingAttachmentData.java
+2 -1
View File
@@ -21,10 +21,11 @@ import android.os.Handler;
import android.os.Looper;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.v7.mms.pdu.ContentType;
import androidx.annotation.NonNull;
import com.android.messaging.util.Assert;
import com.android.messaging.util.ContentType;
import com.android.messaging.util.LogUtil;
import com.android.messaging.util.UriUtil;
src/com/android/messaging/datamodel/media/NetworkUriImageRequest.java
+1 -1
View File
@@ -19,10 +19,10 @@ package com.android.messaging.datamodel.media;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.support.v7.mms.pdu.ContentType;
import com.android.messaging.Factory;
import com.android.messaging.util.Assert;
import com.android.messaging.util.ContentType;
import com.android.messaging.util.LogUtil;
import java.io.FileNotFoundException;