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

Commit 732da929 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Separated IM protocol into two fields, similar to TYPE. 

In previous releases, we had combined well-known protocols
and custom protocols into a single field.  This was because
of previous database constraints, which no longer exist
because of our new Data table approach.
parent b3ac9318

core/java/android/provider/ContactsContract.java

+3 −25
Original line number Diff line number Diff line
@@ -1009,6 +1009,8 @@ public final class ContactsContract { 


            public static final String PROTOCOL = "data5";



            public static final String CUSTOM_PROTOCOL = "data6";



            /**

             * The predefined IM protocol types. The protocol can either be non-present, one

             * of these types, or a free-form string. These cases are encoded in the PROTOCOL
@@ -1019,6 +1021,7 @@ public final class ContactsContract { 
             * <li>custom:&lt;a string&gt;</li>

             * </ul>

             */

            public static final int PROTOCOL_CUSTOM = -1;

            public static final int PROTOCOL_AIM = 0;

            public static final int PROTOCOL_MSN = 1;

            public static final int PROTOCOL_YAHOO = 2;
@@ -1027,31 +1030,6 @@ public final class ContactsContract { 
            public static final int PROTOCOL_GOOGLE_TALK = 5;

            public static final int PROTOCOL_ICQ = 6;

            public static final int PROTOCOL_JABBER = 7;



            public static String encodePredefinedImProtocol(int protocol) {

               return "pre:" + protocol;

            }



            public static String encodeCustomImProtocol(String protocolString) {

               return "custom:" + protocolString;

            }



            public static Object decodeImProtocol(String encodedString) {

               if (encodedString == null) {

                   return null;

               }



               if (encodedString.startsWith("pre:")) {

                   return Integer.parseInt(encodedString.substring(4));

               }



               if (encodedString.startsWith("custom:")) {

                   return encodedString.substring(7);

               }



               throw new IllegalArgumentException(

                       "the value is not a valid encoded protocol, " + encodedString);

            }

        }



        /**