Use contact name for incall view if available
This commit is contained in:
parent
4c6e9d0101
commit
0cce11b866
1 changed files with 6 additions and 2 deletions
|
@ -1304,14 +1304,18 @@ public class InCallActivity extends FragmentActivity implements
|
||||||
|
|
||||||
private void setContactName(LinearLayout callView, LinphoneAddress lAddress, String sipUri, Resources resources) {
|
private void setContactName(LinearLayout callView, LinphoneAddress lAddress, String sipUri, Resources resources) {
|
||||||
TextView contact = (TextView) callView.findViewById(R.id.contactNameOrNumber);
|
TextView contact = (TextView) callView.findViewById(R.id.contactNameOrNumber);
|
||||||
if (lAddress.getDisplayName() == null) {
|
|
||||||
|
LinphoneUtils.findUriPictureOfContactAndSetDisplayName(lAddress, callView.getContext().getContentResolver());
|
||||||
|
String displayName = lAddress.getDisplayName();
|
||||||
|
|
||||||
|
if (displayName == null) {
|
||||||
if (resources.getBoolean(R.bool.only_display_username_if_unknown) && LinphoneUtils.isSipAddress(sipUri)) {
|
if (resources.getBoolean(R.bool.only_display_username_if_unknown) && LinphoneUtils.isSipAddress(sipUri)) {
|
||||||
contact.setText(LinphoneUtils.getUsernameFromAddress(sipUri));
|
contact.setText(LinphoneUtils.getUsernameFromAddress(sipUri));
|
||||||
} else {
|
} else {
|
||||||
contact.setText(sipUri);
|
contact.setText(sipUri);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
contact.setText(lAddress.getDisplayName());
|
contact.setText(displayName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue