TizenRefApp-5902 Implement attaching generated vcf-files into composer

Change-Id: I725407d27a011f674496ab4ce19c91da67d2fd13
Signed-off-by: Oleksander Kostenko <o.kostenko@samsung.com>

diff --git a/src/Common/AppControl/inc/AppControlCompose.h b/src/Common/AppControl/inc/AppControlCompose.h
index 63d0f82..0a7cfe1 100644 (file)
--- a/src/Common/AppControl/inc/AppControlCompose.h
+++ b/src/Common/AppControl/inc/AppControlCompose.h
@@ -28,6 +28,12 @@ namespace Msg
     class AppControlCompose;
     typedef std::shared_ptr<AppControlCompose> AppControlComposeRef;
 
+    struct VcfInfo
+    {
+        std::list<int> contactsIdList;
+        bool isMyProfile;
+    };
+
     class AppControlCompose
         : public AppControlCommand
     {
@@ -78,6 +84,11 @@ namespace Msg
              */
             const FileList &getFileList() const;
 
+            /**
+             * Gets vcf info from APP_CONTROL_DATA_ID
+             */
+            const VcfInfo &getVcfInfo() const;
+
         private:
             bool parseUriCompose(app_control_h handle);
             bool parseUriShare(app_control_h handle);
@@ -94,6 +105,7 @@ namespace Msg
             FileList m_FileList;
             std::string m_MessageText;
             std::string m_Subject;
+            VcfInfo m_VcfInfo;
     };
 }
 

