From 31224014ccb4621921103a2de1c03f9129ad46d1 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Sat, 30 Jan 2016 15:33:47 -0800
Subject: [PATCH] Skip onNewIntent if activity is finishing

We didn't call through to onCreate(), so everything isn't setup.

Fixes #2971
// FREEBIE
---
 src/org/thoughtcrime/securesms/ConversationActivity.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index 60eb729299..bfdb3a65be 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -245,6 +245,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   @Override
   protected void onNewIntent(Intent intent) {
     Log.w(TAG, "onNewIntent()");
+    
+    if (isFinishing()) {
+      Log.w(TAG, "Activity is finishing...");
+      return;
+    }
 
     if (!Util.isEmpty(composeText) || attachmentManager.isAttachmentPresent()) {
       saveDraft();