From: Denis Dolzhenko <d.dolzhenko@samsung.com>
Date: Thu, 6 Jul 2017 08:41:12 +0000 (+0300)
Subject: TizenRefApp-8803 Empty contacts list is displayed
X-Git-Tag: submit/tizen/20170707.090946^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5bbe21890376d776c7d673443ac6b6b9b58d9574;p=profile%2Fwearable%2Fapps%2Fnative%2Fmessage.git

TizenRefApp-8803 Empty contacts list is displayed

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

diff --git a/src/Common/Recipient/src/Recipient.cpp b/src/Common/Recipient/src/Recipient.cpp
index aef681a..0bd20dd 100644
--- a/src/Common/Recipient/src/Recipient.cpp
+++ b/src/Common/Recipient/src/Recipient.cpp
@@ -28,18 +28,25 @@ using namespace Msg;
 namespace {
 
     template<typename ContactRec>
-    Recipient toRecip(const std::shared_ptr<ContactRec> &rec)
+    Recipient toRecip(const ContactRec &rec)
     {
         Recipient res;
 
-        if (rec) {
-            res.setDispName(rec->getDispName());
-            res.setAddress(rec->getAddress());
+        res.setDispName(rec.getDispName());
+        res.setAddress(rec.getAddress());
 
-            if (res.getDispName().empty())
-                res.setDispName(res.getAddress());
-        }
+        if (res.getDispName().empty())
+            res.setDispName(res.getAddress());
+
+        return res;
+    }
 
+    template<typename ContactRec>
+    Recipient toRecip(const std::shared_ptr<ContactRec> &rec)
+    {
+        Recipient res;
+        if (rec)
+            toRecip(*rec);
         return res;
     }
 
@@ -78,7 +85,7 @@ namespace {
                 do {
                     auto &rec = list->get();
                     if (isValid(rec)) {
-                        results.emplace_back(Recipient(rec.getAddress(), rec.getDispName()));
+                        results.push_back(toRecip(rec));
                     } else {
                         MSG_LOG("Skip invalid contact: ", rec.getAddress());
                     }