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

Merge remote-tracking branch 'upstream/accounts_relationships' into 867-message-listing

Browse Source
This commit is contained in:
millmanorama 2017-10-27 13:44:04 +02:00
commit 1aaa76efc6
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,6 +37,7 @@ import org.sleuthkit.datamodel.CommunicationsFilter;
import org.sleuthkit.datamodel.CommunicationsManager; import org.sleuthkit.datamodel.CommunicationsManager;
import org.sleuthkit.datamodel.DataSource; import org.sleuthkit.datamodel.DataSource;
import org.sleuthkit.datamodel.DeviceFilter; import org.sleuthkit.datamodel.DeviceFilter;
import org.sleuthkit.datamodel.AccountTypeFilter;
import org.sleuthkit.datamodel.TskCoreException; import org.sleuthkit.datamodel.TskCoreException;
/** /**
@ -302,8 +303,7 @@ final public class FiltersPanel extends javax.swing.JPanel {
CommunicationsFilter commsFilter = new CommunicationsFilter(); CommunicationsFilter commsFilter = new CommunicationsFilter();
commsFilter.addAndFilter(getDevceFilter()); commsFilter.addAndFilter(getDevceFilter());
//TODO: uncomment and correct this one AccountTypeFilter is in place commsFilter.addAndFilter(getAccountTypeFilter());
//commsFilter.addAndFilter(getAccountTypeFilter());
final CommunicationsManager communicationsManager = Case.getCurrentCase().getSleuthkitCase().getCommunicationsManager(); final CommunicationsManager communicationsManager = Case.getCurrentCase().getSleuthkitCase().getCommunicationsManager();
accountDeviceInstances.addAll(communicationsManager.getAccountDeviceInstancesWithRelationships(commsFilter)); accountDeviceInstances.addAll(communicationsManager.getAccountDeviceInstancesWithRelationships(commsFilter));
@ -320,13 +320,13 @@ final public class FiltersPanel extends javax.swing.JPanel {
return deviceFilter; return deviceFilter;
} }
//TODO: uncomment and correct this one AccountTypeFilter is in place private AccountTypeFilter getAccountTypeFilter() {
//private AccountTypeFilter getAccountTypeFilter() { AccountTypeFilter accountTypeFilter = new AccountTypeFilter(accountTypeMap.entrySet().stream()
// AccountTypeFilter accountTypeFilter = new AccountTypeFilter(accountTypeMap.entrySet().stream() .filter(entry -> entry.getValue().isSelected())
// .filter(entry -> entry.getValue().isSelected()) .map(entry -> entry.getKey()).collect(Collectors.toSet()));
// .map(entry -> entry.getKey()).collect(Collectors.toSet())); return accountTypeFilter;
// return accountTypeFilter; }
//}
@ThreadConfined(type = ThreadConfined.ThreadType.AWT) @ThreadConfined(type = ThreadConfined.ThreadType.AWT)
private void setAllTypesSelected(boolean selected) { private void setAllTypesSelected(boolean selected) {
setAllSelected(accountTypeMap, selected); setAllSelected(accountTypeMap, selected);