From dddb13f3d6de2913c55a17fbb5c5c333f198b603 Mon Sep 17 00:00:00 2001
From: Kelly Kelly <kelly@basistech.com>
Date: Mon, 26 Jul 2021 11:59:49 -0400
Subject: [PATCH] CVT SummaryViewer - Moved db calls into existing SwingWorker

---
 .../relationships/Bundle.properties-MERGED    |  1 +
 .../relationships/SummaryPanelWorker.java     | 16 ++++--
 .../relationships/SummaryViewer.java          | 55 ++++++++++++-------
 3 files changed, 49 insertions(+), 23 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties-MERGED
index c43740776d..65b267bb12 100755
--- a/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties-MERGED
@@ -59,6 +59,7 @@ SummaryViewer_Device_Account_Description=This account was referenced by a device
 SummaryViewer_Fetching_References=<Fetching File References>
 SummaryViewer_FileRef_Message=<Select a single account to see File References>
 SummaryViewer_FileRefNameColumn_Title=Path
+SummaryViewer_loading_count_message=Loading....
 SummaryViewer_Persona_CR_Message=<Enable Central Repository to view Personas>
 SummaryViewer_Select_account_for_persona=<Select a single account to see Persona(s)>
 SummaryViewer_TabTitle=Summary
diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryPanelWorker.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryPanelWorker.java
index e18f3883d9..02ab84029b 100755
--- a/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryPanelWorker.java
+++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryPanelWorker.java
@@ -43,10 +43,12 @@ class SummaryPanelWorker extends SwingWorker<SummaryPanelWorker.SummaryWorkerRes
     private final static Logger logger = Logger.getLogger(SummaryPanelWorker.class.getName());
     
     private final Account account;
+    private final SelectionInfo selectionInfo;
 
     // Construct a instance
