diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties index 52823aa9f3..283bbc6dc5 100644 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties @@ -9,7 +9,7 @@ Browser.name.SalamWeb=SalamWeb Browser.name.UC.Browser=UC Browser Browser.name.Brave=Brave Browser.name.Google.Chrome=Google Chrome -Chrome.moduleName=Chrome +Chrome.moduleName=Chromium Chrome.getHistory.errMsg.errGettingFiles=Error when trying to get Chrome history files. Chrome.getHistory.errMsg.couldntFindAnyFiles=Could not find any allocated Chrome history files. Chrome.getHistory.errMsg.errAnalyzingFile={0}: Error while trying to analyze file:{1} diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED index 5b5a1ea6e5..af0dbf306b 100755 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED @@ -82,7 +82,7 @@ Browser.name.SalamWeb=SalamWeb Browser.name.UC.Browser=UC Browser Browser.name.Brave=Brave Browser.name.Google.Chrome=Google Chrome -Chrome.moduleName=Chrome +Chrome.moduleName=Chromium Chrome.getHistory.errMsg.errGettingFiles=Error when trying to get Chrome history files. Chrome.getHistory.errMsg.couldntFindAnyFiles=Could not find any allocated Chrome history files. Chrome.getHistory.errMsg.errAnalyzingFile={0}: Error while trying to analyze file:{1} diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chromium.java similarity index 98% rename from RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java rename to RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chromium.java index 38eac6b8ec..51ce1e71c8 100644 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chromium.java @@ -59,9 +59,9 @@ import org.sleuthkit.datamodel.TskData; import org.sleuthkit.datamodel.blackboardutils.WebBrowserArtifactsHelper; /** - * Chrome recent activity extraction + * Chromium recent activity extraction */ -class Chrome extends Extract { +class Chromium extends Extract { private static final String HISTORY_QUERY = "SELECT urls.url, urls.title, urls.visit_count, urls.typed_count, " //NON-NLS + "last_visit_time, urls.hidden, visits.visit_time, (SELECT urls.url FROM urls WHERE urls.id=visits.url) AS from_visit, visits.transition FROM urls, visits WHERE urls.id = visits.url"; //NON-NLS @@ -86,13 +86,13 @@ class Chrome extends Extract { private IngestJobContext context; private static final Map BROWSERS_MAP = ImmutableMap.builder() - .put(NbBundle.getMessage(Chrome.class, "Browser.name.Microsoft.Edge"), "Microsoft/Edge") - .put(NbBundle.getMessage(Chrome.class, "Browser.name.Yandex"), "YandexBrowser") - .put(NbBundle.getMessage(Chrome.class, "Browser.name.Opera"), "Opera Software") - .put(NbBundle.getMessage(Chrome.class, "Browser.name.SalamWeb"), "SalamWeb") - .put(NbBundle.getMessage(Chrome.class, "Browser.name.UC.Browser"), "UCBrowser") - .put(NbBundle.getMessage(Chrome.class, "Browser.name.Brave"), "BraveSoftware") - .put(NbBundle.getMessage(Chrome.class, "Browser.name.Google.Chrome"), "Chrome") + .put(NbBundle.getMessage(Chromium.class, "Browser.name.Microsoft.Edge"), "Microsoft/Edge") + .put(NbBundle.getMessage(Chromium.class, "Browser.name.Yandex"), "YandexBrowser") + .put(NbBundle.getMessage(Chromium.class, "Browser.name.Opera"), "Opera Software") + .put(NbBundle.getMessage(Chromium.class, "Browser.name.SalamWeb"), "SalamWeb") + .put(NbBundle.getMessage(Chromium.class, "Browser.name.UC.Browser"), "UCBrowser") + .put(NbBundle.getMessage(Chromium.class, "Browser.name.Brave"), "BraveSoftware") + .put(NbBundle.getMessage(Chromium.class, "Browser.name.Google.Chrome"), "Chrome") .build(); @@ -107,8 +107,8 @@ class Chrome extends Extract { "Progress_Message_Chrome_Cache=Chrome Cache", }) - Chrome() { - moduleName = NbBundle.getMessage(Chrome.class, "Chrome.moduleName"); + Chromium() { + moduleName = NbBundle.getMessage(Chromium.class, "Chrome.moduleName"); } @Override diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java index e9519abf13..488448d434 100644 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java @@ -70,7 +70,7 @@ public final class RAImageIngestModule implements DataSourceIngestModule { Extract registry = new ExtractRegistry(); Extract recentDocuments = new RecentDocumentsByLnk(); - Extract chrome = new Chrome(); + Extract chrome = new Chromium(); Extract firefox = new Firefox(); Extract SEUQA = new SearchEngineURLQueryAnalyzer(); Extract osExtract = new ExtractOs();