From 64d73e04348572539f174820c5888450b8015787 Mon Sep 17 00:00:00 2001
From: Mark McKinnon <mark.mckinnon@davenport.edu>
Date: Thu, 5 Mar 2020 16:44:23 -0500
Subject: [PATCH] Update viber.py

If contact does not have an email or phone number then create a TSK_Contact artifact outside of comms helper so we do not loose the contact.
---
 InternalPythonModules/android/viber.py | 29 +++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/InternalPythonModules/android/viber.py b/InternalPythonModules/android/viber.py
index ded45e186f..aadd1a2104 100644
--- a/InternalPythonModules/android/viber.py
+++ b/InternalPythonModules/android/viber.py
@@ -117,13 +117,28 @@ class ViberAnalyzer(general.AndroidComponentAnalyzer):
         try:
             contacts_parser = ViberContactsParser(contacts_db)
             while contacts_parser.next():
-                helper.addContact( 
-                    contacts_parser.get_contact_name(), 
-                    contacts_parser.get_phone(),
-                    contacts_parser.get_home_phone(),
-                    contacts_parser.get_mobile_phone(),
-                    contacts_parser.get_email()
-                )
+                if contacts_parser.get_phone() is not None:
+                    helper.addContact( 
+                        contacts_parser.get_contact_name(), 
+                        contacts_parser.get_phone(),
+                        contacts_parser.get_home_phone(),
+                        contacts_parser.get_mobile_phone(),
+                        contacts_parser.get_email()
+                    )
+                else:
+                    current_case = Case.getCurrentCase().getSleuthkitCase()
+                    attributes = ArrayList()
+                    artifact = contacts_db.getDBFile().newArtifact(BlackboardArtifact.ARTIFACT_TYPE.TSK_CONTACT)
+                    attributes.add(BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_NAME.getTypeID(), self._PARSER_NAME, contacts_parser.get_contact_name()))
+                    artifact.addAttributes(attributes)
+                    
+                    try:
+                    # Post the artifact to blackboard
+                       current_case.getBlackboard().postArtifact(artifact, self._PARSER_NAME)
+                    except Blackboard.BlackboardException as e:
+                        self.log(Level.WARNING, "Error adding viber contacts artifact to case database.", ex )
+                        self._logger.log(Level.WARNING, traceback.format_exc())
+
             contacts_parser.close()
         except SQLException as ex:
             self._logger.log(Level.WARNING, "Error querying the viber database for contacts.", ex)