Messaging: Remove duplicate code

* 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
@@ -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;
@@ -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;
@@ -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;
@@ -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;