commit a01e50cb1a5dd21293f8a8fe43f3fe0bf6349164
author Jeff Sharkey <jsharkey@android.com> Fri Jul 31 13:45:25 2009 -0700
committer Jeff Sharkey <jsharkey@android.com> Fri Jul 31 13:46:38 2009 -0700
tree 7b04cd9a6cbcaf78893604b34892f872d3e84c8b
parent c70dc0e38ff82c6e6d6b7458637c54fbdf446aac

Fix IM constants to match framework change.

src/com/android/providers/contacts/ContactsProvider2.java

diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java
index 242c705..e9b4f9f 100644
--- a/src/com/android/providers/contacts/ContactsProvider2.java
+++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -348,9 +348,6 @@
     /** Precompiled sql statement for updating a contact display name */
     private SQLiteStatement mContactDisplayNameUpdate;
 
-    private static final String GTALK_PROTOCOL_STRING = Im
-            .encodePredefinedImProtocol(Im.PROTOCOL_GOOGLE_TALK);
-
     static {
         // Contacts URI matching table
         final UriMatcher matcher = sUriMatcher;
@@ -1543,7 +1540,7 @@
         }
 
         // TODO: generalize to allow other providers to match against email
-        boolean matchEmail = GTALK_PROTOCOL_STRING.equals(protocol);
+        boolean matchEmail = Im.PROTOCOL_GOOGLE_TALK == Integer.parseInt(protocol);
 
         StringBuilder selection = new StringBuilder();
         String[] selectionArgs;

tests/src/com/android/providers/contacts/ContactsProvider2Test.java

diff --git a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
index 2256357..de9dd14 100644
--- a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
+++ b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
@@ -585,10 +585,8 @@
             values.put(Email.DATA, "foo@acme.com");
             mResolver.insert(Data.CONTENT_URI, values);
 
-            String protocol = Im.encodePredefinedImProtocol(Im.PROTOCOL_GOOGLE_TALK);
-
             values.clear();
-            values.put(Presence.IM_PROTOCOL, protocol);
+            values.put(Presence.IM_PROTOCOL, Im.PROTOCOL_GOOGLE_TALK);
             values.put(Presence.IM_HANDLE, "foo@acme.com");
             values.put(Presence.IM_ACCOUNT, "foo");
             values.put(Presence.PRESENCE_STATUS, Presence.OFFLINE);