From b3e247e9cc9c10eb8e4f294fabb74ae13b85594b Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Wed, 19 Aug 2020 10:45:01 -0300 Subject: [PATCH] Fix crash when loading vector from typed array. Fixes #9933 --- .../securesms/components/ConversationScrollToView.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationScrollToView.java b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationScrollToView.java index 1d86c50c11..590a24df64 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationScrollToView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationScrollToView.java @@ -2,7 +2,6 @@ package org.thoughtcrime.securesms.components; import android.content.Context; import android.content.res.TypedArray; -import android.graphics.drawable.Drawable; import android.util.AttributeSet; import android.widget.FrameLayout; import android.widget.ImageView; @@ -36,9 +35,9 @@ public final class ConversationScrollToView extends FrameLayout { if (attrs != null) { TypedArray array = context.obtainStyledAttributes(attrs, R.styleable.ConversationScrollToView); - Drawable src = array.getDrawable(R.styleable.ConversationScrollToView_cstv_scroll_button_src); + int srcId = array.getResourceId(R.styleable.ConversationScrollToView_cstv_scroll_button_src, 0); - scrollButton.setImageDrawable(src); + scrollButton.setImageResource(srcId); array.recycle(); }