diff options
| author | Tom Taylor <tomtaylor@google.com> | 2010-01-28 15:54:15 -0800 |
|---|---|---|
| committer | Tom Taylor <tomtaylor@google.com> | 2010-01-28 16:59:27 -0800 |
| commit | 5e342fa3260044353705c946d3ae62c89df52ee6 (patch) | |
| tree | 5a84e9baf175c6cbba2553ebaf45387e6bbdf06b | |
| parent | 1f40f174e7590d9e19042b418427b8efa72f2454 (diff) | |
| download | frameworks_base-5e342fa3260044353705c946d3ae62c89df52ee6.zip frameworks_base-5e342fa3260044353705c946d3ae62c89df52ee6.tar.gz frameworks_base-5e342fa3260044353705c946d3ae62c89df52ee6.tar.bz2 | |
Remove MMS from the framework
The MMS code has been moved into the mms-common library.
Move SqliteWrapper (and make it hidden) into the database
directory because Telephony.java depends on it. Create a mmscommon
library similar to androidcommon for a number of files used both
by the telephony layer, by mms, and by myfaves.
Change-Id: I2e23e87c4961b87c42a4c8a63f812fa9e0e44dec
| -rw-r--r-- | core/java/android/database/sqlite/SqliteWrapper.java (renamed from core/java/com/google/android/mms/util/SqliteWrapper.java) | 22 | ||||
| -rw-r--r-- | core/java/android/provider/Telephony.java | 3 | ||||
| -rwxr-xr-x | core/java/com/google/android/mms/package.html | 5 | ||||
| -rwxr-xr-x | core/java/com/google/android/mms/pdu/package.html | 5 | ||||
| -rwxr-xr-x | core/java/com/google/android/mms/util/package.html | 5 | ||||
| -rw-r--r-- | mms-common/Android.mk | 29 | ||||
| -rw-r--r-- | mms-common/java/com/android/common/CharacterSets.java (renamed from core/java/com/google/android/mms/pdu/CharacterSets.java) | 2 | ||||
| -rw-r--r-- | mms-common/java/com/android/common/ContentType.java | 223 | ||||
| -rw-r--r-- | mms-common/java/com/android/common/EncodedStringValue.java (renamed from core/java/com/google/android/mms/pdu/EncodedStringValue.java) | 4 | ||||
| -rw-r--r-- | mms-common/java/com/android/common/InvalidHeaderValueException.java (renamed from core/java/com/google/android/mms/InvalidHeaderValueException.java) | 2 | ||||
| -rw-r--r-- | mms-common/java/com/android/common/MmsException.java (renamed from core/java/com/google/android/mms/MmsException.java) | 2 | ||||
| -rw-r--r-- | mms-common/java/com/android/common/PduHeaders.java (renamed from core/java/com/google/android/mms/pdu/PduHeaders.java) | 26 | ||||
| -rw-r--r-- | mms-common/java/com/android/common/mms/ContentType.java (renamed from core/java/com/google/android/mms/ContentType.java) | 3 | ||||
| -rw-r--r-- | mms-common/java/com/android/common/mms/pdu/AcknowledgeInd.java (renamed from core/java/com/google/android/mms/pdu/AcknowledgeInd.java) | 5 | ||||
| -rw-r--r-- | mms-common/java/com/android/common/mms/pdu/Base64.java (renamed from core/java/com/google/android/mms/pdu/Base64.java) | 2 | ||||
| -rw-r--r-- | mms-common/java/com/android/common/mms/pdu/DeliveryInd.java (renamed from core/java/com/google/android/mms/pdu/DeliveryInd.java) | 6 | ||||
| -rw-r--r-- | mms-common/java/com/android/common/mms/pdu/GenericPdu.java (renamed from core/java/com/google/android/mms/pdu/GenericPdu.java) | 6 | ||||
| -rw-r--r-- | mms-common/java/com/android/common/mms/pdu/MultimediaMessagePdu.java (renamed from core/java/com/google/android/mms/pdu/MultimediaMessagePdu.java) | 6 | ||||
| -rw-r--r-- | mms-common/java/com/android/common/mms/pdu/NotificationInd.java (renamed from core/java/com/google/android/mms/pdu/NotificationInd.java) | 6 | ||||
| -rw-r--r-- | mms-common/java/com/android/common/mms/pdu/NotifyRespInd.java (renamed from core/java/com/google/android/mms/pdu/NotifyRespInd.java) | 5 | ||||
| -rw-r--r-- | mms-common/java/com/android/common/mms/pdu/PduBody.java (renamed from core/java/com/google/android/mms/pdu/PduBody.java) | 2 | ||||
| -rw-r--r-- | mms-common/java/com/android/common/mms/pdu/PduComposer.java (renamed from core/java/com/google/android/mms/pdu/PduComposer.java) | 5 | ||||
| -rw-r--r-- | mms-common/java/com/android/common/mms/pdu/PduContentTypes.java (renamed from core/java/com/google/android/mms/pdu/PduContentTypes.java) | 2 | ||||
| -rw-r--r-- | mms-common/java/com/android/common/mms/pdu/PduParser.java (renamed from core/java/com/google/android/mms/pdu/PduParser.java) | 13 | ||||
| -rw-r--r-- | mms-common/java/com/android/common/mms/pdu/PduPart.java (renamed from core/java/com/google/android/mms/pdu/PduPart.java) | 2 | ||||
| -rw-r--r-- | mms-common/java/com/android/common/mms/pdu/PduPersister.java (renamed from core/java/com/google/android/mms/pdu/PduPersister.java) | 43 | ||||
| -rw-r--r-- | mms-common/java/com/android/common/mms/pdu/QuotedPrintable.java (renamed from core/java/com/google/android/mms/pdu/QuotedPrintable.java) | 2 | ||||
| -rw-r--r-- | mms-common/java/com/android/common/mms/pdu/ReadOrigInd.java (renamed from core/java/com/google/android/mms/pdu/ReadOrigInd.java) | 6 | ||||
| -rw-r--r-- | mms-common/java/com/android/common/mms/pdu/ReadRecInd.java (renamed from core/java/com/google/android/mms/pdu/ReadRecInd.java) | 6 | ||||
| -rw-r--r-- | mms-common/java/com/android/common/mms/pdu/RetrieveConf.java (renamed from core/java/com/google/android/mms/pdu/RetrieveConf.java) | 6 | ||||
| -rw-r--r-- | mms-common/java/com/android/common/mms/pdu/SendConf.java (renamed from core/java/com/google/android/mms/pdu/SendConf.java) | 6 | ||||
| -rw-r--r-- | mms-common/java/com/android/common/mms/pdu/SendReq.java (renamed from core/java/com/google/android/mms/pdu/SendReq.java) | 6 | ||||
| -rw-r--r-- | mms-common/java/com/android/common/mms/telephony/TelephonyProvider.java | 1790 | ||||
| -rw-r--r-- | mms-common/java/com/android/common/mms/util/AbstractCache.java (renamed from core/java/com/google/android/mms/util/AbstractCache.java) | 2 | ||||
| -rw-r--r-- | mms-common/java/com/android/common/mms/util/PduCache.java (renamed from core/java/com/google/android/mms/util/PduCache.java) | 4 | ||||
| -rw-r--r-- | mms-common/java/com/android/common/mms/util/PduCacheEntry.java (renamed from core/java/com/google/android/mms/util/PduCacheEntry.java) | 4 | ||||
| -rw-r--r-- | preloaded-classes | 4 |
37 files changed, 2157 insertions, 113 deletions
diff --git a/core/java/com/google/android/mms/util/SqliteWrapper.java b/core/java/android/database/sqlite/SqliteWrapper.java index bcdac22..b019618 100644 --- a/core/java/com/google/android/mms/util/SqliteWrapper.java +++ b/core/java/android/database/sqlite/SqliteWrapper.java @@ -15,9 +15,8 @@ * limitations under the License. */ -package com.google.android.mms.util; +package android.database.sqlite; -import android.app.ActivityManager; import android.content.ContentResolver; import android.content.ContentValues; import android.content.Context; @@ -27,6 +26,10 @@ import android.net.Uri; import android.util.Log; import android.widget.Toast; +/** + * @hide + */ + public final class SqliteWrapper { private static final String TAG = "SqliteWrapper"; private static final String SQLITE_EXCEPTION_DETAIL_MESSAGE @@ -36,21 +39,6 @@ public final class SqliteWrapper { // Forbidden being instantiated. } - // FIXME: It looks like outInfo.lowMemory does not work well as we expected. - // after run command: adb shell fillup -p 100, outInfo.lowMemory is still false. - private static boolean isLowMemory(Context context) { - if (null == context) { - return false; - } - - ActivityManager am = (ActivityManager) - context.getSystemService(Context.ACTIVITY_SERVICE); - ActivityManager.MemoryInfo outInfo = new ActivityManager.MemoryInfo(); - am.getMemoryInfo(outInfo); - - return outInfo.lowMemory; - } - // FIXME: need to optimize this method. private static boolean isLowMemory(SQLiteException e) { return e.getMessage().equals(SQLITE_EXCEPTION_DETAIL_MESSAGE); diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java index 747ae30..adeef54 100644 --- a/core/java/android/provider/Telephony.java +++ b/core/java/android/provider/Telephony.java @@ -16,8 +16,6 @@ package android.provider; -import com.google.android.mms.util.SqliteWrapper; - import android.annotation.SdkConstant; import android.annotation.SdkConstant.SdkConstantType; import android.content.ContentResolver; @@ -25,6 +23,7 @@ import android.content.ContentValues; import android.content.Context; import android.content.Intent; import android.database.Cursor; +import android.database.sqlite.SqliteWrapper; import android.net.Uri; import android.telephony.SmsMessage; import android.text.TextUtils; diff --git a/core/java/com/google/android/mms/package.html b/core/java/com/google/android/mms/package.html deleted file mode 100755 index c9f96a6..0000000 --- a/core/java/com/google/android/mms/package.html +++ /dev/null @@ -1,5 +0,0 @@ -<body> - -{@hide} - -</body> diff --git a/core/java/com/google/android/mms/pdu/package.html b/core/java/com/google/android/mms/pdu/package.html deleted file mode 100755 index c9f96a6..0000000 --- a/core/java/com/google/android/mms/pdu/package.html +++ /dev/null @@ -1,5 +0,0 @@ -<body> - -{@hide} - -</body> diff --git a/core/java/com/google/android/mms/util/package.html b/core/java/com/google/android/mms/util/package.html deleted file mode 100755 index c9f96a6..0000000 --- a/core/java/com/google/android/mms/util/package.html +++ /dev/null @@ -1,5 +0,0 @@ -<body> - -{@hide} - -</body> diff --git a/mms-common/Android.mk b/mms-common/Android.mk new file mode 100644 index 0000000..de994c0 --- /dev/null +++ b/mms-common/Android.mk @@ -0,0 +1,29 @@ +# Copyright (C) 2009 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +LOCAL_PATH := $(call my-dir) + +# Note: the source code is in java/, not src/, because this code is also part of +# the framework library, and build/core/pathmap.mk expects a java/ subdirectory. + +include $(CLEAR_VARS) +LOCAL_MODULE := mms-common +LOCAL_SRC_FILES := $(call all-java-files-under, java) +include $(BUILD_STATIC_JAVA_LIBRARY) + +# Include this library in the build server's output directory +$(call dist-for-goals, droid, $(LOCAL_BUILT_MODULE):mms-common.jar) + +# Build the test package +include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/core/java/com/google/android/mms/pdu/CharacterSets.java b/mms-common/java/com/android/common/CharacterSets.java index 4e22ca5..f19b078 100644 --- a/core/java/com/google/android/mms/pdu/CharacterSets.java +++ b/mms-common/java/com/android/common/CharacterSets.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.google.android.mms.pdu; +package com.android.mmscommon; import java.io.UnsupportedEncodingException; import java.util.HashMap; diff --git a/mms-common/java/com/android/common/ContentType.java b/mms-common/java/com/android/common/ContentType.java new file mode 100644 index 0000000..ca449fe --- /dev/null +++ b/mms-common/java/com/android/common/ContentType.java @@ -0,0 +1,223 @@ +/* + * Copyright (C) 2007-2008 Esmertec AG. + * Copyright (C) 2007-2008 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.mmscommon; + +import java.util.ArrayList; + +public class ContentType { + public static final String MMS_MESSAGE = "application/vnd.wap.mms-message"; + // The phony content type for generic PDUs (e.g. ReadOrig.ind, + // Notification.ind, Delivery.ind). + public static final String MMS_GENERIC = "application/vnd.wap.mms-generic"; + public static final String MULTIPART_MIXED = "application/vnd.wap.multipart.mixed"; + public static final String MULTIPART_RELATED = "application/vnd.wap.multipart.related"; + public static final String MULTIPART_ALTERNATIVE = "application/vnd.wap.multipart.alternative"; + + public static final String TEXT_PLAIN = "text/plain"; + public static final String TEXT_HTML = "text/html"; + public static final String TEXT_VCALENDAR = "text/x-vCalendar"; + public static final String TEXT_VCARD = "text/x-vCard"; + + public static final String IMAGE_UNSPECIFIED = "image/*"; + public static final String IMAGE_JPEG = "image/jpeg"; + public static final String IMAGE_JPG = "image/jpg"; + public static final String IMAGE_GIF = "image/gif"; + public static final String IMAGE_WBMP = "image/vnd.wap.wbmp"; + public static final String IMAGE_PNG = "image/png"; + + public static final String AUDIO_UNSPECIFIED = "audio/*"; + public static final String AUDIO_AAC = "audio/aac"; + public static final String AUDIO_AMR = "audio/amr"; + public static final String AUDIO_IMELODY = "audio/imelody"; + public static final String AUDIO_MID = "audio/mid"; + public static final String AUDIO_MIDI = "audio/midi"; + public static final String AUDIO_MP3 = "audio/mp3"; + public static final String AUDIO_MPEG3 = "audio/mpeg3"; + public static final String AUDIO_MPEG = "audio/mpeg"; + public static final String AUDIO_MPG = "audio/mpg"; + public static final String AUDIO_MP4 = "audio/mp4"; + public static final String AUDIO_X_MID = "audio/x-mid"; + public static final String AUDIO_X_MIDI = "audio/x-midi"; + public static final String AUDIO_X_MP3 = "audio/x-mp3"; + public static final String AUDIO_X_MPEG3 = "audio/x-mpeg3"; + public static final String AUDIO_X_MPEG = "audio/x-mpeg"; + public static final String AUDIO_X_MPG = "audio/x-mpg"; + public static final String AUDIO_3GPP = "audio/3gpp"; + public static final String AUDIO_OGG = "application/ogg"; + + public static final String VIDEO_UNSPECIFIED = "video/*"; + public static final String VIDEO_3GPP = "video/3gpp"; + public static final String VIDEO_3G2 = "video/3gpp2"; + public static final String VIDEO_H263 = "video/h263"; + public static final String VIDEO_MP4 = "video/mp4"; + + public static final String APP_SMIL = "application/smil"; + public static final String APP_WAP_XHTML = "application/vnd.wap.xhtml+xml"; + public static final String APP_XHTML = "application/xhtml+xml"; + + public static final String APP_DRM_CONTENT = "application/vnd.oma.drm.content"; + public static final String APP_DRM_MESSAGE = "application/vnd.oma.drm.message"; + + private static final ArrayList<String> sSupportedContentTypes = new ArrayList<String>(); + private static final ArrayList<String> sSupportedImageTypes = new ArrayList<String>(); + private static final ArrayList<String> sSupportedAudioTypes = new ArrayList<String>(); + private static final ArrayList<String> sSupportedVideoTypes = new ArrayList<String>(); + + static { + sSupportedContentTypes.add(TEXT_PLAIN); + sSupportedContentTypes.add(TEXT_HTML); + sSupportedContentTypes.add(TEXT_VCALENDAR); + sSupportedContentTypes.add(TEXT_VCARD); + + sSupportedContentTypes.add(IMAGE_JPEG); + sSupportedContentTypes.add(IMAGE_GIF); + sSupportedContentTypes.add(IMAGE_WBMP); + sSupportedContentTypes.add(IMAGE_PNG); + sSupportedContentTypes.add(IMAGE_JPG); + //supportedContentTypes.add(IMAGE_SVG); not yet supported. + + sSupportedContentTypes.add(AUDIO_AAC); + sSupportedContentTypes.add(AUDIO_AMR); + sSupportedContentTypes.add(AUDIO_IMELODY); + sSupportedContentTypes.add(AUDIO_MID); + sSupportedContentTypes.add(AUDIO_MIDI); + sSupportedContentTypes.add(AUDIO_MP3); + sSupportedContentTypes.add(AUDIO_MPEG3); + sSupportedContentTypes.add(AUDIO_MPEG); + sSupportedContentTypes.add(AUDIO_MPG); + sSupportedContentTypes.add(AUDIO_X_MID); + sSupportedContentTypes.add(AUDIO_X_MIDI); + sSupportedContentTypes.add(AUDIO_X_MP3); + sSupportedContentTypes.add(AUDIO_X_MPEG3); + sSupportedContentTypes.add(AUDIO_X_MPEG); + sSupportedContentTypes.add(AUDIO_X_MPG); + sSupportedContentTypes.add(AUDIO_3GPP); + sSupportedContentTypes.add(AUDIO_OGG); + + sSupportedContentTypes.add(VIDEO_3GPP); + sSupportedContentTypes.add(VIDEO_3G2); + sSupportedContentTypes.add(VIDEO_H263); + sSupportedContentTypes.add(VIDEO_MP4); + + sSupportedContentTypes.add(APP_SMIL); + sSupportedContentTypes.add(APP_WAP_XHTML); + sSupportedContentTypes.add(APP_XHTML); + + sSupportedContentTypes.add(APP_DRM_CONTENT); + sSupportedContentTypes.add(APP_DRM_MESSAGE); + + // add supported image types + sSupportedImageTypes.add(IMAGE_JPEG); + sSupportedImageTypes.add(IMAGE_GIF); + sSupportedImageTypes.add(IMAGE_WBMP); + sSupportedImageTypes.add(IMAGE_PNG); + sSupportedImageTypes.add(IMAGE_JPG); + + // add supported audio types + sSupportedAudioTypes.add(AUDIO_AAC); + sSupportedAudioTypes.add(AUDIO_AMR); + sSupportedAudioTypes.add(AUDIO_IMELODY); + sSupportedAudioTypes.add(AUDIO_MID); + sSupportedAudioTypes.add(AUDIO_MIDI); + sSupportedAudioTypes.add(AUDIO_MP3); + sSupportedAudioTypes.add(AUDIO_MPEG3); + sSupportedAudioTypes.add(AUDIO_MPEG); + sSupportedAudioTypes.add(AUDIO_MPG); + sSupportedAudioTypes.add(AUDIO_MP4); + sSupportedAudioTypes.add(AUDIO_X_MID); + sSupportedAudioTypes.add(AUDIO_X_MIDI); + sSupportedAudioTypes.add(AUDIO_X_MP3); + sSupportedAudioTypes.add(AUDIO_X_MPEG3); + sSupportedAudioTypes.add(AUDIO_X_MPEG); + sSupportedAudioTypes.add(AUDIO_X_MPG); + sSupportedAudioTypes.add(AUDIO_3GPP); + sSupportedAudioTypes.add(AUDIO_OGG); + + // add supported video types + sSupportedVideoTypes.add(VIDEO_3GPP); + sSupportedVideoTypes.add(VIDEO_3G2); + sSupportedVideoTypes.add(VIDEO_H263); + sSupportedVideoTypes.add(VIDEO_MP4); + } + + // This class should never be instantiated. + private ContentType() { + } + + public static boolean isSupportedType(String contentType) { + return (null != contentType) && sSupportedContentTypes.contains(contentType); + } + + public static boolean isSupportedImageType(String contentType) { + return isImageType(contentType) && isSupportedType(contentType); + } + + public static boolean isSupportedAudioType(String contentType) { + return isAudioType(contentType) && isSupportedType(contentType); + } + + public static boolean isSupportedVideoType(String contentType) { + return isVideoType(contentType) && isSupportedType(contentType); + } + + public static boolean isTextType(String contentType) { + return (null != contentType) && contentType.startsWith("text/"); + } + + public static boolean isImageType(String contentType) { + return (null != contentType) && contentType.startsWith("image/"); + } + + public static boolean isAudioType(String contentType) { + return (null != contentType) && contentType.startsWith("audio/"); + } + + public static boolean isVideoType(String contentType) { + return (null != contentType) && contentType.startsWith("video/"); + } + + public static boolean isDrmType(String contentType) { + return (null != contentType) + && (contentType.equals(APP_DRM_CONTENT) + || contentType.equals(APP_DRM_MESSAGE)); + } + + public static boolean isUnspecified(String contentType) { + return (null != contentType) && contentType.endsWith("*"); + } + + @SuppressWarnings("unchecked") + public static ArrayList<String> getImageTypes() { + return (ArrayList<String>) sSupportedImageTypes.clone(); + } + + @SuppressWarnings("unchecked") + public static ArrayList<String> getAudioTypes() { + return (ArrayList<String>) sSupportedAudioTypes.clone(); + } + + @SuppressWarnings("unchecked") + public static ArrayList<String> getVideoTypes() { + return (ArrayList<String>) sSupportedVideoTypes.clone(); + } + + @SuppressWarnings("unchecked") + public static ArrayList<String> getSupportedTypes() { + return (ArrayList<String>) sSupportedContentTypes.clone(); + } +} diff --git a/core/java/com/google/android/mms/pdu/EncodedStringValue.java b/mms-common/java/com/android/common/EncodedStringValue.java index a27962d..0a4424e 100644 --- a/core/java/com/google/android/mms/pdu/EncodedStringValue.java +++ b/mms-common/java/com/android/common/EncodedStringValue.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.google.android.mms.pdu; +package com.android.mmscommon; import android.util.Config; import android.util.Log; @@ -269,7 +269,7 @@ public class EncodedStringValue implements Cloneable { return new EncodedStringValue(value.mCharacterSet, value.mData); } - + public static EncodedStringValue[] encodeStrings(String[] array) { int count = array.length; if (count > 0) { diff --git a/core/java/com/google/android/mms/InvalidHeaderValueException.java b/mms-common/java/com/android/common/InvalidHeaderValueException.java index 73d7832..34d5871 100644 --- a/core/java/com/google/android/mms/InvalidHeaderValueException.java +++ b/mms-common/java/com/android/common/InvalidHeaderValueException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.google.android.mms; +package com.android.mmscommon; /** * Thrown when an invalid header value was set. diff --git a/core/java/com/google/android/mms/MmsException.java b/mms-common/java/com/android/common/MmsException.java index 6ca0c7e..296a2c3 100644 --- a/core/java/com/google/android/mms/MmsException.java +++ b/mms-common/java/com/android/common/MmsException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.google.android.mms; +package com.android.mmscommon; /** * A generic exception that is thrown by the Mms client. diff --git a/core/java/com/google/android/mms/pdu/PduHeaders.java b/mms-common/java/com/android/common/PduHeaders.java index 4313815..d8f1211 100644 --- a/core/java/com/google/android/mms/pdu/PduHeaders.java +++ b/mms-common/java/com/android/common/PduHeaders.java @@ -15,9 +15,7 @@ * limitations under the License. */ -package com.google.android.mms.pdu; - -import com.google.android.mms.InvalidHeaderValueException; +package com.android.mmscommon; import java.util.ArrayList; import java.util.HashMap; @@ -339,7 +337,7 @@ public class PduHeaders { * with specified header field. Return 0 if * the value is not set. */ - protected int getOctet(int field) { + public int getOctet(int field) { Integer octet = (Integer) mHeaderMap.get(field); if (null == octet) { return 0; @@ -355,7 +353,7 @@ public class PduHeaders { * @param field the field * @throws InvalidHeaderValueException if the value is invalid. */ - protected void setOctet(int value, int field) + public void setOctet(int value, int field) throws InvalidHeaderValueException{ /** * Check whether this field can be set for specific @@ -499,7 +497,7 @@ public class PduHeaders { * @return the TextString value of the pdu header * with specified header field */ - protected byte[] getTextString(int field) { + public byte[] getTextString(int field) { return (byte[]) mHeaderMap.get(field); } @@ -512,7 +510,7 @@ public class PduHeaders { * with specified header field * @throws NullPointerException if the value is null. */ - protected void setTextString(byte[] value, int field) { + public void setTextString(byte[] value, int field) { /** * Check whether this field can be set for specific * header and check validity of the field. @@ -548,7 +546,7 @@ public class PduHeaders { * @return the EncodedStringValue value of the pdu header * with specified header field */ - protected EncodedStringValue getEncodedStringValue(int field) { + public EncodedStringValue getEncodedStringValue(int field) { return (EncodedStringValue) mHeaderMap.get(field); } @@ -559,7 +557,7 @@ public class PduHeaders { * @return the EncodeStringValue array of the pdu header * with specified header field */ - protected EncodedStringValue[] getEncodedStringValues(int field) { + public EncodedStringValue[] getEncodedStringValues(int field) { ArrayList<EncodedStringValue> list = (ArrayList<EncodedStringValue>) mHeaderMap.get(field); if (null == list) { @@ -578,7 +576,7 @@ public class PduHeaders { * with specified header field * @throws NullPointerException if the value is null. */ - protected void setEncodedStringValue(EncodedStringValue value, int field) { + public void setEncodedStringValue(EncodedStringValue value, int field) { /** * Check whether this field can be set for specific * header and check validity of the field. @@ -615,7 +613,7 @@ public class PduHeaders { * with specified header field * @throws NullPointerException if the value is null. */ - protected void setEncodedStringValues(EncodedStringValue[] value, int field) { + public void setEncodedStringValues(EncodedStringValue[] value, int field) { /** * Check whether this field can be set for specific * header and check validity of the field. @@ -648,7 +646,7 @@ public class PduHeaders { * @param field the field * @throws NullPointerException if the value is null. */ - protected void appendEncodedStringValue(EncodedStringValue value, + public void appendEncodedStringValue(EncodedStringValue value, int field) { if (null == value) { throw new NullPointerException(); @@ -680,7 +678,7 @@ public class PduHeaders { * with specified header field. if return -1, the * field is not existed in pdu header. */ - protected long getLongInteger(int field) { + public long getLongInteger(int field) { Long longInteger = (Long) mHeaderMap.get(field); if (null == longInteger) { return -1; @@ -695,7 +693,7 @@ public class PduHeaders { * @param value the value * @param field the field */ - protected void setLongInteger(long value, int field) { + public void setLongInteger(long value, int field) { /** * Check whether this field can be set for specific * header and check validity of the field. diff --git a/core/java/com/google/android/mms/ContentType.java b/mms-common/java/com/android/common/mms/ContentType.java index 94bc9fd..0fdb46c 100644 --- a/core/java/com/google/android/mms/ContentType.java +++ b/mms-common/java/com/android/common/mms/ContentType.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.google.android.mms; +package com.android.mms.mms; import java.util.ArrayList; @@ -26,6 +26,7 @@ public class ContentType { public static final String MMS_GENERIC = "application/vnd.wap.mms-generic"; public static final String MULTIPART_MIXED = "application/vnd.wap.multipart.mixed"; public static final String MULTIPART_RELATED = "application/vnd.wap.multipart.related"; + public static final String MULTIPART_ALTERNATIVE = "application/vnd.wap.multipart.alternative"; public static final String TEXT_PLAIN = "text/plain"; public static final String TEXT_HTML = "text/html"; diff --git a/core/java/com/google/android/mms/pdu/AcknowledgeInd.java b/mms-common/java/com/android/common/mms/pdu/AcknowledgeInd.java index 0e96c60..d1243b2 100644 --- a/core/java/com/google/android/mms/pdu/AcknowledgeInd.java +++ b/mms-common/java/com/android/common/mms/pdu/AcknowledgeInd.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.google.android.mms.pdu; +package com.android.mmscommon.mms.pdu; -import com.google.android.mms.InvalidHeaderValueException; +import com.android.mmscommon.InvalidHeaderValueException; +import com.android.mmscommon.PduHeaders; /** * M-Acknowledge.ind PDU. diff --git a/core/java/com/google/android/mms/pdu/Base64.java b/mms-common/java/com/android/common/mms/pdu/Base64.java index 604bee0..4c95dec 100644 --- a/core/java/com/google/android/mms/pdu/Base64.java +++ b/mms-common/java/com/android/common/mms/pdu/Base64.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.google.android.mms.pdu; +package com.android.mmscommon.mms.pdu; public class Base64 { /** diff --git a/core/java/com/google/android/mms/pdu/DeliveryInd.java b/mms-common/java/com/android/common/mms/pdu/DeliveryInd.java index dafa8d1..e83729b 100644 --- a/core/java/com/google/android/mms/pdu/DeliveryInd.java +++ b/mms-common/java/com/android/common/mms/pdu/DeliveryInd.java @@ -15,9 +15,11 @@ * limitations under the License. */ -package com.google.android.mms.pdu; +package com.android.mmscommon.mms.pdu; -import com.google.android.mms.InvalidHeaderValueException; +import com.android.mmscommon.EncodedStringValue; +import com.android.mmscommon.InvalidHeaderValueException; +import com.android.mmscommon.PduHeaders; /** * M-Delivery.Ind Pdu. diff --git a/core/java/com/google/android/mms/pdu/GenericPdu.java b/mms-common/java/com/android/common/mms/pdu/GenericPdu.java index 705de6a..c38e502 100644 --- a/core/java/com/google/android/mms/pdu/GenericPdu.java +++ b/mms-common/java/com/android/common/mms/pdu/GenericPdu.java @@ -15,9 +15,11 @@ * limitations under the License. */ -package com.google.android.mms.pdu; +package com.android.mmscommon.mms.pdu; -import com.google.android.mms.InvalidHeaderValueException; +import com.android.mmscommon.EncodedStringValue; +import com.android.mmscommon.InvalidHeaderValueException; +import com.android.mmscommon.PduHeaders; public class GenericPdu { /** diff --git a/core/java/com/google/android/mms/pdu/MultimediaMessagePdu.java b/mms-common/java/com/android/common/mms/pdu/MultimediaMessagePdu.java index 5a85e0e..04fde2d 100644 --- a/core/java/com/google/android/mms/pdu/MultimediaMessagePdu.java +++ b/mms-common/java/com/android/common/mms/pdu/MultimediaMessagePdu.java @@ -15,9 +15,11 @@ * limitations under the License. */ -package com.google.android.mms.pdu; +package com.android.mmscommon.mms.pdu; -import com.google.android.mms.InvalidHeaderValueException; +import com.android.mmscommon.EncodedStringValue; +import com.android.mmscommon.InvalidHeaderValueException; +import com.android.mmscommon.PduHeaders; /** * Multimedia message PDU. diff --git a/core/java/com/google/android/mms/pdu/NotificationInd.java b/mms-common/java/com/android/common/mms/pdu/NotificationInd.java index c56cba6..24f17b0 100644 --- a/core/java/com/google/android/mms/pdu/NotificationInd.java +++ b/mms-common/java/com/android/common/mms/pdu/NotificationInd.java @@ -15,9 +15,11 @@ * limitations under the License. */ -package com.google.android.mms.pdu; +package com.android.mmscommon.mms.pdu; -import com.google.android.mms.InvalidHeaderValueException; +import com.android.mmscommon.EncodedStringValue; +import com.android.mmscommon.InvalidHeaderValueException; +import com.android.mmscommon.PduHeaders; /** * M-Notification.ind PDU. diff --git a/core/java/com/google/android/mms/pdu/NotifyRespInd.java b/mms-common/java/com/android/common/mms/pdu/NotifyRespInd.java index 2cc2fce..c2e2b26 100644 --- a/core/java/com/google/android/mms/pdu/NotifyRespInd.java +++ b/mms-common/java/com/android/common/mms/pdu/NotifyRespInd.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.google.android.mms.pdu; +package com.android.mmscommon.mms.pdu; -import com.google.android.mms.InvalidHeaderValueException; +import com.android.mmscommon.InvalidHeaderValueException; +import com.android.mmscommon.PduHeaders; /** * M-NofifyResp.ind PDU. diff --git a/core/java/com/google/android/mms/pdu/PduBody.java b/mms-common/java/com/android/common/mms/pdu/PduBody.java index fa0416c..cc28d80 100644 --- a/core/java/com/google/android/mms/pdu/PduBody.java +++ b/mms-common/java/com/android/common/mms/pdu/PduBody.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.google.android.mms.pdu; +package com.android.mmscommon.mms.pdu; import java.util.HashMap; import java.util.Map; diff --git a/core/java/com/google/android/mms/pdu/PduComposer.java b/mms-common/java/com/android/common/mms/pdu/PduComposer.java index 8940945..bb3116d 100644 --- a/core/java/com/google/android/mms/pdu/PduComposer.java +++ b/mms-common/java/com/android/common/mms/pdu/PduComposer.java @@ -15,7 +15,10 @@ * limitations under the License. */ -package com.google.android.mms.pdu; +package com.android.mmscommon.mms.pdu; + +import com.android.mmscommon.EncodedStringValue; +import com.android.mmscommon.PduHeaders; import android.content.ContentResolver; import android.content.Context; diff --git a/core/java/com/google/android/mms/pdu/PduContentTypes.java b/mms-common/java/com/android/common/mms/pdu/PduContentTypes.java index 7799e0e..3f971fd 100644 --- a/core/java/com/google/android/mms/pdu/PduContentTypes.java +++ b/mms-common/java/com/android/common/mms/pdu/PduContentTypes.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.google.android.mms.pdu; +package com.android.mmscommon.mms.pdu; public class PduContentTypes { /** diff --git a/core/java/com/google/android/mms/pdu/PduParser.java b/mms-common/java/com/android/common/mms/pdu/PduParser.java index d465c5a..9253f83 100644 --- a/core/java/com/google/android/mms/pdu/PduParser.java +++ b/mms-common/java/com/android/common/mms/pdu/PduParser.java @@ -15,10 +15,13 @@ * limitations under the License. */ -package com.google.android.mms.pdu; +package com.android.mmscommon.mms.pdu; -import com.google.android.mms.ContentType; -import com.google.android.mms.InvalidHeaderValueException; +import com.android.mmscommon.ContentType; +import com.android.mmscommon.CharacterSets; +import com.android.mmscommon.EncodedStringValue; +import com.android.mmscommon.InvalidHeaderValueException; +import com.android.mmscommon.PduHeaders; import android.util.Config; import android.util.Log; @@ -157,9 +160,11 @@ public class PduParser { } String ctTypeStr = new String(contentType); if (ctTypeStr.equals(ContentType.MULTIPART_MIXED) - || ctTypeStr.equals(ContentType.MULTIPART_RELATED)) { + || ctTypeStr.equals(ContentType.MULTIPART_RELATED) + || ctTypeStr.equals(ContentType.MULTIPART_ALTERNATIVE)) { // The MMS content type must be "application/vnd.wap.multipart.mixed" // or "application/vnd.wap.multipart.related" + // or "application/vnd.wap.multipart.alternative" return retrieveConf; } return null; diff --git a/core/java/com/google/android/mms/pdu/PduPart.java b/mms-common/java/com/android/common/mms/pdu/PduPart.java index b43e388..7d51b86 100644 --- a/core/java/com/google/android/mms/pdu/PduPart.java +++ b/mms-common/java/com/android/common/mms/pdu/PduPart.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.google.android.mms.pdu; +package com.android.mmscommon.mms.pdu; import android.net.Uri; diff --git a/core/java/com/google/android/mms/pdu/PduPersister.java b/mms-common/java/com/android/common/mms/pdu/PduPersister.java index 1f754bc..46f28c7 100644 --- a/core/java/com/google/android/mms/pdu/PduPersister.java +++ b/mms-common/java/com/android/common/mms/pdu/PduPersister.java @@ -15,14 +15,19 @@ * limitations under the License. */ -package com.google.android.mms.pdu; +package com.android.mmscommon.mms.pdu; -import com.google.android.mms.ContentType; -import com.google.android.mms.InvalidHeaderValueException; -import com.google.android.mms.MmsException; -import com.google.android.mms.util.PduCache; -import com.google.android.mms.util.PduCacheEntry; -import com.google.android.mms.util.SqliteWrapper; +import com.android.mmscommon.mms.pdu.PduPersister; + +import com.android.mmscommon.ContentType; +import com.android.mmscommon.CharacterSets; +import com.android.mmscommon.EncodedStringValue; +import com.android.mmscommon.InvalidHeaderValueException; +import com.android.mmscommon.MmsException; +import com.android.mmscommon.PduHeaders; +import com.android.mmscommon.mms.util.PduCache; +import com.android.mmscommon.mms.util.PduCacheEntry; +import android.database.sqlite.SqliteWrapper; import android.content.ContentResolver; import android.content.ContentUris; @@ -31,13 +36,13 @@ import android.content.Context; import android.database.Cursor; import android.database.DatabaseUtils; import android.net.Uri; -import android.provider.Telephony; -import android.provider.Telephony.Mms; -import android.provider.Telephony.MmsSms; -import android.provider.Telephony.Threads; -import android.provider.Telephony.Mms.Addr; -import android.provider.Telephony.Mms.Part; -import android.provider.Telephony.MmsSms.PendingMessages; +import com.android.mmscommon.telephony.TelephonyProvider; +import com.android.mmscommon.telephony.TelephonyProvider.Mms; +import com.android.mmscommon.telephony.TelephonyProvider.MmsSms; +import com.android.mmscommon.telephony.TelephonyProvider.Threads; +import com.android.mmscommon.telephony.TelephonyProvider.Mms.Addr; +import com.android.mmscommon.telephony.TelephonyProvider.Mms.Part; +import com.android.mmscommon.telephony.TelephonyProvider.MmsSms.PendingMessages; import android.text.TextUtils; import android.util.Config; import android.util.Log; @@ -55,7 +60,6 @@ import java.util.Map; import java.util.Set; import java.util.Map.Entry; -import com.google.android.mms.pdu.EncodedStringValue; /** * This class is the high-level manager of PDU storage. @@ -422,7 +426,8 @@ public class PduPersister { // Store simple string values directly in the database instead of an // external file. This makes the text searchable and retrieval slightly // faster. - if ("text/plain".equals(type) || "application/smil".equals(type)) { + if (ContentType.TEXT_PLAIN.equals(type) || ContentType.APP_SMIL.equals(type) + || ContentType.TEXT_HTML.equals(type)) { String text = c.getString(PART_COLUMN_TEXT); if (text == null) { text = ""; @@ -738,9 +743,11 @@ public class PduPersister { try { byte[] data = part.getData(); - if ("text/plain".equals(contentType) || "application/smil".equals(contentType)) { + if (ContentType.TEXT_PLAIN.equals(contentType) + || ContentType.APP_SMIL.equals(contentType) + || ContentType.TEXT_HTML.equals(contentType)) { ContentValues cv = new ContentValues(); - cv.put(Telephony.Mms.Part.TEXT, new EncodedStringValue(data).getString()); + cv.put(TelephonyProvider.Mms.Part.TEXT, new EncodedStringValue(data).getString()); if (mContentResolver.update(uri, cv, null, null) != 1) { throw new MmsException("unable to update " + uri.toString()); } diff --git a/core/java/com/google/android/mms/pdu/QuotedPrintable.java b/mms-common/java/com/android/common/mms/pdu/QuotedPrintable.java index a34ed12..e9da7df 100644 --- a/core/java/com/google/android/mms/pdu/QuotedPrintable.java +++ b/mms-common/java/com/android/common/mms/pdu/QuotedPrintable.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.google.android.mms.pdu; +package com.android.mmscommon.mms.pdu; import java.io.ByteArrayOutputStream; diff --git a/core/java/com/google/android/mms/pdu/ReadOrigInd.java b/mms-common/java/com/android/common/mms/pdu/ReadOrigInd.java index 1bfc0bb..9678784 100644 --- a/core/java/com/google/android/mms/pdu/ReadOrigInd.java +++ b/mms-common/java/com/android/common/mms/pdu/ReadOrigInd.java @@ -15,9 +15,11 @@ * limitations under the License. */ -package com.google.android.mms.pdu; +package com.android.mmscommon.mms.pdu; -import com.google.android.mms.InvalidHeaderValueException; +import com.android.mmscommon.EncodedStringValue; +import com.android.mmscommon.InvalidHeaderValueException; +import com.android.mmscommon.PduHeaders; public class ReadOrigInd extends GenericPdu { /** diff --git a/core/java/com/google/android/mms/pdu/ReadRecInd.java b/mms-common/java/com/android/common/mms/pdu/ReadRecInd.java index 880e3ac..c1efbbc 100644 --- a/core/java/com/google/android/mms/pdu/ReadRecInd.java +++ b/mms-common/java/com/android/common/mms/pdu/ReadRecInd.java @@ -15,9 +15,11 @@ * limitations under the License. */ -package com.google.android.mms.pdu; +package com.android.mmscommon.mms.pdu; -import com.google.android.mms.InvalidHeaderValueException; +import com.android.mmscommon.EncodedStringValue; +import com.android.mmscommon.InvalidHeaderValueException; +import com.android.mmscommon.PduHeaders; public class ReadRecInd extends GenericPdu { /** diff --git a/core/java/com/google/android/mms/pdu/RetrieveConf.java b/mms-common/java/com/android/common/mms/pdu/RetrieveConf.java index 98e67c0..442949e 100644 --- a/core/java/com/google/android/mms/pdu/RetrieveConf.java +++ b/mms-common/java/com/android/common/mms/pdu/RetrieveConf.java @@ -15,9 +15,11 @@ * limitations under the License. */ -package com.google.android.mms.pdu; +package com.android.mmscommon.mms.pdu; -import com.google.android.mms.InvalidHeaderValueException; +import com.android.mmscommon.EncodedStringValue; +import com.android.mmscommon.InvalidHeaderValueException; +import com.android.mmscommon.PduHeaders; /** * M-Retrive.conf Pdu. diff --git a/core/java/com/google/android/mms/pdu/SendConf.java b/mms-common/java/com/android/common/mms/pdu/SendConf.java index 0568fe7..0a57b6b 100644 --- a/core/java/com/google/android/mms/pdu/SendConf.java +++ b/mms-common/java/com/android/common/mms/pdu/SendConf.java @@ -15,9 +15,11 @@ * limitations under the License. */ -package com.google.android.mms.pdu; +package com.android.mmscommon.mms.pdu; -import com.google.android.mms.InvalidHeaderValueException; +import com.android.mmscommon.EncodedStringValue; +import com.android.mmscommon.InvalidHeaderValueException; +import com.android.mmscommon.PduHeaders; public class SendConf extends GenericPdu { /** diff --git a/core/java/com/google/android/mms/pdu/SendReq.java b/mms-common/java/com/android/common/mms/pdu/SendReq.java index 597cd00..5da4719 100644 --- a/core/java/com/google/android/mms/pdu/SendReq.java +++ b/mms-common/java/com/android/common/mms/pdu/SendReq.java @@ -15,11 +15,13 @@ * limitations under the License. */ -package com.google.android.mms.pdu; +package com.android.mmscommon.mms.pdu; import android.util.Log; -import com.google.android.mms.InvalidHeaderValueException; +import com.android.mmscommon.EncodedStringValue; +import com.android.mmscommon.InvalidHeaderValueException; +import com.android.mmscommon.PduHeaders; public class SendReq extends MultimediaMessagePdu { private static final String TAG = "SendReq"; diff --git a/mms-common/java/com/android/common/mms/telephony/TelephonyProvider.java b/mms-common/java/com/android/common/mms/telephony/TelephonyProvider.java new file mode 100644 index 0000000..0237bc2 --- /dev/null +++ b/mms-common/java/com/android/common/mms/telephony/TelephonyProvider.java @@ -0,0 +1,1790 @@ +/* + * Copyright (C) 2006 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.mmscommon.telephony; + +import java.util.HashSet; +import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import android.content.ContentResolver; +import android.content.ContentValues; +import android.content.Context; +import android.content.Intent; +import android.database.Cursor; +import android.net.Uri; +import android.provider.BaseColumns; +import android.telephony.SmsMessage; +import android.text.TextUtils; +import android.util.Config; +import android.util.Log; + +import com.android.common.Patterns; +import android.database.sqlite.SqliteWrapper; + +/** + * The Telephony provider contains data related to phone operation. + * + * @hide + */ + +// This is a copy of the private TelephoneProvider.java file found in: +// com.android.providers.telephony +// TODO: keep these files in sync. + +public final class TelephonyProvider { + private static final String TAG = "Telephony"; + private static final boolean DEBUG = true; + private static final boolean LOCAL_LOGV = DEBUG ? Config.LOGD : Config.LOGV; + +// public static final Pattern EMAIL_ADDRESS +// = Pattern.compile( +// "[a-zA-Z0-9\\+\\.\\_\\%\\-]{1,256}" + +// "\\@" + +// "[a-zA-Z0-9][a-zA-Z0-9\\-]{0,64}" + +// "(" + +// "\\." + +// "[a-zA-Z0-9][a-zA-Z0-9\\-]{0,25}" + +// ")+" +// ); +// +// /** +// * This pattern is intended for searching for things that look like they +// * might be phone numbers in arbitrary text, not for validating whether +// * something is in fact a phone number. It will miss many things that +// * are legitimate phone numbers. +// * +// * <p> The pattern matches the following: +// * <ul> +// * <li>Optionally, a + sign followed immediately by one or more digits. Spaces, dots, or dashes +// * may follow. +// * <li>Optionally, sets of digits in parentheses, separated by spaces, dots, or dashes. +// * <li>A string starting and ending with a digit, containing digits, spaces, dots, and/or dashes. +// * </ul> +// */ +// public static final Pattern PHONE +// = Pattern.compile( // sdd = space, dot, or dash +// "(\\+[0-9]+[\\- \\.]*)?" // +<digits><sdd>* +// + "(\\([0-9]+\\)[\\- \\.]*)?" // (<digits>)<sdd>* +// + "([0-9][0-9\\- \\.][0-9\\- \\.]+[0-9])"); // <digit><digit|sdd>+<digit> + + // Constructor + public TelephonyProvider() { + } + + /** + * Base columns for tables that contain text based SMSs. + */ + public interface TextBasedSmsColumns { + /** + * The type of the message + * <P>Type: INTEGER</P> + */ + public static final String TYPE = "type"; + + public static final int MESSAGE_TYPE_ALL = 0; + public static final int MESSAGE_TYPE_INBOX = 1; + public static final int MESSAGE_TYPE_SENT = 2; + public static final int MESSAGE_TYPE_DRAFT = 3; + public static final int MESSAGE_TYPE_OUTBOX = 4; + public static final int MESSAGE_TYPE_FAILED = 5; // for failed outgoing messages + public static final int MESSAGE_TYPE_QUEUED = 6; // for messages to send later + + + /** + * The thread ID of the message + * <P>Type: INTEGER</P> + */ + public static final String THREAD_ID = "thread_id"; + + /** + * The address of the other party + * <P>Type: TEXT</P> + */ + public static final String ADDRESS = "address"; + + /** + * The person ID of the sender + * <P>Type: INTEGER (long)</P> + */ + public static final String PERSON_ID = "person"; + + /** + * The date the message was sent + * <P>Type: INTEGER (long)</P> + */ + public static final String DATE = "date"; + + /** + * Has the message been read + * <P>Type: INTEGER (boolean)</P> + */ + public static final String READ = "read"; + + /** + * The TP-Status value for the message, or -1 if no status has + * been received + */ + public static final String STATUS = "status"; + + public static final int STATUS_NONE = -1; + public static final int STATUS_COMPLETE = 0; + public static final int STATUS_PENDING = 64; + public static final int STATUS_FAILED = 128; + + /** + * The subject of the message, if present + * <P>Type: TEXT</P> + */ + public static final String SUBJECT = "subject"; + + /** + * The body of the message + * <P>Type: TEXT</P> + */ + public static final String BODY = "body"; + + /** + * The id of the sender of the conversation, if present + * <P>Type: INTEGER (reference to item in content://contacts/people)</P> + */ + public static final String PERSON = "person"; + + /** + * The protocol identifier code + * <P>Type: INTEGER</P> + */ + public static final String PROTOCOL = "protocol"; + + /** + * Whether the <code>TP-Reply-Path</code> bit was set on this message + * <P>Type: BOOLEAN</P> + */ + public static final String REPLY_PATH_PRESENT = "reply_path_present"; + + /** + * The service center (SC) through which to send the message, if present + * <P>Type: TEXT</P> + */ + public static final String SERVICE_CENTER = "service_center"; + + /** + * Has the message been locked? + * <P>Type: INTEGER (boolean)</P> + */ + public static final String LOCKED = "locked"; + + /** + * Error code associated with sending or receiving this message + * <P>Type: INTEGER</P> + */ + public static final String ERROR_CODE = "error_code"; +} + + /** + * Contains all text based SMS messages. + */ + public static final class Sms implements BaseColumns, TextBasedSmsColumns { + public static final Cursor query(ContentResolver cr, String[] projection) { + return cr.query(CONTENT_URI, projection, null, null, DEFAULT_SORT_ORDER); + } + + public static final Cursor query(ContentResolver cr, String[] projection, + String where, String orderBy) { + return cr.query(CONTENT_URI, projection, where, + null, orderBy == null ? DEFAULT_SORT_ORDER : orderBy); + } + + /** + * The content:// style URL for this table + */ + public static final Uri CONTENT_URI = + Uri.parse("content://sms"); + + /** + * The default sort order for this table + */ + public static final String DEFAULT_SORT_ORDER = "date DESC"; + + /** + * Add an SMS to the given URI. + * + * @param resolver the content resolver to use + * @param uri the URI to add the message to + * @param address the address of the sender + * @param body the body of the message + * @param subject the psuedo-subject of the message + * @param date the timestamp for the message + * @param read true if the message has been read, false if not + * @param deliveryReport true if a delivery report was requested, false if not + * @return the URI for the new message + */ + public static Uri addMessageToUri(ContentResolver resolver, + Uri uri, String address, String body, String subject, + Long date, boolean read, boolean deliveryReport) { + return addMessageToUri(resolver, uri, address, body, subject, + date, read, deliveryReport, -1L); + } + + /** + * Add an SMS to the given URI with thread_id specified. + * + * @param resolver the content resolver to use + * @param uri the URI to add the message to + * @param address the address of the sender + * @param body the body of the message + * @param subject the psuedo-subject of the message + * @param date the timestamp for the message + * @param read true if the message has been read, false if not + * @param deliveryReport true if a delivery report was requested, false if not + * @param threadId the thread_id of the message + * @return the URI for the new message + */ + public static Uri addMessageToUri(ContentResolver resolver, + Uri uri, String address, String body, String subject, + Long date, boolean read, boolean deliveryReport, long threadId) { + ContentValues values = new ContentValues(7); + + values.put(ADDRESS, address); + if (date != null) { + values.put(DATE, date); + } + values.put(READ, read ? Integer.valueOf(1) : Integer.valueOf(0)); + values.put(SUBJECT, subject); + values.put(BODY, body); + if (deliveryReport) { + values.put(STATUS, STATUS_PENDING); + } + if (threadId != -1L) { + values.put(THREAD_ID, threadId); + } + return resolver.insert(uri, values); + } + + /** + * Move a message to the given folder. + * + * @param context the context to use + * @param uri the message to move + * @param folder the folder to move to + * @return true if the operation succeeded + */ + public static boolean moveMessageToFolder(Context context, + Uri uri, int folder, int error) { + if (uri == null) { + return false; + } + + boolean markAsUnread = false; + boolean markAsRead = false; + switch(folder) { + case MESSAGE_TYPE_INBOX: + case MESSAGE_TYPE_DRAFT: + break; + case MESSAGE_TYPE_OUTBOX: + case MESSAGE_TYPE_SENT: + markAsRead = true; + break; + case MESSAGE_TYPE_FAILED: + case MESSAGE_TYPE_QUEUED: + markAsUnread = true; + break; + default: + return false; + } + + ContentValues values = new ContentValues(3); + + values.put(TYPE, folder); + if (markAsUnread) { + values.put(READ, Integer.valueOf(0)); + } else if (markAsRead) { + values.put(READ, Integer.valueOf(1)); + } + values.put(ERROR_CODE, error); + + return 1 == SqliteWrapper.update(context, context.getContentResolver(), + uri, values, null, null); + } + + /** + * Returns true iff the folder (message type) identifies an + * outgoing message. + */ + public static boolean isOutgoingFolder(int messageType) { + return (messageType == MESSAGE_TYPE_FAILED) + || (messageType == MESSAGE_TYPE_OUTBOX) + || (messageType == MESSAGE_TYPE_SENT) + || (messageType == MESSAGE_TYPE_QUEUED); + } + + /** + * Contains all text based SMS messages in the SMS app's inbox. + */ + public static final class Inbox implements BaseColumns, TextBasedSmsColumns { + /** + * The content:// style URL for this table + */ + public static final Uri CONTENT_URI = + Uri.parse("content://sms/inbox"); + + /** + * The default sort order for this table + */ + public static final String DEFAULT_SORT_ORDER = "date DESC"; + + /** + * Add an SMS to the Draft box. + * + * @param resolver the content resolver to use + * @param address the address of the sender + * @param body the body of the message + * @param subject the psuedo-subject of the message + * @param date the timestamp for the message + * @param read true if the message has been read, false if not + * @return the URI for the new message + */ + public static Uri addMessage(ContentResolver resolver, + String address, String body, String subject, Long date, + boolean read) { + return addMessageToUri(resolver, CONTENT_URI, address, body, + subject, date, read, false); + } + } + + /** + * Contains all sent text based SMS messages in the SMS app's. + */ + public static final class Sent implements BaseColumns, TextBasedSmsColumns { + /** + * The content:// style URL for this table + */ + public static final Uri CONTENT_URI = + Uri.parse("content://sms/sent"); + + /** + * The default sort order for this table + */ + public static final String DEFAULT_SORT_ORDER = "date DESC"; + + /** + * Add an SMS to the Draft box. + * + * @param resolver the content resolver to use + * @param address the address of the sender + * @param body the body of the message + * @param subject the psuedo-subject of the message + * @param date the timestamp for the message + * @return the URI for the new message + */ + public static Uri addMessage(ContentResolver resolver, + String address, String body, String subject, Long date) { + return addMessageToUri(resolver, CONTENT_URI, address, body, + subject, date, true, false); + } + } + + /** + * Contains all sent text based SMS messages in the SMS app's. + */ + public static final class Draft implements BaseColumns, TextBasedSmsColumns { + /** + * The content:// style URL for this table + */ + public static final Uri CONTENT_URI = + Uri.parse("content://sms/draft"); + + /** + * The default sort order for this table + */ + public static final String DEFAULT_SORT_ORDER = "date DESC"; + + /** + * Add an SMS to the Draft box. + * + * @param resolver the content resolver to use + * @param address the address of the sender + * @param body the body of the message + * @param subject the psuedo-subject of the message + * @param date the timestamp for the message + * @return the URI for the new message + */ + public static Uri addMessage(ContentResolver resolver, + String address, String body, String subject, Long date) { + return addMessageToUri(resolver, CONTENT_URI, address, body, + subject, date, true, false); + } + + /** + * Save over an existing draft message. + * + * @param resolver the content resolver to use + * @param uri of existing message + * @param body the new body for the draft message + * @return true is successful, false otherwise + */ + public static boolean saveMessage(ContentResolver resolver, + Uri uri, String body) { + ContentValues values = new ContentValues(2); + values.put(BODY, body); + values.put(DATE, System.currentTimeMillis()); + return resolver.update(uri, values, null, null) == 1; + } + } + + /** + * Contains all pending outgoing text based SMS messages. + */ + public static final class Outbox implements BaseColumns, TextBasedSmsColumns { + /** + * The content:// style URL for this table + */ + public static final Uri CONTENT_URI = + Uri.parse("content://sms/outbox"); + + /** + * The default sort order for this table + */ + public static final String DEFAULT_SORT_ORDER = "date DESC"; + + /** + * Add an SMS to the Out box. + * + * @param resolver the content resolver to use + * @param address the address of the sender + * @param body the body of the message + * @param subject the psuedo-subject of the message + * @param date the timestamp for the message + * @param deliveryReport whether a delivery report was requested for the message + * @return the URI for the new message + */ + public static Uri addMessage(ContentResolver resolver, + String address, String body, String subject, Long date, + boolean deliveryReport, long threadId) { + return addMessageToUri(resolver, CONTENT_URI, address, body, + subject, date, true, deliveryReport, threadId); + } + } + + /** + * Contains all sent text-based SMS messages in the SMS app's. + */ + public static final class Conversations + implements BaseColumns, TextBasedSmsColumns { + /** + * The content:// style URL for this table + */ + public static final Uri CONTENT_URI = + Uri.parse("content://sms/conversations"); + + /** + * The default sort order for this table + */ + public static final String DEFAULT_SORT_ORDER = "date DESC"; + + /** + * The first 45 characters of the body of the message + * <P>Type: TEXT</P> + */ + public static final String SNIPPET = "snippet"; + + /** + * The number of messages in the conversation + * <P>Type: INTEGER</P> + */ + public static final String MESSAGE_COUNT = "msg_count"; + } + + /** + * Contains info about SMS related Intents that are broadcast. + */ + public static final class Intents { + /** + * Set by BroadcastReceiver. Indicates the message was handled + * successfully. + */ + public static final int RESULT_SMS_HANDLED = 1; + + /** + * Set by BroadcastReceiver. Indicates a generic error while + * processing the message. + */ + public static final int RESULT_SMS_GENERIC_ERROR = 2; + + /** + * Set by BroadcastReceiver. Indicates insufficient memory to store + * the message. + */ + public static final int RESULT_SMS_OUT_OF_MEMORY = 3; + + /** + * Set by BroadcastReceiver. Indicates the message, while + * possibly valid, is of a format or encoding that is not + * supported. + */ + public static final int RESULT_SMS_UNSUPPORTED = 4; + + /** + * Broadcast Action: A new text based SMS message has been received + * by the device. The intent will have the following extra + * values:</p> + * + * <ul> + * <li><em>pdus</em> - An Object[] od byte[]s containing the PDUs + * that make up the message.</li> + * </ul> + * + * <p>The extra values can be extracted using + * {@link #getMessagesFromIntent(Intent)}.</p> + * + * <p>If a BroadcastReceiver encounters an error while processing + * this intent it should set the result code appropriately.</p> + */ + public static final String SMS_RECEIVED_ACTION = + "android.provider.Telephony.SMS_RECEIVED"; + + /** + * Broadcast Action: A new data based SMS message has been received + * by the device. The intent will have the following extra + * values:</p> + * + * <ul> + * <li><em>pdus</em> - An Object[] od byte[]s containing the PDUs + * that make up the message.</li> + * </ul> + * + * <p>The extra values can be extracted using + * {@link #getMessagesFromIntent(Intent)}.</p> + * + * <p>If a BroadcastReceiver encounters an error while processing + * this intent it should set the result code appropriately.</p> + */ + public static final String DATA_SMS_RECEIVED_ACTION = + "android.intent.action.DATA_SMS_RECEIVED"; + + /** + * Broadcast Action: A new WAP PUSH message has been received by the + * device. The intent will have the following extra + * values:</p> + * + * <ul> + * <li><em>transactionId (Integer)</em> - The WAP transaction + * ID</li> + * <li><em>pduType (Integer)</em> - The WAP PDU type</li> + * <li><em>header (byte[])</em> - The header of the message</li> + * <li><em>data (byte[])</em> - The data payload of the message</li> + * </ul> + * + * <p>If a BroadcastReceiver encounters an error while processing + * this intent it should set the result code appropriately.</p> + */ + public static final String WAP_PUSH_RECEIVED_ACTION = + "android.provider.Telephony.WAP_PUSH_RECEIVED"; + + /** + * Broadcast Action: The SIM storage for SMS messages is full. If + * space is not freed, messages targeted for the SIM (class 2) may + * not be saved. + */ + public static final String SIM_FULL_ACTION = + "android.provider.Telephony.SIM_FULL"; + + /** + * Broadcast Action: An incoming SMS has been rejected by the + * telephony framework. This intent is sent in lieu of any + * of the RECEIVED_ACTION intents. The intent will have the + * following extra value:</p> + * + * <ul> + * <li><em>result</em> - An int result code, eg, + * <code>{@link #RESULT_SMS_OUT_OF_MEMORY}</code>, + * indicating the error returned to the network.</li> + * </ul> + + */ + public static final String SMS_REJECTED_ACTION = + "android.provider.Telephony.SMS_REJECTED"; + + /** + * Broadcast Action: The phone service state has changed. The intent will have the following + * extra values:</p> + * <ul> + * <li><em>state</em> - An int with one of the following values: + * {@link android.telephony.ServiceState#STATE_IN_SERVICE}, + * {@link android.telephony.ServiceState#STATE_OUT_OF_SERVICE}, + * {@link android.telephony.ServiceState#STATE_EMERGENCY_ONLY} + * or {@link android.telephony.ServiceState#STATE_POWER_OFF} + * <li><em>roaming</em> - A boolean value indicating whether the phone is roaming.</li> + * <li><em>operator-alpha-long</em> - The carrier name as a string.</li> + * <li><em>operator-alpha-short</em> - A potentially shortened version of the carrier name, + * as a string.</li> + * <li><em>operator-numeric</em> - A number representing the carrier, as a string. This is + * a five or six digit number consisting of the MCC (Mobile Country Code, 3 digits) + * and MNC (Mobile Network code, 2-3 digits).</li> + * <li><em>manual</em> - A boolean, where true indicates that the user has chosen to select + * the network manually, and false indicates that network selection is handled by the + * phone.</li> + * </ul> + * + * <p class="note"> + * Requires the READ_PHONE_STATE permission. + * + * <p class="note">This is a protected intent that can only be sent + * by the system. + */ + public static final String ACTION_SERVICE_STATE_CHANGED = + "android.intent.action.SERVICE_STATE"; + + /** + * Read the PDUs out of an {@link #SMS_RECEIVED_ACTION} or a + * {@link #DATA_SMS_RECEIVED_ACTION} intent. + * + * @param intent the intent to read from + * @return an array of SmsMessages for the PDUs + */ + public static final SmsMessage[] getMessagesFromIntent( + Intent intent) { + Object[] messages = (Object[]) intent.getSerializableExtra("pdus"); + byte[][] pduObjs = new byte[messages.length][]; + + for (int i = 0; i < messages.length; i++) { + pduObjs[i] = (byte[]) messages[i]; + } + byte[][] pdus = new byte[pduObjs.length][]; + int pduCount = pdus.length; + SmsMessage[] msgs = new SmsMessage[pduCount]; + for (int i = 0; i < pduCount; i++) { + pdus[i] = pduObjs[i]; + msgs[i] = SmsMessage.createFromPdu(pdus[i]); + } + return msgs; + } + } + } + + /** + * Base columns for tables that contain MMSs. + */ + public interface BaseMmsColumns extends BaseColumns { + + public static final int MESSAGE_BOX_ALL = 0; + public static final int MESSAGE_BOX_INBOX = 1; + public static final int MESSAGE_BOX_SENT = 2; + public static final int MESSAGE_BOX_DRAFTS = 3; + public static final int MESSAGE_BOX_OUTBOX = 4; + + /** + * The date the message was sent. + * <P>Type: INTEGER (long)</P> + */ + public static final String DATE = "date"; + + /** + * The box which the message belong to, for example, MESSAGE_BOX_INBOX. + * <P>Type: INTEGER</P> + */ + public static final String MESSAGE_BOX = "msg_box"; + + /** + * Has the message been read. + * <P>Type: INTEGER (boolean)</P> + */ + public static final String READ = "read"; + + /** + * The Message-ID of the message. + * <P>Type: TEXT</P> + */ + public static final String MESSAGE_ID = "m_id"; + + /** + * The subject of the message, if present. + * <P>Type: TEXT</P> + */ + public static final String SUBJECT = "sub"; + + /** + * The character set of the subject, if present. + * <P>Type: INTEGER</P> + */ + public static final String SUBJECT_CHARSET = "sub_cs"; + + /** + * The Content-Type of the message. + * <P>Type: TEXT</P> + */ + public static final String CONTENT_TYPE = "ct_t"; + + /** + * The Content-Location of the message. + * <P>Type: TEXT</P> + */ + public static final String CONTENT_LOCATION = "ct_l"; + + /** + * The address of the sender. + * <P>Type: TEXT</P> + */ + public static final String FROM = "from"; + + /** + * The address of the recipients. + * <P>Type: TEXT</P> + */ + public static final String TO = "to"; + + /** + * The address of the cc. recipients. + * <P>Type: TEXT</P> + */ + public static final String CC = "cc"; + + /** + * The address of the bcc. recipients. + * <P>Type: TEXT</P> + */ + public static final String BCC = "bcc"; + + /** + * The expiry time of the message. + * <P>Type: INTEGER</P> + */ + public static final String EXPIRY = "exp"; + + /** + * The class of the message. + * <P>Type: TEXT</P> + */ + public static final String MESSAGE_CLASS = "m_cls"; + + /** + * The type of the message defined by MMS spec. + * <P>Type: INTEGER</P> + */ + public static final String MESSAGE_TYPE = "m_type"; + + /** + * The version of specification that this message conform. + * <P>Type: INTEGER</P> + */ + public static final String MMS_VERSION = "v"; + + /** + * The size of the message. + * <P>Type: INTEGER</P> + */ + public static final String MESSAGE_SIZE = "m_size"; + + /** + * The priority of the message. + * <P>Type: TEXT</P> + */ + public static final String PRIORITY = "pri"; + + /** + * The read-report of the message. + * <P>Type: TEXT</P> + */ + public static final String READ_REPORT = "rr"; + + /** + * Whether the report is allowed. + * <P>Type: TEXT</P> + */ + public static final String REPORT_ALLOWED = "rpt_a"; + + /** + * The response-status of the message. + * <P>Type: INTEGER</P> + */ + public static final String RESPONSE_STATUS = "resp_st"; + + /** + * The status of the message. + * <P>Type: INTEGER</P> + */ + public static final String STATUS = "st"; + + /** + * The transaction-id of the message. + * <P>Type: TEXT</P> + */ + public static final String TRANSACTION_ID = "tr_id"; + + /** + * The retrieve-status of the message. + * <P>Type: INTEGER</P> + */ + public static final String RETRIEVE_STATUS = "retr_st"; + + /** + * The retrieve-text of the message. + * <P>Type: TEXT</P> + */ + public static final String RETRIEVE_TEXT = "retr_txt"; + + /** + * The character set of the retrieve-text. + * <P>Type: TEXT</P> + */ + public static final String RETRIEVE_TEXT_CHARSET = "retr_txt_cs"; + + /** + * The read-status of the message. + * <P>Type: INTEGER</P> + */ + public static final String READ_STATUS = "read_status"; + + /** + * The content-class of the message. + * <P>Type: INTEGER</P> + */ + public static final String CONTENT_CLASS = "ct_cls"; + + /** + * The delivery-report of the message. + * <P>Type: INTEGER</P> + */ + public static final String DELIVERY_REPORT = "d_rpt"; + + /** + * The delivery-time-token of the message. + * <P>Type: INTEGER</P> + */ + public static final String DELIVERY_TIME_TOKEN = "d_tm_tok"; + + /** + * The delivery-time of the message. + * <P>Type: INTEGER</P> + */ + public static final String DELIVERY_TIME = "d_tm"; + + /** + * The response-text of the message. + * <P>Type: TEXT</P> + */ + public static final String RESPONSE_TEXT = "resp_txt"; + + /** + * The sender-visibility of the message. + * <P>Type: TEXT</P> + */ + public static final String SENDER_VISIBILITY = "s_vis"; + + /** + * The reply-charging of the message. + * <P>Type: INTEGER</P> + */ + public static final String REPLY_CHARGING = "r_chg"; + + /** + * The reply-charging-deadline-token of the message. + * <P>Type: INTEGER</P> + */ + public static final String REPLY_CHARGING_DEADLINE_TOKEN = "r_chg_dl_tok"; + + /** + * The reply-charging-deadline of the message. + * <P>Type: INTEGER</P> + */ + public static final String REPLY_CHARGING_DEADLINE = "r_chg_dl"; + + /** + * The reply-charging-id of the message. + * <P>Type: TEXT</P> + */ + public static final String REPLY_CHARGING_ID = "r_chg_id"; + + /** + * The reply-charging-size of the message. + * <P>Type: INTEGER</P> + */ + public static final String REPLY_CHARGING_SIZE = "r_chg_sz"; + + /** + * The previously-sent-by of the message. + * <P>Type: TEXT</P> + */ + public static final String PREVIOUSLY_SENT_BY = "p_s_by"; + + /** + * The previously-sent-date of the message. + * <P>Type: INTEGER</P> + */ + public static final String PREVIOUSLY_SENT_DATE = "p_s_d"; + + /** + * The store of the message. + * <P>Type: TEXT</P> + */ + public static final String STORE = "store"; + + /** + * The mm-state of the message. + * <P>Type: INTEGER</P> + */ + public static final String MM_STATE = "mm_st"; + + /** + * The mm-flags-token of the message. + * <P>Type: INTEGER</P> + */ + public static final String MM_FLAGS_TOKEN = "mm_flg_tok"; + + /** + * The mm-flags of the message. + * <P>Type: TEXT</P> + */ + public static final String MM_FLAGS = "mm_flg"; + + /** + * The store-status of the message. + * <P>Type: TEXT</P> + */ + public static final String STORE_STATUS = "store_st"; + + /** + * The store-status-text of the message. + * <P>Type: TEXT</P> + */ + public static final String STORE_STATUS_TEXT = "store_st_txt"; + + /** + * The stored of the message. + * <P>Type: TEXT</P> + */ + public static final String STORED = "stored"; + + /** + * The totals of the message. + * <P>Type: TEXT</P> + */ + public static final String TOTALS = "totals"; + + /** + * The mbox-totals of the message. + * <P>Type: TEXT</P> + */ + public static final String MBOX_TOTALS = "mb_t"; + + /** + * The mbox-totals-token of the message. + * <P>Type: INTEGER</P> + */ + public static final String MBOX_TOTALS_TOKEN = "mb_t_tok"; + + /** + * The quotas of the message. + * <P>Type: TEXT</P> + */ + public static final String QUOTAS = "qt"; + + /** + * The mbox-quotas of the message. + * <P>Type: TEXT</P> + */ + public static final String MBOX_QUOTAS = "mb_qt"; + + /** + * The mbox-quotas-token of the message. + * <P>Type: INTEGER</P> + */ + public static final String MBOX_QUOTAS_TOKEN = "mb_qt_tok"; + + /** + * The message-count of the message. + * <P>Type: INTEGER</P> + */ + public static final String MESSAGE_COUNT = "m_cnt"; + + /** + * The start of the message. + * <P>Type: INTEGER</P> + */ + public static final String START = "start"; + + /** + * The distribution-indicator of the message. + * <P>Type: TEXT</P> + */ + public static final String DISTRIBUTION_INDICATOR = "d_ind"; + + /** + * The element-descriptor of the message. + * <P>Type: TEXT</P> + */ + public static final String ELEMENT_DESCRIPTOR = "e_des"; + + /** + * The limit of the message. + * <P>Type: INTEGER</P> + */ + public static final String LIMIT = "limit"; + + /** + * The recommended-retrieval-mode of the message. + * <P>Type: INTEGER</P> + */ + public static final String RECOMMENDED_RETRIEVAL_MODE = "r_r_mod"; + + /** + * The recommended-retrieval-mode-text of the message. + * <P>Type: TEXT</P> + */ + public static final String RECOMMENDED_RETRIEVAL_MODE_TEXT = "r_r_mod_txt"; + + /** + * The status-text of the message. + * <P>Type: TEXT</P> + */ + public static final String STATUS_TEXT = "st_txt"; + + /** + * The applic-id of the message. + * <P>Type: TEXT</P> + */ + public static final String APPLIC_ID = "apl_id"; + + /** + * The reply-applic-id of the message. + * <P>Type: TEXT</P> + */ + public static final String REPLY_APPLIC_ID = "r_apl_id"; + + /** + * The aux-applic-id of the message. + * <P>Type: TEXT</P> + */ + public static final String AUX_APPLIC_ID = "aux_apl_id"; + + /** + * The drm-content of the message. + * <P>Type: TEXT</P> + */ + public static final String DRM_CONTENT = "drm_c"; + + /** + * The adaptation-allowed of the message. + * <P>Type: TEXT</P> + */ + public static final String ADAPTATION_ALLOWED = "adp_a"; + + /** + * The replace-id of the message. + * <P>Type: TEXT</P> + */ + public static final String REPLACE_ID = "repl_id"; + + /** + * The cancel-id of the message. + * <P>Type: TEXT</P> + */ + public static final String CANCEL_ID = "cl_id"; + + /** + * The cancel-status of the message. + * <P>Type: INTEGER</P> + */ + public static final String CANCEL_STATUS = "cl_st"; + + /** + * The thread ID of the message + * <P>Type: INTEGER</P> + */ + public static final String THREAD_ID = "thread_id"; + + /** + * Has the message been locked? + * <P>Type: INTEGER (boolean)</P> + */ + public static final String LOCKED = "locked"; + } + + /** + * Columns for the "canonical_addresses" table used by MMS and + * SMS." + */ + public interface CanonicalAddressesColumns extends BaseColumns { + /** + * An address used in MMS or SMS. Email addresses are + * converted to lower case and are compared by string + * equality. Other addresses are compared using + * PHONE_NUMBERS_EQUAL. + * <P>Type: TEXT</P> + */ + public static final String ADDRESS = "address"; + } + + /** + * Columns for the "threads" table used by MMS and SMS. + */ + public interface ThreadsColumns extends BaseColumns { + /** + * The date at which the thread was created. + * + * <P>Type: INTEGER (long)</P> + */ + public static final String DATE = "date"; + + /** + * A string encoding of the recipient IDs of the recipients of + * the message, in numerical order and separated by spaces. + * <P>Type: TEXT</P> + */ + public static final String RECIPIENT_IDS = "recipient_ids"; + + /** + * The message count of the thread. + * <P>Type: INTEGER</P> + */ + public static final String MESSAGE_COUNT = "message_count"; + /** + * Indicates whether all messages of the thread have been read. + * <P>Type: INTEGER</P> + */ + public static final String READ = "read"; + /** + * The snippet of the latest message in the thread. + * <P>Type: TEXT</P> + */ + public static final String SNIPPET = "snippet"; + /** + * The charset of the snippet. + * <P>Type: INTEGER</P> + */ + public static final String SNIPPET_CHARSET = "snippet_cs"; + /** + * Type of the thread, either Threads.COMMON_THREAD or + * Threads.BROADCAST_THREAD. + * <P>Type: INTEGER</P> + */ + public static final String TYPE = "type"; + /** + * Indicates whether there is a transmission error in the thread. + * <P>Type: INTEGER</P> + */ + public static final String ERROR = "error"; + /** + * Indicates whether this thread contains any attachments. + * <P>Type: INTEGER</P> + */ + public static final String HAS_ATTACHMENT = "has_attachment"; + } + + /** + * Helper functions for the "threads" table used by MMS and SMS. + */ + public static final class Threads implements ThreadsColumns { + private static final String[] ID_PROJECTION = { BaseColumns._ID }; + private static final String STANDARD_ENCODING = "UTF-8"; + private static final Uri THREAD_ID_CONTENT_URI = Uri.parse( + "content://mms-sms/threadID"); + public static final Uri CONTENT_URI = Uri.withAppendedPath( + MmsSms.CONTENT_URI, "conversations"); + public static final Uri OBSOLETE_THREADS_URI = Uri.withAppendedPath( + CONTENT_URI, "obsolete"); + + public static final int COMMON_THREAD = 0; + public static final int BROADCAST_THREAD = 1; + + // No one should construct an instance of this class. + private Threads() { + } + + /** + * This is a single-recipient version of + * getOrCreateThreadId. It's convenient for use with SMS + * messages. + */ + public static long getOrCreateThreadId(Context context, String recipient) { + Set<String> recipients = new HashSet<String>(); + + recipients.add(recipient); + return getOrCreateThreadId(context, recipients); + } + + /** + * Given the recipients list and subject of an unsaved message, + * return its thread ID. If the message starts a new thread, + * allocate a new thread ID. Otherwise, use the appropriate + * existing thread ID. + * + * Find the thread ID of the same set of recipients (in + * any order, without any additions). If one + * is found, return it. Otherwise, return a unique thread ID. + */ + public static long getOrCreateThreadId( + Context context, Set<String> recipients) { + Uri.Builder uriBuilder = THREAD_ID_CONTENT_URI.buildUpon(); + + for (String recipient : recipients) { + if (Mms.isEmailAddress(recipient)) { + recipient = Mms.extractAddrSpec(recipient); + } + + uriBuilder.appendQueryParameter("recipient", recipient); + } + + Uri uri = uriBuilder.build(); + if (DEBUG) { + Log.v(TAG, "getOrCreateThreadId uri: " + uri); + } + Cursor cursor = SqliteWrapper.query(context, context.getContentResolver(), + uri, ID_PROJECTION, null, null, null); + if (DEBUG) { + Log.v(TAG, "getOrCreateThreadId cursor cnt: " + cursor.getCount()); + } + if (cursor != null) { + try { + if (cursor.moveToFirst()) { + return cursor.getLong(0); + } else { + Log.e(TAG, "getOrCreateThreadId returned no rows!"); + } + } finally { + cursor.close(); + } + } + + Log.e(TAG, "getOrCreateThreadId failed with uri " + uri.toString()); + throw new IllegalArgumentException("Unable to find or allocate a thread ID."); + } + } + + /** + * Contains all MMS messages. + */ + public static final class Mms implements BaseMmsColumns { + /** + * The content:// style URL for this table + */ + public static final Uri CONTENT_URI = Uri.parse("content://mms"); + + public static final Uri REPORT_REQUEST_URI = Uri.withAppendedPath( + CONTENT_URI, "report-request"); + + public static final Uri REPORT_STATUS_URI = Uri.withAppendedPath( + CONTENT_URI, "report-status"); + + /** + * The default sort order for this table + */ + public static final String DEFAULT_SORT_ORDER = "date DESC"; + + /** + * mailbox = name-addr + * name-addr = [display-name] angle-addr + * angle-addr = [CFWS] "<" addr-spec ">" [CFWS] + */ + public static final Pattern NAME_ADDR_EMAIL_PATTERN = + Pattern.compile("\\s*(\"[^\"]*\"|[^<>\"]+)\\s*<([^<>]+)>\\s*"); + + /** + * quoted-string = [CFWS] + * DQUOTE *([FWS] qcontent) [FWS] DQUOTE + * [CFWS] + */ + public static final Pattern QUOTED_STRING_PATTERN = + Pattern.compile("\\s*\"([^\"]*)\"\\s*"); + + public static final Cursor query( + ContentResolver cr, String[] projection) { + return cr.query(CONTENT_URI, projection, null, null, DEFAULT_SORT_ORDER); + } + + public static final Cursor query( + ContentResolver cr, String[] projection, + String where, String orderBy) { + return cr.query(CONTENT_URI, projection, + where, null, orderBy == null ? DEFAULT_SORT_ORDER : orderBy); + } + + public static final String getMessageBoxName(int msgBox) { + switch (msgBox) { + case MESSAGE_BOX_ALL: + return "all"; + case MESSAGE_BOX_INBOX: + return "inbox"; + case MESSAGE_BOX_SENT: + return "sent"; + case MESSAGE_BOX_DRAFTS: + return "drafts"; + case MESSAGE_BOX_OUTBOX: + return "outbox"; + default: + throw new IllegalArgumentException("Invalid message box: " + msgBox); + } + } + + public static String extractAddrSpec(String address) { + Matcher match = NAME_ADDR_EMAIL_PATTERN.matcher(address); + + if (match.matches()) { + return match.group(2); + } + return address; + } + + /** + * Returns true if the address is an email address + * + * @param address the input address to be tested + * @return true if address is an email address + */ + public static boolean isEmailAddress(String address) { + if (TextUtils.isEmpty(address)) { + return false; + } + + String s = extractAddrSpec(address); + Matcher match = Patterns.EMAIL_ADDRESS.matcher(s); + return match.matches(); + } + + /** + * Returns true if the number is a Phone number + * + * @param number the input number to be tested + * @return true if number is a Phone number + */ + public static boolean isPhoneNumber(String number) { + if (TextUtils.isEmpty(number)) { + return false; + } + + Matcher match = Patterns.PHONE.matcher(number); + return match.matches(); + } + + /** + * Contains all MMS messages in the MMS app's inbox. + */ + public static final class Inbox implements BaseMmsColumns { + /** + * The content:// style URL for this table + */ + public static final Uri + CONTENT_URI = Uri.parse("content://mms/inbox"); + + /** + * The default sort order for this table + */ + public static final String DEFAULT_SORT_ORDER = "date DESC"; + } + + /** + * Contains all MMS messages in the MMS app's sent box. + */ + public static final class Sent implements BaseMmsColumns { + /** + * The content:// style URL for this table + */ + public static final Uri + CONTENT_URI = Uri.parse("content://mms/sent"); + + /** + * The default sort order for this table + */ + public static final String DEFAULT_SORT_ORDER = "date DESC"; + } + + /** + * Contains all MMS messages in the MMS app's drafts box. + */ + public static final class Draft implements BaseMmsColumns { + /** + * The content:// style URL for this table + */ + public static final Uri + CONTENT_URI = Uri.parse("content://mms/drafts"); + + /** + * The default sort order for this table + */ + public static final String DEFAULT_SORT_ORDER = "date DESC"; + } + + /** + * Contains all MMS messages in the MMS app's outbox. + */ + public static final class Outbox implements BaseMmsColumns { + /** + * The content:// style URL for this table + */ + public static final Uri + CONTENT_URI = Uri.parse("content://mms/outbox"); + + /** + * The default sort order for this table + */ + public static final String DEFAULT_SORT_ORDER = "date DESC"; + } + + public static final class Addr implements BaseColumns { + /** + * The ID of MM which this address entry belongs to. + */ + public static final String MSG_ID = "msg_id"; + + /** + * The ID of contact entry in Phone Book. + */ + public static final String CONTACT_ID = "contact_id"; + + /** + * The address text. + */ + public static final String ADDRESS = "address"; + + /** + * Type of address, must be one of PduHeaders.BCC, + * PduHeaders.CC, PduHeaders.FROM, PduHeaders.TO. + */ + public static final String TYPE = "type"; + + /** + * Character set of this entry. + */ + public static final String CHARSET = "charset"; + } + + public static final class Part implements BaseColumns { + /** + * The identifier of the message which this part belongs to. + * <P>Type: INTEGER</P> + */ + public static final String MSG_ID = "mid"; + + /** + * The order of the part. + * <P>Type: INTEGER</P> + */ + public static final String SEQ = "seq"; + + /** + * The content type of the part. + * <P>Type: TEXT</P> + */ + public static final String CONTENT_TYPE = "ct"; + + /** + * The name of the part. + * <P>Type: TEXT</P> + */ + public static final String NAME = "name"; + + /** + * The charset of the part. + * <P>Type: TEXT</P> + */ + public static final String CHARSET = "chset"; + + /** + * The file name of the part. + * <P>Type: TEXT</P> + */ + public static final String FILENAME = "fn"; + + /** + * The content disposition of the part. + * <P>Type: TEXT</P> + */ + public static final String CONTENT_DISPOSITION = "cd"; + + /** + * The content ID of the part. + * <P>Type: INTEGER</P> + */ + public static final String CONTENT_ID = "cid"; + + /** + * The content location of the part. + * <P>Type: INTEGER</P> + */ + public static final String CONTENT_LOCATION = "cl"; + + /** + * The start of content-type of the message. + * <P>Type: INTEGER</P> + */ + public static final String CT_START = "ctt_s"; + + /** + * The type of content-type of the message. + * <P>Type: TEXT</P> + */ + public static final String CT_TYPE = "ctt_t"; + + /** + * The location(on filesystem) of the binary data of the part. + * <P>Type: INTEGER</P> + */ + public static final String _DATA = "_data"; + + public static final String TEXT = "text"; + + } + + public static final class Rate { + public static final Uri CONTENT_URI = Uri.withAppendedPath( + Mms.CONTENT_URI, "rate"); + /** + * When a message was successfully sent. + * <P>Type: INTEGER</P> + */ + public static final String SENT_TIME = "sent_time"; + } + + public static final class ScrapSpace { + /** + * The content:// style URL for this table + */ + public static final Uri CONTENT_URI = Uri.parse("content://mms/scrapSpace"); + + /** + * This is the scrap file we use to store the media attachment when the user + * chooses to capture a photo to be attached . We pass {#link@Uri} to the Camera app, + * which streams the captured image to the uri. Internally we write the media content + * to this file. It's named '.temp.jpg' so Gallery won't pick it up. + */ + public static final String SCRAP_FILE_PATH = "/sdcard/mms/scrapSpace/.temp.jpg"; + } + + public static final class Intents { + private Intents() { + // Non-instantiatable. + } + + /** + * The extra field to store the contents of the Intent, + * which should be an array of Uri. + */ + public static final String EXTRA_CONTENTS = "contents"; + /** + * The extra field to store the type of the contents, + * which should be an array of String. + */ + public static final String EXTRA_TYPES = "types"; + /** + * The extra field to store the 'Cc' addresses. + */ + public static final String EXTRA_CC = "cc"; + /** + * The extra field to store the 'Bcc' addresses; + */ + public static final String EXTRA_BCC = "bcc"; + /** + * The extra field to store the 'Subject'. + */ + public static final String EXTRA_SUBJECT = "subject"; + /** + * Indicates that the contents of specified URIs were changed. + * The application which is showing or caching these contents + * should be updated. + */ + public static final String + CONTENT_CHANGED_ACTION = "android.intent.action.CONTENT_CHANGED"; + /** + * An extra field which stores the URI of deleted contents. + */ + public static final String DELETED_CONTENTS = "deleted_contents"; + } + } + + /** + * Contains all MMS and SMS messages. + */ + public static final class MmsSms implements BaseColumns { + /** + * The column to distinguish SMS & MMS messages in query results. + */ + public static final String TYPE_DISCRIMINATOR_COLUMN = + "transport_type"; + + public static final Uri CONTENT_URI = Uri.parse("content://mms-sms/"); + + public static final Uri CONTENT_CONVERSATIONS_URI = Uri.parse( + "content://mms-sms/conversations"); + + public static final Uri CONTENT_FILTER_BYPHONE_URI = Uri.parse( + "content://mms-sms/messages/byphone"); + + public static final Uri CONTENT_UNDELIVERED_URI = Uri.parse( + "content://mms-sms/undelivered"); + + public static final Uri CONTENT_DRAFT_URI = Uri.parse( + "content://mms-sms/draft"); + + public static final Uri CONTENT_LOCKED_URI = Uri.parse( + "content://mms-sms/locked"); + + /*** + * Pass in a query parameter called "pattern" which is the text + * to search for. + * The sort order is fixed to be thread_id ASC,date DESC. + */ + public static final Uri SEARCH_URI = Uri.parse( + "content://mms-sms/search"); + + // Constants for message protocol types. + public static final int SMS_PROTO = 0; + public static final int MMS_PROTO = 1; + + // Constants for error types of pending messages. + public static final int NO_ERROR = 0; + public static final int ERR_TYPE_GENERIC = 1; + public static final int ERR_TYPE_SMS_PROTO_TRANSIENT = 2; + public static final int ERR_TYPE_MMS_PROTO_TRANSIENT = 3; + public static final int ERR_TYPE_TRANSPORT_FAILURE = 4; + public static final int ERR_TYPE_GENERIC_PERMANENT = 10; + public static final int ERR_TYPE_SMS_PROTO_PERMANENT = 11; + public static final int ERR_TYPE_MMS_PROTO_PERMANENT = 12; + + public static final class PendingMessages implements BaseColumns { + public static final Uri CONTENT_URI = Uri.withAppendedPath( + MmsSms.CONTENT_URI, "pending"); + /** + * The type of transport protocol(MMS or SMS). + * <P>Type: INTEGER</P> + */ + public static final String PROTO_TYPE = "proto_type"; + /** + * The ID of the message to be sent or downloaded. + * <P>Type: INTEGER</P> + */ + public static final String MSG_ID = "msg_id"; + /** + * The type of the message to be sent or downloaded. + * This field is only valid for MM. For SM, its value is always + * set to 0. + */ + public static final String MSG_TYPE = "msg_type"; + /** + * The type of the error code. + * <P>Type: INTEGER</P> + */ + public static final String ERROR_TYPE = "err_type"; + /** + * The error code of sending/retrieving process. + * <P>Type: INTEGER</P> + */ + public static final String ERROR_CODE = "err_code"; + /** + * How many times we tried to send or download the message. + * <P>Type: INTEGER</P> + */ + public static final String RETRY_INDEX = "retry_index"; + /** + * The time to do next retry. + */ + public static final String DUE_TIME = "due_time"; + /** + * The time we last tried to send or download the message. + */ + public static final String LAST_TRY = "last_try"; + } + } + + public static final class Carriers implements BaseColumns { + /** + * The content:// style URL for this table + */ + public static final Uri CONTENT_URI = + Uri.parse("content://telephony/carriers"); + + /** + * The default sort order for this table + */ + public static final String DEFAULT_SORT_ORDER = "name ASC"; + + public static final String NAME = "name"; + + public static final String APN = "apn"; + + public static final String PROXY = "proxy"; + + public static final String PORT = "port"; + + public static final String MMSPROXY = "mmsproxy"; + + public static final String MMSPORT = "mmsport"; + + public static final String SERVER = "server"; + + public static final String USER = "user"; + + public static final String PASSWORD = "password"; + + public static final String MMSC = "mmsc"; + + public static final String MCC = "mcc"; + + public static final String MNC = "mnc"; + + public static final String NUMERIC = "numeric"; + + public static final String AUTH_TYPE = "authtype"; + + public static final String TYPE = "type"; + + public static final String CURRENT = "current"; + } + + public static final class Intents { + private Intents() { + // Not instantiable + } + + /** + * Broadcast Action: A "secret code" has been entered in the dialer. Secret codes are + * of the form *#*#<code>#*#*. The intent will have the data URI:</p> + * + * <p><code>android_secret_code://<code></code></p> + */ + public static final String SECRET_CODE_ACTION = + "android.provider.Telephony.SECRET_CODE"; + + /** + * Broadcast Action: The Service Provider string(s) have been updated. Activities or + * services that use these strings should update their display. + * The intent will have the following extra values:</p> + * <ul> + * <li><em>showPlmn</em> - Boolean that indicates whether the PLMN should be shown.</li> + * <li><em>plmn</em> - The operator name of the registered network, as a string.</li> + * <li><em>showSpn</em> - Boolean that indicates whether the SPN should be shown.</li> + * <li><em>spn</em> - The service provider name, as a string.</li> + * </ul> + * Note that <em>showPlmn</em> may indicate that <em>plmn</em> should be displayed, even + * though the value for <em>plmn</em> is null. This can happen, for example, if the phone + * has not registered to a network yet. In this case the receiver may substitute an + * appropriate placeholder string (eg, "No service"). + * + * It is recommended to display <em>plmn</em> before / above <em>spn</em> if + * both are displayed. + * + * <p>Note this is a protected intent that can only be sent + * by the system. + */ + public static final String SPN_STRINGS_UPDATED_ACTION = + "android.provider.Telephony.SPN_STRINGS_UPDATED"; + + public static final String EXTRA_SHOW_PLMN = "showPlmn"; + public static final String EXTRA_PLMN = "plmn"; + public static final String EXTRA_SHOW_SPN = "showSpn"; + public static final String EXTRA_SPN = "spn"; + } +} diff --git a/core/java/com/google/android/mms/util/AbstractCache.java b/mms-common/java/com/android/common/mms/util/AbstractCache.java index 670439c..10a6fce 100644 --- a/core/java/com/google/android/mms/util/AbstractCache.java +++ b/mms-common/java/com/android/common/mms/util/AbstractCache.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.google.android.mms.util; +package com.android.mmscommon.mms.util; import android.util.Config; import android.util.Log; diff --git a/core/java/com/google/android/mms/util/PduCache.java b/mms-common/java/com/android/common/mms/util/PduCache.java index 7c3fad7..ca5432f 100644 --- a/core/java/com/google/android/mms/util/PduCache.java +++ b/mms-common/java/com/android/common/mms/util/PduCache.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.google.android.mms.util; +package com.android.mmscommon.mms.util; import android.content.ContentUris; import android.content.UriMatcher; import android.net.Uri; -import android.provider.Telephony.Mms; +import com.android.mmscommon.telephony.TelephonyProvider.Mms; import android.util.Config; import android.util.Log; diff --git a/core/java/com/google/android/mms/util/PduCacheEntry.java b/mms-common/java/com/android/common/mms/util/PduCacheEntry.java index 8b41386..aed741d 100644 --- a/core/java/com/google/android/mms/util/PduCacheEntry.java +++ b/mms-common/java/com/android/common/mms/util/PduCacheEntry.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.google.android.mms.util; +package com.android.mmscommon.mms.util; -import com.google.android.mms.pdu.GenericPdu; +import com.android.mmscommon.mms.pdu.GenericPdu; public final class PduCacheEntry { private final GenericPdu mPdu; diff --git a/preloaded-classes b/preloaded-classes index d108883..0c84904 100644 --- a/preloaded-classes +++ b/preloaded-classes @@ -686,10 +686,6 @@ com.android.internal.widget.Smileys com.google.android.gles_jni.EGLDisplayImpl com.google.android.gles_jni.EGLImpl com.google.android.gles_jni.GLImpl -com.google.android.mms.ContentType -com.google.android.mms.pdu.CharacterSets -com.google.android.mms.pdu.PduPart -com.google.android.mms.pdu.PduPersister com.ibm.icu4jni.charset.CharsetDecoderICU com.ibm.icu4jni.charset.CharsetEncoderICU com.ibm.icu4jni.charset.CharsetICU |