From: Denis Dolzhenko <d.dolzhenko@samsung.com>
Date: Wed, 24 May 2017 09:09:22 +0000 (+0300)
Subject: TizenRefApp-8527 Send of MMS doesn't work
X-Git-Tag: submit/tizen/20170602.135848~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=baac0b0043a85e5a40de43c1917978fcbf9c1fe9;p=profile%2Fwearable%2Fapps%2Fnative%2Fmessage.git

TizenRefApp-8527 Send of MMS doesn't work

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

diff --git a/.cproject b/.cproject
index 0508402..c766061 100644
--- a/.cproject
+++ b/.cproject
@@ -27,16 +27,16 @@
 								<option defaultValue="gnu.cpp.compiler.debugging.level.max" id="sbi.gnu.cpp.compiler.option.debugging.level.core.721225116" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" useByScannerDiscovery="false" valueType="enumerated"/>
 								<option defaultValue="false" id="sbi.gnu.cpp.compiler.option.misc.pic.core.2126605510" name="-fPIC option" superClass="sbi.gnu.cpp.compiler.option.misc.pic.core" useByScannerDiscovery="false" valueType="boolean"/>
 								<option id="sbi.gnu.cpp.compiler.option.1185085811" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" useByScannerDiscovery="false" valueType="userObjs">
-									<listOptionValue builtIn="false" value="wearable-4.0-device.core.private.20170522_1_llvm37.armel.core.app"/>
+									<listOptionValue builtIn="false" value="wearable-4.0-device.core.private_llvm37.armel.core.app"/>
 								</option>
 								<option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.732942750" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore/&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-watch&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/asp/&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/aul/&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/badge&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/base&quot;"/>
@@ -104,7 +104,6 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/pkgmgr&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/rua/&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/storage&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/system&quot;"/>
@@ -166,16 +165,16 @@
 								<option defaultValue="gnu.c.debugging.level.max" id="sbi.gnu.c.compiler.option.debugging.level.core.1213365629" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" useByScannerDiscovery="false" valueType="enumerated"/>
 								<option defaultValue="false" id="sbi.gnu.c.compiler.option.misc.pic.core.1887344732" name="-fPIC option" superClass="sbi.gnu.c.compiler.option.misc.pic.core" useByScannerDiscovery="false" valueType="boolean"/>
 								<option id="sbi.gnu.c.compiler.option.1991353278" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" useByScannerDiscovery="false" valueType="userObjs">
-									<listOptionValue builtIn="false" value="wearable-4.0-device.core.private.20170522_1_llvm37.armel.core.app"/>
+									<listOptionValue builtIn="false" value="wearable-4.0-device.core.private_llvm37.armel.core.app"/>
 								</option>
 								<option id="sbi.gnu.c.compiler.option.frameworks_inc.core.775346096" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore/&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-watch&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/asp/&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/aul/&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/badge&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/base&quot;"/>
@@ -243,7 +242,6 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/pkgmgr&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/rua/&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/storage&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/system&quot;"/>
diff --git a/src/Common/MsgEngine/inc/Message.h b/src/Common/MsgEngine/inc/Message.h
index 754c19b..19edc85 100644
--- a/src/Common/MsgEngine/inc/Message.h
+++ b/src/Common/MsgEngine/inc/Message.h
@@ -133,12 +133,6 @@ namespace Msg {
              */
             virtual std::string getText() const = 0;
 
-            /**
-             * @brief Sets text into message
-             * @param[in] text message text.
-             */
-            virtual void setText(const std::string &text) = 0;
-
             /**
              * @brief Figures out whether message is outgoing or incoming.
              * @return direction(in\out).
diff --git a/src/Common/MsgEngine/inc/MessageSMS.h b/src/Common/MsgEngine/inc/MessageSMS.h
index d74321c..f69888d 100644
--- a/src/Common/MsgEngine/inc/MessageSMS.h
+++ b/src/Common/MsgEngine/inc/MessageSMS.h
@@ -33,6 +33,12 @@ namespace Msg {
         public:
             MessageSMS();
             virtual ~MessageSMS();
+
+            /**
+             * @brief Sets text into message
+             * @param[in] text message text.
+             */
+            virtual void setText(const std::string &text) = 0;
     };
 }
 
