From 821957137a8d6274213739bbe22ccdf7b89b5eee Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Wed, 4 Apr 2018 08:34:46 -0700
Subject: [PATCH] Check for context liveness to prevent NPE

Fixes #7633
---
 .../thoughtcrime/securesms/RecipientPreferenceActivity.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java b/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
index a6c65f5b98..86b0e5bb1c 100644
--- a/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
+++ b/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
@@ -517,8 +517,11 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
 
       @Override
       public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final Context context = getContext();
+        if (context == null) return true;
+
         final int           value         = (Integer) newValue;
-        final MaterialColor selectedColor = MaterialColors.CONVERSATION_PALETTE.getByColor(getActivity(), value);
+        final MaterialColor selectedColor = MaterialColors.CONVERSATION_PALETTE.getByColor(context, value);
         final MaterialColor currentColor  = recipient.getColor();
 
         if (selectedColor == null) return true;
@@ -527,7 +530,6 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
           new AsyncTask<Void, Void, Void>() {
             @Override
             protected Void doInBackground(Void... params) {
-              Context context = getActivity();
               DatabaseFactory.getRecipientDatabase(context).setColor(recipient, selectedColor);
 
               if (recipient.resolve().getRegistered() == RecipientDatabase.RegisteredState.REGISTERED) {