fix onDestroy NPE when views not inflated

Closes #3647
Fixes #3646

// FREEBIE
This commit is contained in:
Jake McGinty 2015-07-13 11:25:10 -07:00 committed by Moxie Marlinspike
parent 0af902b81c
commit 5c3b96a947

View File

@ -29,7 +29,6 @@ import android.graphics.Color;
import android.graphics.PorterDuff;
import android.graphics.PorterDuff.Mode;
import android.graphics.drawable.ColorDrawable;
import android.content.res.Configuration;
import android.graphics.Bitmap;
import android.net.Uri;
import android.os.AsyncTask;
@ -277,7 +276,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
if (recipients != null) recipients.removeListener(this);
if (securityUpdateReceiver != null) unregisterReceiver(securityUpdateReceiver);
if (groupUpdateReceiver != null) unregisterReceiver(groupUpdateReceiver);
hideEmojiPopup(false);
if (isEmojiDrawerOpen()) hideEmojiPopup(false);
super.onDestroy();
}