Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-25 19:29:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix crashes and issues with blurred avatars.

Browse Source 
- Tinting on Android 5/6 caused NPE deep in Android
- Invite group flow can have zero members
- Missed spot to blur avatar in old notification flow
This commit is contained in:
Cody Henthorne
2021-04-24 14:31:38 -04:00
parent e02e07ae7a
commit 5ca4db6ea5
5 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationBannerView.java
View File

@@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.conversation;
import android.content.Context;
import android.content.res.ColorStateList;
import android.graphics.PorterDuff;
import android.graphics.drawable.LayerDrawable;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.view.View;
@@ -58,19 +59,15 @@ public class ConversationBannerView extends ConstraintLayout {
public void setAvatar(@NonNull GlideRequests requests, @Nullable Recipient recipient) {
contactAvatar.setAvatar(requests, recipient, false);
if (recipient.shouldBlurAvatar() && recipient.getContactPhoto() != null) {
if (recipient != null && recipient.shouldBlurAvatar() && recipient.getContactPhoto() != null) {
tapToView.setVisibility(VISIBLE);
tapToView.setOnClickListener(v -> {
SignalExecutors.BOUNDED.execute(() -> DatabaseFactory.getRecipientDatabase(getContext().getApplicationContext())
.manuallyShowAvatar(recipient.getId()));
});
ImageViewCompat.setImageTintList(contactAvatar, ColorStateList.valueOf(ContextCompat.getColor(getContext(), R.color.transparent_black_40)));
ImageViewCompat.setImageTintMode(contactAvatar, PorterDuff.Mode.SRC_ATOP);
} else {
tapToView.setVisibility(GONE);
tapToView.setOnClickListener(null);
ImageViewCompat.setImageTintList(contactAvatar, null);
ImageViewCompat.setImageTintMode(contactAvatar, PorterDuff.Mode.SRC_IN);
}
}