Addressed PR feedback

app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java

@@ -515,14 +515,6 @@ public class ThreadDatabase extends Database {
     return getConversationList(where);
   }
 
-  /*
-  public Cursor getArchivedConversationList() {
-    String where  = "(" + MESSAGE_COUNT + " != 0 OR " + GroupDatabase.TABLE_NAME + "." + GROUP_ID + " LIKE '" + COMMUNITY_PREFIX + "%') " +
-            "AND " + ARCHIVED + " = 1 ";
-    return getConversationList(where);
-  }
-  */
-
   private Cursor getConversationList(String where) {
     SQLiteDatabase db     = databaseHelper.getReadableDatabase();
     String         query  = createQuery(where, 0);
@@ -752,10 +744,7 @@ public class ThreadDatabase extends Database {
       return true;
     }
 
-    MmsSmsDatabase.Reader reader = null;
-
-    try {
-      reader = mmsSmsDatabase.readerFor(mmsSmsDatabase.getConversationSnippet(threadId));
+    try (MmsSmsDatabase.Reader reader = mmsSmsDatabase.readerFor(mmsSmsDatabase.getConversationSnippet(threadId))) {
       MessageRecord record = null;
       if (reader != null) {
         record = reader.getNext();
@@ -777,7 +766,6 @@ public class ThreadDatabase extends Database {
         return false;
       }
     } finally {
-      if (reader != null) { reader.close(); }
       notifyConversationListListeners();
       notifyConversationListeners(threadId);
     }