From b6e241b0dcbded2fdddb27373c8e442258c8b508 Mon Sep 17 00:00:00 2001
From: Rhodey Orbits <rhodey@anhonesteffort.org>
Date: Thu, 7 May 2015 15:39:21 -0700
Subject: [PATCH] finish ConversationActivity on delete of empty thread

Fixes #3086
Closes #3124

// FREEBIE
---
 src/org/thoughtcrime/securesms/ConversationActivity.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index d656d9ad86..844ca5a450 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -504,10 +504,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       public void onClick(DialogInterface dialog, int which) {
         if (threadId > 0) {
           DatabaseFactory.getThreadDatabase(ConversationActivity.this).deleteConversation(threadId);
-          composeText.getText().clear();
-          threadId = -1;
-          finish();
         }
+        composeText.getText().clear();
+        threadId = -1;
+        finish();
       }
     });