diff --git a/src/Common/MsgEngine/inc/MsgComposer.h b/src/Common/MsgEngine/inc/MsgComposer.h
index 8d08ac2..7bf4d48 100644
--- a/src/Common/MsgEngine/inc/MsgComposer.h
+++ b/src/Common/MsgEngine/inc/MsgComposer.h
@@ -32,7 +32,6 @@ namespace Msg {
 
             virtual MessageSMSRef createSms() = 0;
             virtual MessageMmsRef createMms() = 0;
-            virtual std::vector<MessageRef> createMultiMessage(const std::string &text) = 0;
 
             /**
              * @brief Calculates input text length by encode type.
diff --git a/src/Common/MsgEngine/src/dummy/MessageDummy.cpp b/src/Common/MsgEngine/src/dummy/MessageDummy.cpp
index 595ddd1..957371d 100644
--- a/src/Common/MsgEngine/src/dummy/MessageDummy.cpp
+++ b/src/Common/MsgEngine/src/dummy/MessageDummy.cpp
@@ -74,10 +74,6 @@ time_t MessageDummy::getTime() const
     return 0;
 }
 
-void MessageDummy::setText(const std::string &text)
-{
-}
-
 std::string MessageDummy::getText() const
 {
 	return fakeMessages[rand() % fakeMessages.size()];
diff --git a/src/Common/MsgEngine/src/dummy/MessageDummy.h b/src/Common/MsgEngine/src/dummy/MessageDummy.h
index 5611c0c..b0303cc 100644
--- a/src/Common/MsgEngine/src/dummy/MessageDummy.h
+++ b/src/Common/MsgEngine/src/dummy/MessageDummy.h
@@ -38,7 +38,6 @@ namespace Msg
             virtual const MsgAddressListDummy &getAddressList() const;
             virtual MsgAddressDummy &addAddress();
             virtual void addAddresses(const MsgAddressList &list);
-            virtual void setText(const std::string &text);
             virtual std::string getText() const;
             Message::Direction getDirection() const;
             virtual Type getType() const;
diff --git a/src/Common/MsgEngine/src/dummy/MessageMmsDummy.cpp b/src/Common/MsgEngine/src/dummy/MessageMmsDummy.cpp
index 3bf6e64..48ac6c7 100644
--- a/src/Common/MsgEngine/src/dummy/MessageMmsDummy.cpp
+++ b/src/Common/MsgEngine/src/dummy/MessageMmsDummy.cpp
@@ -45,10 +45,6 @@ MessageMmsDummy::Type MessageMmsDummy::getType() const
     return MsgUtilsDummy::nativeToMessageType(0);
 }
 
-void MessageMmsDummy::setText(const std::string &text)
-{
-}
-
 std::string MessageMmsDummy::getText() const
 {
     return fakeMessages[rand() % fakeMessages.size()];
diff --git a/src/Common/MsgEngine/src/dummy/MessageMmsDummy.h b/src/Common/MsgEngine/src/dummy/MessageMmsDummy.h
index 93efb1e..2dc67ef 100644
--- a/src/Common/MsgEngine/src/dummy/MessageMmsDummy.h
+++ b/src/Common/MsgEngine/src/dummy/MessageMmsDummy.h
@@ -32,7 +32,6 @@ namespace Msg
             MessageMmsDummy(bool release);
             virtual ~MessageMmsDummy();
 
-            virtual void setText(const std::string &text);
             virtual std::string getText() const;
             virtual Type getType() const;
             virtual int getSize() const;
diff --git a/src/Common/MsgEngine/src/dummy/MsgComposerDummy.cpp b/src/Common/MsgEngine/src/dummy/MsgComposerDummy.cpp
index 5aea53a..0195fbd 100644
--- a/src/Common/MsgEngine/src/dummy/MsgComposerDummy.cpp
+++ b/src/Common/MsgEngine/src/dummy/MsgComposerDummy.cpp
@@ -47,11 +47,6 @@ MessageMmsRef MsgComposerDummy::createMms()
     return mmsRef;
 }
 
-std::vector<MessageRef> MsgComposerDummy::createMultiMessage(const std::string &text)
-{
-    return {};
-}
-
 void MsgComposerDummy::calculateTextMetric(const std::string &text, MsgTextMetric &textMetric)
 {
 
diff --git a/src/Common/MsgEngine/src/dummy/MsgComposerDummy.h b/src/Common/MsgEngine/src/dummy/MsgComposerDummy.h
index ef604ab..b4aa903 100644
--- a/src/Common/MsgEngine/src/dummy/MsgComposerDummy.h
+++ b/src/Common/MsgEngine/src/dummy/MsgComposerDummy.h
@@ -32,7 +32,6 @@ namespace Msg
 
             MessageSMSRef createSms() override;
             MessageMmsRef createMms() override;
-            std::vector<MessageRef> createMultiMessage(const std::string &text) override;
             void calculateTextMetric(const std::string &text, MsgTextMetric &textMetric) override;
 
         private:
diff --git a/src/Common/MsgEngine/src/private/MessageMmsPrivate.cpp b/src/Common/MsgEngine/src/private/MessageMmsPrivate.cpp
index d71eaa3..0f59112 100644
--- a/src/Common/MsgEngine/src/private/MessageMmsPrivate.cpp
+++ b/src/Common/MsgEngine/src/private/MessageMmsPrivate.cpp
@@ -67,11 +67,6 @@ MessageMmsPrivate::Type MessageMmsPrivate::getType() const
     return MsgUtilsPrivate::nativeToMessageType(nativeType);
 }
 
-void MessageMmsPrivate::setText(const std::string &text)
-{
-    MsgUtilsPrivate::setStr(m_MsgStruct, MSG_MESSAGE_MMS_TEXT_STR, text);
-}
-
 std::string MessageMmsPrivate::getText() const
 {
     const MsgPageList &pageList = getPageList();
diff --git a/src/Common/MsgEngine/src/private/MessageMmsPrivate.h b/src/Common/MsgEngine/src/private/MessageMmsPrivate.h
index a7ec543..ca996e7 100644
--- a/src/Common/MsgEngine/src/private/MessageMmsPrivate.h
+++ b/src/Common/MsgEngine/src/private/MessageMmsPrivate.h
@@ -30,7 +30,6 @@ namespace Msg {
             MessageMmsPrivate(bool release, msg_struct_t msgStruct = nullptr, msg_struct_t mmsStruct = nullptr);
             virtual ~MessageMmsPrivate();
 
-            virtual void setText(const std::string &text);
             virtual std::string getText() const;
             virtual Type getType() const;
             virtual int getSize() const;
diff --git a/src/Common/MsgEngine/src/private/MessagePrivate.cpp b/src/Common/MsgEngine/src/private/MessagePrivate.cpp
index fd59d81..283fff9 100644
--- a/src/Common/MsgEngine/src/private/MessagePrivate.cpp
+++ b/src/Common/MsgEngine/src/private/MessagePrivate.cpp
@@ -93,12 +93,6 @@ time_t MessagePrivate::getTime() const
     return time;
 }
 
-void MessagePrivate::setText(const std::string &text)
-{
-    int field = isMms() ? MSG_MESSAGE_MMS_TEXT_STR : MSG_MESSAGE_SMS_DATA_STR;
-    MsgUtilsPrivate::setStr(m_MsgStruct, field, text);
-}
-
 std::string MessagePrivate::getText() const
 {
     if (isMms())
diff --git a/src/Common/MsgEngine/src/private/MessagePrivate.h b/src/Common/MsgEngine/src/private/MessagePrivate.h
index 497bb24..fd5c260 100644
--- a/src/Common/MsgEngine/src/private/MessagePrivate.h
+++ b/src/Common/MsgEngine/src/private/MessagePrivate.h
@@ -37,7 +37,6 @@ namespace Msg {
             virtual const MsgAddressListHandlePrivate &getAddressList() const;
             virtual MsgAddressPrivate &addAddress();
             virtual void addAddresses(const MsgAddressList &list);
-            virtual void setText(const std::string &text);
             virtual std::string getText() const;
             Message::Direction getDirection() const;
             virtual Type getType() const;
diff --git a/src/Common/MsgEngine/src/private/MsgComposerPrivate.cpp b/src/Common/MsgEngine/src/private/MsgComposerPrivate.cpp
index 00d4d87..0b07c5e 100644
--- a/src/Common/MsgEngine/src/private/MsgComposerPrivate.cpp
+++ b/src/Common/MsgEngine/src/private/MsgComposerPrivate.cpp
@@ -112,38 +112,13 @@ void MsgComposerPrivate::setSmilHeader(msg_struct_t mms, bool isTextTop)
     msg_set_bool_value(imageRegion, MSG_MMS_REGION_LENGTH_HEIGHT_PERCENT_BOOL, true);
 }
 
-std::vector<MessageRef> MsgComposerPrivate::createMultiMessage(const std::string &text)
-{
-    std::vector<MessageRef> msgList;
-    int maxMsgSize = m_Engine.getSettings().getMaxMmsSize();
-    if (maxMsgSize <= 0) {
-        MSG_LOG_ERROR("getMaxMmsSize() returns 0");
-        return {};
-    }
-
-    auto textList = MsgUtils::splitUtf8String(text, maxMsgSize);
-
-    for (auto &&text : textList) {
-        MsgTextMetric metric;
-        calculateTextMetric(text, metric);
-        Message::Type type = metric.isMms ? Message::MT_MMS : Message::MT_SMS;
-        auto msg = createMessage(type);
-        if (msg) {
-            msg->setText(std::move(text));
-            msgList.push_back(msg);
-        }
-    }
-
-    return msgList;
-}
-
 void MsgComposerPrivate::calculateTextMetric(const std::string &text, MsgTextMetric &textMetric)
 {
     textMetric.reset();
 
     static const int maxGsm7Len = 160;
     static const int maxUnicodeLen = 70;
-    const int maxMmsLen = m_Engine.getSettings().getMaxMmsSize();; // In bytes
+    const int maxMmsLen = m_Engine.getSettings().getMaxMmsSize(); // In bytes
     int maxSmsLen = maxGsm7Len; // In chars
 
     msg_encode_type_t encode = MSG_ENCODE_GSM7BIT;
diff --git a/src/Common/MsgEngine/src/private/MsgComposerPrivate.h b/src/Common/MsgEngine/src/private/MsgComposerPrivate.h
index e6416f3..aefca1a 100644
--- a/src/Common/MsgEngine/src/private/MsgComposerPrivate.h
+++ b/src/Common/MsgEngine/src/private/MsgComposerPrivate.h
@@ -32,7 +32,6 @@ namespace Msg {
 
             MessageSMSRef createSms() override;
             MessageMmsRef createMms() override;
-            std::vector<MessageRef> createMultiMessage(const std::string &text) override;
             void calculateTextMetric(const std::string &text, MsgTextMetric &textMetric) override;
 
         private:
diff --git a/src/Common/Utils/src/WorkingDir.cpp b/src/Common/Utils/src/WorkingDir.cpp
index 7fca2b5..3fdad53 100644
--- a/src/Common/Utils/src/WorkingDir.cpp
+++ b/src/Common/Utils/src/WorkingDir.cpp
@@ -24,11 +24,10 @@
 
 using namespace Msg;
 
-const std::string commonWorkingDirName = "Temp";
-const std::string currentWorkingDirPrefix = "Temp";
+const std::string commonWorkingDirName = "working_dir";
+const std::string currentWorkingDirPrefix = "dir";
 const std::string textFileName = "mms.txt";
 
-
 WorkingDir::WorkingDir()
 {
     MSG_LOG("");
diff --git a/src/Composer/Controller/inc/MsgBodyFrame.h b/src/Composer/Controller/inc/MsgBodyFrame.h
index 7f84f96..add8fe8 100644
--- a/src/Composer/Controller/inc/MsgBodyFrame.h
+++ b/src/Composer/Controller/inc/MsgBodyFrame.h
@@ -23,6 +23,7 @@
 #include "Recipient.h"
 #include "MsgStorage.h"
 #include "ContactManager.h"
+#include "WorkingDir.h"
 
 #include <set>
 
@@ -74,10 +75,11 @@ namespace Msg {
             MsgEngine &getMsgEngine();
             bool checkBeforeSend(Message::Type type);
             void handleSendResult(MsgTransport::SendResult result);
-            bool read(Message &msg);
-            bool readBody(Message &msg);
-            bool readAddress(Message &msg);
             void afterSentHandler();
+            void setText(MessageRef msg, const std::string &text);
+            void setText(MessageSMS &msg, const std::string &text);
+            void setText(MessageMms &msg, const std::string &text);
+            bool readAddress(MessageRef msg);
 
             // Popup:
             void showMaxCharactersPopup();
@@ -117,6 +119,7 @@ namespace Msg {
             Recipient m_Recip;
             SendInfo m_SendInfo;
             bool m_CloseAfterSent;
+            WorkingDirRef m_WorkingDir;
     };
 }
 
diff --git a/src/Composer/Controller/src/MsgBodyFrame.cpp b/src/Composer/Controller/src/MsgBodyFrame.cpp
index e13de37..4c1c873 100644
--- a/src/Composer/Controller/src/MsgBodyFrame.cpp
+++ b/src/Composer/Controller/src/MsgBodyFrame.cpp
@@ -26,6 +26,7 @@
 #include "PopupManager.h"
 #include "ConvFrame.h"
 #include "MsgUtils.h"
+#include "MessageMms.h"
 
 using namespace Msg;
 
@@ -53,6 +54,7 @@ MsgBodyFrame::MsgBodyFrame(NaviFrameController &parent)
     , m_pSendingPopup(nullptr)
     , m_TextMetric()
     , m_CloseAfterSent(false)
+    , m_WorkingDir(std::make_shared<WorkingDir>())
 {
     MSG_LOG("");
     prepareLayout();
@@ -154,49 +156,73 @@ bool MsgBodyFrame::checkBeforeSend(Message::Type type)
     return true;
 }
 
-bool MsgBodyFrame::read(Message &msg)
+bool MsgBodyFrame::readAddress(MessageRef msg)
 {
-    if (readAddress(msg)) {
-        return readBody(msg);
+    if(m_Recip.isValid() && msg) {
+        MsgAddress &msgAddr = msg->addAddress();
+        msgAddr.setAddress(m_Recip.getAddress());
+        msgAddr.setRecipientType(MsgAddress::To);
+        msgAddr.setAddressType(MsgAddress::Phone);
+        return true;
     }
+
     return false;
 }
 
-bool MsgBodyFrame::readBody(Message &msg)
+MsgEngine &MsgBodyFrame::getMsgEngine()
 {
-    const std::string &text = m_pBody->getEntry().getText();
-    if (!text.empty()) {
-        msg.setText(text);
-        return true;
-    }
-    return false;
+    return App::getInst().getMsgEngine();
 }
 
-bool MsgBodyFrame::readAddress(Message &msg)
+void MsgBodyFrame::setText(MessageRef msg, const std::string &text)
 {
-    if(m_Recip.isValid()) {
-        MsgAddress &msgAddr = msg.addAddress();
-        msgAddr.setAddress(m_Recip.getAddress());
-        msgAddr.setRecipientType(MsgAddress::To);
-        msgAddr.setAddressType(MsgAddress::Phone);
-        return true;
+    if (msg && !text.empty()) {
+        if (auto *sms = dynamic_cast<MessageSMS*>(msg.get()))
+            setText(*sms, text);
+        else if (auto *mms = dynamic_cast<MessageMms*>(msg.get()))
+            setText(*mms, text);
     }
+}
 
-    return false;
+void MsgBodyFrame::setText(MessageSMS &msg, const std::string &text)
+{
+    msg.setText(text);
 }
 
-MsgEngine &MsgBodyFrame::getMsgEngine()
+void MsgBodyFrame::setText(MessageMms &msg, const std::string &text)
 {
-    return App::getInst().getMsgEngine();
+    static const int defaultPageDuration = 5000; // msec
+    std::string filePath = m_WorkingDir->addTextFile(text);
+    if (!filePath.empty()) {
+        MsgPage &page = msg.addPage();
+        page.setPageDuration(defaultPageDuration);
+        page.addMedia().setFilePath(filePath);
+    }
 }
 
 std::vector<MessageRef> MsgBodyFrame::createMessage()
 {
     const std::string &text = m_pBody->getEntry().getText();
-    std::vector<MessageRef> msgList = getMsgEngine().getComposer().createMultiMessage(text);
 
-    for (MessageRef &msg : msgList) {
-        readAddress(*msg);
+    std::vector<MessageRef> msgList;
+    const int maxMsgSize =  getMsgEngine().getSettings().getMaxMmsSize();
+
+    if (maxMsgSize <= 0) {
+        MSG_LOG_ERROR("getMaxMmsSize() returns 0");
+        return {};
+    }
+
+    auto textList = MsgUtils::splitUtf8String(text, maxMsgSize);
+
+    for (auto &&text : textList) {
+        MsgTextMetric metric;
+        getMsgEngine().getComposer().calculateTextMetric(text, metric);
+        Message::Type type = metric.isMms ? Message::MT_MMS : Message::MT_SMS;
+        auto msg = getMsgEngine().getComposer().createMessage(type);
+        if (readAddress(msg)) {
+            setText(msg, text);
+            msgList.push_back(msg);
+        }
     }
 
     return msgList;