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

Merge pull request #6725 from sleuthkit/release-4.18.0

Browse Source 
Merge release 4.18.0 branch into develop branch
This commit is contained in:
Richard Cordovano 2021-02-11 16:31:29 -05:00 committed by GitHub
commit 2ec498db73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -329,7 +329,6 @@ class AddImageWizardAddingProgressPanel extends ShortcutWizardDescriptorPanel {
final UUID dataSourceId = UUID.randomUUID(); final UUID dataSourceId = UUID.randomUUID();
newContents.clear(); newContents.clear();
cleanupTask = null; cleanupTask = null;
readyToIngest = false;
dsProcessor = dsp; dsProcessor = dsp;
// Add a cleanup task to interrupt the background process if the // Add a cleanup task to interrupt the background process if the
@ -364,6 +363,8 @@ class AddImageWizardAddingProgressPanel extends ShortcutWizardDescriptorPanel {
// Kick off the DSProcessor // Kick off the DSProcessor
if (dsProcessor.supportsIngestStream()) { if (dsProcessor.supportsIngestStream()) {
// Set readyToIngest to false to prevent the wizard from starting ingest a second time.
readyToIngest = false;
dsProcessor.runWithIngestStream(ingestJobSettings, getDSPProgressMonitorImpl(), cbObj); dsProcessor.runWithIngestStream(ingestJobSettings, getDSPProgressMonitorImpl(), cbObj);
} else { } else {
dsProcessor.run(getDSPProgressMonitorImpl(), cbObj); dsProcessor.run(getDSPProgressMonitorImpl(), cbObj);

8
Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/AddNewOrganizationDialog.java
View File

@ -52,8 +52,8 @@ class AddNewOrganizationDialog extends javax.swing.JDialog {
* Creates new form AddNewOrganizationDialog * Creates new form AddNewOrganizationDialog
*/ */
@Messages({"AddNewOrganizationDialog.addNewOrg.msg=Add New Organization"}) @Messages({"AddNewOrganizationDialog.addNewOrg.msg=Add New Organization"})
AddNewOrganizationDialog() { AddNewOrganizationDialog(javax.swing.JDialog parent) {
super((JFrame) WindowManager.getDefault().getMainWindow(), super(parent,
Bundle.AddNewOrganizationDialog_addNewOrg_msg(), Bundle.AddNewOrganizationDialog_addNewOrg_msg(),
true); // NON-NLS true); // NON-NLS
textBoxes = new ArrayList<>(); textBoxes = new ArrayList<>();
@ -67,8 +67,8 @@ class AddNewOrganizationDialog extends javax.swing.JDialog {
} }
// populates the dialog with existing case information to edit // populates the dialog with existing case information to edit
public AddNewOrganizationDialog(CentralRepoOrganization orgToEdit) { public AddNewOrganizationDialog(javax.swing.JDialog parent, CentralRepoOrganization orgToEdit) {
super((JFrame) WindowManager.getDefault().getMainWindow(), super(parent,
Bundle.AddNewOrganizationDialog_addNewOrg_msg(), Bundle.AddNewOrganizationDialog_addNewOrg_msg(),
true); // NON-NLS true); // NON-NLS
organizationToEdit = orgToEdit; organizationToEdit = orgToEdit;

6
Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageOrganizationsDialog.java
View File

@ -376,7 +376,7 @@ public final class ManageOrganizationsDialog extends JDialog {
private void deleteButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_deleteButtonActionPerformed private void deleteButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_deleteButtonActionPerformed
CentralRepoOrganization orgToDelete = organizationList.getSelectedValue(); CentralRepoOrganization orgToDelete = organizationList.getSelectedValue();
if (orgToDelete != null) { if (orgToDelete != null) {
if (JOptionPane.YES_OPTION == JOptionPane.showConfirmDialog(WindowManager.getDefault().getMainWindow(), if (JOptionPane.YES_OPTION == JOptionPane.showConfirmDialog(this,
Bundle.ManageOrganizationsDialog_confirmDeletion_message(), Bundle.ManageOrganizationsDialog_confirmDeletion_message(),
Bundle.ManageOrganizationsDialog_confirmDeletion_title(), Bundle.ManageOrganizationsDialog_confirmDeletion_title(),
JOptionPane.YES_NO_OPTION)) { JOptionPane.YES_NO_OPTION)) {
@ -397,7 +397,7 @@ public final class ManageOrganizationsDialog extends JDialog {
}//GEN-LAST:event_closeButtonActionPerformed }//GEN-LAST:event_closeButtonActionPerformed
private void newButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_newButtonActionPerformed private void newButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_newButtonActionPerformed
AddNewOrganizationDialog dialogO = new AddNewOrganizationDialog(); AddNewOrganizationDialog dialogO = new AddNewOrganizationDialog(this);
if (dialogO.isChanged()) { if (dialogO.isChanged()) {
try { try {
newOrg = dialogO.getNewOrg(); newOrg = dialogO.getNewOrg();
@ -411,7 +411,7 @@ public final class ManageOrganizationsDialog extends JDialog {
private void editButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_editButtonActionPerformed private void editButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_editButtonActionPerformed
CentralRepoOrganization orgToEdit = organizationList.getSelectedValue(); CentralRepoOrganization orgToEdit = organizationList.getSelectedValue();
if (orgToEdit != null) { if (orgToEdit != null) {
AddNewOrganizationDialog dialogO = new AddNewOrganizationDialog(orgToEdit); AddNewOrganizationDialog dialogO = new AddNewOrganizationDialog(this, orgToEdit);
if (dialogO.isChanged()) { if (dialogO.isChanged()) {
try { try {
newOrg = dialogO.getNewOrg(); newOrg = dialogO.getNewOrg();