From 849a6a7ebf5b3afe6218a007c6e6aed1e8843fcf Mon Sep 17 00:00:00 2001 From: sidheshenator Date: Wed, 18 Mar 2015 14:04:45 -0400 Subject: [PATCH] passed reference of FileManager as an argument --- .../modules/android/AndroidIngestModule.java | 19 +++++++++++-------- .../android/BrowserLocationAnalyzer.java | 3 +-- .../android/CacheLocationAnalyzer.java | 3 +-- .../modules/android/CallLogAnalyzer.java | 3 +-- .../modules/android/ContactAnalyzer.java | 3 +-- .../android/GoogleMapLocationAnalyzer.java | 3 +-- .../modules/android/TangoMessageAnalyzer.java | 3 +-- .../modules/android/TextMessageAnalyzer.java | 3 +-- .../modules/android/WWFMessageAnalyzer.java | 3 +-- 9 files changed, 19 insertions(+), 24 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/modules/android/AndroidIngestModule.java b/Core/src/org/sleuthkit/autopsy/modules/android/AndroidIngestModule.java index 175d9d6a63..4407ad82f2 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/android/AndroidIngestModule.java +++ b/Core/src/org/sleuthkit/autopsy/modules/android/AndroidIngestModule.java @@ -22,6 +22,8 @@ import java.util.ArrayList; import java.util.HashMap; import org.openide.util.NbBundle; +import org.sleuthkit.autopsy.casemodule.Case; +import org.sleuthkit.autopsy.casemodule.services.FileManager; import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.ingest.DataSourceIngestModuleProgress; import org.sleuthkit.autopsy.ingest.IngestModule; @@ -53,9 +55,10 @@ class AndroidIngestModule implements DataSourceIngestModule { ArrayList errors = new ArrayList<>(); progressBar.switchToDeterminate(9); + FileManager fileManager = Case.getCurrentCase().getServices().getFileManager(); try { - ContactAnalyzer.findContacts(dataSource); + ContactAnalyzer.findContacts(dataSource, fileManager); progressBar.progress(1); if (context.dataSourceIngestIsCancelled()) { return IngestModule.ProcessResult.OK; @@ -65,7 +68,7 @@ class AndroidIngestModule implements DataSourceIngestModule { } try { - CallLogAnalyzer.findCallLogs(dataSource); + CallLogAnalyzer.findCallLogs(dataSource, fileManager); progressBar.progress(2); if (context.dataSourceIngestIsCancelled()) { return IngestModule.ProcessResult.OK; @@ -75,7 +78,7 @@ class AndroidIngestModule implements DataSourceIngestModule { } try { - TextMessageAnalyzer.findTexts(dataSource); + TextMessageAnalyzer.findTexts(dataSource, fileManager); progressBar.progress(3); if (context.dataSourceIngestIsCancelled()) { return IngestModule.ProcessResult.OK; @@ -85,7 +88,7 @@ class AndroidIngestModule implements DataSourceIngestModule { } try { - TangoMessageAnalyzer.findTangoMessages(dataSource); + TangoMessageAnalyzer.findTangoMessages(dataSource, fileManager); progressBar.progress(4); if (context.dataSourceIngestIsCancelled()) { return IngestModule.ProcessResult.OK; @@ -95,7 +98,7 @@ class AndroidIngestModule implements DataSourceIngestModule { } try { - WWFMessageAnalyzer.findWWFMessages(dataSource); + WWFMessageAnalyzer.findWWFMessages(dataSource, fileManager); progressBar.progress(5); if (context.dataSourceIngestIsCancelled()) { return IngestModule.ProcessResult.OK; @@ -105,7 +108,7 @@ class AndroidIngestModule implements DataSourceIngestModule { } try { - GoogleMapLocationAnalyzer.findGeoLocations(dataSource); + GoogleMapLocationAnalyzer.findGeoLocations(dataSource, fileManager); progressBar.progress(6); if (context.dataSourceIngestIsCancelled()) { return IngestModule.ProcessResult.OK; @@ -115,7 +118,7 @@ class AndroidIngestModule implements DataSourceIngestModule { } try { - BrowserLocationAnalyzer.findGeoLocations(dataSource); + BrowserLocationAnalyzer.findGeoLocations(dataSource, fileManager); progressBar.progress(7); if (context.dataSourceIngestIsCancelled()) { return IngestModule.ProcessResult.OK; @@ -125,7 +128,7 @@ class AndroidIngestModule implements DataSourceIngestModule { } try { - CacheLocationAnalyzer.findGeoLocations(dataSource); + CacheLocationAnalyzer.findGeoLocations(dataSource, fileManager); progressBar.progress(8); } catch (Exception e) { errors.add("Error getting Cache Locations"); //NON-NLS diff --git a/Core/src/org/sleuthkit/autopsy/modules/android/BrowserLocationAnalyzer.java b/Core/src/org/sleuthkit/autopsy/modules/android/BrowserLocationAnalyzer.java index 38eb17ea6a..4461e955f9 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/android/BrowserLocationAnalyzer.java +++ b/Core/src/org/sleuthkit/autopsy/modules/android/BrowserLocationAnalyzer.java @@ -47,9 +47,8 @@ class BrowserLocationAnalyzer { private static final String moduleName = AndroidModuleFactory.getModuleName(); private static final Logger logger = Logger.getLogger(BrowserLocationAnalyzer.class.getName()); - public static void findGeoLocations(Content dataSource) { + public static void findGeoLocations(Content dataSource, FileManager fileManager) { try { - FileManager fileManager = Case.getCurrentCase().getServices().getFileManager(); List abstractFiles = fileManager.findFiles(dataSource, "CachedGeoposition%.db"); //NON-NLS for (AbstractFile abstractFile : abstractFiles) { diff --git a/Core/src/org/sleuthkit/autopsy/modules/android/CacheLocationAnalyzer.java b/Core/src/org/sleuthkit/autopsy/modules/android/CacheLocationAnalyzer.java index a3e733677c..7eb9d89dfb 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/android/CacheLocationAnalyzer.java +++ b/Core/src/org/sleuthkit/autopsy/modules/android/CacheLocationAnalyzer.java @@ -49,10 +49,9 @@ class CacheLocationAnalyzer { /** * cache.cell stores mobile tower GPS locations and cache.wifi stores GPS and MAC info from Wifi points. */ - public static void findGeoLocations(Content dataSource) { + public static void findGeoLocations(Content dataSource, FileManager fileManager) { try { - FileManager fileManager = Case.getCurrentCase().getServices().getFileManager(); List abstractFiles = fileManager.findFiles(dataSource, "cache.cell"); //NON-NLS abstractFiles.addAll(fileManager.findFiles(dataSource, "cache.wifi")); diff --git a/Core/src/org/sleuthkit/autopsy/modules/android/CallLogAnalyzer.java b/Core/src/org/sleuthkit/autopsy/modules/android/CallLogAnalyzer.java index 9fbb5b6983..189e8d6d51 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/android/CallLogAnalyzer.java +++ b/Core/src/org/sleuthkit/autopsy/modules/android/CallLogAnalyzer.java @@ -54,9 +54,8 @@ class CallLogAnalyzer { /** the names of tables that potentially hold call logs in the dbs */ private static final Iterable tableNames = Arrays.asList("calls", "logs"); //NON-NLS - public static void findCallLogs(Content dataSource) { + public static void findCallLogs(Content dataSource, FileManager fileManager) { try { - FileManager fileManager = Case.getCurrentCase().getServices().getFileManager(); List absFiles = fileManager.findFiles(dataSource, "logs.db"); //NON-NLS absFiles.addAll(fileManager.findFiles(dataSource, "contacts.db")); //NON-NLS absFiles.addAll(fileManager.findFiles(dataSource, "contacts2.db")); //NON-NLS diff --git a/Core/src/org/sleuthkit/autopsy/modules/android/ContactAnalyzer.java b/Core/src/org/sleuthkit/autopsy/modules/android/ContactAnalyzer.java index ca7e473a53..3ad485ad35 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/android/ContactAnalyzer.java +++ b/Core/src/org/sleuthkit/autopsy/modules/android/ContactAnalyzer.java @@ -47,11 +47,10 @@ class ContactAnalyzer { private static final String moduleName = AndroidModuleFactory.getModuleName(); private static final Logger logger = Logger.getLogger(ContactAnalyzer.class.getName()); - public static void findContacts(Content dataSource) { + public static void findContacts(Content dataSource, FileManager fileManager) { List absFiles; try { - FileManager fileManager = Case.getCurrentCase().getServices().getFileManager(); absFiles = fileManager.findFiles(dataSource, "contacts.db"); //NON-NLS absFiles.addAll(fileManager.findFiles(dataSource, "contacts2.db")); //NON-NLS if (absFiles.isEmpty()) { diff --git a/Core/src/org/sleuthkit/autopsy/modules/android/GoogleMapLocationAnalyzer.java b/Core/src/org/sleuthkit/autopsy/modules/android/GoogleMapLocationAnalyzer.java index 08aec2e417..6f980fb6fb 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/android/GoogleMapLocationAnalyzer.java +++ b/Core/src/org/sleuthkit/autopsy/modules/android/GoogleMapLocationAnalyzer.java @@ -47,10 +47,9 @@ class GoogleMapLocationAnalyzer { private static final String moduleName = AndroidModuleFactory.getModuleName(); private static final Logger logger = Logger.getLogger(GoogleMapLocationAnalyzer.class.getName()); - public static void findGeoLocations(Content dataSource) { + public static void findGeoLocations(Content dataSource, FileManager fileManager) { List absFiles; try { - FileManager fileManager = Case.getCurrentCase().getServices().getFileManager(); absFiles = fileManager.findFiles(dataSource, "da_destination_history"); //NON-NLS if (absFiles.isEmpty()) { return; diff --git a/Core/src/org/sleuthkit/autopsy/modules/android/TangoMessageAnalyzer.java b/Core/src/org/sleuthkit/autopsy/modules/android/TangoMessageAnalyzer.java index 6aafecf40d..7a59bd03cb 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/android/TangoMessageAnalyzer.java +++ b/Core/src/org/sleuthkit/autopsy/modules/android/TangoMessageAnalyzer.java @@ -47,10 +47,9 @@ class TangoMessageAnalyzer { private static final String moduleName = AndroidModuleFactory.getModuleName(); private static final Logger logger = Logger.getLogger(TangoMessageAnalyzer.class.getName()); - public static void findTangoMessages(Content dataSource) { + public static void findTangoMessages(Content dataSource, FileManager fileManager) { List absFiles; try { - FileManager fileManager = Case.getCurrentCase().getServices().getFileManager(); absFiles = fileManager.findFiles(dataSource, "tc.db"); //NON-NLS for (AbstractFile abstractFile : absFiles) { try { diff --git a/Core/src/org/sleuthkit/autopsy/modules/android/TextMessageAnalyzer.java b/Core/src/org/sleuthkit/autopsy/modules/android/TextMessageAnalyzer.java index e5291270b1..a3606b59df 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/android/TextMessageAnalyzer.java +++ b/Core/src/org/sleuthkit/autopsy/modules/android/TextMessageAnalyzer.java @@ -47,10 +47,9 @@ class TextMessageAnalyzer { private static final String moduleName = AndroidModuleFactory.getModuleName(); private static final Logger logger = Logger.getLogger(TextMessageAnalyzer.class.getName()); - public static void findTexts(Content dataSource) { + public static void findTexts(Content dataSource, FileManager fileManager) { try { - FileManager fileManager = Case.getCurrentCase().getServices().getFileManager(); List absFiles = fileManager.findFiles(dataSource, "mmssms.db"); //NON-NLS for (AbstractFile abstractFile : absFiles) { try { diff --git a/Core/src/org/sleuthkit/autopsy/modules/android/WWFMessageAnalyzer.java b/Core/src/org/sleuthkit/autopsy/modules/android/WWFMessageAnalyzer.java index a6ab3db748..16238f6458 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/android/WWFMessageAnalyzer.java +++ b/Core/src/org/sleuthkit/autopsy/modules/android/WWFMessageAnalyzer.java @@ -47,10 +47,9 @@ class WWFMessageAnalyzer { private static final String moduleName = AndroidModuleFactory.getModuleName(); private static final Logger logger = Logger.getLogger(WWFMessageAnalyzer.class.getName()); - public static void findWWFMessages(Content dataSource) { + public static void findWWFMessages(Content dataSource, FileManager fileManager) { List absFiles; try { - FileManager fileManager = Case.getCurrentCase().getServices().getFileManager(); absFiles = fileManager.findFiles(dataSource, "WordsFramework"); //NON-NLS for (AbstractFile abstractFile : absFiles) {