Merge branch 'develop' into 1489-find-missingtb-attachment

Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties

@@ -9,7 +9,6 @@ SummaryViewer.callLogsLabel.text=Call Logs:
 ThreadRootMessagePanel.showAllCheckBox.text=Show All Messages
 ThreadPane.backButton.text=<---
 SummaryViewer.caseReferencesPanel.border.title=Other Occurrences
-SummaryViewer.fileReferencesPanel.border.title=File References in Current Case
 MessageViewer.threadsLabel.text=Select a Thread to View
 MessageViewer.threadNameLabel.text=<threadName>
 MessageViewer.showingMessagesLabel.text=Showing Messages for Thread:
@@ -27,3 +26,5 @@ SummaryViewer.referencesLabel.text=Communication References:
 SummaryViewer.referencesDataLabel.text=<reference count>
 SummaryViewer.contactsLabel.text=Book Entries:
 SummaryViewer.accountCountry.text=<account country>
+SummaryViewer.fileRefPane.border.title=File References in Current Case
+SummaryViewer.selectAccountFileRefLabel.text=<Select a single account to see File References>

Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties-MERGED

@@ -49,13 +49,13 @@ SummaryViewer_CentralRepository_Message=<Enable Central Respository to see Other
 SummaryViewer_Country_Code=Country: 
 SummaryViewer_Creation_Date_Title=Creation Date
 SummaryViewer_Device_Account_Description=This account was referenced by a device in the case.
+SummaryViewer_Fetching_References=<Fetching File References>
 SummaryViewer_FileRef_Message=<Select a single account to see File References>
 SummaryViewer_FileRefNameColumn_Title=Path
 SummaryViewer_TabTitle=Summary
 ThreadRootMessagePanel.showAllCheckBox.text=Show All Messages
 ThreadPane.backButton.text=<---
 SummaryViewer.caseReferencesPanel.border.title=Other Occurrences
-SummaryViewer.fileReferencesPanel.border.title=File References in Current Case
 MessageViewer.threadsLabel.text=Select a Thread to View
 MessageViewer.threadNameLabel.text=<threadName>
 MessageViewer.showingMessagesLabel.text=Showing Messages for Thread:
@@ -73,3 +73,5 @@ SummaryViewer.referencesLabel.text=Communication References:
 SummaryViewer.referencesDataLabel.text=<reference count>
 SummaryViewer.contactsLabel.text=Book Entries:
 SummaryViewer.accountCountry.text=<account country>
+SummaryViewer.fileRefPane.border.title=File Referernce(s) in Current Case
+SummaryViewer.selectAccountFileRefLabel.text=<Select a single account to see File References>

Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle_ja.properties

@@ -49,7 +49,6 @@ SummeryViewer_FileRef_Message=<\u30a2\u30ab\u30a6\u30f3\u30c8\u30921\u3064\u9078
 ThreadRootMessagePanel.showAllCheckBox.text=\u3059\u3079\u3066\u306e\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u8868\u793a
 ThreadPane.backButton.text=<---
 SummaryViewer.caseReferencesPanel.border.title=\u305d\u306e\u4ed6\u306e\u767a\u751f
-SummaryViewer.fileReferencesPanel.border.title=\u73fe\u5728\u306e\u30b1\u30fc\u30b9\u306e\u30d5\u30a1\u30a4\u30eb\u30ec\u30d5\u30a1\u30ec\u30f3\u30b9
 MessageViewer.threadsLabel.text=\u30b9\u30ec\u30c3\u30c9\u3092\u9078\u629e\u3057\u3066\u8868\u793a
 MessageViewer.threadNameLabel.text=<threadName>
 MessageViewer.showingMessagesLabel.text=\u6b21\u306e\u30b9\u30ec\u30c3\u30c9\u306e\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u8868\u793a\u4e2d\u3067\u3059:

Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.form

@@ -253,22 +253,6 @@
         </Component>
       </SubComponents>
     </Container>
