From 620355db2df0afb30b0f230ecbea32a20eb77c3d Mon Sep 17 00:00:00 2001
From: William Schaefer <wschaefer@basistech.net>
Date: Fri, 22 May 2020 13:09:44 -0400
Subject: [PATCH] 6305 hook up sorting algorithms correctly

---
 .../org/sleuthkit/autopsy/discovery/DiscoveryDialog.form   | 3 ---
 .../org/sleuthkit/autopsy/discovery/DiscoveryDialog.java   | 7 ++++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.form b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.form
index 3212106574..f96d1c6eab 100644
--- a/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.form
+++ b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.form
@@ -6,9 +6,6 @@
     <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
       <Dimension value="[1000, 300]"/>
     </Property>
-    <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-      <Dimension value="[1200, 600]"/>
-    </Property>
   </Properties>
   <SyntheticProperties>
     <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
diff --git a/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.java b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.java
index 80b25db6c7..954c4c8ebd 100644
--- a/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.java
@@ -401,6 +401,7 @@ final class DiscoveryDialog extends javax.swing.JDialog {
         if (tc.isOpened() == false) {
             tc.open();
         }
+
         tc.resetTopComponent();
         List<FileSearchFiltering.FileFilter> filters;
         if (videosButton.isSelected()) {
@@ -413,11 +414,11 @@ final class DiscoveryDialog extends javax.swing.JDialog {
         DiscoveryEventUtils.getDiscoveryEventBus().post(new DiscoveryEventUtils.SearchStartedEvent(fileType));
 
         // Get the grouping attribute and group sorting method
-        FileSearch.AttributeType groupingAttr = FileSearch.GroupingAttributeType.FILE_SIZE.getAttributeType();
-        FileGroup.GroupSortingAlgorithm groupSortAlgorithm = FileGroup.GroupSortingAlgorithm.BY_GROUP_NAME;
+        FileSearch.AttributeType groupingAttr = groupByCombobox.getItemAt(groupByCombobox.getSelectedIndex()).getAttributeType();
+        FileGroup.GroupSortingAlgorithm groupSortAlgorithm = groupSortingComboBox.getItemAt(groupSortingComboBox.getSelectedIndex());
 
         // Get the file sorting method
-        FileSorter.SortingMethod fileSort = FileSorter.SortingMethod.BY_FILE_NAME;
+        FileSorter.SortingMethod fileSort = (FileSorter.SortingMethod) orderByCombobox.getSelectedItem();
         CentralRepository centralRepoDb = null;
         if (CentralRepository.isEnabled()) {
             try {