chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases Activity

prevent crash in NotificationsAdapter when avatar url is not set

Browse source
This commit is contained in:
Conny Duck 2018-01-15 17:06:21 +01:00
parent 0426e8725a
commit 8fa1320afe
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java
View file

@ -264,12 +264,16 @@ public class NotificationsAdapter extends RecyclerView.Adapter {
displayNameView.setText(displayName); displayNameView.setText(displayName);
Picasso.with(context) if (TextUtils.isEmpty(avatarUrl)) {
.load(avatarUrl) avatar.setImageResource(R.drawable.avatar_default);
.fit() } else {
.transform(new RoundedTransformation(7, 0)) Picasso.with(context)
.placeholder(R.drawable.avatar_default) .load(avatarUrl)
.into(avatar); .fit()
.transform(new RoundedTransformation(7, 0))
.placeholder(R.drawable.avatar_default)
.into(avatar);
}
} }
void setupButtons(final NotificationActionListener listener, final String accountId) { void setupButtons(final NotificationActionListener listener, final String accountId) {
@ -407,7 +411,7 @@ public class NotificationsAdapter extends RecyclerView.Adapter {
void setAvatars(@Nullable String statusAvatarUrl, @Nullable String notificationAvatarUrl) { void setAvatars(@Nullable String statusAvatarUrl, @Nullable String notificationAvatarUrl) {
Context context = statusAvatar.getContext(); Context context = statusAvatar.getContext();
if (statusAvatarUrl == null || statusAvatarUrl.isEmpty()) { if (TextUtils.isEmpty(statusAvatarUrl)) {
statusAvatar.setImageResource(R.drawable.avatar_default); statusAvatar.setImageResource(R.drawable.avatar_default);
} else { } else {
Picasso.with(context) Picasso.with(context)
@ -417,7 +421,7 @@ public class NotificationsAdapter extends RecyclerView.Adapter {
.into(statusAvatar); .into(statusAvatar);
} }
if (notificationAvatarUrl == null || notificationAvatarUrl.isEmpty()) { if (TextUtils.isEmpty(notificationAvatarUrl)) {
notificationAvatar.setImageResource(R.drawable.avatar_default); notificationAvatar.setImageResource(R.drawable.avatar_default);
} else { } else {
Picasso.with(context) Picasso.with(context)