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

Merge pull request #3184 from raman-bt/accounts_relationships

Browse Source 
Updated the CommunicationsManager API usage for getCommunicationsCoun…
This commit is contained in:
Richard Cordovano 2017-11-08 09:39:31 -05:00 committed by GitHub
commit a0b27ae39d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Core/src/org/sleuthkit/autopsy/communications/AccountDetailsNode.java
View File

@ -28,6 +28,7 @@ import org.openide.nodes.Children;
import org.openide.nodes.Node; import org.openide.nodes.Node;
import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.datamodel.Account; import org.sleuthkit.datamodel.Account;
import org.sleuthkit.datamodel.AccountDeviceInstance;
import org.sleuthkit.datamodel.BlackboardArtifact; import org.sleuthkit.datamodel.BlackboardArtifact;
import org.sleuthkit.datamodel.CommunicationsFilter; import org.sleuthkit.datamodel.CommunicationsFilter;
import org.sleuthkit.datamodel.CommunicationsManager; import org.sleuthkit.datamodel.CommunicationsManager;
@ -38,8 +39,8 @@ class AccountDetailsNode extends AbstractNode {
private final static Logger logger = Logger.getLogger(AccountDetailsNode.class.getName()); private final static Logger logger = Logger.getLogger(AccountDetailsNode.class.getName());
private final CommunicationsFilter filter; //TODO: Use this private final CommunicationsFilter filter; //TODO: Use this
AccountDetailsNode(Set<Account> accounts,CommunicationsFilter filter, CommunicationsManager commsManager) { AccountDetailsNode(Set<AccountDeviceInstance> accountDeviceInstances, CommunicationsFilter filter, CommunicationsManager commsManager) {
super(new AccountRelationshipChildren(accounts, commsManager, filter)); super(new AccountRelationshipChildren(accountDeviceInstances, commsManager, filter));
this.filter = filter; this.filter = filter;
} }
@ -48,12 +49,12 @@ class AccountDetailsNode extends AbstractNode {
*/ */
private static class AccountRelationshipChildren extends Children.Keys<BlackboardArtifact> { private static class AccountRelationshipChildren extends Children.Keys<BlackboardArtifact> {
private final Set<Account> accounts; private final Set<AccountDeviceInstance> accountDeviceInstances;
private final CommunicationsManager commsManager; private final CommunicationsManager commsManager;
private final CommunicationsFilter filter;//TODO: Use this private final CommunicationsFilter filter;
private AccountRelationshipChildren(Set<Account> accounts, CommunicationsManager commsManager, CommunicationsFilter filter) { private AccountRelationshipChildren(Set<AccountDeviceInstance> accountDeviceInstances, CommunicationsManager commsManager, CommunicationsFilter filter) {
this.accounts = accounts; this.accountDeviceInstances = accountDeviceInstances;
this.commsManager = commsManager; this.commsManager = commsManager;
this.filter = filter; this.filter = filter;
} }
@ -66,22 +67,15 @@ class AccountDetailsNode extends AbstractNode {
@Override @Override
protected void addNotify() { protected void addNotify() {
Set<BlackboardArtifact> keys = new HashSet<>(); Set<BlackboardArtifact> keys = new HashSet<>();
for (Account account : accounts) {
List<Account> accountsWithRelationship = new ArrayList<>(); try {
try { Set<BlackboardArtifact> communications = commsManager.getCommunications(accountDeviceInstances, filter);
accountsWithRelationship.addAll(commsManager.getAccountsWithRelationship(account)); //TODO: Use filter here keys = new HashSet<>(communications);
} catch (TskCoreException ex) {
logger.log(Level.WARNING, "Error loading with relationships to " + account, ex);
}
accountsWithRelationship.forEach(otherAcount -> {
try {
keys.addAll(commsManager.getRelationships(account, otherAcount)); //TODO:Use filter here
} catch (TskCoreException ex) {
logger.log(Level.WARNING, "Error loading relationships between " + account + " and " + otherAcount, ex);
}
});
} }
catch (TskCoreException ex) {
logger.log(Level.WARNING, "Error loading communications for accounts. ", ex);
}
setKeys(keys); setKeys(keys);
} }
} }

2
Core/src/org/sleuthkit/autopsy/communications/AccountsRootChildren.java
View File

@ -115,7 +115,7 @@ class AccountsRootChildren extends Children.Keys<AccountDeviceInstanceKey> {
} }
long msgCount = 0; long msgCount = 0;
try { try {
msgCount = commsManager.getRelationshipsCount(accountDeviceInstance.getAccount(), filter ); msgCount = commsManager.getCommunicationsCount(accountDeviceInstance, filter );
} catch (TskCoreException ex) { } catch (TskCoreException ex) {
LOGGER.log(Level.WARNING, "Failed to get message count for account", ex); //NON-NLS LOGGER.log(Level.WARNING, "Failed to get message count for account", ex); //NON-NLS
} }

2
Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java
View File

@ -306,7 +306,7 @@ final public class FiltersPanel extends javax.swing.JPanel {
final CommunicationsManager commsManager = Case.getCurrentCase().getSleuthkitCase().getCommunicationsManager(); final CommunicationsManager commsManager = Case.getCurrentCase().getSleuthkitCase().getCommunicationsManager();
List<AccountDeviceInstanceKey> accountDeviceInstanceKeys = List<AccountDeviceInstanceKey> accountDeviceInstanceKeys =
commsManager.getAccountDeviceInstancesWithRelationships(commsFilter) commsManager.getAccountDeviceInstancesWithCommunications(commsFilter)
.stream() .stream()
.map(adi -> new AccountDeviceInstanceKey(adi, commsFilter)) .map(adi -> new AccountDeviceInstanceKey(adi, commsFilter))
.collect(Collectors.toList()); .collect(Collectors.toList());

13
Core/src/org/sleuthkit/autopsy/communications/MessageBrowser.java
View File

@ -31,6 +31,7 @@ import org.sleuthkit.autopsy.corecomponents.TableFilterNode;
import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.directorytree.DataResultFilterNode; import org.sleuthkit.autopsy.directorytree.DataResultFilterNode;
import org.sleuthkit.datamodel.Account; import org.sleuthkit.datamodel.Account;
import org.sleuthkit.datamodel.AccountDeviceInstance;
import org.sleuthkit.datamodel.CommunicationsFilter; import org.sleuthkit.datamodel.CommunicationsFilter;
import org.sleuthkit.datamodel.CommunicationsManager; import org.sleuthkit.datamodel.CommunicationsManager;
@ -71,13 +72,13 @@ final class MessageBrowser extends javax.swing.JPanel implements ExplorerManager
messagesResultPanel.setNode(null); messagesResultPanel.setNode(null);
messagesResultPanel.setPath(""); messagesResultPanel.setPath("");
} else { } else {
Set<Account> accounts = new HashSet<>(); Set<AccountDeviceInstance> accountDeviceInstances = new HashSet<>();
CommunicationsFilter filter = null; CommunicationsFilter filter = null;
CommunicationsManager commsManager = null; CommunicationsManager commsManager = null;
for (Node n : selectedNodes) { for (Node n : selectedNodes) {
if (n instanceof AccountDeviceInstanceNode) { if (n instanceof AccountDeviceInstanceNode) {
final AccountDeviceInstanceNode adiNode = (AccountDeviceInstanceNode) n; final AccountDeviceInstanceNode adiNode = (AccountDeviceInstanceNode) n;
accounts.add(adiNode.getAccountDeviceInstance().getAccount()); accountDeviceInstances.add(adiNode.getAccountDeviceInstance());
if (commsManager == null) { if (commsManager == null) {
commsManager = adiNode.getCommsManager(); commsManager = adiNode.getCommsManager();
} }
@ -92,11 +93,11 @@ final class MessageBrowser extends javax.swing.JPanel implements ExplorerManager
logger.log(Level.WARNING, "Unexpected Node encountered: " + n.toString()); logger.log(Level.WARNING, "Unexpected Node encountered: " + n.toString());
} }
} }
messagesResultPanel.setNode(new TableFilterNode(new DataResultFilterNode(new AccountDetailsNode(accounts, filter, commsManager),internalExplorerManager), true)); messagesResultPanel.setNode(new TableFilterNode(new AccountDetailsNode(accountDeviceInstances, filter, commsManager), true));
if (accounts.size() == 1) { if (accountDeviceInstances.size() == 1) {
messagesResultPanel.setPath(Iterables.getOnlyElement(accounts).getAccountUniqueID()); messagesResultPanel.setPath(Iterables.getOnlyElement(accountDeviceInstances).getAccount().getAccountUniqueID());
} else { } else {
messagesResultPanel.setPath(accounts.size() + " accounts"); messagesResultPanel.setPath(accountDeviceInstances.size() + " accounts");
} }
} }
} }