From c8c1fbd91deeed6c648909964a72c59e7ffb9da8 Mon Sep 17 00:00:00 2001 From: "U-BASIS\\dsmyda" Date: Thu, 26 Sep 2019 13:51:34 -0400 Subject: [PATCH 1/2] Wrapped data into a Account.Address instance --- InternalPythonModules/android/TskContactsParser.py | 8 +++----- InternalPythonModules/android/line.py | 10 ++++------ InternalPythonModules/android/skype.py | 11 ++++------- InternalPythonModules/android/textnow.py | 13 +++++-------- InternalPythonModules/android/viber.py | 11 ++++------- InternalPythonModules/android/whatsapp.py | 13 +++++-------- 6 files changed, 25 insertions(+), 41 deletions(-) diff --git a/InternalPythonModules/android/TskContactsParser.py b/InternalPythonModules/android/TskContactsParser.py index 122e6a9445..9f1d4d293e 100644 --- a/InternalPythonModules/android/TskContactsParser.py +++ b/InternalPythonModules/android/TskContactsParser.py @@ -29,12 +29,10 @@ class TskContactsParser(ResultSetIterator): def __init__(self, result_set): super(TskContactsParser, self).__init__(result_set) self._DEFAULT_VALUE = "" + self._DEFAULT_ACCOUNT_ADDRESS = None - def get_account_name(self): - return self._DEFAULT_VALUE - - def get_contact_name(self): - return self._DEFAULT_VALUE + def get_account_instance(self): + return self._DEFAULT_ACCOUNT_ADDRESS def get_phone(self): return self._DEFAULT_VALUE diff --git a/InternalPythonModules/android/line.py b/InternalPythonModules/android/line.py index b8655b46e8..242c5d1503 100644 --- a/InternalPythonModules/android/line.py +++ b/InternalPythonModules/android/line.py @@ -142,8 +142,7 @@ class LineAnalyzer(general.AndroidComponentAnalyzer): contacts_parser = LineContactsParser(contacts_db) while contacts_parser.next(): helper.addContact( - contacts_parser.get_account_name(), - contacts_parser.get_contact_name(), + contacts_parser.get_account_instance(), contacts_parser.get_phone(), contacts_parser.get_home_phone(), contacts_parser.get_mobile_phone(), @@ -341,11 +340,10 @@ class LineContactsParser(TskContactsParser): """ ) ) - def get_account_name(self): - return self.result_set.getString("m_id") - def get_contact_name(self): - return self.result_set.getString("server_name") + def get_account_instance(self): + return Account.Address(self.result_set.getString("m_id"), + self.result_set.getString("server_name")) class LineMessagesParser(TskMessagesParser): """ diff --git a/InternalPythonModules/android/skype.py b/InternalPythonModules/android/skype.py index 6d0df56259..3556567305 100644 --- a/InternalPythonModules/android/skype.py +++ b/InternalPythonModules/android/skype.py @@ -151,8 +151,7 @@ class SkypeAnalyzer(general.AndroidComponentAnalyzer): contacts_parser = SkypeContactsParser(skype_db) while contacts_parser.next(): helper.addContact( - contacts_parser.get_account_name(), - contacts_parser.get_contact_name(), + contacts_parser.get_account_instance(), contacts_parser.get_phone(), contacts_parser.get_home_phone(), contacts_parser.get_mobile_phone(), @@ -362,11 +361,9 @@ class SkypeContactsParser(TskContactsParser): ) ) - def get_account_name(self): - return self.result_set.getString("entry_id") - - def get_contact_name(self): - return self.result_set.getString("name") + def get_account_instance(self): + return Account.Address(self.result_set.getString("entry_id"), + self.result_set.getString("name")) class SkypeMessagesParser(TskMessagesParser): """ diff --git a/InternalPythonModules/android/textnow.py b/InternalPythonModules/android/textnow.py index 216864f2e1..b45bae37a5 100644 --- a/InternalPythonModules/android/textnow.py +++ b/InternalPythonModules/android/textnow.py @@ -108,8 +108,7 @@ class TextNowAnalyzer(general.AndroidComponentAnalyzer): contacts_parser = TextNowContactsParser(textnow_db) while contacts_parser.next(): helper.addContact( - contacts_parser.get_account_name(), - contacts_parser.get_contact_name(), + contacts_parser.get_account_instance(), contacts_parser.get_phone(), contacts_parser.get_home_phone(), contacts_parser.get_mobile_phone(), @@ -267,12 +266,10 @@ class TextNowContactsParser(TskContactsParser): ) ) - def get_account_name(self): - return self.result_set.getString("number") - - def get_contact_name(self): - return self.result_set.getString("name") - + def get_account_instance(self): + return Account.Address(self.result_set.getString("number"), + self.result_set.getString("name")) + def get_phone(self): return self.result_set.getString("number") diff --git a/InternalPythonModules/android/viber.py b/InternalPythonModules/android/viber.py index fb2b77ac7a..fb73f145b2 100644 --- a/InternalPythonModules/android/viber.py +++ b/InternalPythonModules/android/viber.py @@ -116,8 +116,7 @@ class ViberAnalyzer(general.AndroidComponentAnalyzer): contacts_parser = ViberContactsParser(contacts_db) while contacts_parser.next(): helper.addContact( - contacts_parser.get_account_name(), - contacts_parser.get_contact_name(), + contacts_parser.get_account_instance(), contacts_parser.get_phone(), contacts_parser.get_home_phone(), contacts_parser.get_mobile_phone(), @@ -273,11 +272,9 @@ class ViberContactsParser(TskContactsParser): ) ) - def get_account_name(self): - return self.result_set.getString("number") - - def get_contact_name(self): - return self.result_set.getString("name") + def get_account_instance(self): + return Account.Address(self.result_set.getString("number"), + self.result_set.getString("name")) def get_phone(self): return self.result_set.getString("number") diff --git a/InternalPythonModules/android/whatsapp.py b/InternalPythonModules/android/whatsapp.py index 8fdb09f13b..15f60cbd89 100644 --- a/InternalPythonModules/android/whatsapp.py +++ b/InternalPythonModules/android/whatsapp.py @@ -170,8 +170,7 @@ class WhatsAppAnalyzer(general.AndroidComponentAnalyzer): contacts_parser = WhatsAppContactsParser(contacts_db) while contacts_parser.next(): helper.addContact( - contacts_parser.get_account_name(), - contacts_parser.get_contact_name(), + contacts_parser.get_account_instance(), contacts_parser.get_phone(), contacts_parser.get_home_phone(), contacts_parser.get_mobile_phone(), @@ -410,12 +409,10 @@ class WhatsAppContactsParser(TskContactsParser): """ ) ) - - def get_account_name(self): - return self.result_set.getString("jid") - - def get_contact_name(self): - return self.result_set.getString("name") + + def get_account_instance(self): + return Account.Address(self.result_set.getString("jid"), + self.result_set.getString("name")) def get_phone(self): return self.result_set.getString("number") From fafb297cd1fedcafead237ec8c582254356d4697 Mon Sep 17 00:00:00 2001 From: "U-BASIS\\dsmyda" Date: Thu, 26 Sep 2019 13:55:44 -0400 Subject: [PATCH 2/2] Changed name from instance to address --- InternalPythonModules/android/TskContactsParser.py | 2 +- InternalPythonModules/android/line.py | 4 ++-- InternalPythonModules/android/skype.py | 4 ++-- InternalPythonModules/android/textnow.py | 4 ++-- InternalPythonModules/android/viber.py | 4 ++-- InternalPythonModules/android/whatsapp.py | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/InternalPythonModules/android/TskContactsParser.py b/InternalPythonModules/android/TskContactsParser.py index 9f1d4d293e..4e03613bcd 100644 --- a/InternalPythonModules/android/TskContactsParser.py +++ b/InternalPythonModules/android/TskContactsParser.py @@ -31,7 +31,7 @@ class TskContactsParser(ResultSetIterator): self._DEFAULT_VALUE = "" self._DEFAULT_ACCOUNT_ADDRESS = None - def get_account_instance(self): + def get_account_address(self): return self._DEFAULT_ACCOUNT_ADDRESS def get_phone(self): diff --git a/InternalPythonModules/android/line.py b/InternalPythonModules/android/line.py index 242c5d1503..f8e826542f 100644 --- a/InternalPythonModules/android/line.py +++ b/InternalPythonModules/android/line.py @@ -142,7 +142,7 @@ class LineAnalyzer(general.AndroidComponentAnalyzer): contacts_parser = LineContactsParser(contacts_db) while contacts_parser.next(): helper.addContact( - contacts_parser.get_account_instance(), + contacts_parser.get_account_address(), contacts_parser.get_phone(), contacts_parser.get_home_phone(), contacts_parser.get_mobile_phone(), @@ -341,7 +341,7 @@ class LineContactsParser(TskContactsParser): ) ) - def get_account_instance(self): + def get_account_address(self): return Account.Address(self.result_set.getString("m_id"), self.result_set.getString("server_name")) diff --git a/InternalPythonModules/android/skype.py b/InternalPythonModules/android/skype.py index 3556567305..fe027961ff 100644 --- a/InternalPythonModules/android/skype.py +++ b/InternalPythonModules/android/skype.py @@ -151,7 +151,7 @@ class SkypeAnalyzer(general.AndroidComponentAnalyzer): contacts_parser = SkypeContactsParser(skype_db) while contacts_parser.next(): helper.addContact( - contacts_parser.get_account_instance(), + contacts_parser.get_account_address(), contacts_parser.get_phone(), contacts_parser.get_home_phone(), contacts_parser.get_mobile_phone(), @@ -361,7 +361,7 @@ class SkypeContactsParser(TskContactsParser): ) ) - def get_account_instance(self): + def get_account_address(self): return Account.Address(self.result_set.getString("entry_id"), self.result_set.getString("name")) diff --git a/InternalPythonModules/android/textnow.py b/InternalPythonModules/android/textnow.py index b45bae37a5..8361b0d3eb 100644 --- a/InternalPythonModules/android/textnow.py +++ b/InternalPythonModules/android/textnow.py @@ -108,7 +108,7 @@ class TextNowAnalyzer(general.AndroidComponentAnalyzer): contacts_parser = TextNowContactsParser(textnow_db) while contacts_parser.next(): helper.addContact( - contacts_parser.get_account_instance(), + contacts_parser.get_account_address(), contacts_parser.get_phone(), contacts_parser.get_home_phone(), contacts_parser.get_mobile_phone(), @@ -266,7 +266,7 @@ class TextNowContactsParser(TskContactsParser): ) ) - def get_account_instance(self): + def get_account_address(self): return Account.Address(self.result_set.getString("number"), self.result_set.getString("name")) diff --git a/InternalPythonModules/android/viber.py b/InternalPythonModules/android/viber.py index fb73f145b2..54f0b260a0 100644 --- a/InternalPythonModules/android/viber.py +++ b/InternalPythonModules/android/viber.py @@ -116,7 +116,7 @@ class ViberAnalyzer(general.AndroidComponentAnalyzer): contacts_parser = ViberContactsParser(contacts_db) while contacts_parser.next(): helper.addContact( - contacts_parser.get_account_instance(), + contacts_parser.get_account_address(), contacts_parser.get_phone(), contacts_parser.get_home_phone(), contacts_parser.get_mobile_phone(), @@ -272,7 +272,7 @@ class ViberContactsParser(TskContactsParser): ) ) - def get_account_instance(self): + def get_account_address(self): return Account.Address(self.result_set.getString("number"), self.result_set.getString("name")) diff --git a/InternalPythonModules/android/whatsapp.py b/InternalPythonModules/android/whatsapp.py index 15f60cbd89..09f2521a8d 100644 --- a/InternalPythonModules/android/whatsapp.py +++ b/InternalPythonModules/android/whatsapp.py @@ -170,7 +170,7 @@ class WhatsAppAnalyzer(general.AndroidComponentAnalyzer): contacts_parser = WhatsAppContactsParser(contacts_db) while contacts_parser.next(): helper.addContact( - contacts_parser.get_account_instance(), + contacts_parser.get_account_address(), contacts_parser.get_phone(), contacts_parser.get_home_phone(), contacts_parser.get_mobile_phone(), @@ -410,7 +410,7 @@ class WhatsAppContactsParser(TskContactsParser): ) ) - def get_account_instance(self): + def get_account_address(self): return Account.Address(self.result_set.getString("jid"), self.result_set.getString("name"))