-    <Component class="org.sleuthkit.autopsy.communications.relationships.OutlineViewPanel" name="fileReferencesPanel">
-      <Properties>
-        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
-          <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
-            <TitledBorder title="File References in Current Case">
-              <ResourceString PropertyName="titleX" bundle="org/sleuthkit/autopsy/communications/relationships/Bundle.properties" key="SummaryViewer.fileReferencesPanel.border.title" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-            </TitledBorder>
-          </Border>
-        </Property>
-      </Properties>
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-          <GridBagConstraints gridX="0" gridY="3" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="9" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="18" weightX="1.0" weightY="1.0"/>
-        </Constraint>
-      </Constraints>
-    </Component>
     <Component class="org.sleuthkit.autopsy.communications.relationships.OutlineViewPanel" name="caseReferencesPanel">
       <Properties>
         <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
@@ -285,5 +269,99 @@
         </Constraint>
       </Constraints>
     </Component>
+    <Container class="javax.swing.JPanel" name="fileRefPane">
+      <Properties>
+        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+          <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
+            <TitledBorder title="File References in Current Case">
+              <ResourceString PropertyName="titleX" bundle="org/sleuthkit/autopsy/communications/relationships/Bundle.properties" key="SummaryViewer.fileRefPane.border.title" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </TitledBorder>
+          </Border>
+        </Property>
+      </Properties>
+      <Constraints>
+        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+          <GridBagConstraints gridX="0" gridY="3" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="18" weightX="0.0" weightY="1.0"/>
+        </Constraint>
+      </Constraints>
+
+      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignCardLayout"/>
+      <SubComponents>
+        <Container class="javax.swing.JPanel" name="fileRefScrolPanel">
+          <AuxValues>
+            <AuxValue name="JavaCodeGenerator_VariableLocal" type="java.lang.Boolean" value="true"/>
+            <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
+          </AuxValues>
+          <Constraints>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignCardLayout" value="org.netbeans.modules.form.compat2.layouts.DesignCardLayout$CardConstraintsDescription">
+              <CardConstraints cardName="listPanelCard"/>
+            </Constraint>
+          </Constraints>
+
+          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
+          <SubComponents>
+            <Container class="javax.swing.JScrollPane" name="scrollPane">
+              <AuxValues>
+                <AuxValue name="JavaCodeGenerator_VariableLocal" type="java.lang.Boolean" value="true"/>
+                <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
+              </AuxValues>
+              <Constraints>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+                  <BorderConstraints direction="Center"/>
+                </Constraint>
+              </Constraints>
+
+              <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
+              <SubComponents>
+                <Component class="javax.swing.JList" name="fileRefList">
+                  <Properties>
+                    <Property name="model" type="javax.swing.ListModel" editor="org.netbeans.modules.form.editors2.ListModelEditor">
+                      <StringArray count="5">
+                        <StringItem index="0" value="Item 1"/>
+                        <StringItem index="1" value="Item 2"/>
+                        <StringItem index="2" value="Item 3"/>
+                        <StringItem index="3" value="Item 4"/>
+                        <StringItem index="4" value="Item 5"/>
+                      </StringArray>
+                    </Property>
+                  </Properties>
+                  <AuxValues>
+                    <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;String&gt;"/>
+                  </AuxValues>
+                </Component>
+              </SubComponents>
+            </Container>
+          </SubComponents>
+        </Container>
+        <Container class="javax.swing.JPanel" name="selectAccountPane">
+          <AuxValues>
+            <AuxValue name="JavaCodeGenerator_VariableLocal" type="java.lang.Boolean" value="true"/>
+            <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
+          </AuxValues>
+          <Constraints>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignCardLayout" value="org.netbeans.modules.form.compat2.layouts.DesignCardLayout$CardConstraintsDescription">
+              <CardConstraints cardName="selectAccountCard"/>
+            </Constraint>
+          </Constraints>
+
+          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
+          <SubComponents>
+            <Component class="javax.swing.JLabel" name="selectAccountFileRefLabel">
+              <Properties>
+                <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+                  <ResourceString bundle="org/sleuthkit/autopsy/communications/relationships/Bundle.properties" key="SummaryViewer.selectAccountFileRefLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                </Property>
+                <Property name="enabled" type="boolean" value="false"/>
+              </Properties>
+              <Constraints>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+                  <GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
+                </Constraint>
+              </Constraints>
+            </Component>
+          </SubComponents>
+        </Container>
+      </SubComponents>
+    </Container>
   </SubComponents>
 </Form>

Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.java

