ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Renaming Presence and Presence-related columns.

Browse Source 
Change-Id: Icba02cdb905ae3514ec16bea097167e09bc18a63
This commit is contained in:
Dmitri Plotnikov 2009-09-27 19:11:17 -07:00
parent e6a8d98e9e
commit fff989df75
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/email/activity/MessageView.java
View File

@ -54,8 +54,9 @@ import android.os.Handler;
import android.provider.Browser;
import android.provider.ContactsContract;
import android.provider.ContactsContract.CommonDataKinds;
import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.FastTrack;
import android.provider.ContactsContract.Presence;
import android.provider.ContactsContract.StatusUpdates;
import android.text.TextUtils;
import android.text.util.Regex;
import android.util.Log;
@ -101,7 +102,7 @@ public class MessageView extends Activity implements OnClickListener {
};
private static final String[] PRESENCE_STATUS_PROJECTION =
new String[] { Presence.PRESENCE_STATUS };
new String[] { Contacts.CONTACT_PRESENCE };
private static final int BODY_CONTENT_COLUMN_RECORD_ID = 0;
private static final int BODY_CONTENT_COLUMN_MESSAGE_KEY = 1;
@ -954,13 +955,13 @@ public class MessageView extends Activity implements OnClickListener {
@Override
protected Integer doInBackground(String... emails) {
Cursor cursor =
getContentResolver().query(ContactsContract.Data.CONTENT_WITH_PRESENCE_URI,
getContentResolver().query(ContactsContract.Data.CONTENT_URI,
PRESENCE_STATUS_PROJECTION, CommonDataKinds.Email.DATA + "=?", emails, null);
if (cursor != null) {
try {
if (cursor.moveToFirst()) {
int status = cursor.getInt(0);
int icon = Presence.getPresenceIconResourceId(status);
int icon = StatusUpdates.getPresenceIconResourceId(status);
return icon;
}
} finally {