Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Few changes in the way to look for the display name in the History view

Browse source
This commit is contained in:
Sylvain Berfini 2011-11-03 13:03:53 +01:00
parent be85783752
commit bc0412131d
3 changed files with 11 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/org/linphone/ContactHelper.java
View file

@ -42,9 +42,9 @@ public final class ContactHelper {
private String displayName;
// public String getDisplayName() {
// return displayName;
// }
public String getDisplayName() {
return displayName;
}
private LinphoneAddress address;
public ContactHelper(LinphoneAddress address, ContentResolver resolver) {

52
src/org/linphone/HistoryActivity.java
View file

@ -31,10 +31,8 @@ import org.linphone.core.Log;
import android.app.ListActivity;
import android.content.Context;
import android.database.Cursor;
import android.net.Uri;
import android.os.Bundle;
import android.provider.ContactsContract;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
@ -47,13 +45,11 @@ import android.widget.ListView;
import android.widget.TextView;
public class HistoryActivity extends ListActivity {
LayoutInflater mInflater;
Cursor mContacts;
LayoutInflater mInflater;
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mInflater = (LayoutInflater)getSystemService(Context.LAYOUT_INFLATER_SERVICE);
mContacts = getContacts();
}
@ -110,50 +106,6 @@ public class HistoryActivity extends ListActivity {
return false;
}
/**
* Obtains the contact list for the currently selected account.
*
* @return A cursor for for accessing the contact list.
*/
private Cursor getContacts()
{
// Run query
Uri uri = ContactsContract.Data.CONTENT_URI;
String[] projection = new String[] {
ContactsContract.Data._ID,
ContactsContract.Data.DISPLAY_NAME,
ContactsContract.CommonDataKinds.SipAddress.SIP_ADDRESS,
ContactsContract.CommonDataKinds.Phone.NUMBER
};
String selection =
ContactsContract.Data.MIMETYPE+" ='"
+ContactsContract.CommonDataKinds.SipAddress.CONTENT_ITEM_TYPE+"'";
String[] selectionArgs = null;
String sortOrder = ContactsContract.Contacts.DISPLAY_NAME + " COLLATE LOCALIZED ASC";
return managedQuery(uri, projection, selection, selectionArgs, sortOrder);
}
private String getContactNameIfExist(String sipUri)
{
String contactName = null;
if (mContacts != null && mContacts.moveToFirst())
{
int displayNameColumnIndex = mContacts.getColumnIndex(ContactsContract.Contacts.DISPLAY_NAME);
int sipAdressColumnIndex = mContacts.getColumnIndex(ContactsContract.CommonDataKinds.SipAddress.SIP_ADDRESS);
int phoneNumberColumnIndex = mContacts.getColumnIndex(ContactsContract.CommonDataKinds.Phone.NUMBER);
do
{
String sipAdress = mContacts.getString(sipAdressColumnIndex);
String phoneNumber = mContacts.getString(phoneNumberColumnIndex);
if (sipUri.toLowerCase().contains(sipAdress.toLowerCase()) || sipUri.toLowerCase().contains(phoneNumber.toLowerCase()))
contactName = mContacts.getString(displayNameColumnIndex);
}
while (contactName == null && mContacts.moveToNext());
}
return contactName;
}
class CallHistoryAdapter extends BaseAdapter {
final List<LinphoneCallLog> mLogs;
@ -209,7 +161,7 @@ public class HistoryActivity extends ListActivity {
String lDetailedName=null;
String lDisplayName = lAddress.getDisplayName();
if (lDisplayName == null)
lDisplayName = getContactNameIfExist(lAddress.asStringUriOnly());
lDisplayName = LinphoneUtils.findDisplayNameOfContact(lAddress, getContentResolver());
if (lProxyConfig != null && lProxyConfig.getDomain().equals(lAddress.getDomain())) {
lDetailedName = lAddress.getUserName();

6
src/org/linphone/LinphoneUtils.java
View file

@ -93,6 +93,12 @@ public final class LinphoneUtils {
return helper.getUri();
}
public static String findDisplayNameOfContact(LinphoneAddress address, ContentResolver resolver) {
ContactHelper helper = new ContactHelper(address, resolver);
helper.query();
return helper.getDisplayName();
}
public static Bitmap downloadBitmap(Uri uri) {
URL url;
InputStream is = null;