From 1ccce24cf886641d2b91f501301045799c9373e1 Mon Sep 17 00:00:00 2001 From: Alan Evans Date: Fri, 25 Oct 2019 15:32:34 -0400 Subject: [PATCH] Fix drawable crash on API 19. --- .../securesms/contacts/avatars/ResourceContactPhoto.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java b/src/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java index 09b97a8889..1d69397aac 100644 --- a/src/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java +++ b/src/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java @@ -5,12 +5,10 @@ import android.graphics.Color; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.graphics.drawable.LayerDrawable; +import android.widget.ImageView; + import androidx.annotation.DrawableRes; import androidx.appcompat.content.res.AppCompatResources; -import androidx.core.content.ContextCompat; -import androidx.core.graphics.drawable.DrawableCompat; - -import android.widget.ImageView; import com.amulyakhare.textdrawable.TextDrawable; import com.makeramen.roundedimageview.RoundedDrawable; @@ -55,7 +53,7 @@ public class ResourceContactPhoto implements FallbackContactPhoto { private Drawable buildDrawable(Context context, int resourceId, int color, boolean inverted) { Drawable background = TextDrawable.builder().buildRound(" ", inverted ? Color.WHITE : color); - RoundedDrawable foreground = (RoundedDrawable) RoundedDrawable.fromDrawable(ContextCompat.getDrawable(context, resourceId)); + RoundedDrawable foreground = (RoundedDrawable) RoundedDrawable.fromDrawable(AppCompatResources.getDrawable(context, resourceId)); foreground.setScaleType(ImageView.ScaleType.CENTER);