Skip onNewIntent if activity is finishing

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

Fixes #2971
// FREEBIE
This commit is contained in:
Moxie Marlinspike 2016-01-30 15:33:47 -08:00
parent 4a261bcf68
commit 31224014cc

View File

@ -245,6 +245,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
@Override @Override
protected void onNewIntent(Intent intent) { protected void onNewIntent(Intent intent) {
Log.w(TAG, "onNewIntent()"); Log.w(TAG, "onNewIntent()");
if (isFinishing()) {
Log.w(TAG, "Activity is finishing...");
return;
}
if (!Util.isEmpty(composeText) || attachmentManager.isAttachmentPresent()) { if (!Util.isEmpty(composeText) || attachmentManager.isAttachmentPresent()) {
saveDraft(); saveDraft();