From f6d24a421d8be6ebf3b67e0524851855d75eb951 Mon Sep 17 00:00:00 2001
From: Mark McKinnon <mark.mckinnon@davenport.edu>
Date: Wed, 25 Sep 2019 14:16:51 -0400
Subject: [PATCH] Open portable case after decompression

Open a portable case after it is decompressed.
---
 .../org/sleuthkit/autopsy/casemodule/Bundle.properties-MERGED | 2 +-
 .../autopsy/casemodule/UnpackagePortableCaseAction.java       | 4 ++--
 .../casemodule/UnpackagePortableCaseProgressDialog.java       | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties-MERGED
index 594b458990..6d5111fd91 100755
--- a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties-MERGED
@@ -117,7 +117,7 @@ CTL_CaseNewAction=New Case
 CTL_CaseDetailsAction=Case Details
 CTL_CaseDeleteAction=Delete Case
 CTL_CaseOpenAction=Open Case
-CTL_UnpackagePortableCaseAction=Unpackage Portable Case
+CTL_UnpackagePortableCaseAction=Unpackage and Open Portable Case
 EditOptionalCasePropertiesPanel.cancelButton.text=Cancel
 EditOptionalCasePropertiesPanel.saveButton.text=Save
 GeneralFilter.encaseImageDesc.text=Encase Images (*.e01)
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/UnpackagePortableCaseAction.java b/Core/src/org/sleuthkit/autopsy/casemodule/UnpackagePortableCaseAction.java
index c17a6ba5c9..c2ca8ead96 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/UnpackagePortableCaseAction.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/UnpackagePortableCaseAction.java
@@ -29,10 +29,10 @@ import org.openide.windows.WindowManager;
 
 @ActionID(category = "Case", id = "org.sleuthkit.autopsy.casemodule.UnpackagePortableCaseAction")
 @ActionRegistration(displayName = "#CTL_UnpackagePortableCaseAction", lazy = false)
-@Messages({"CTL_UnpackagePortableCaseAction=Unpackage Portable Case"})
+@Messages({"CTL_UnpackagePortableCaseAction=Unpackage and Open Portable Case"})
 /**
  * Unpackage Portable Case action for the Case menu to allow the user to
- * decompress a portable case.
+ * decompress a portable case and open it.
  */
 public class UnpackagePortableCaseAction extends CallableSystemAction {
 
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/UnpackagePortableCaseProgressDialog.java b/Core/src/org/sleuthkit/autopsy/casemodule/UnpackagePortableCaseProgressDialog.java
index 5f0f318183..fb2f0f6a91 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/UnpackagePortableCaseProgressDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/UnpackagePortableCaseProgressDialog.java
@@ -30,6 +30,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Level;
 import javax.swing.JFrame;
 import javax.swing.SwingWorker;
+import org.apache.commons.io.FilenameUtils;
 import org.openide.modules.InstalledFileLocator;
 import org.openide.util.NbBundle;
 import org.openide.windows.WindowManager;
@@ -189,6 +190,8 @@ class UnpackagePortableCaseProgressDialog extends javax.swing.JDialog implements
                 setDisplayError(Bundle.UnpackageWorker_doInBackground_errorCompressingCase());
                 throw new TskCoreException("Error unpackaging case", ex); // NON-NLS
             }
+            
+            Case.openAsCurrentCase(FilenameUtils.removeExtension(packagedCase) + File.separator + FilenameUtils.getBaseName(packagedCase) + ".aut");
 
             success.set(true);
             return null;