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"))