mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-17 18:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

2518 corrected a couple comments to reflect when ingest is actually started now

Browse Source
This commit is contained in:
William Schaefer 2017-04-04 14:30:42 -04:00
parent b56bb8094a
commit 28a706efde
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressPanel.java
View File

@ -236,6 +236,7 @@ class AddImageWizardAddingProgressPanel extends ShortcutWizardDescriptorPanel {
*/ */
@Override @Override
public void readSettings(WizardDescriptor settings) { public void readSettings(WizardDescriptor settings) {
// Start ingest if it hasn't already been started
startIngest(); startIngest();
settings.setOptions(new Object[]{WizardDescriptor.PREVIOUS_OPTION, WizardDescriptor.NEXT_OPTION, WizardDescriptor.FINISH_OPTION, WizardDescriptor.CANCEL_OPTION}); settings.setOptions(new Object[]{WizardDescriptor.PREVIOUS_OPTION, WizardDescriptor.NEXT_OPTION, WizardDescriptor.FINISH_OPTION, WizardDescriptor.CANCEL_OPTION});
if (imgAdded) { if (imgAdded) {

9
Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java
View File

@ -159,10 +159,8 @@ class AddImageWizardIngestConfigPanel extends ShortcutWizardDescriptorPanel {
@Override @Override
public void storeSettings(WizardDescriptor settings) { public void storeSettings(WizardDescriptor settings) {
IngestJobSettings ingestJobSettings = ingestJobSettingsPanel.getSettings(); IngestJobSettings ingestJobSettings = ingestJobSettingsPanel.getSettings();
ingestJobSettings.save(); ingestJobSettings.save();
progressPanel.setIngestJobSettings(ingestJobSettings); //prepare ingest for being started
// Start ingest if it hasn't already been started
progressPanel.setIngestJobSettings(ingestJobSettings); //calls start Ingest
} }
private static void showWarnings(IngestJobSettings ingestJobSettings) { private static void showWarnings(IngestJobSettings ingestJobSettings) {
@ -189,8 +187,7 @@ class AddImageWizardIngestConfigPanel extends ShortcutWizardDescriptorPanel {
} }
//Because this panel kicks off ingest during the wizard we need to //Because this panel kicks off ingest during the wizard we need to
//swap out the ingestJobSettings for the ones of the chosen profile before //swap out the ingestJobSettings for the ones of the chosen profile before
//we start processing
IngestJobSettings ingestJobSettings = new IngestJobSettings(lastProfileUsed); IngestJobSettings ingestJobSettings = new IngestJobSettings(lastProfileUsed);
progressPanel.setIngestJobSettings(ingestJobSettings); //calls start ingest progressPanel.setIngestJobSettings(ingestJobSettings); //prepare ingest for being started
} }
} }