TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-27 20:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Skip onNewIntent if activity is finishing

Browse Source 
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
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/org/thoughtcrime/securesms/ConversationActivity.java
View File

@ -246,6 +246,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
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();
attachmentManager.clear(); attachmentManager.clear();