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

Fixed avatar issue in history list

Browse source
This commit is contained in:
Sylvain Berfini 2018-10-24 12:14:18 +02:00
parent e28e3f78bd
commit 0b643e27d4
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/android/org/linphone/call/CallHistoryAdapter.java
View file

@ -181,7 +181,7 @@ public class CallHistoryAdapter extends SelectableAdapter<CallHistoryAdapter.Vie
if (c != null) { if (c != null) {
ContactAvatar.displayAvatar(c, holder.avatarLayout); ContactAvatar.displayAvatar(c, holder.avatarLayout);
} else { } else {
ContactAvatar.displayAvatar(displayName, holder.avatarLayout); ContactAvatar.displayAvatar(holder.contact.getText().toString(), holder.avatarLayout);
} }
holder.detail.setVisibility(isEditionEnabled() ? View.INVISIBLE : View.VISIBLE); holder.detail.setVisibility(isEditionEnabled() ? View.INVISIBLE : View.VISIBLE);

8
src/android/org/linphone/ui/ContactAvatar.java
View file

@ -44,6 +44,12 @@ class ContactAvatarHolder {
securityLevel = v.findViewById(R.id.security_level); securityLevel = v.findViewById(R.id.security_level);
generatedAvatar = v.findViewById(R.id.generated_avatar); generatedAvatar = v.findViewById(R.id.generated_avatar);
} }
public void init() {
contactPicture.setVisibility(View.VISIBLE);
generatedAvatar.setVisibility(View.VISIBLE);
securityLevel.setVisibility(View.GONE);
}
} }
public class ContactAvatar { public class ContactAvatar {
@ -66,6 +72,7 @@ public class ContactAvatar {
if (displayName == null || v == null) return; if (displayName == null || v == null) return;
ContactAvatarHolder holder = new ContactAvatarHolder(v); ContactAvatarHolder holder = new ContactAvatarHolder(v);
holder.init();
if (displayName.startsWith("+")) { if (displayName.startsWith("+")) {
// If display name is a phone number, use default avatar because generated one will be +... // If display name is a phone number, use default avatar because generated one will be +...
@ -82,6 +89,7 @@ public class ContactAvatar {
Bitmap bm = null; Bitmap bm = null;
ContactAvatarHolder holder = new ContactAvatarHolder(v); ContactAvatarHolder holder = new ContactAvatarHolder(v);
holder.init();
if (contact.getThumbnailUri() != null && contact.getThumbnailUri().getScheme().startsWith("http")) { if (contact.getThumbnailUri() != null && contact.getThumbnailUri().getScheme().startsWith("http")) {
bm = LinphoneUtils.downloadBitmap(contact.getThumbnailUri()); bm = LinphoneUtils.downloadBitmap(contact.getThumbnailUri());