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/ui/AttachmentPreviewFactory.java
+2 -1
View File
@@ -21,6 +21,8 @@ import android.content.res.Resources;
import android.graphics.Rect;
import android.net.Uri;
import androidx.annotation.Nullable;
import android.support.v7.mms.pdu.ContentType;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
@@ -42,7 +44,6 @@ import com.android.messaging.datamodel.media.UriImageRequestDescriptor;
import com.android.messaging.ui.MultiAttachmentLayout.OnAttachmentClickListener;
import com.android.messaging.ui.PersonItemView.PersonItemViewListener;
import com.android.messaging.util.Assert;
import com.android.messaging.util.ContentType;
import com.android.messaging.util.ImageUtils;
import com.android.messaging.util.UiUtils;
import com.android.messaging.util.UriUtil;
src/com/android/messaging/ui/AudioAttachmentView.java
+1 -1
View File
@@ -26,6 +26,7 @@ import android.media.AudioManager;
import android.media.MediaPlayer;
import android.net.Uri;
import android.os.SystemClock;
import android.support.v7.mms.pdu.ContentType;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.view.LayoutInflater;
@@ -40,7 +41,6 @@ import com.android.messaging.R;
import com.android.messaging.datamodel.data.MessagePartData;
import com.android.messaging.ui.mediapicker.PausableChronometer;
import com.android.messaging.util.Assert;
import com.android.messaging.util.ContentType;
import com.android.messaging.util.LogUtil;
import com.android.messaging.util.UiUtils;
src/com/android/messaging/ui/UIIntentsImpl.java
+1 -1
View File
@@ -32,6 +32,7 @@ import android.os.Bundle;
import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.Intents;
import android.provider.MediaStore;
import android.support.v7.mms.pdu.ContentType;
import android.text.TextUtils;
import androidx.annotation.Nullable;
@@ -59,7 +60,6 @@ import com.android.messaging.ui.conversationlist.ForwardMessageActivity;
import com.android.messaging.ui.conversationsettings.PeopleAndOptionsActivity;
import com.android.messaging.ui.photoviewer.BuglePhotoViewActivity;
import com.android.messaging.util.Assert;
import com.android.messaging.util.ContentType;
import com.android.messaging.util.ConversationIdSet;
import com.android.messaging.util.LogUtil;
import com.android.messaging.util.UiUtils;
src/com/android/messaging/ui/conversation/ComposeMessageView.java
+1 -1
View File
@@ -23,6 +23,7 @@ import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.support.v7.mms.pdu.ContentType;
import android.text.Editable;
import android.text.Html;
import android.text.InputFilter;
@@ -68,7 +69,6 @@ import com.android.messaging.util.AccessibilityUtil;
import com.android.messaging.util.Assert;
import com.android.messaging.util.AvatarUriUtil;
import com.android.messaging.util.BuglePrefs;
import com.android.messaging.util.ContentType;
import com.android.messaging.util.LogUtil;
import com.android.messaging.util.MediaUtil;
import com.android.messaging.util.PhoneUtils;
src/com/android/messaging/ui/conversation/ConversationActivity.java
+1 -1
View File
@@ -21,6 +21,7 @@ import android.content.Intent;
import android.graphics.Rect;
import android.net.Uri;
import android.os.Bundle;
import android.support.v7.mms.pdu.ContentType;
import android.text.TextUtils;
import android.view.MenuItem;
@@ -40,7 +41,6 @@ import com.android.messaging.ui.conversation.ConversationActivityUiState.Convers
import com.android.messaging.ui.conversation.ConversationFragment.ConversationFragmentHost;
import com.android.messaging.ui.conversationlist.ConversationListActivity;
import com.android.messaging.util.Assert;
import com.android.messaging.util.ContentType;
import com.android.messaging.util.LogUtil;
import com.android.messaging.util.UiUtils;
src/com/android/messaging/ui/conversation/ConversationFragment.java
+1 -4
View File
@@ -36,6 +36,7 @@ import android.os.Environment;
import android.os.Handler;
import android.os.Looper;
import android.os.Parcelable;
import android.support.v7.mms.pdu.ContentType;
import android.telephony.PhoneNumberUtils;
import android.text.TextUtils;
import android.view.ActionMode;
@@ -49,8 +50,6 @@ import android.view.ViewConfiguration;
import android.view.ViewGroup;
import android.widget.TextView;
import androidx.activity.result.ActivityResult;
import androidx.activity.result.ActivityResultCallback;
import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts;
import androidx.annotation.NonNull;
@@ -101,10 +100,8 @@ import com.android.messaging.util.AccessibilityUtil;
import com.android.messaging.util.Assert;
import com.android.messaging.util.AvatarUriUtil;
import com.android.messaging.util.ChangeDefaultSmsAppHelper;
import com.android.messaging.util.ContentType;
import com.android.messaging.util.ImeUtil;
import com.android.messaging.util.LogUtil;
import com.android.messaging.util.OsUtil;
import com.android.messaging.util.PhoneUtils;
import com.android.messaging.util.TextUtil;
import com.android.messaging.util.UiUtils;
src/com/android/messaging/ui/conversation/ConversationMessageView.java
+3 -2
View File
@@ -22,7 +22,7 @@ import android.database.Cursor;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import androidx.annotation.Nullable;
import android.support.v7.mms.pdu.ContentType;
import android.text.Spanned;
import android.text.TextUtils;
import android.text.format.DateUtils;
@@ -41,6 +41,8 @@ import android.widget.ImageView.ScaleType;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.annotation.Nullable;
import com.android.messaging.R;
import com.android.messaging.datamodel.DataModel;
import com.android.messaging.datamodel.data.ConversationMessageData;
@@ -64,7 +66,6 @@ import com.android.messaging.ui.VideoThumbnailView;
import com.android.messaging.util.AccessibilityUtil;
import com.android.messaging.util.Assert;
import com.android.messaging.util.AvatarUriUtil;
import com.android.messaging.util.ContentType;
import com.android.messaging.util.ImageUtils;
import com.android.messaging.util.LinkifyHelper;
import com.android.messaging.util.OsUtil;
src/com/android/messaging/ui/conversation/LaunchConversationActivity.java
+1 -1
View File
@@ -22,6 +22,7 @@ import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.support.v7.mms.pdu.ContentType;
import android.text.TextUtils;
import com.android.messaging.Factory;
@@ -31,7 +32,6 @@ import com.android.messaging.datamodel.binding.Binding;
import com.android.messaging.datamodel.binding.BindingBase;
import com.android.messaging.datamodel.data.LaunchConversationData;
import com.android.messaging.ui.UIIntents;
import com.android.messaging.util.ContentType;
import com.android.messaging.util.LogUtil;
import com.android.messaging.util.UiUtils;
import com.android.messaging.util.UriUtil;
src/com/android/messaging/ui/conversation/MessageDetailsDialog.java
+1 -1
View File
@@ -21,6 +21,7 @@ import android.app.AlertDialog;
import android.content.Context;
import android.content.res.Resources;
import android.net.Uri;
import android.support.v7.mms.pdu.PduHeaders;
import android.text.TextUtils;
import android.text.format.Formatter;
@@ -31,7 +32,6 @@ import com.android.messaging.datamodel.DataModel;
import com.android.messaging.datamodel.data.ConversationMessageData;
import com.android.messaging.datamodel.data.ConversationParticipantsData;
import com.android.messaging.datamodel.data.ParticipantData;
import com.android.messaging.mmslib.pdu.PduHeaders;
import com.android.messaging.sms.DatabaseMessages.MmsMessage;
import com.android.messaging.sms.MmsUtils;
import com.android.messaging.util.Assert;
src/com/android/messaging/ui/conversationlist/ConversationListItemView.java
+1 -1
View File
@@ -24,6 +24,7 @@ import android.graphics.Rect;
import android.graphics.Typeface;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.support.v7.mms.pdu.ContentType;
import android.text.TextPaint;
import android.text.TextUtils;
import android.util.AttributeSet;
@@ -55,7 +56,6 @@ import com.android.messaging.ui.ContactIconView;
import com.android.messaging.ui.SnackBar;
import com.android.messaging.ui.SnackBarInteraction;
import com.android.messaging.util.Assert;
import com.android.messaging.util.ContentType;
import com.android.messaging.util.ImageUtils;
import com.android.messaging.util.PhoneUtils;
import com.android.messaging.util.Typefaces;
src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java
+3 -3
View File
@@ -22,6 +22,7 @@ import android.content.Intent;
import android.media.MediaMetadataRetriever;
import android.net.Uri;
import android.os.Bundle;
import android.support.v7.mms.pdu.ContentType;
import android.text.TextUtils;
import androidx.annotation.NonNull;
@@ -37,17 +38,16 @@ import com.android.messaging.datamodel.data.PendingAttachmentData;
import com.android.messaging.ui.BaseBugleActivity;
import com.android.messaging.ui.UIIntents;
import com.android.messaging.util.Assert;
import com.android.messaging.util.ContentType;
import com.android.messaging.util.FileUtil;
import com.android.messaging.util.LogUtil;
import com.android.messaging.util.MediaMetadataRetrieverWrapper;
import com.android.messaging.util.FileUtil;
import com.android.messaging.util.UriUtil;
import java.io.BufferedReader;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Map;
src/com/android/messaging/ui/mediapicker/AudioRecordView.java
+1 -1
View File
@@ -26,6 +26,7 @@ import android.graphics.drawable.Drawable;
import android.graphics.drawable.GradientDrawable;
import android.media.MediaRecorder;
import android.net.Uri;
import android.support.v7.mms.pdu.ContentType;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.View;
@@ -42,7 +43,6 @@ import com.android.messaging.datamodel.data.MediaPickerMessagePartData;
import com.android.messaging.datamodel.data.MessagePartData;
import com.android.messaging.sms.MmsConfig;
import com.android.messaging.util.Assert;
import com.android.messaging.util.ContentType;
import com.android.messaging.util.LogUtil;
import com.android.messaging.util.MediaUtil;
import com.android.messaging.util.MediaUtil.OnCompletionListener;
src/com/android/messaging/ui/mediapicker/CameraMediaChooser.java
+1 -1
View File
@@ -17,7 +17,7 @@
package com.android.messaging.ui.mediapicker;
import static com.android.messaging.util.ContentType.VIDEO_UNSPECIFIED;
import static android.support.v7.mms.pdu.ContentType.VIDEO_UNSPECIFIED;
import android.Manifest;
import android.app.Activity;
src/com/android/messaging/ui/mediapicker/ContactMediaChooser.java
+1 -1
View File
@@ -23,6 +23,7 @@ import android.content.Intent;
import android.database.Cursor;
import android.net.Uri;
import android.provider.ContactsContract.Contacts;
import android.support.v7.mms.pdu.ContentType;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -32,7 +33,6 @@ import androidx.activity.result.contract.ActivityResultContracts;
import com.android.messaging.R;
import com.android.messaging.datamodel.data.PendingAttachmentData;
import com.android.messaging.util.ContentType;
import com.android.messaging.util.LogUtil;
import com.android.messaging.util.UiUtils;
src/com/android/messaging/ui/mediapicker/LevelTrackingMediaRecorder.java
+1 -1
View File
@@ -19,12 +19,12 @@ package com.android.messaging.ui.mediapicker;
import android.media.MediaRecorder;
import android.net.Uri;
import android.os.ParcelFileDescriptor;
import android.support.v7.mms.pdu.ContentType;
import com.android.messaging.Factory;
import com.android.messaging.R;
import com.android.messaging.datamodel.MediaScratchFileProvider;
import com.android.messaging.util.Assert;
import com.android.messaging.util.ContentType;
import com.android.messaging.util.LogUtil;
import com.android.messaging.util.UiUtils;