-    SummaryPanelWorker(Account account) {
+    SummaryPanelWorker(SelectionInfo selectionInfo, Account account) {
         this.account = account;
+        this.selectionInfo = selectionInfo;
     }
 
     /**
@@ -89,8 +91,8 @@ class SummaryPanelWorker extends SwingWorker<SummaryPanelWorker.SummaryWorkerRes
                 }
             }
         }
-
-        return new SummaryWorkerResults(stringList, personaList, crAccount);
+        
+        return new SummaryWorkerResults(stringList, personaList, crAccount, new AccountSummary(account, selectionInfo.getArtifacts()));
     }
 
     /**
@@ -102,6 +104,7 @@ class SummaryPanelWorker extends SwingWorker<SummaryPanelWorker.SummaryWorkerRes
         private final List<String> accountFileInstancePaths;
         private final List<Persona> personaList;
         private final CentralRepoAccount centralRepoAccount;
+        private final AccountSummary accountSummary;
 
         /**
          * Constructor.
@@ -112,10 +115,11 @@ class SummaryPanelWorker extends SwingWorker<SummaryPanelWorker.SummaryWorkerRes
          *                                 account, maybe null if CR is not
          *                                 enabled.
          */
-        SummaryWorkerResults(List<String> accountFileInstancePaths, List<Persona> personaList, CentralRepoAccount centralRepoAccount) {
+        SummaryWorkerResults(List<String> accountFileInstancePaths, List<Persona> personaList, CentralRepoAccount centralRepoAccount, AccountSummary accountSummary) {
             this.accountFileInstancePaths = accountFileInstancePaths;
             this.personaList = personaList;
             this.centralRepoAccount = centralRepoAccount;
+            this.accountSummary = accountSummary;
         }
 
         /**
@@ -148,6 +152,10 @@ class SummaryPanelWorker extends SwingWorker<SummaryPanelWorker.SummaryWorkerRes
         CentralRepoAccount getCRAccount() {
             return centralRepoAccount;
         }
+        
+        AccountSummary getAccountSummary() {
+            return accountSummary;
+        }
     }
 
 }
diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.java
index 8ba0e957d3..50b0f484ad 100755
--- a/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.java
+++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.java
@@ -51,6 +51,8 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi
 
     private static final Logger logger = Logger.getLogger(SummaryViewer.class.getName());
 
+    private SummaryPanelWorker worker;
+
     @Messages({
         "SummaryViewer_TabTitle=Summary",
         "SummaryViewer_FileRefNameColumn_Title=Path",
@@ -62,7 +64,8 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi
         "SummaryViewer_Account_Description=This account represents a device in the case.",
         "SummaryViewer_Account_Description_MuliSelect=Summary information is not available when multiple accounts are selected.",
         "SummaryViewer_Country_Code=Country: ",
-        "SummaryViewer_Select_account_for_persona=<Select a single account to see Persona(s)>"
+        "SummaryViewer_Select_account_for_persona=<Select a single account to see Persona(s)>",
+        "SummaryViewer_loading_count_message=Loading...."
     })
 
     /**
@@ -85,8 +88,8 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi
         clearControls();
 
         caseReferencesPanel.hideOutlineView(Bundle.SummaryViewer_CentralRepository_Message());
-        ((SummaryPersonaPane)personaPanel).setMessage(Bundle.SummaryViewer_Select_account_for_persona());
-        ((SummaryPersonaPane)personaPanel).showMessagePanel();
+        ((SummaryPersonaPane) personaPanel).setMessage(Bundle.SummaryViewer_Select_account_for_persona());
+        ((SummaryPersonaPane) personaPanel).showMessagePanel();
     }
 
     @Override
@@ -143,19 +146,17 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi
                 accoutDescriptionLabel.setText(Bundle.SummaryViewer_Device_Account_Description());
             }
 
-            AccountSummary summaryDetails = new AccountSummary(account, info.getArtifacts());
-
-            thumbnailsDataLabel.setText(Integer.toString(summaryDetails.getThumbnailCnt()));
-            callLogsDataLabel.setText(Integer.toString(summaryDetails.getCallLogCnt()));
-            contactsDataLabel.setText(Integer.toString(summaryDetails.getContactsCnt()));
-            messagesDataLabel.setText(Integer.toString(summaryDetails.getMessagesCnt() + summaryDetails.getEmailCnt()));
-            attachmentDataLabel.setText(Integer.toString(summaryDetails.getAttachmentCnt()));
-            referencesDataLabel.setText(Integer.toString(summaryDetails.getReferenceCnt()));
-            contactsDataLabel.setText(Integer.toString(summaryDetails.getContactsCnt()));
+            thumbnailsDataLabel.setText(Bundle.SummaryViewer_loading_count_message());
+            callLogsDataLabel.setText(Bundle.SummaryViewer_loading_count_message());
+            contactsDataLabel.setText(Bundle.SummaryViewer_loading_count_message());
+            messagesDataLabel.setText(Bundle.SummaryViewer_loading_count_message());
+            attachmentDataLabel.setText(Bundle.SummaryViewer_loading_count_message());
+            referencesDataLabel.setText(Bundle.SummaryViewer_loading_count_message());
+            contactsDataLabel.setText(Bundle.SummaryViewer_loading_count_message());
 
             caseReferencesPanel.setNode(new AbstractNode(Children.create(new CorrelationCaseChildNodeFactory(info.getAccounts()), true)));
 
-            updateOtherAccountInfo(account);
+            updateOtherAccountInfo(info, account);
 
             setEnabled(true);
         }
@@ -207,13 +208,21 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi
         "SummaryViewer_Fetching_References=<Fetching File References>",
         "SummaryViewer_Persona_CR_Message=<Enable Central Repository to view Personas>"
     })
-    private void updateOtherAccountInfo(final Account account) {
-        SummaryPanelWorker worker = new SummaryPanelWorker(account) {
+    private void updateOtherAccountInfo(SelectionInfo info, Account account) {
+        if (worker != null) {
+            worker.cancel(true);
+        }
+
+        worker = new SummaryPanelWorker(info, account) {
             @Override
             protected void done() {
+                if (isCancelled()) {
+                    return;
+                }
+
                 try {
                     SummaryPanelWorker.SummaryWorkerResults results = get();
-                    
+
                     List<String> fileRefList = results.getPaths();
 
                     if (fileRefList != null) {
@@ -224,7 +233,7 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi
 
                     CardLayout cardLayout = (CardLayout) fileRefPane.getLayout();
                     cardLayout.show(fileRefPane, "listPanelCard");
-                    
+
                     List<Persona> personaList = results.getPersonaList();
 
                     if (CentralRepository.isEnabled()) {
@@ -234,10 +243,18 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi
                         ((SummaryPersonaPane) personaPanel).showMessagePanel();
                     }
 
- 
+                    AccountSummary summaryDetails = results.getAccountSummary();
+                    thumbnailsDataLabel.setText(Integer.toString(summaryDetails.getThumbnailCnt()));
+                    callLogsDataLabel.setText(Integer.toString(summaryDetails.getCallLogCnt()));
+                    contactsDataLabel.setText(Integer.toString(summaryDetails.getContactsCnt()));
+                    messagesDataLabel.setText(Integer.toString(summaryDetails.getMessagesCnt() + summaryDetails.getEmailCnt()));
+                    attachmentDataLabel.setText(Integer.toString(summaryDetails.getAttachmentCnt()));
+                    referencesDataLabel.setText(Integer.toString(summaryDetails.getReferenceCnt()));
+                    contactsDataLabel.setText(Integer.toString(summaryDetails.getContactsCnt()));
+
                 } catch (InterruptedException | ExecutionException ex) {
                     logger.log(Level.WARNING, String.format(("Failed to get data for account: %d"), account.getAccountID()), ex);
-                } 
+                }
             }
         };