From eccebc92150c6e15307cc1d3553c15faa6929d4d Mon Sep 17 00:00:00 2001 From: Vavassor Date: Sun, 2 Apr 2017 19:10:07 -0400 Subject: [PATCH] Fixes a vector drawable crash on earlier versions. --- .../java/com/keylesspalace/tusky/ComposeActivity.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java index b333646a..22daadd0 100644 --- a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java +++ b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java @@ -49,6 +49,7 @@ import android.support.v13.view.inputmethod.InputContentInfoCompat; import android.support.v4.app.ActivityCompat; import android.support.v4.content.ContextCompat; import android.support.v7.app.ActionBar; +import android.support.v7.content.res.AppCompatResources; import android.support.v7.widget.Toolbar; import android.text.Editable; import android.text.InputType; @@ -326,7 +327,7 @@ public class ComposeActivity extends BaseActivity { actionBar.setTitle(null); actionBar.setDisplayHomeAsUpEnabled(true); actionBar.setDisplayShowHomeEnabled(true); - Drawable closeIcon = ContextCompat.getDrawable(this, R.drawable.ic_close_24dp); + Drawable closeIcon = AppCompatResources.getDrawable(this, R.drawable.ic_close_24dp); ThemeUtils.setDrawableTint(this, closeIcon, R.attr.compose_close_button_tint); actionBar.setHomeAsUpIndicator(closeIcon); } @@ -506,9 +507,11 @@ public class ComposeActivity extends BaseActivity { } case "private": { floatingBtn.setText(R.string.action_send); - Drawable lock = ContextCompat.getDrawable(this, R.drawable.send_private); - lock.setBounds(0, 0, lock.getIntrinsicWidth(), lock.getIntrinsicHeight()); - floatingBtn.setCompoundDrawables(null, null, lock, null); + Drawable lock = AppCompatResources.getDrawable(this, R.drawable.send_private); + if (lock != null) { + lock.setBounds(0, 0, lock.getIntrinsicWidth(), lock.getIntrinsicHeight()); + floatingBtn.setCompoundDrawables(null, null, lock, null); + } break; } default: {