Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4bf1002 authored by Debashish Chatterjee's avatar Debashish Chatterjee
Browse files

Cleanup VoicemailContract. 

Moved constants/methods specific to Voicemails and Status table under
respective classes.

Marked currently used constants as deprecated, which will be deleted
once the apps using it is modified.

Change-Id: I122439c32ac62e9ae83c4c8468f5160a79743335
parent a4ad22a5

core/java/android/provider/VoicemailContract.java

+45 −24
Original line number Diff line number Diff line
@@ -52,15 +52,18 @@ public class VoicemailContract { 


    /** The authority used by the voicemail provider. */

    public static final String AUTHORITY = "com.android.voicemail";

    /** URI to insert/retrieve all voicemails. */

    /**

     * URI to insert/retrieve all voicemails.

     * @deprecated

     */

    public static final Uri CONTENT_URI =

            Uri.parse("content://" + AUTHORITY + "/voicemail");

    /** URI to insert/retrieve voicemails by a given voicemail source. */

    /**

     * URI to insert/retrieve voicemails by a given voicemail source.

     * @deprecated

     */

    public static final Uri CONTENT_URI_SOURCE =

            Uri.parse("content://" + AUTHORITY + "/voicemail/source/");

    /** URI to insert/retrieve status of voicemail source. */

    public static final Uri STATUS_CONTENT_URI =

            Uri.parse("content://" + AUTHORITY + "/status");

    /**

     * Parameter key used in the URI to specify the voicemail source package name.

     * <p> This field must be set in all requests that originate from a voicemail source.
@@ -77,26 +80,10 @@ public class VoicemailContract { 
     */

    public static final String EXTRA_SELF_CHANGE = "com.android.voicemail.extra.SELF_CHANGE";



    /** The mime type for a collection of voicemails. */

    public static final String DIR_TYPE = "vnd.android.cursor.dir/voicemails";



    /**

     * A convenience method to build voicemail URI specific to a source package. Appends URI param

     * {@link #PARAM_KEY_SOURCE_PACKAGE} to the base voicemail content URI.

     */

    public static Uri buildSourceVoicemailUri(String packageName) {

        return CONTENT_URI.buildUpon()

                .appendQueryParameter(PARAM_KEY_SOURCE_PACKAGE, packageName).build();

    }



    /**

     * A convenience method to build status URI specific to a source package. Appends URI param

     * {@link #PARAM_KEY_SOURCE_PACKAGE} to the base status content URI.

     */

    public static Uri buildSourceStatusUri(String packageName) {

        return STATUS_CONTENT_URI.buildUpon()

                .appendQueryParameter(PARAM_KEY_SOURCE_PACKAGE, packageName).build();

    }

     * The mime type for a collection of voicemails.

     * @deprecated */

    public static final String DIR_TYPE = "vnd.android.cursor.dir/voicemails";



    /** Defines fields exposed through the /voicemail path of this content provider. */

    public static final class Voicemails implements BaseColumns {
@@ -104,6 +91,16 @@ public class VoicemailContract { 
        private Voicemails() {

        }



        /** URI to insert/retrieve voicemails by a given voicemail source. */

        public static final Uri CONTENT_URI =

            Uri.parse("content://" + AUTHORITY + "/voicemail");

        /** URI to insert/retrieve voicemails by a given voicemail source. */

        public static final Uri CONTENT_URI_SOURCE =

                Uri.parse("content://" + AUTHORITY + "/voicemail/source/");



        /** The mime type for a collection of voicemails. */

        public static final String DIR_TYPE = "vnd.android.cursor.dir/voicemails";



        /**

         * Phone number of the voicemail sender.

         * <P>Type: TEXT</P>
@@ -167,10 +164,26 @@ public class VoicemailContract { 
         * @hide

         */

        public static final String _DATA = "_data";



        /**

         * A convenience method to build voicemail URI specific to a source package by appending

         * {@link VoicemailContract#PARAM_KEY_SOURCE_PACKAGE} param to the base URI.

         */

        public static Uri buildSourceUri(String packageName) {

            return Voicemails.CONTENT_URI.buildUpon()

                    .appendQueryParameter(PARAM_KEY_SOURCE_PACKAGE, packageName).build();

        }

    }



    /** Defines fields exposed through the /status path of this content provider. */

    public static final class Status implements BaseColumns {

        /** URI to insert/retrieve status of voicemail source. */

        public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/status");

        /** The mime type for a collection of voicemail source statuses. */

        public static final String DIR_TYPE = "vnd.android.cursor.dir/voicemail.source.status";

        /** The mime type for a collection of voicemails. */

        public static final String ITEM_TYPE = "vnd.android.cursor.item/voicemail.source.status";



        /** Not instantiable. */

        private Status() {

        }
@@ -239,5 +252,13 @@ public class VoicemailContract { 
         */

        public static final int NOTIFICATION_CHANNEL_STATE_MESSAGE_WAITING = 2;



        /**

         * A convenience method to build status URI specific to a source package by appending

         * {@link VoicemailContract#PARAM_KEY_SOURCE_PACKAGE} param to the base URI.

         */

        public static Uri buildSourceUri(String packageName) {

            return Status.CONTENT_URI.buildUpon()

                    .appendQueryParameter(PARAM_KEY_SOURCE_PACKAGE, packageName).build();

        }

    }

}