diff options
| -rw-r--r-- | core/java/android/provider/Im.java | 188 |
1 files changed, 99 insertions, 89 deletions
diff --git a/core/java/android/provider/Im.java b/core/java/android/provider/Im.java index f126c4ddc5a5..d5cc22070bc8 100644 --- a/core/java/android/provider/Im.java +++ b/core/java/android/provider/Im.java @@ -27,7 +27,7 @@ import android.os.Handler; import java.util.HashMap; /** - * The IM provider stores all information about roster contacts, chat messages, presence, etc. + * The GTalk provider stores all information about roster contacts, chat messages, presence, etc. * * @hide */ @@ -38,7 +38,7 @@ public class Im { private Im() {} /** - * The Columns for IM providers (i.e. AIM, Y!, GTalk) + * The Columns for IM providers */ public interface ProviderColumns { /** @@ -146,20 +146,20 @@ public class Im { * The content:// style URL for this table */ public static final Uri CONTENT_URI = - Uri.parse("content://im/providers"); + Uri.parse("content://com.google.android.providers.talk/providers"); public static final Uri CONTENT_URI_WITH_ACCOUNT = - Uri.parse("content://im/providers/account"); + Uri.parse("content://com.google.android.providers.talk/providers/account"); /** * The MIME type of {@link #CONTENT_URI} providing a directory of * people. */ public static final String CONTENT_TYPE = - "vnd.android.cursor.dir/im-providers"; + "vnd.android.cursor.dir/gtalk-providers"; public static final String CONTENT_ITEM_TYPE = - "vnd.android.cursor.item/im-providers"; + "vnd.android.cursor.item/gtalk-providers"; /** * The default sort order for this table @@ -253,21 +253,21 @@ public class Im { * The content:// style URL for this table */ public static final Uri CONTENT_URI = - Uri.parse("content://im/accounts"); + Uri.parse("content://com.google.android.providers.talk/accounts"); /** * The MIME type of {@link #CONTENT_URI} providing a directory of * account. */ public static final String CONTENT_TYPE = - "vnd.android.cursor.dir/im-accounts"; + "vnd.android.cursor.dir/gtalk-accounts"; /** * The MIME type of a {@link #CONTENT_URI} subdirectory of a single * account. */ public static final String CONTENT_ITEM_TYPE = - "vnd.android.cursor.item/im-accounts"; + "vnd.android.cursor.item/gtalk-accounts"; /** * The default sort order for this table @@ -326,19 +326,19 @@ public class Im { * The content:// style URL for this table */ public static final Uri CONTENT_URI = - Uri.parse("content://im/accountStatus"); + Uri.parse("content://com.google.android.providers.talk/accountStatus"); /** * The MIME type of {@link #CONTENT_URI} providing a directory of account status. */ public static final String CONTENT_TYPE = - "vnd.android.cursor.dir/im-account-status"; + "vnd.android.cursor.dir/gtalk-account-status"; /** * The MIME type of a {@link #CONTENT_URI} subdirectory of a single account status. */ public static final String CONTENT_ITEM_TYPE = - "vnd.android.cursor.item/im-account-status"; + "vnd.android.cursor.item/gtalk-account-status"; /** * The default sort order for this table @@ -522,83 +522,83 @@ public class Im { * The content:// style URL for this table */ public static final Uri CONTENT_URI = - Uri.parse("content://im/contacts"); + Uri.parse("content://com.google.android.providers.talk/contacts"); /** * The content:// style URL for contacts joined with presence */ public static final Uri CONTENT_URI_WITH_PRESENCE = - Uri.parse("content://im/contactsWithPresence"); + Uri.parse("content://com.google.android.providers.talk/contactsWithPresence"); /** * The content:// style URL for barebone contacts, not joined with any other table */ public static final Uri CONTENT_URI_CONTACTS_BAREBONE = - Uri.parse("content://im/contactsBarebone"); + Uri.parse("content://com.google.android.providers.talk/contactsBarebone"); /** * The content:// style URL for contacts who have an open chat session */ public static final Uri CONTENT_URI_CHAT_CONTACTS = - Uri.parse("content://im/contacts/chatting"); + Uri.parse("content://com.google.android.providers.talk/contacts/chatting"); /** * The content:// style URL for contacts who have been blocked */ public static final Uri CONTENT_URI_BLOCKED_CONTACTS = - Uri.parse("content://im/contacts/blocked"); + Uri.parse("content://com.google.android.providers.talk/contacts/blocked"); /** * The content:// style URL for contacts by provider and account */ public static final Uri CONTENT_URI_CONTACTS_BY = - Uri.parse("content://im/contacts"); + Uri.parse("content://com.google.android.providers.talk/contacts"); /** * The content:// style URL for contacts by provider and account, * and who have an open chat session */ public static final Uri CONTENT_URI_CHAT_CONTACTS_BY = - Uri.parse("content://im/contacts/chatting"); + Uri.parse("content://com.google.android.providers.talk/contacts/chatting"); /** * The content:// style URL for contacts by provider and account, * and who are online */ public static final Uri CONTENT_URI_ONLINE_CONTACTS_BY = - Uri.parse("content://im/contacts/online"); + Uri.parse("content://com.google.android.providers.talk/contacts/online"); /** * The content:// style URL for contacts by provider and account, * and who are offline */ public static final Uri CONTENT_URI_OFFLINE_CONTACTS_BY = - Uri.parse("content://im/contacts/offline"); + Uri.parse("content://com.google.android.providers.talk/contacts/offline"); /** * The content:// style URL for operations on bulk contacts */ public static final Uri BULK_CONTENT_URI = - Uri.parse("content://im/bulk_contacts"); + Uri.parse("content://com.google.android.providers.talk/bulk_contacts"); /** * The content:// style URL for the count of online contacts in each * contact list by provider and account. */ public static final Uri CONTENT_URI_ONLINE_COUNT = - Uri.parse("content://im/contacts/onlineCount"); + Uri.parse("content://com.google.android.providers.talk/contacts/onlineCount"); /** * The MIME type of {@link #CONTENT_URI} providing a directory of * people. */ - public static final String CONTENT_TYPE = "vnd.android.cursor.dir/im-contacts"; + public static final String CONTENT_TYPE = "vnd.android.cursor.dir/gtalk-contacts"; /** * The MIME type of a {@link #CONTENT_URI} subdirectory of a single * person. */ - public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/im-contacts"; + public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/gtalk-contacts"; /** * The default sort order for this table @@ -634,21 +634,21 @@ public class Im { * The content:// style URL for this table */ public static final Uri CONTENT_URI = - Uri.parse("content://im/contactLists"); + Uri.parse("content://com.google.android.providers.talk/contactLists"); /** * The MIME type of {@link #CONTENT_URI} providing a directory of * people. */ public static final String CONTENT_TYPE = - "vnd.android.cursor.dir/im-contactLists"; + "vnd.android.cursor.dir/gtalk-contactLists"; /** * The MIME type of a {@link #CONTENT_URI} subdirectory of a single * person. */ public static final String CONTENT_ITEM_TYPE = - "vnd.android.cursor.item/im-contactLists"; + "vnd.android.cursor.item/gtalk-contactLists"; /** * The default sort order for this table @@ -699,21 +699,21 @@ public class Im { * The content:// style URL for this table */ public static final Uri CONTENT_URI = - Uri.parse("content://im/blockedList"); + Uri.parse("content://com.google.android.providers.talk/blockedList"); /** * The MIME type of {@link #CONTENT_URI} providing a directory of * people. */ public static final String CONTENT_TYPE = - "vnd.android.cursor.dir/im-blockedList"; + "vnd.android.cursor.dir/gtalk-blockedList"; /** * The MIME type of a {@link #CONTENT_URI} subdirectory of a single * person. */ public static final String CONTENT_ITEM_TYPE = - "vnd.android.cursor.item/im-blockedList"; + "vnd.android.cursor.item/gtalk-blockedList"; /** * The default sort order for this table @@ -822,21 +822,21 @@ public class Im { * The content:// style URL for this table */ public static final Uri CONTENT_URI = - Uri.parse("content://im/contactsEtag"); + Uri.parse("content://com.google.android.providers.talk/contactsEtag"); /** * The MIME type of {@link #CONTENT_URI} providing a directory of * people. */ public static final String CONTENT_TYPE = - "vnd.android.cursor.dir/im-contactsEtag"; + "vnd.android.cursor.dir/gtalk-contactsEtag"; /** * The MIME type of a {@link #CONTENT_URI} subdirectory of a single * person. */ public static final String CONTENT_ITEM_TYPE = - "vnd.android.cursor.item/im-contactsEtag"; + "vnd.android.cursor.item/gtalk-contactsEtag"; } /** @@ -1057,75 +1057,75 @@ public class Im { * The content:// style URL for this table */ public static final Uri CONTENT_URI = - Uri.parse("content://im/messages"); + Uri.parse("content://com.google.android.providers.talk/messages"); /** * The content:// style URL for messages by thread id */ public static final Uri CONTENT_URI_MESSAGES_BY_THREAD_ID = - Uri.parse("content://im/messagesByThreadId"); + Uri.parse("content://com.google.android.providers.talk/messagesByThreadId"); /** * The content:// style URL for messages by account and contact */ public static final Uri CONTENT_URI_MESSAGES_BY_ACCOUNT_AND_CONTACT = - Uri.parse("content://im/messagesByAcctAndContact"); + Uri.parse("content://com.google.android.providers.talk/messagesByAcctAndContact"); /** * The content:// style URL for messages by provider */ public static final Uri CONTENT_URI_MESSAGES_BY_PROVIDER = - Uri.parse("content://im/messagesByProvider"); + Uri.parse("content://com.google.android.providers.talk/messagesByProvider"); /** * The content:// style URL for messages by account */ public static final Uri CONTENT_URI_BY_ACCOUNT = - Uri.parse("content://im/messagesByAccount"); + Uri.parse("content://com.google.android.providers.talk/messagesByAccount"); /** * The content:// style url for off the record messages */ public static final Uri OTR_MESSAGES_CONTENT_URI = - Uri.parse("content://im/otrMessages"); + Uri.parse("content://com.google.android.providers.talk/otrMessages"); /** * The content:// style url for off the record messages by thread id */ public static final Uri OTR_MESSAGES_CONTENT_URI_BY_THREAD_ID = - Uri.parse("content://im/otrMessagesByThreadId"); + Uri.parse("content://com.google.android.providers.talk/otrMessagesByThreadId"); /** * The content:// style url for off the record messages by account and contact */ public static final Uri OTR_MESSAGES_CONTENT_URI_BY_ACCOUNT_AND_CONTACT = - Uri.parse("content://im/otrMessagesByAcctAndContact"); + Uri.parse("content://com.google.android.providers.talk/otrMessagesByAcctAndContact"); /** * The content:// style URL for off the record messages by provider */ public static final Uri OTR_MESSAGES_CONTENT_URI_BY_PROVIDER = - Uri.parse("content://im/otrMessagesByProvider"); + Uri.parse("content://com.google.android.providers.talk/otrMessagesByProvider"); /** * The content:// style URL for off the record messages by account */ public static final Uri OTR_MESSAGES_CONTENT_URI_BY_ACCOUNT = - Uri.parse("content://im/otrMessagesByAccount"); + Uri.parse("content://com.google.android.providers.talk/otrMessagesByAccount"); /** * The MIME type of {@link #CONTENT_URI} providing a directory of * people. */ public static final String CONTENT_TYPE = - "vnd.android.cursor.dir/im-messages"; + "vnd.android.cursor.dir/gtalk-messages"; /** * The MIME type of a {@link #CONTENT_URI} subdirectory of a single * person. */ public static final String CONTENT_ITEM_TYPE = - "vnd.android.cursor.item/im-messages"; + "vnd.android.cursor.item/gtalk-messages"; /** * The default sort order for this table @@ -1166,21 +1166,21 @@ public class Im { private GroupMembers(){} public static final Uri CONTENT_URI = - Uri.parse("content://im/groupMembers"); + Uri.parse("content://com.google.android.providers.talk/groupMembers"); /** * The MIME type of {@link #CONTENT_URI} providing a directory of * group members. */ public static final String CONTENT_TYPE = - "vnd.android.cursor.dir/im-groupMembers"; + "vnd.android.cursor.dir/gtalk-groupMembers"; /** * The MIME type of a {@link #CONTENT_URI} subdirectory of a single * group member. */ public static final String CONTENT_ITEM_TYPE = - "vnd.android.cursor.item/im-groupMembers"; + "vnd.android.cursor.item/gtalk-groupMembers"; } /** @@ -1246,21 +1246,21 @@ public class Im { * The content:// style URL for this table */ public static final Uri CONTENT_URI = - Uri.parse("content://im/invitations"); + Uri.parse("content://com.google.android.providers.talk/invitations"); /** * The MIME type of {@link #CONTENT_URI} providing a directory of * invitations. */ public static final String CONTENT_TYPE = - "vnd.android.cursor.dir/im-invitations"; + "vnd.android.cursor.dir/gtalk-invitations"; /** * The MIME type of a {@link #CONTENT_URI} subdirectory of a single * invitation. */ public static final String CONTENT_ITEM_TYPE = - "vnd.android.cursor.item/im-invitations"; + "vnd.android.cursor.item/gtalk-invitations"; } /** @@ -1302,24 +1302,25 @@ public class Im { /** * The content:// style URL for this table */ - public static final Uri CONTENT_URI = Uri.parse("content://im/avatars"); + public static final Uri CONTENT_URI = + Uri.parse("content://com.google.android.providers.talk/avatars"); /** * The content:// style URL for avatars by provider, account and contact */ public static final Uri CONTENT_URI_AVATARS_BY = - Uri.parse("content://im/avatarsBy"); + Uri.parse("content://com.google.android.providers.talk/avatarsBy"); /** * The MIME type of {@link #CONTENT_URI} providing the avatars */ - public static final String CONTENT_TYPE = "vnd.android.cursor.dir/im-avatars"; + public static final String CONTENT_TYPE = "vnd.android.cursor.dir/gtalk-avatars"; /** * The MIME type of a {@link #CONTENT_URI} */ public static final String CONTENT_ITEM_TYPE = - "vnd.android.cursor.item/im-avatars"; + "vnd.android.cursor.item/gtalk-avatars"; /** * The default sort order for this table @@ -1397,28 +1398,31 @@ public class Im { /** * The content:// style URL for this table */ - public static final Uri CONTENT_URI = Uri.parse("content://im/presence"); + public static final Uri CONTENT_URI = + Uri.parse("content://com.google.android.providers.talk/presence"); /** - * The content URL for IM presences for an account + * The content URL for Talk presences for an account */ - public static final Uri CONTENT_URI_BY_ACCOUNT = Uri.parse("content://im/presence/account"); + public static final Uri CONTENT_URI_BY_ACCOUNT = + Uri.parse("content://com.google.android.providers.talk/presence/account"); /** * The content:// style URL for operations on bulk contacts */ - public static final Uri BULK_CONTENT_URI = Uri.parse("content://im/bulk_presence"); + public static final Uri BULK_CONTENT_URI = + Uri.parse("content://com.google.android.providers.talk/bulk_presence"); /** * The content:// style URL for seeding presences for a given account id. */ public static final Uri SEED_PRESENCE_BY_ACCOUNT_CONTENT_URI = - Uri.parse("content://im/seed_presence/account"); + Uri.parse("content://com.google.android.providers.talk/seed_presence/account"); /** * The MIME type of a {@link #CONTENT_URI} providing a directory of presence */ - public static final String CONTENT_TYPE = "vnd.android.cursor.dir/im-presence"; + public static final String CONTENT_TYPE = "vnd.android.cursor.dir/gtalk-presence"; /** * The default sort order for this table @@ -1491,22 +1495,23 @@ public class Im { * The content:// style URL for this table */ public static final Uri CONTENT_URI = - Uri.parse("content://im/chats"); + Uri.parse("content://com.google.android.providers.talk/chats"); /** * The content URL for all chats that belong to the account */ - public static final Uri CONTENT_URI_BY_ACCOUNT = Uri.parse("content://im/chats/account"); + public static final Uri CONTENT_URI_BY_ACCOUNT = + Uri.parse("content://com.google.android.providers.talk/chats/account"); /** * The MIME type of {@link #CONTENT_URI} providing a directory of chats. */ - public static final String CONTENT_TYPE = "vnd.android.cursor.dir/im-chats"; + public static final String CONTENT_TYPE = "vnd.android.cursor.dir/gtalk-chats"; /** * The MIME type of a {@link #CONTENT_URI} subdirectory of a single chat. */ - public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/im-chats"; + public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/gtalk-chats"; /** * The default sort order for this table @@ -1534,19 +1539,20 @@ public class Im { /** * The content:// style URI for this table */ - public static final Uri CONTENT_URI = Uri.parse("content://im/sessionCookies"); + public static final Uri CONTENT_URI = + Uri.parse("content://com.google.android.providers.talk/sessionCookies"); /** * The content:// style URL for session cookies by provider and account */ public static final Uri CONTENT_URI_SESSION_COOKIES_BY = - Uri.parse("content://im/sessionCookiesBy"); + Uri.parse("content://com.google.android.providers.talk/sessionCookiesBy"); /** * The MIME type of {@link #CONTENT_URI} providing a directory of * people. */ - public static final String CONTENT_TYPE = "vnd.android-dir/im-sessionCookies"; + public static final String CONTENT_TYPE = "vnd.android-dir/gtalk-sessionCookies"; } /** @@ -1581,12 +1587,12 @@ public class Im { * The content:// style URI for this table */ public static final Uri CONTENT_URI = - Uri.parse("content://im/providerSettings"); + Uri.parse("content://com.google.android.providers.talk/providerSettings"); /** * The MIME type of {@link #CONTENT_URI} providing provider settings */ - public static final String CONTENT_TYPE = "vnd.android-dir/im-providerSettings"; + public static final String CONTENT_TYPE = "vnd.android-dir/gtalk-providerSettings"; /** * A boolean value to indicate whether this provider should show the offline contacts @@ -1596,13 +1602,13 @@ public class Im { /** controls whether or not the GTalk service automatically connect to server. */ public static final String SETTING_AUTOMATICALLY_CONNECT_GTALK = "gtalk_auto_connect"; - /** controls whether or not the IM service will be automatically started after boot */ + /** controls whether or not the GTalk service will be automatically started after boot */ public static final String SETTING_AUTOMATICALLY_START_SERVICE = "auto_start_service"; /** controls whether or not the offline contacts will be hided */ public static final String SETTING_HIDE_OFFLINE_CONTACTS = "hide_offline_contacts"; - /** controls whether or not enable the IM notification */ + /** controls whether or not enable the GTalk notification */ public static final String SETTING_ENABLE_NOTIFICATION = "enable_notification"; /** specifies whether or not to vibrate */ @@ -1794,10 +1800,10 @@ public class Im { } /** - * A convenience method to set whether or not enable the IM notification. + * A convenience method to set whether or not enable the GTalk notification. * * @param contentResolver The ContentResolver to use to access the setting table. - * @param enable Whether enable the IM notification + * @param enable Whether enable the GTalk notification */ public static void setEnableNotification(ContentResolver contentResolver, long providerId, boolean enable) { @@ -1935,18 +1941,18 @@ public class Im { } /** - * Set whether or not enable the IM notification. + * Set whether or not enable the GTalk notification. * - * @param enable Whether or not enable the IM notification. + * @param enable Whether or not enable the GTalk notification. */ public void setEnableNotification(boolean enable) { ProviderSettings.setEnableNotification(mContentResolver, mProviderId, enable); } /** - * Check if the IM notification is enabled. + * Check if the GTalk notification is enabled. * - * @return Whether or not enable the IM notification. + * @return Whether or not enable the GTalk notification. */ public boolean getEnableNotification() { return getBoolean(SETTING_ENABLE_NOTIFICATION, @@ -1954,7 +1960,7 @@ public class Im { } /** - * Set whether or not to vibrate on IM notification. + * Set whether or not to vibrate on GTalk notification. * * @param vibrate Whether or not to vibrate. */ @@ -1963,7 +1969,7 @@ public class Im { } /** - * Gets whether or not to vibrate on IM notification. + * Gets whether or not to vibrate on GTalk notification. * * @return Whether or not to vibrate. */ @@ -2138,8 +2144,8 @@ public class Im { /** - * Columns for IM branding resource map cache table. This table caches the result of - * loading the branding resources to speed up IM landing page start. + * Columns for GTalk branding resource map cache table. This table caches the result of + * loading the branding resources to speed up GTalk landing page start. */ public interface BrandingResourceMapCacheColumns { /** @@ -2160,14 +2166,15 @@ public class Im { } /** - * The table for caching the result of loading IM branding resources. + * The table for caching the result of loading GTalk branding resources. */ public static final class BrandingResourceMapCache implements BaseColumns, BrandingResourceMapCacheColumns { /** * The content:// style URL for this table. */ - public static final Uri CONTENT_URI = Uri.parse("content://im/brandingResMapCache"); + public static final Uri CONTENT_URI = + Uri.parse("content://com.google.android.providers.talk/brandingResMapCache"); } @@ -2229,13 +2236,14 @@ public class Im { /** * The content:// style URL for this table. */ - public static final Uri CONTENT_URI = Uri.parse("content://im/outgoingRmqMessages"); + public static final Uri CONTENT_URI = + Uri.parse("content://com.google.android.providers.talk/outgoingRmqMessages"); /** * The content:// style URL for the highest rmq id for the outgoing rmq messages */ public static final Uri CONTENT_URI_FOR_HIGHEST_RMQ_ID = - Uri.parse("content://im/outgoingHighestRmqId"); + Uri.parse("content://com.google.android.providers.talk/outgoingHighestRmqId"); /** * The default sort order for this table. @@ -2309,7 +2317,8 @@ public class Im { /** * The content:// style URL for this table. */ - public static final Uri CONTENT_URI = Uri.parse("content://im/lastRmqId"); + public static final Uri CONTENT_URI = + Uri.parse("content://com.google.android.providers.talk/lastRmqId"); } /** @@ -2327,7 +2336,8 @@ public class Im { /** * The content:// style URL for this table. */ - public static final Uri CONTENT_URI = Uri.parse("content://im/s2dids"); + public static final Uri CONTENT_URI = + Uri.parse("content://com.google.android.providers.talk/s2dids"); } } |