Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-22 10:46:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not allow BadgeImageView to control its own visibility.

Browse Source
This commit is contained in:
Alex Hart
2021-11-04 13:42:45 -03:00
committed by Greyson Parrelli
parent fb0b1af056
commit 997f6ef534
12 changed files with 13 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/thoughtcrime/securesms/badges/BadgeImageView.kt
View File

@@ -31,7 +31,7 @@ class BadgeImageView @JvmOverloads constructor(
fun setBadgeFromRecipient(recipient: Recipient?) {
getGlideRequests()?.let {
setBadgeFromRecipient(recipient, it)
}
} ?: setImageDrawable(null)
}
fun setBadgeFromRecipient(recipient: Recipient?, glideRequests: GlideRequests) {
@@ -45,12 +45,10 @@ class BadgeImageView @JvmOverloads constructor(
fun setBadge(badge: Badge?) {
getGlideRequests()?.let {
setBadge(badge, it)
}
} ?: setImageDrawable(null)
}
fun setBadge(badge: Badge?, glideRequests: GlideRequests) {
visible = badge != null
if (badge != null) {
glideRequests
.load(badge)
@@ -60,6 +58,7 @@ class BadgeImageView @JvmOverloads constructor(
} else {
glideRequests
.clear(this)
setImageDrawable(null)
}
}