diff options
| author | Dmitri Plotnikov <dplotnikov@google.com> | 2009-09-27 20:57:06 -0700 |
|---|---|---|
| committer | Dmitri Plotnikov <dplotnikov@google.com> | 2009-09-27 20:57:15 -0700 |
| commit | 0cc388933e698760d4985a7d7be1325f9c8305e9 (patch) | |
| tree | c6e7d5039de936dad0df007223434373af7744e7 /src | |
| parent | 82bd858c9911dfbd8dca52dc276333768b0a429e (diff) | |
| download | ContactsProvider-0cc388933e698760d4985a7d7be1325f9c8305e9.tar.gz | |
Fixing legacy contacts API support after the latest change in the status update APIs.
Change-Id: I0d9bb5bdc3217cfdd70131cd7aa361f5db9ad1a5
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/providers/contacts/LegacyApiSupport.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/com/android/providers/contacts/LegacyApiSupport.java b/src/com/android/providers/contacts/LegacyApiSupport.java index ab725d5f..58a6a97a 100644 --- a/src/com/android/providers/contacts/LegacyApiSupport.java +++ b/src/com/android/providers/contacts/LegacyApiSupport.java @@ -131,9 +131,11 @@ public class LegacyApiSupport { + PEOPLE_JOINS; public static final String PRESENCE_JOINS = - " LEFT OUTER JOIN presence ON (" - + " presence.presence_id = (SELECT max(presence_id) FROM presence" - + " WHERE people._id = presence_raw_contact_id))"; + " LEFT OUTER JOIN presence" + + " ON (" + " presence." + StatusUpdates.DATA_ID + + " = (SELECT max(" + StatusUpdates.DATA_ID + ")" + + " FROM presence" + + " WHERE people._id = presence_raw_contact_id))"; private static final String PHONETIC_NAME_SQL = "trim(trim(" + "ifnull(name." + StructuredName.PHONETIC_GIVEN_NAME + ",' ')||' '||" @@ -359,12 +361,12 @@ public class LegacyApiSupport { sPeopleProjectionMap.put(People.IM_ACCOUNT, People.IM_ACCOUNT); sPeopleProjectionMap.put(People.PRESENCE_STATUS, People.PRESENCE_STATUS); sPeopleProjectionMap.put(People.PRESENCE_CUSTOM_STATUS, - "(SELECT " + StatusUpdatesColumns.STATUS + + "(SELECT " + StatusUpdates.STATUS + " FROM " + Tables.STATUS_UPDATES + " JOIN " + Tables.DATA + " ON(" + StatusUpdatesColumns.DATA_ID + "=" + DataColumns.CONCRETE_ID + ")" + " WHERE " + DataColumns.CONCRETE_RAW_CONTACT_ID + "=people." + People._ID + - " ORDER BY " + StatusUpdatesColumns.TIMESTAMP + " DESC " + + " ORDER BY " + StatusUpdates.STATUS_TIMESTAMP + " DESC " + " LIMIT 1" + ") AS " + People.PRESENCE_CUSTOM_STATUS); |