From 12020a3f864218ff75bec8eb6dacf94ff93954af Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Sun, 8 Oct 2017 17:42:45 -0700
Subject: [PATCH] Fix vector drawable problems < Android 5.0

Fixes #7056
// FREEBIE
---
 .../securesms/contacts/avatars/GeneratedContactPhoto.java    | 4 +++-
 .../securesms/contacts/avatars/ResourceContactPhoto.java     | 5 ++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/GeneratedContactPhoto.java b/src/org/thoughtcrime/securesms/contacts/avatars/GeneratedContactPhoto.java
index 4812398482..eec9c81ab6 100644
--- a/src/org/thoughtcrime/securesms/contacts/avatars/GeneratedContactPhoto.java
+++ b/src/org/thoughtcrime/securesms/contacts/avatars/GeneratedContactPhoto.java
@@ -5,6 +5,7 @@ import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.support.annotation.NonNull;
 import android.support.v4.content.ContextCompat;
+import android.support.v7.content.res.AppCompatResources;
 
 import com.amulyakhare.textdrawable.TextDrawable;
 
@@ -48,7 +49,8 @@ public class GeneratedContactPhoto implements ContactPhoto {
 
   @Override
   public Drawable asCallCard(Context context) {
-    return ContextCompat.getDrawable(context, R.drawable.ic_person_large);
+    return AppCompatResources.getDrawable(context, R.drawable.ic_person_large);
+
   }
 
   @Override
diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java b/src/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java
index d7c88acbd4..130f0b7fa2 100644
--- a/src/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java
+++ b/src/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java
@@ -2,12 +2,11 @@ package org.thoughtcrime.securesms.contacts.avatars;
 
 import android.content.Context;
 import android.graphics.Color;
-import android.graphics.ColorFilter;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
 import android.support.annotation.DrawableRes;
-import android.support.v4.graphics.ColorUtils;
+import android.support.v7.content.res.AppCompatResources;
 import android.widget.ImageView;
 
 import com.amulyakhare.textdrawable.TextDrawable;
@@ -48,7 +47,7 @@ public class ResourceContactPhoto implements ContactPhoto {
 
   @Override
   public Drawable asCallCard(Context context) {
-    return context.getResources().getDrawable(callCardResourceId);
+    return AppCompatResources.getDrawable(context, callCardResourceId);
   }
 
   @Override