From ab58eab9f4d0bc64a58af88d7b3edd7b0d7a336d Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 24 Aug 2018 12:00:02 -0700
Subject: [PATCH] Fix potential crash with recipient preferences.

---
 .../thoughtcrime/securesms/RecipientPreferenceActivity.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java b/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
index de1b227088..023159b71b 100644
--- a/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
+++ b/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
@@ -443,7 +443,11 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
 
     @Override
     public void onModified(final Recipient recipient) {
-      Util.runOnMain(() -> setSummaries(recipient));
+      Util.runOnMain(() -> {
+        if (getContext() != null && getActivity() != null && !getActivity().isFinishing()) {
+          setSummaries(recipient);
+        }
+      });
     }
 
     private class RingtoneChangeListener implements Preference.OnPreferenceChangeListener {