finish ConversationActivity on delete of empty thread

Fixes #3086
Closes #3124

// FREEBIE
This commit is contained in:
Rhodey Orbits 2015-05-07 15:39:21 -07:00 committed by Moxie Marlinspike
parent 75edb8c12c
commit b6e241b0dc

View File

@ -504,11 +504,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
if (threadId > 0) { if (threadId > 0) {
DatabaseFactory.getThreadDatabase(ConversationActivity.this).deleteConversation(threadId); DatabaseFactory.getThreadDatabase(ConversationActivity.this).deleteConversation(threadId);
}
composeText.getText().clear(); composeText.getText().clear();
threadId = -1; threadId = -1;
finish(); finish();
} }
}
}); });
builder.setNegativeButton(R.string.no, null); builder.setNegativeButton(R.string.no, null);