codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-10-05 16:56:16 +00:00
Code Issues Releases Wiki Activity

bug fixes

Browse Source
This commit is contained in:
Greg DiCristofaro
2021-12-07 18:44:51 -05:00
parent dfae506edf
commit e9ab77bcdc
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/src/org/sleuthkit/autopsy/mainui/datamodel/ViewsDAO.java
+15 -8
View File
@@ -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;