diff --git a/src/org/linphone/HistoryDetailFragment.java b/src/org/linphone/HistoryDetailFragment.java index 78a72c64e..fc64844ee 100644 --- a/src/org/linphone/HistoryDetailFragment.java +++ b/src/org/linphone/HistoryDetailFragment.java @@ -37,7 +37,7 @@ import android.widget.TextView; * @author Sylvain Berfini */ public class HistoryDetailFragment extends Fragment implements OnClickListener { - private ImageView dialBack, chat, addToContacts, back; + private ImageView dialBack, chat, /*addToContacts, */back; private View view; private ImageView contactPicture, callDirection; private AvatarWithPresenceImage avatarWithPresenceImage; @@ -119,22 +119,22 @@ public class HistoryDetailFragment extends Fragment implements OnClickListener { Log.e(e); } - /*if(lAddress != null) { + if(lAddress != null) { contactAddress.setText(lAddress.asStringUriOnly()); LinphoneContact contact = ContactsManager.getInstance().findContactFromAddress(lAddress); if (contact != null) { contactName.setText(contact.getFullName()); LinphoneUtils.setImagePictureFromUri(view.getContext(),contactPicture,contact.getPhotoUri(),contact.getThumbnailUri()); - addToContacts.setVisibility(View.INVISIBLE); + //addToContacts.setVisibility(View.INVISIBLE); } else { contactName.setText(displayName == null ? LinphoneUtils.getAddressDisplayName(sipUri) : displayName); contactPicture.setImageResource(R.drawable.avatar); - addToContacts.setVisibility(View.VISIBLE); + //addToContacts.setVisibility(View.VISIBLE); } } else { contactAddress.setText(sipUri); contactName.setText(displayName == null ? LinphoneUtils.getAddressDisplayName(sipUri) : displayName); - }*/ + } } public void changeDisplayedHistory(String sipUri, String displayName, String pictureUri, String status, String callTime, String callDate) { diff --git a/src/org/linphone/HistoryListFragment.java b/src/org/linphone/HistoryListFragment.java index d2d31b29c..e1828a6e5 100644 --- a/src/org/linphone/HistoryListFragment.java +++ b/src/org/linphone/HistoryListFragment.java @@ -27,14 +27,13 @@ import org.linphone.core.CallDirection; import org.linphone.core.LinphoneAddress; import org.linphone.core.LinphoneCallLog; import org.linphone.core.LinphoneCallLog.CallStatus; -import org.linphone.core.LinphoneFriend; import org.linphone.ui.AvatarWithPresenceImage; import android.annotation.SuppressLint; import android.app.Dialog; +import android.app.Fragment; import android.content.Context; import android.os.Bundle; -import android.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; @@ -433,9 +432,9 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On holder.callDirection.setImageResource(R.drawable.call_status_outgoing); } - LinphoneContact c = ContactsManager.getInstance().findContactFromAddress(address); //findContactWithAddress(getActivity().getContentResolver(), address); + LinphoneContact c = ContactsManager.getInstance().findContactFromAddress(address); String displayName = null; - final String sipUri = address.asStringUriOnly(); + final String sipUri = address.asString(); if(c != null){ displayName = c.getFullName(); LinphoneUtils.setImagePictureFromUri(view.getContext(),holder.contactPicture,c.getPhotoUri(),c.getThumbnailUri()); @@ -443,11 +442,11 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On holder.contactPicture.setImageResource(R.drawable.avatar); } - /* if(friend != null) { - holder.contact.setText(LinphoneUtils.getAddressDisplayName(friend.getAddress())); + if (displayName == null) { + holder.contact.setText(LinphoneUtils.getAddressDisplayName(sipUri)); } else { - */ holder.contact.setText(LinphoneUtils.getAddressDisplayName(address)); - // } + holder.contact.setText(displayName); + } if(c != null && c.isLinphoneFriend() ) { holder.avatarWithPresenceImage.setLinphoneContact(c);