@@ -18,8 +18,14 @@
  */
 package org.sleuthkit.autopsy.communications.relationships;
 
-import java.util.Set;
+import java.awt.CardLayout;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.logging.Level;
+import javax.swing.DefaultListModel;
 import javax.swing.JPanel;
+import javax.swing.SwingWorker;
 import org.netbeans.swing.outline.DefaultOutlineModel;
 import org.netbeans.swing.outline.Outline;
 import org.openide.explorer.view.OutlineView;
@@ -27,8 +33,11 @@ import org.openide.nodes.AbstractNode;
 import org.openide.nodes.Children;
 import org.openide.util.Lookup;
 import org.openide.util.NbBundle.Messages;
+import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.datamodel.Account;
 import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepository;
+import org.sleuthkit.autopsy.coreutils.Logger;
+import org.sleuthkit.datamodel.AccountFileInstance;
 
 /**
  * Account Summary View Panel. This panel shows a list of various counts related
@@ -39,6 +48,9 @@ import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepository;
 public class SummaryViewer extends javax.swing.JPanel implements RelationshipsViewer {
 
     private final Lookup lookup;
+    private final DefaultListModel<String> fileRefListModel;
+
+    private static final Logger logger = Logger.getLogger(SummaryViewer.class.getName());
 
     @Messages({
         "SummaryViewer_TabTitle=Summary",
@@ -60,14 +72,11 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi
         lookup = Lookup.getDefault();
         initComponents();
 
-        OutlineView outlineView = fileReferencesPanel.getOutlineView();
+        fileRefListModel = new DefaultListModel<>();
+        fileRefList.setModel(fileRefListModel);
+
+        OutlineView outlineView = caseReferencesPanel.getOutlineView();
         Outline outline = outlineView.getOutline();
-
-        outline.setRootVisible(false);
-        ((DefaultOutlineModel) outline.getOutlineModel()).setNodesColumnLabel(Bundle.SummaryViewer_FileRefNameColumn_Title());
-
-        outlineView = caseReferencesPanel.getOutlineView();
-        outline = outlineView.getOutline();
         outlineView.setPropertyColumns("creationDate", Bundle.SummaryViewer_Creation_Date_Title()); //NON-NLS
 
         outline.setRootVisible(false);
@@ -76,7 +85,6 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi
         clearControls();
 
         caseReferencesPanel.hideOutlineView(Bundle.SummaryViewer_CentralRepository_Message());
-        fileReferencesPanel.hideOutlineView(Bundle.SummaryViewer_FileRef_Message());
     }
 
     @Override
@@ -98,19 +106,24 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi
             caseReferencesPanel.showOutlineView();
         }
 
+        CardLayout cardLayout = (CardLayout) fileRefPane.getLayout();
+        cardLayout.show(fileRefPane, "selectAccountCard");
+
+        fileRefListModel.removeAllElements();
+
         // Request is that the SummaryViewer only show information if one
         // account is selected
-        if (info.getAccounts().size() != 1) {
+        if (info == null || info.getAccounts().size() != 1) {
             setEnabled(false);
             clearControls();
-            
-            accoutDescriptionLabel.setText(Bundle.SummaryViewer_Account_Description_MuliSelect());
 
-            fileReferencesPanel.hideOutlineView(Bundle.SummaryViewer_FileRef_Message());
+            accoutDescriptionLabel.setText(Bundle.SummaryViewer_Account_Description_MuliSelect());
+            selectAccountFileRefLabel.setText(Bundle.SummaryViewer_FileRef_Message());
+
         } else {
             Account[] accountArray = info.getAccounts().toArray(new Account[1]);
             Account account = accountArray[0];
-            
+
             if (account.getAccountType().getTypeName().contains("PHONE")) {
                 String countryCode = PhoneNumUtil.getCountryCode(account.getTypeSpecificID());
                 accountLabel.setText(PhoneNumUtil.convertToInternational(account.getTypeSpecificID()));
@@ -121,13 +134,13 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi
                 accountCountry.setText("");
                 accountCountry.setEnabled(false);
             }
-            
+
             if (account.getAccountType().equals(Account.Type.DEVICE)) {
                 accoutDescriptionLabel.setText(Bundle.SummaryViewer_Account_Description());
             } else {
                 accoutDescriptionLabel.setText(Bundle.SummaryViewer_Device_Account_Description());
             }
-            
+
             AccountSummary summaryDetails = new AccountSummary(account, info.getArtifacts());
 
             thumbnailsDataLabel.setText(Integer.toString(summaryDetails.getThumbnailCnt()));
@@ -138,11 +151,10 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi
             referencesDataLabel.setText(Integer.toString(summaryDetails.getReferenceCnt()));
             contactsDataLabel.setText(Integer.toString(summaryDetails.getContactsCnt()));
 
-            fileReferencesPanel.showOutlineView();
-
-            fileReferencesPanel.setNode(new AbstractNode(Children.create(new AccountSourceContentChildNodeFactory(info.getAccounts()), true)));
             caseReferencesPanel.setNode(new AbstractNode(Children.create(new CorrelationCaseChildNodeFactory(info.getAccounts()), true)));
 
+            updateFileReferences(account);
+
             setEnabled(true);
         }
     }
@@ -165,7 +177,7 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi
         contactsLabel.setEnabled(enabled);
         messagesLabel.setEnabled(enabled);
         caseReferencesPanel.setEnabled(enabled);
-        fileReferencesPanel.setEnabled(enabled);
+        fileRefList.setEnabled(enabled);
         countsPanel.setEnabled(enabled);
         attachmentsLabel.setEnabled(enabled);
         referencesLabel.setEnabled(enabled);
@@ -184,29 +196,46 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi
         accoutDescriptionLabel.setText("");
         referencesDataLabel.setText("");
         accountCountry.setText("");
-        
-        fileReferencesPanel.setNode(new AbstractNode(Children.LEAF));
+
+        fileRefListModel.clear();
         caseReferencesPanel.setNode(new AbstractNode(Children.LEAF));
     }
 
-    /**
-     * For the given accounts create a comma separated string of all of the
-     * names (TypeSpecificID).
-     *
-     * @param accounts Set of selected accounts
-     *
-     * @return String listing the account names
-     */
-    private String createAccountLabel(Set<Account> accounts) {
-        StringBuilder buffer = new StringBuilder();
-        accounts.stream().map((account) -> {
-            buffer.append(account.getTypeSpecificID());
-            return account;
-        }).forEachOrdered((_item) -> {
-            buffer.append(", ");
-        });
+    @Messages({
+        "SummaryViewer_Fetching_References=<Fetching File References>"
+    })
+    private void updateFileReferences(final Account account) {
+        SwingWorker<List<String>, Void> worker = new SwingWorker<List<String>, Void>() {
+            @Override
+            protected List<String> doInBackground() throws Exception {
+                List<String> stringList = new ArrayList<>();
+                List<AccountFileInstance> accountFileInstanceList = Case.getCurrentCase().getSleuthkitCase().getCommunicationsManager().getAccountFileInstances(account);
+                for (AccountFileInstance instance : accountFileInstanceList) {
+                    stringList.add(instance.getFile().getUniquePath());
+                }
+                return stringList;
+            }
 
-        return buffer.toString().substring(0, buffer.length() - 2);
+            @Override
+            protected void done() {
+                try {
+                    List<String> fileRefList = get();
+
+                    fileRefList.forEach(value -> {
+                        fileRefListModel.addElement(value);
+                    });
+
+                    CardLayout cardLayout = (CardLayout) fileRefPane.getLayout();
+                    cardLayout.show(fileRefPane, "listPanelCard");
+
+                } catch (InterruptedException | ExecutionException ex) {
+                    logger.log(Level.WARNING, String.format(("Failed to get file references for account: %d"), account.getAccountID()), ex);
+                }
+            }
+        };
+
+        selectAccountFileRefLabel.setText(Bundle.SummaryViewer_Fetching_References());
+        worker.execute();
     }
 
     /**
@@ -237,8 +266,13 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi
         contactsDataLabel = new javax.swing.JLabel();
         referencesLabel = new javax.swing.JLabel();
         referencesDataLabel = new javax.swing.JLabel();
-        fileReferencesPanel = new org.sleuthkit.autopsy.communications.relationships.OutlineViewPanel();
         caseReferencesPanel = new org.sleuthkit.autopsy.communications.relationships.OutlineViewPanel();
+        fileRefPane = new javax.swing.JPanel();
+        javax.swing.JPanel fileRefScrolPanel = new javax.swing.JPanel();
+        javax.swing.JScrollPane scrollPane = new javax.swing.JScrollPane();
+        fileRefList = new javax.swing.JList<>();
+        javax.swing.JPanel selectAccountPane = new javax.swing.JPanel();
+        selectAccountFileRefLabel = new javax.swing.JLabel();
 
         setLayout(new java.awt.GridBagLayout());
 
@@ -393,17 +427,6 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi
         gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
         add(contanctsPanel, gridBagConstraints);
 
-        fileReferencesPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.fileReferencesPanel.border.title"))); // NOI18N
-        gridBagConstraints = new java.awt.GridBagConstraints();
-        gridBagConstraints.gridx = 0;
-        gridBagConstraints.gridy = 3;
-        gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
-        gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
-        gridBagConstraints.weightx = 1.0;
-        gridBagConstraints.weighty = 1.0;
-        gridBagConstraints.insets = new java.awt.Insets(9, 0, 0, 0);
-        add(fileReferencesPanel, gridBagConstraints);
-
         caseReferencesPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.caseReferencesPanel.border.title"))); // NOI18N
         gridBagConstraints = new java.awt.GridBagConstraints();
         gridBagConstraints.gridx = 0;
@@ -414,6 +437,38 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi
         gridBagConstraints.weighty = 1.0;
         gridBagConstraints.insets = new java.awt.Insets(9, 0, 0, 0);
         add(caseReferencesPanel, gridBagConstraints);
+
+        fileRefPane.setBorder(javax.swing.BorderFactory.createTitledBorder(org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.fileRefPane.border.title"))); // NOI18N
+        fileRefPane.setLayout(new java.awt.CardLayout());
+
+        fileRefScrolPanel.setLayout(new java.awt.BorderLayout());
+
+        fileRefList.setModel(new javax.swing.AbstractListModel<String>() {
+            String[] strings = { "Item 1", "Item 2", "Item 3", "Item 4", "Item 5" };
+            public int getSize() { return strings.length; }
+            public String getElementAt(int i) { return strings[i]; }
+        });
+        scrollPane.setViewportView(fileRefList);
+
+        fileRefScrolPanel.add(scrollPane, java.awt.BorderLayout.CENTER);
+
+        fileRefPane.add(fileRefScrolPanel, "listPanelCard");
+
+        selectAccountPane.setLayout(new java.awt.GridBagLayout());
+
+        org.openide.awt.Mnemonics.setLocalizedText(selectAccountFileRefLabel, org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.selectAccountFileRefLabel.text")); // NOI18N
+        selectAccountFileRefLabel.setEnabled(false);
+        selectAccountPane.add(selectAccountFileRefLabel, new java.awt.GridBagConstraints());
+
+        fileRefPane.add(selectAccountPane, "selectAccountCard");
+
+        gridBagConstraints = new java.awt.GridBagConstraints();
+        gridBagConstraints.gridx = 0;
+        gridBagConstraints.gridy = 3;
+        gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
+        gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
+        gridBagConstraints.weighty = 1.0;
+        add(fileRefPane, gridBagConstraints);
     }// </editor-fold>//GEN-END:initComponents
 
 
@@ -430,11 +485,13 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi
     private javax.swing.JLabel contactsLabel;
     private javax.swing.JPanel contanctsPanel;
     private javax.swing.JPanel countsPanel;
-    private org.sleuthkit.autopsy.communications.relationships.OutlineViewPanel fileReferencesPanel;
+    private javax.swing.JList<String> fileRefList;
+    private javax.swing.JPanel fileRefPane;
     private javax.swing.JLabel messagesDataLabel;
     private javax.swing.JLabel messagesLabel;
     private javax.swing.JLabel referencesDataLabel;
     private javax.swing.JLabel referencesLabel;
+    private javax.swing.JLabel selectAccountFileRefLabel;
     private javax.swing.JPanel summaryPanel;
     private javax.swing.JLabel thumbnailCntLabel;
     private javax.swing.JLabel thumbnailsDataLabel;

Core/src/org/sleuthkit/autopsy/coreutils/textutils/EncodingUtils.java

@@ -87,12 +87,28 @@ public class EncodingUtils {
         try (InputStream stream = new BufferedInputStream(new ReadContentInputStream(file))) {
             CharsetDetector detector = new CharsetDetector();
             detector.setText(stream);
-            CharsetMatch tikaResult = detector.detect();
-            if (tikaResult != null && tikaResult.getConfidence() >= MIN_CHARSETDETECT_MATCH_CONFIDENCE) {
-                String tikaCharSet = tikaResult.getName();
-                //Check if the nio package has support for the charset determined by Tika.
-                if(Charset.isSupported(tikaCharSet)) {
-                    return Charset.forName(tikaCharSet);
+            
+            CharsetMatch[] tikaResults = detector.detectAll();
+            // Get all guesses by Tika. These matches are ordered
+            // by descending confidence (largest first).
+            if (tikaResults.length > 0) {
+                CharsetMatch topPick = tikaResults[0];
+                
+                if (topPick.getName().equalsIgnoreCase("IBM500") && tikaResults.length > 1) {
+                    // Legacy encoding, let's discard this one in favor
+                    // of the second pick. Tika has some problems with 
+                    // mistakenly identifying text as IBM500. See JIRA-6600 
+                    // and https://issues.apache.org/jira/browse/TIKA-2771 for 
+                    // more details.
+                    topPick = tikaResults[1];
+                }
+                
+                if (!topPick.getName().equalsIgnoreCase("IBM500") && 
+                        topPick.getConfidence() >= MIN_CHARSETDETECT_MATCH_CONFIDENCE &&
+                        Charset.isSupported(topPick.getName())) {
+                    // Choose this charset since it's supported and has high 
+                    // enough confidence
+                    return Charset.forName(topPick.getName());
                 }
             }
         }

docs/doxygen-user/main.dox

@@ -71,6 +71,7 @@ The following topics are available here:
  - \subpage communications_page
  - \subpage geolocation_page
  - \subpage discovery_page
+ - \subpage personas_page
 
 - Reporting
  - \subpage tagging_page

docs/doxygen-user/personas.dox

@@ -0,0 +1,107 @@
+/*! \page personas_page Personas
+
+\section personas_overview Overview
+
+Autopsy can store and organize account information based on personas, which represent an online identity. A person may have several online identities and therefore several personas. As an example, a single person may have a set of accounts that post online about loving cats and another set of accounts that appear unrelated that post about hating cats.
+
+\section personas_concepts Concepts
+
+Here are some basic concepts about persona:
+<ul>
+<li>To make a persona, you need to have a name and at least one account.
+<li>A persona may have multiple accounts - a phone number, an email, a Facebook account, a Skype account, etc.
+<li>Personas span cases and therefore are stored in the \ref central_repo_page "Central Repository".
+<li>You can manually create a persona or make one based on a contact book entry, or a call log, or a message.
+<li>An account may be part of multiple personas. This can happen if someone uses the same cell phone as a recovery number for accounts on multiple personas.
+<li>A persona may have additional metadata associated with it as name/value pairs.
+<li>A persona may have one or more aliases.
+<li>Autopsy will show you if an account is part of a persona, where applicable.
+</ul>
+
+Personas are stored in the Central Repository based on accounts that were found in results. These results are generated by various ingest modules such as the \ref recent_activity_page and \ref android_analyzer_page.
+
+Autopsy provides a dedicated tool, \ref personas_editor "Personas Editor", to create, view,  edit, and delete personas.
+
+\section personas_editor Personas Editor
+
+The Personas Editor is loaded through the Tools -> Personas menu item.
+
+The left panel in the Personas Editor is a table that lists personas, based on the selected criteria.  The right panel displays the details of selected persona. 
+ 
+By default, when the Personas Editor is launched, all the personas in the Central Repository are listed in the table. You may filter this list by checking the "Filter personas by Keyword" checkbox.  Type in either a persona name or an account identifier in the textbox and select the "Name" or "Account" radio button appropriately.  Then click the "Show" button to show only the personas that match the filtering criteria.
+
+\image html Personas/personas_main.png
+
+\subsection personas_create Create Personas
+
+To create a new persona, click the "New Persona" button.  A "Create Persona" dialog box will pop up. The following is a description of each field:
+
+<ul>
+<li><b>Created by</b>: Will be automatically filled in with the current user
+<li><b>Created on</b>: Will be automatically filled in after saving the persona
+<li><b>Comment</b>: A description of the persona
+<li><b>Name</b>: The name of the persona
+<li><b>Accounts</b>: At least one account belonging to the persona
+<li><b>Metadata</b>: (Optional) Name/value pairs of data related to the persona
+<li><b>Aliases</b>: (Optional) Any aliases for this persona
+<li><b>Cases found in</b>: Will be automatically filled in when editing a persona
+</ul>
+
+Each persona needs at least one account associated with it. These accounts must have been previously saved to the \ref central_repo_page "central repository". Clicking "Add" under "Accounts" will bring up another dialog with four fields, all required:
+
+<ul>
+<li><b>Identifier</b>: The identifier for the account (phone number, email address, Facebook account id, etc)
+<li><b>Type</b>: The type of identifier
+<li><b>Confidence</b>: General confidence that this account goes with the given persona
+<li><b>Justification</b>: Why this account is being added to the persona
+</ul>
+
+\image html Personas/personas_create.png
+
+When finished adding at least one account and filling in the required fields, click on OK to create the persona.  A persona with the specified name will be created and associated with the specified account(s).
+
+\subsection personas_edit Edit Personas
+
+To edit a persona, click the "Edit Persona" button. You'll be able to edit all the data about the persona.
+
+\image html Personas/persona_edit.png
+
+\subsection personas_delete Delete Personas
+
+To delete a persona, select the persona in the table and click on the "Delete Persona" button.   Click "Yes" on confirmation dialog to delete the selected persona.
+
+\subsection personas_account_create Create Account
+
+All personas must be associated with at least one account. Normally these account will be added to the central repository by various ingest modules, but you can also create them manually with the "Create Account" button.
+
+\image html Personas/personas_create_account.png
+
+\section personas_artifact_viewers Persona integration in Content Viewers
+
+Autopsy shows persona associated with accounts, where applicable. When viewing contact, call log and message results, Autopsy shows the personas associated with accounts in these panels. If no persona exists for an account, Autopsy provides a button for the user to create one.
+ 
+As shown below, when viewing a contact result you may see persona data. When one or more personas are found associated with the accounts in the result then the Persona name is shown in the contact content viewer. There will be a "View" button to see the details of the persona.
+
+\image html Personas/personas_contact_found.png
+
+If no matching persona is found, a "Create" button is shown to create a persona for the account(s). This will bring you to the \ref personas_create "Create Personas" panel with the account(s) already added.
+
+\image html Personas/personas_contact_not_found.png
+
+Personas are integrated similarly in the content viewers for call logs and messages/e-mail.
+
+\image html Personas/personas_calllog.png
+<br>
+\image html Personas/personas_message.png
+
+\section personas_cvt Persona Integration in the Communications Visualization Tool
+
+Personas are integrated with the \ref communications_page.  When viewing accounts in the Accounts browsers in the Communications Visualization Tool, associated persona information is shown in the tooltip if you hover over the account.
+
+\image html Personas/personas_cvt_hover.png
+
+As in the Autopsy main window, you may also create or view personas when examining contacts, call logs, and messages in the Communications Visualization Tool.
+
+\image html Personas/personas_cvt_accounts.png
+
+*/