Fixed: ConvContactList for invalid/hidden address

Change-Id: Iae00ade05507c8cc3775f6d9c9133ee9615cbffd
Signed-off-by: Denis Dolzhenko <d.dolzhenko@samsung.com>

diff --git a/src/Common/MsgEngine/src/MsgUtils.cpp b/src/Common/MsgEngine/src/MsgUtils.cpp
index 013da65f139edef860bb70ff0f248f470f1b6298..3a9f85dc41657a928c94f34a5b94842ac3aa459c 100644 (file)
--- a/src/Common/MsgEngine/src/MsgUtils.cpp
+++ b/src/Common/MsgEngine/src/MsgUtils.cpp
@@ -67,16 +67,18 @@ TokenizedRecipients MsgUtils::tokenizeRecipients(const std::string &inputText)
 
 bool MsgUtils::isValidNumber(const std::string &address)
 {
+    if(address.empty())
+        return false;
+
     std::regex numTemplate(numberRegex);
     return std::regex_match(address,numTemplate);
 }
 
 bool MsgUtils::isValidEmail(const std::string &address)
 {
-    if(address.length() > emailAddrLenMax)
-    {
+    if(address.empty() || address.length() > emailAddrLenMax)
         return false;
-    }
+
     std::regex emailTemplate(emailRegex);
     return std::regex_match(address,emailTemplate);
 }

diff --git a/src/Conversation/ContactList/Controller/src/ConvContactList.cpp b/src/Conversation/ContactList/Controller/src/ConvContactList.cpp
index 8da002850c555b5af6cad0831bd894dffa121d49..4013251eade0ac88c793db08e42ebf7133bf4e3c 100644 (file)
--- a/src/Conversation/ContactList/Controller/src/ConvContactList.cpp
+++ b/src/Conversation/ContactList/Controller/src/ConvContactList.cpp
@@ -20,22 +20,10 @@
 #include "ContactPersonPhoneLog.h"
 #include "ContactPersonEmail.h"
 #include "ContactPersonPhoneLog.h"
+#include "MsgUtils.h"
 
 using namespace Msg;
 
-namespace
-{
-    inline bool isValid(const ContactAddress &rec)
-    {
-        return !rec.getAddress().empty();
-    }
-
-    inline bool isValid(const ContactPersonPhoneLog &rec)
-    {
-        return !rec.getAddress().empty();
-    }
-}
-
 ConvContactList::ConvContactList(Evas_Object *parent, App &app)
     : ConvContactListView(parent)
     , m_pListener(nullptr)
@@ -105,14 +93,14 @@ void ConvContactList::search()
         do
         {
             auto &rec = list->get();
-            if(isValid(rec))
+            if(MsgUtils::isValidAddress(rec.getAddress()))
             {
                 ContactListItem *item = new ContactListItem(rec, m_App, m_SearchWord);
                 getList().appendItem(*item);
             }
             else
             {
-                MSG_LOG("Skip invalid contact");
+                MSG_LOG("Skip invalid contact: ", rec.getAddress());
             }
         } while(list->next());
      }