summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTaesu Lee <taesu82.lee@samsung.com>2020-02-12 16:37:04 +0900
committerLuca Stefani <luca.stefani.ge1@gmail.com>2020-03-16 16:29:45 +0100
commitd0c4357defa8a3ffb5f1810a02d3c1ac339791ff (patch)
treeae5f8266763595033ea3d96a6e27d64fde004122
parentac0b2bfce404d2341e8266dbad462ba6745af94e (diff)
downloadpackages_apps_Messaging-d0c4357defa8a3ffb5f1810a02d3c1ac339791ff.tar.gz
packages_apps_Messaging-d0c4357defa8a3ffb5f1810a02d3c1ac339791ff.tar.bz2
packages_apps_Messaging-d0c4357defa8a3ffb5f1810a02d3c1ac339791ff.zip
Actual attachments size is the minimum size except images
Only images can be compressed before sending. Actual size got from a content uri is used for computing the minimum size for others. Test: Manual Change-Id: Id8d6ec24f80fe0eae70b6b1686ca7b199c70e313 Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
-rw-r--r--src/com/android/messaging/datamodel/data/MessagePartData.java12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/com/android/messaging/datamodel/data/MessagePartData.java b/src/com/android/messaging/datamodel/data/MessagePartData.java
index d1f5c9d..b835c53 100644
--- a/src/com/android/messaging/datamodel/data/MessagePartData.java
+++ b/src/com/android/messaging/datamodel/data/MessagePartData.java
@@ -497,16 +497,8 @@ public class MessagePartData implements Parcelable {
}
// Other images should be arbitrarily resized by ImageResizer before sending.
return MmsUtils.MIN_IMAGE_BYTE_SIZE;
- } else if (isAudio()) {
- // Audios are already recorded with the lowest sampling settings (AMR_NB), so just
- // return the file size as the minimum size.
- return UriUtil.getContentSize(mContentUri);
- } else if (isVideo()) {
- final int mediaDurationMs = UriUtil.getMediaDurationMs(mContentUri);
- return MmsUtils.MIN_VIDEO_BYTES_PER_SECOND * mediaDurationMs
- / TimeUnit.SECONDS.toMillis(1);
- } else if (isVCard()) {
- // We can't compress vCards.
+ } else if (isMedia()) {
+ // We can't compress attachments except images.
return UriUtil.getContentSize(mContentUri);
} else {
// This is some unknown media type that we don't know how to handle. Log an error