mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-11-27 17:08:34 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2882 from nextcloud/bgfix/noid/avoidNpeLoadAvatarImage

Browse source 
Avoid NPE in loadAvatarImage
This commit is contained in:
Andy Scherzinger 2023-03-23 12:33:11 +01:00 committed by GitHub
commit 45deb7fec5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java
View file

@ -269,13 +269,13 @@ public class DisplayUtils {
lastStartIndex = end;
Drawable drawableForChip = DisplayUtils.getDrawableForMentionChipSpan(context,
id,
label,
conversationUser,
type,
chipXmlRes,
null,
viewThemeUtils);
id,
label,
conversationUser,
type,
chipXmlRes,
null,
viewThemeUtils);
mentionChipSpan = new Spans.MentionChipSpan(drawableForChip,
BetterImageSpan.ALIGN_CENTER,
@ -453,18 +453,20 @@ public class DisplayUtils {
}
public static void loadAvatarImage(User user, ImageView avatarImageView, boolean deleteCache) {
String avatarId;
if (!TextUtils.isEmpty(user.getUserId())) {
avatarId = user.getUserId();
} else {
avatarId = user.getUsername();
}
if (avatarId != null) {
if (deleteCache) {
ImageViewExtensionsKt.replaceAvatar(avatarImageView, user, avatarId, true);
if (user != null && avatarImageView != null) {
String avatarId;
if (!TextUtils.isEmpty(user.getUserId())) {
avatarId = user.getUserId();
} else {
ImageViewExtensionsKt.loadAvatar(avatarImageView, user, avatarId, true);
avatarId = user.getUsername();
}
if (avatarId != null) {
if (deleteCache) {
ImageViewExtensionsKt.replaceAvatar(avatarImageView, user, avatarId, true);
} else {
ImageViewExtensionsKt.loadAvatar(avatarImageView, user, avatarId, true);
}
}
}
}