From c03377b658acd7ea37e681f6ea85d423eb2e59b6 Mon Sep 17 00:00:00 2001 From: "U-BASIS\\dsmyda" Date: Wed, 11 Sep 2019 09:43:55 -0400 Subject: [PATCH] Refactoring/code clean up --- .../android/TskCallLogsParser.py | 4 ++-- InternalPythonModules/android/viber.py | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/InternalPythonModules/android/TskCallLogsParser.py b/InternalPythonModules/android/TskCallLogsParser.py index 22b509d612..66ea27eee3 100644 --- a/InternalPythonModules/android/TskCallLogsParser.py +++ b/InternalPythonModules/android/TskCallLogsParser.py @@ -32,8 +32,8 @@ class TskCallLogsParser(ResultSetIterator): def __init__(self, result_set): super(TskCallLogsParser, self).__init__(result_set) - self.INCOMING_MSG_STRING = "Incoming" - self.OUTGOING_MSG_STRING = "Outgoing" + self.INCOMING_CALL = "Incoming" + self.OUTGOING_CALL = "Outgoing" self._DEFAULT_STRING = "" def get_account_name(self): diff --git a/InternalPythonModules/android/viber.py b/InternalPythonModules/android/viber.py index 77a4560839..1505b9956a 100644 --- a/InternalPythonModules/android/viber.py +++ b/InternalPythonModules/android/viber.py @@ -135,30 +135,30 @@ class ViberCallLogsParser(TskCallLogsParser): ) ) - self._OUTGOING_CALL = 2 - self._INCOMING_CALL = 1 - self._MISSED_CALL = 3 + self._OUTGOING_CALL_TYPE = 2 + self._INCOMING_CALL_TYPE = 1 + self._MISSED_CALL_TYPE = 3 def get_account_name(self): return self.result_set.getString("number") def get_phone_number_from(self): - if self.get_call_direction() == self.INCOMING_MSG_STRING: + if self.get_call_direction() == self.INCOMING_CALL: return self.result_set.getString("number") #Give default value if the call is outgoing, the device's # is not stored in the database. return super(ViberCallLogsParser, self).get_phone_number_from() def get_phone_number_to(self): - if self.get_call_direction() == self.OUTGOING_MSG_STRING: + if self.get_call_direction() == self.OUTGOING_CALL: return self.result_set.getString("number") #Give default value if the call is incoming, the device's # is not stored in the database. return super(ViberCallLogsParser, self).get_phone_number_to() def get_call_direction(self): direction = self.result_set.getInt("direction") - if direction == self._INCOMING_CALL or direction == self._MISSED_CALL: - return self.INCOMING_MSG_STRING - return self.OUTGOING_MSG_STRING + if direction == self._INCOMING_CALL_TYPE or direction == self._MISSED_CALL_TYPE: + return self.INCOMING_CALL + return self.OUTGOING_CALL def get_call_start_date_time(self): return self.result_set.getLong("start_time") / 1000