From e9ab77bcdcd445f8dbd4a0c263491612bbd5061d Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Tue, 7 Dec 2021 18:44:51 -0500
Subject: [PATCH] bug fixes

---
 .../autopsy/mainui/datamodel/ViewsDAO.java    | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/mainui/datamodel/ViewsDAO.java b/Core/src/org/sleuthkit/autopsy/mainui/datamodel/ViewsDAO.java
index 75b9d3b18b..87474a9187 100644
--- a/Core/src/org/sleuthkit/autopsy/mainui/datamodel/ViewsDAO.java
+++ b/Core/src/org/sleuthkit/autopsy/mainui/datamodel/ViewsDAO.java
@@ -554,12 +554,7 @@ public class ViewsDAO extends AbstractDAO {
                     if (resultSet.next()) {
                         for (DeletedContentFilter filter : DeletedContentFilter.values()) {
                             long count = resultSet.getLong(filter.name());
-                            treeList.add(new TreeItemDTO<>(
-                                    "DELETED_CONTENT",
-                                    new DeletedContentSearchParams(filter, dataSourceId),
-                                    filter,
-                                    filter.getDisplayName(),
-                                    TreeDisplayCount.getDeterminate(count)));
+                            treeList.add(createDeletedContentTreeItem(filter, dataSourceId, TreeDisplayCount.getDeterminate(count)));
                         }
                     }
                 } catch (SQLException ex) {
@@ -573,6 +568,15 @@ public class ViewsDAO extends AbstractDAO {
         }
     }
 
+    private static TreeItemDTO<DeletedContentSearchParams> createDeletedContentTreeItem(DeletedContentFilter filter, Long dataSourceId, TreeDisplayCount displayCount) {
+        return new TreeItemDTO<>(
+                "DELETED_CONTENT",
+                new DeletedContentSearchParams(filter, dataSourceId),
+                filter,
+                filter.getDisplayName(),
+                displayCount);
+    }
+
     /**
      * Creates a size tree item.
      *
@@ -900,6 +904,9 @@ public class ViewsDAO extends AbstractDAO {
         } else if (daoEvent instanceof FileTypeSizeEvent) {
             FileTypeSizeEvent sizeEvt = (FileTypeSizeEvent) daoEvent;
             return createSizeTreeItem(sizeEvt.getSizeFilter(), sizeEvt.getDataSourceId(), count);
+        } else if (daoEvent instanceof DeletedContentEvent) {
+            DeletedContentEvent sizeEvt = (DeletedContentEvent) daoEvent;
+            return createDeletedContentTreeItem(sizeEvt.getFilter(), sizeEvt.getDataSourceId(), count);
         } else {
             return null;
         }
@@ -954,7 +961,7 @@ public class ViewsDAO extends AbstractDAO {
                         .findFirst()
                         .orElse(null);
 
-        if (evtExtFilters.isEmpty() && evtMimeType == null && evtFileSize == null) {
+        if (evtExtFilters.isEmpty() && deletedContentFilters.isEmpty() && evtMimeType == null && evtFileSize == null) {
             return Collections.emptySet();
         }
 
@@ -987,7 +994,7 @@ public class ViewsDAO extends AbstractDAO {
                     && (sizeParams.getDataSourceId() == null || Objects.equals(sizeParams.getDataSourceId(), dsId));
         } else if (searchParams instanceof DeletedContentSearchParams) {
             DeletedContentSearchParams deletedParams = (DeletedContentSearchParams) searchParams;
-            return evtExtFilters.contains(deletedParams.getFilter())
+            return deletedContentFilters.contains(deletedParams.getFilter())
                     && (deletedParams.getDataSourceId() == null || Objects.equals(deletedParams.getDataSourceId(), dsId));
         } else {
             return false;