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

Fixed history list showing display name but not history details

Browse source
This commit is contained in:
Sylvain Berfini 2019-09-16 11:51:24 +02:00
parent badc6034c4
commit 7cfd739186
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/linphone/history/HistoryActivity.java
View file

@ -101,7 +101,7 @@ public class HistoryActivity extends MainActivity {
String displayName = String displayName =
contact != null contact != null
? contact.getFullName() ? contact.getFullName()
: LinphoneUtils.getAddressDisplayName(address.asStringUriOnly()); : LinphoneUtils.getAddressDisplayName(address);
String pictureUri = String pictureUri =
contact != null && contact.getPhotoUri() != null contact != null && contact.getPhotoUri() != null
? contact.getPhotoUri().toString() ? contact.getPhotoUri().toString()

12
app/src/main/java/org/linphone/history/HistoryDetailFragment.java
View file

@ -201,6 +201,10 @@ public class HistoryDetailFragment extends Fragment {
mContactAddress.setText(LinphoneUtils.getDisplayableAddress(address)); mContactAddress.setText(LinphoneUtils.getDisplayableAddress(address));
mContact = ContactsManager.getInstance().findContactFromAddress(address); mContact = ContactsManager.getInstance().findContactFromAddress(address);
if (mDisplayName == null) {
mDisplayName = LinphoneUtils.getAddressDisplayName(address);
}
if (mContact != null) { if (mContact != null) {
mContactName.setText(mContact.getFullName()); mContactName.setText(mContact.getFullName());
ContactAvatar.displayAvatar(mContact, mAvatarLayout); ContactAvatar.displayAvatar(mContact, mAvatarLayout);
@ -213,12 +217,8 @@ public class HistoryDetailFragment extends Fragment {
mChatSecured.setVisibility(View.VISIBLE); mChatSecured.setVisibility(View.VISIBLE);
} }
} else { } else {
mContactName.setText( mContactName.setText(mDisplayName);
mDisplayName == null ContactAvatar.displayAvatar(mDisplayName, mAvatarLayout);
? LinphoneUtils.getAddressDisplayName(mSipUri)
: mDisplayName);
ContactAvatar.displayAvatar(
LinphoneUtils.getAddressDisplayName(address), mAvatarLayout);
mAddToContacts.setVisibility(View.VISIBLE); mAddToContacts.setVisibility(View.VISIBLE);
mGoToContact.setVisibility(View.GONE); mGoToContact.setVisibility(View.GONE);
} }