From 566e981473bff00a640bf1e5b2f9461119853201 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Mon, 18 Oct 2021 09:54:41 -0300 Subject: [PATCH] Catch IAE instead of checking lifecycle. --- .../securesms/badges/BadgeImageView.kt | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/BadgeImageView.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/BadgeImageView.kt index 4efa6e100..b59724793 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/badges/BadgeImageView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/badges/BadgeImageView.kt @@ -15,6 +15,7 @@ import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.util.ThemeUtil import org.thoughtcrime.securesms.util.ViewUtil import org.thoughtcrime.securesms.util.visible +import java.lang.IllegalArgumentException private val TAG = Log.tag(BadgeImageView::class.java) @@ -42,22 +43,21 @@ class BadgeImageView @JvmOverloads constructor( fun setBadge(badge: Badge?) { visible = badge != null - val lifecycle = ViewUtil.getActivityLifecycle(this) - if (lifecycle?.currentState == Lifecycle.State.DESTROYED) { - return - } - - if (badge != null) { - GlideApp - .with(this) - .load(badge) - .downsample(DownsampleStrategy.NONE) - .transform(BadgeSpriteTransformation(BadgeSpriteTransformation.Size.fromInteger(badgeSize), badge.imageDensity, ThemeUtil.isDarkTheme(context))) - .into(this) - } else { - GlideApp - .with(this) - .clear(this) + try { + if (badge != null) { + GlideApp + .with(this) + .load(badge) + .downsample(DownsampleStrategy.NONE) + .transform(BadgeSpriteTransformation(BadgeSpriteTransformation.Size.fromInteger(badgeSize), badge.imageDensity, ThemeUtil.isDarkTheme(context))) + .into(this) + } else { + GlideApp + .with(this) + .clear(this) + } + } catch (e: IllegalArgumentException) { + // Do nothing. Activity was destroyed. } } }