diff --git a/src/Common/AppControl/src/AppControlCompose.cpp b/src/Common/AppControl/src/AppControlCompose.cpp
index be99eba..de5b31f 100644 (file)
--- a/src/Common/AppControl/src/AppControlCompose.cpp
+++ b/src/Common/AppControl/src/AppControlCompose.cpp
@@ -25,6 +25,9 @@ using namespace Msg;
 
 namespace
 {
+    const std::string mimeContact = "application/vnd.tizen.contact";
+    const std::string myProfileDataType = "my_profile";
+
     typedef std::unordered_map<std::string, AppControlCompose::OpComposeType> OperationMap;
 
     const OperationMap operationMap =
@@ -88,6 +91,18 @@ void AppControlCompose::createComposeOp(app_control_h handle)
 void AppControlCompose::createShareOp(app_control_h handle)
 {
     parseUriShare(handle);
+
+    if(mimeContact == AppControlUtils::getMimeType(handle))
+    {
+        std::string idStr = AppControlUtils::getExtraData(handle, APP_CONTROL_DATA_ID);
+        if(!idStr.empty())
+        {
+            std::string dataType = AppControlUtils::getExtraData(handle, APP_CONTROL_DATA_TYPE);
+            m_VcfInfo.isMyProfile = (dataType == myProfileDataType);
+            m_VcfInfo.contactsIdList.push_back(atoi(idStr.c_str()));
+        }
+    }
+
     if (m_FileList.empty())
     {
         m_FileList.push_back(AppControlUtils::getExtraData(handle, APP_CONTROL_DATA_PATH));
@@ -95,6 +110,14 @@ void AppControlCompose::createShareOp(app_control_h handle)
 }
 void AppControlCompose::createMultiShareOp(app_control_h handle)
 {
+    if(mimeContact == AppControlUtils::getMimeType(handle))
+    {
+        std::list<std::string> contactsList;
+        AppControlUtils::getExtraDataArray(handle, APP_CONTROL_DATA_ID, contactsList);
+        for(auto it : contactsList)
+            m_VcfInfo.contactsIdList.push_back(atoi(it.c_str()));
+    }
+
     AppControlUtils::getExtraDataArray(handle, APP_CONTROL_DATA_PATH, m_FileList);
     parseUriShare(handle);
 }
@@ -120,6 +143,7 @@ bool AppControlCompose::isMms() const
 {
     return m_isMms;
 }
+
 const std::string &AppControlCompose::getMessageText() const
 {
     return m_MessageText;
@@ -133,6 +157,11 @@ const AppControlCompose::FileList &AppControlCompose::getFileList() const
     return m_FileList;
 }
 
+const VcfInfo &AppControlCompose::getVcfInfo() const
+{
+    return m_VcfInfo;
+}
+
 bool AppControlCompose::parseUriCompose(app_control_h handle)
 {
     TRACE;

diff --git a/src/Common/ContactManager/src/VcfGenerator.cpp b/src/Common/ContactManager/src/VcfGenerator.cpp
index 5f95479..218c499 100644 (file)
--- a/src/Common/ContactManager/src/VcfGenerator.cpp
+++ b/src/Common/ContactManager/src/VcfGenerator.cpp
@@ -16,7 +16,6 @@
  */
 
 #include "ContactManager.h"
-#include "FileUtils.h"
 #include <sstream>
 #include "Logger.h"
 #include <contacts_vcard.h>
@@ -25,6 +24,11 @@
 
 using namespace Msg;
 
+namespace
+{
+    const int avgLengthOfContent = 2048;
+}
+
 std::string ContactManager::makeVcard(const int personId, bool myProfile)
 {
     contacts_record_h record = nullptr;
@@ -37,7 +41,7 @@ std::string ContactManager::makeVcard(const int personId, bool myProfile)
         return std::string();
     }
     vcardContent = createContactContent(record, myProfile);
-    MSG_LOG("vcardContent = ", vcardContent);
+
     if(record)
         contacts_record_destroy(record, true);
 
@@ -46,17 +50,12 @@ std::string ContactManager::makeVcard(const int personId, bool myProfile)
 
 std::string ContactManager::makeVcard(const std::list<int> &idList)
 {
-    std::ostringstream vcardContent;
-
+    std::string vcardContent;
+    vcardContent.reserve(idList.size() * avgLengthOfContent);
     for(auto it : idList)
-    {
-        if(!vcardContent.str().empty())
-            vcardContent << "/n";
+        vcardContent += createContentForContactList(it);
 
-        vcardContent << createContentForContactList(it);
-    }
-    MSG_LOG("vcardContent = ", vcardContent.str());
-    return vcardContent.str();
+    return vcardContent;
 }
 
 std::string ContactManager::createContactContent(contacts_record_h record, bool myProfile)

diff --git a/src/Conversation/Body/Controller/inc/Body.h b/src/Conversation/Body/Controller/inc/Body.h
index 82f415c..2a3b257 100644 (file)
--- a/src/Conversation/Body/Controller/inc/Body.h
+++ b/src/Conversation/Body/Controller/inc/Body.h
@@ -72,6 +72,8 @@ namespace Msg
 
             void onTooLargePopupDel(Evas_Object *obj, void *eventInfo);
 
+            std::string createVcfFile(const AppControlComposeRef &cmd);
+
             // BodyView:
             virtual void onContentChanged();
             virtual void onItemDelete(PageViewItem &item);

diff --git a/src/Conversation/Body/Controller/src/Body.cpp b/src/Conversation/Body/Controller/src/Body.cpp
index a114927..9a9a0bb 100644 (file)
--- a/src/Conversation/Body/Controller/src/Body.cpp
+++ b/src/Conversation/Body/Controller/src/Body.cpp
@@ -36,6 +36,9 @@ using namespace Msg;
 
 namespace
 {
+    const std::string contactFileName = "Contact.vcf";
+    const std::string contactsFileName = "Contacts.vcf";
+
     inline TextPageViewItem *getTextItem(const PageView &page)
     {
         return page ? static_cast<TextPageViewItem*>(page.getItem(PageViewItem::TextType)) : nullptr;
@@ -282,9 +285,13 @@ void Body::execCmd(const AppControlComposeRef &cmd)
     if(textItem)
         textItem->setText(cmd->getMessageText());
 
+    std::list<std::string> path = cmd->getFileList();
+    if(!cmd->getVcfInfo().contactsIdList.empty())
+        path.push_back(createVcfFile(cmd));
+
     //TODO: implement fill of subject.
 
-    addMedia(cmd->getFileList());
+    addMedia(path);
 }
 
 void Body::addAttachment(const std::string &filePath, const std::string &fileName)
@@ -378,6 +385,28 @@ void Body::onTooLargePopupDel(Evas_Object *obj, void *eventInfo)
     m_TooLargePopupShow = false;
 }
 
+std::string Body::createVcfFile(const AppControlComposeRef &cmd)
+{
+    auto &idList = cmd->getVcfInfo().contactsIdList;
+    std::string content;
+    std::string path;
+
+    if(cmd->getComposeType() == AppControlCompose::OpShare)
+    {
+        content = m_App.getContactManager().makeVcard(*idList.begin(), cmd->getVcfInfo().isMyProfile);
+        path = contactFileName;
+    }
+    else if(cmd->getComposeType() == AppControlCompose::OpMultiShare)
+    {
+        content = m_App.getContactManager().makeVcard(idList);
+        path = contactsFileName;
+    }
+
+    path = content.empty() ? std::string() : m_WorkingDir.addTextFile(content, path);
+
+    return path;
+}
+
 void Body::onContentChanged()
 {
     if(!m_pOnChangedIdler)

diff --git a/src/Conversation/Body/Utils/inc/WorkingDir.h b/src/Conversation/Body/Utils/inc/WorkingDir.h
index 04c5a6f..52c0978 100644 (file)
--- a/src/Conversation/Body/Utils/inc/WorkingDir.h
+++ b/src/Conversation/Body/Utils/inc/WorkingDir.h
@@ -36,7 +36,7 @@ namespace Msg
 
             std::string genUniqueFilePath(const std::string &fileName) const;
             std::string addFile(const std::string &path);
-            std::string addTextFile(const std::string &text);
+            std::string addTextFile(const std::string &text, const std::string &fileName = "");
             void removeFile(const std::string &path);
             void clear();
 

diff --git a/src/Conversation/Body/Utils/src/WorkingDir.cpp b/src/Conversation/Body/Utils/src/WorkingDir.cpp
index 5abc904..78e4830 100644 (file)
--- a/src/Conversation/Body/Utils/src/WorkingDir.cpp
+++ b/src/Conversation/Body/Utils/src/WorkingDir.cpp
@@ -95,19 +95,30 @@ std::string WorkingDir::addFile(const std::string &path)
 
     if(FileUtils::isExists(path))
     {
-        newPath = genUniqueFilePath(path);
-        if(FileUtils::copy(path, newPath))
+        if(path.find(m_Path) != std::string::npos)
         {
-            MSG_LOG("File added: ", newPath);
+            newPath = path;
+            MSG_LOG("File is already exists: ", newPath);
+        }
+        else
+        {
+            newPath = genUniqueFilePath(path);
+            if(FileUtils::copy(path, newPath))
+            {
+                MSG_LOG("File added: ", newPath);
+            }
         }
     }
 
     return newPath;
 }
 
-std::string WorkingDir::addTextFile(const std::string &text)
+std::string WorkingDir::addTextFile(const std::string &text, const std::string &fileName)
 {
-    std::string path = genUniqueFilePath(textFileName);
+    std::string result;
+    result = fileName.empty() ? textFileName : fileName;
+
+    std::string path = genUniqueFilePath(result);
     std::ofstream file(path, std::ofstream::trunc | std::ofstream::binary | std::ofstream::out);
     if(file.is_open())
     {