Merged release-4.13.0 and resolved conflicts

This commit is contained in:
U-BASIS\dsmyda
2019-09-20 09:59:31 -04:00
4 changed files with 457 additions and 28 deletions
+2 -1
View File
@@ -48,6 +48,7 @@ import textmessage
import wwfmessage
import imo
import line
import textnow
class AndroidModuleFactory(IngestModuleFactoryAdapter):
@@ -92,7 +93,7 @@ class AndroidIngestModule(DataSourceIngestModule):
analyzers = [contact.ContactAnalyzer(), calllog.CallLogAnalyzer(), textmessage.TextMessageAnalyzer(),
tangomessage.TangoMessageAnalyzer(), wwfmessage.WWFMessageAnalyzer(),
googlemaplocation.GoogleMapLocationAnalyzer(), browserlocation.BrowserLocationAnalyzer(),
cachelocation.CacheLocationAnalyzer(), imo.IMOAnalyzer(), line.LineAnalyzer()]
cachelocation.CacheLocationAnalyzer(), imo.IMOAnalyzer(), line.LineAnalyzer(), textnow.TextNowAnalyzer()]
self.log(Level.INFO, "running " + str(len(analyzers)) + " analyzers")
progressBar.switchToDeterminate(len(analyzers))