Skip to content
This repository has been archived by the owner on Nov 15, 2022. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'eclair' into eclair-release
  • Loading branch information
The Android Automerger committed Nov 18, 2009
2 parents 7ffef6f + 715e32f commit 425fa10
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 9 deletions.
4 changes: 2 additions & 2 deletions src/com/android/mms/data/Conversation.java
Expand Up @@ -132,7 +132,7 @@ public static Conversation get(Context context, ContactList recipients) {
long threadId = getOrCreateThreadId(context, recipients);
conv = new Conversation(context, threadId);
conv.setRecipients(recipients);

try {
Cache.put(conv);
} catch (IllegalStateException e) {
Expand Down Expand Up @@ -386,7 +386,7 @@ private static long getOrCreateThreadId(Context context, ContactList list) {
HashSet<String> recipients = new HashSet<String>();
Contact cacheContact = null;
for (Contact c : list) {
cacheContact = Contact.get(c.getNumber(),true);
cacheContact = Contact.get(c.getNumber(), false);
if (cacheContact != null) {
recipients.add(cacheContact.getNumber());
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/com/android/mms/ui/ComposeMessageActivity.java
Expand Up @@ -827,7 +827,7 @@ private boolean haveEmailContact(String emailAddress) {
}

private boolean isNumberInContacts(String phoneNumber) {
return Contact.get(phoneNumber, true).existsInDatabase();
return Contact.get(phoneNumber, false).existsInDatabase();
}

private final OnCreateContextMenuListener mMsgListMenuCreateListener =
Expand Down
3 changes: 1 addition & 2 deletions src/com/android/mms/ui/DeliveryReportListItem.java
Expand Up @@ -54,8 +54,7 @@ public DeliveryReportListItem(Context context, AttributeSet attrs) {

public final void bind(String recipient, String status) {
// Recipient
// TODO: Make the call to Contact.get() guaranteed non-blocking.
mRecipientView.setText(Contact.get(recipient, true).getName());
mRecipientView.setText(Contact.get(recipient, false).getName());

// Status text
mStatusView.setText(status);
Expand Down
4 changes: 2 additions & 2 deletions src/com/android/mms/ui/MessageItem.java
Expand Up @@ -103,7 +103,7 @@ public class MessageItem {
mContact = meString;
} else {
// For incoming messages, the ADDRESS field contains the sender.
mContact = Contact.get(mAddress, true).getName();
mContact = Contact.get(mAddress, false).getName();
}
mBody = cursor.getString(columnsMap.mColumnSmsBody);

Expand Down Expand Up @@ -218,7 +218,7 @@ private void interpretFrom(EncodedStringValue from, Uri messageUri) {
// notification system uses.
mAddress = AddressUtils.getFrom(mContext, messageUri);
}
mContact = TextUtils.isEmpty(mAddress) ? "" : Contact.get(mAddress, true).getName();
mContact = TextUtils.isEmpty(mAddress) ? "" : Contact.get(mAddress, false).getName();
}

private int getTimestampStrId() {
Expand Down
2 changes: 1 addition & 1 deletion src/com/android/mms/ui/RecipientsEditor.java
Expand Up @@ -264,7 +264,7 @@ protected ContextMenuInfo getContextMenuInfo() {

if (end != start) {
String number = getNumberAt(getText(), start, end, mContext);
Contact c = Contact.get(number, true);
Contact c = Contact.get(number, false);
return new RecipientContextMenuInfo(c);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/com/android/mms/util/DownloadManager.java
Expand Up @@ -250,7 +250,7 @@ private String getMessage(Uri uri) throws MmsException {

v = ind.getFrom();
String from = (v != null)
? Contact.get(v.getString(), true).getName()
? Contact.get(v.getString(), false).getName()
: mContext.getString(R.string.unknown_sender);

return mContext.getString(R.string.dl_failure_notification, subject, from);
Expand Down

0 comments on commit 425fa10

Please sign in to comment.