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

Merge pull request #7068 from sleuthkit/develop

Browse Source 
Merge develop into release-4.19.0
This commit is contained in:
Richard Cordovano 2021-06-24 14:27:19 -04:00 committed by GitHub
commit abe3ee4131
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Core/src/org/sleuthkit/autopsy/datamodel/EmailExtracted.java
View File

@ -314,7 +314,7 @@ public class EmailExtracted implements AutopsyVisitableItem {
}
}
};
private final PropertyChangeListener weakPcl = WeakListeners.propertyChange(pcl, null);
@Override
@ -327,7 +327,7 @@ public class EmailExtracted implements AutopsyVisitableItem {
}
@Override
protected void finalize() throws Throwable{
protected void finalize() throws Throwable {
super.finalize();
IngestManager.getInstance().removeIngestJobEventListener(weakPcl);
IngestManager.getInstance().removeIngestModuleEventListener(weakPcl);
@ -440,6 +440,23 @@ public class EmailExtracted implements AutopsyVisitableItem {
}
}
/**
* Ensures that the key for the parent node and child factory is the same to
* ensure that the BaseChildFactory registered listener node name
* (BaseChildFactory.register and DataResultViewerTable.setNode with event
* registration) is the same as the factory name that will post events from
* BaseChildFactory.post called in BaseChildFactory.makeKeys. See JIRA-7752
* for more details.
*
* @param accountName The account name.
* @param folderName The folder name.
*
* @return The generated key.
*/
private static String getFolderKey(String accountName, String folderName) {
return accountName + "_" + folderName;
}
/**
* Node representing mail folder
*/
@ -450,7 +467,7 @@ public class EmailExtracted implements AutopsyVisitableItem {
public FolderNode(String accountName, String folderName) {
super(Children.create(new MessageFactory(accountName, folderName), true), Lookups.singleton(accountName));
super.setName(folderName);
super.setName(getFolderKey(accountName, folderName));
this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/folder-icon-16.png"); //NON-NLS
this.accountName = accountName;
this.folderName = folderName;
@ -510,7 +527,7 @@ public class EmailExtracted implements AutopsyVisitableItem {
private final String folderName;
private MessageFactory(String accountName, String folderName) {
super(accountName + "_" + folderName);
super(getFolderKey(accountName, folderName));
this.accountName = accountName;
this.folderName = folderName;
emailResults.addObserver(this);