From: Dmytro Dragan Date: Tue, 14 Jun 2016 14:54:31 +0000 (+0300) Subject: TSAM-4615 MMS sending fails on first attempt X-Git-Tag: submit/tizen/20160616.101748^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9ad7f061274edbeb34d0ed6c4adcb9d20843865e;p=profile%2Fmobile%2Fapps%2Fnative%2Fmessage.git TSAM-4615 MMS sending fails on first attempt Change-Id: I815e9e20626e0b21cf87ecc8fa387e07d305b51a Signed-off-by: Dmytro Dragan --- diff --git a/src/Common/MsgEngine/src/private/MsgAddressPrivate.cpp b/src/Common/MsgEngine/src/private/MsgAddressPrivate.cpp index d55a5d2..279d25b 100644 --- a/src/Common/MsgEngine/src/private/MsgAddressPrivate.cpp +++ b/src/Common/MsgEngine/src/private/MsgAddressPrivate.cpp @@ -41,7 +41,7 @@ std::string MsgAddressPrivate::getAddress() const MsgAddressPrivate::AddressType MsgAddressPrivate::getAddressType() const { int nativeType = MSG_ADDRESS_TYPE_UNKNOWN; - msg_get_int_value(m_MsgStruct, MSG_ADDRESS_INFO_ADDRESS_VALUE_STR, &nativeType); + msg_get_int_value(m_MsgStruct, MSG_ADDRESS_INFO_ADDRESS_TYPE_INT, &nativeType); return MsgUtilsPrivate::nativeToAddressType(nativeType); } diff --git a/src/Common/MsgEngine/src/private/MsgComposerPrivate.cpp b/src/Common/MsgEngine/src/private/MsgComposerPrivate.cpp index 429bfcd..ff2ef2d 100644 --- a/src/Common/MsgEngine/src/private/MsgComposerPrivate.cpp +++ b/src/Common/MsgEngine/src/private/MsgComposerPrivate.cpp @@ -73,10 +73,11 @@ void MsgComposerPrivate::setSmilHeader(msg_struct_t mms, bool isTextTop) msg_struct_t imageRegion = NULL; /************ make rootlayout ***************/ - msg_set_int_value(mms, MSG_MMS_ROOTLAYOUT_WIDTH_INT, smilScreenWidth); - msg_set_int_value(mms, MSG_MMS_ROOTLAYOUT_HEIGHT_INT, smilScreenHeight); - msg_set_int_value(mms, MSG_MMS_ROOTLAYOUT_BGCOLOR_INT, smilDefaultBgColor); + msg_set_int_value(mms, MSG_MMS_ROOTLAYOUT_WIDTH_INT, smilScreenWidthP); + msg_set_int_value(mms, MSG_MMS_ROOTLAYOUT_HEIGHT_INT, smilScreenHeightP); + msg_set_bool_value(mms, MSG_MMS_ROOTLAYOUT_WIDTH_PERCENT_BOOL, true); + msg_set_bool_value(mms, MSG_MMS_ROOTLAYOUT_HEIGHT_PERCENT_BOOL, true); /************ make region ********************/ /* 1. add text region */ msg_list_add_item(mms, MSG_STRUCT_MMS_REGION, &textRegion); @@ -95,8 +96,6 @@ void MsgComposerPrivate::setSmilHeader(msg_struct_t mms, bool isTextTop) msg_set_int_value(textRegion, MSG_MMS_REGION_LENGTH_HEIGHT_INT, smilRegionHeight); msg_set_bool_value(textRegion, MSG_MMS_REGION_LENGTH_HEIGHT_PERCENT_BOOL, true); - msg_set_int_value(textRegion, MSG_MMS_REGION_BGCOLOR_INT, smilDefaultBgColor); - /* 2. image(video) region */ msg_list_add_item(mms, MSG_STRUCT_MMS_REGION, &imageRegion); MsgUtilsPrivate::setStr(imageRegion, MSG_MMS_REGION_ID_STR, imageRegionId); @@ -111,5 +110,4 @@ void MsgComposerPrivate::setSmilHeader(msg_struct_t mms, bool isTextTop) msg_set_bool_value(imageRegion, MSG_MMS_REGION_LENGTH_WIDTH_PERCENT_BOOL, true); msg_set_int_value(imageRegion, MSG_MMS_REGION_LENGTH_HEIGHT_INT, smilRegionHeight); msg_set_bool_value(imageRegion, MSG_MMS_REGION_LENGTH_HEIGHT_PERCENT_BOOL, true); - msg_set_int_value(imageRegion, MSG_MMS_REGION_BGCOLOR_INT, smilDefaultBgColor); } diff --git a/src/Common/MsgEngine/src/private/MsgDefPrivate.h b/src/Common/MsgEngine/src/private/MsgDefPrivate.h index f868256..2b753fa 100644 --- a/src/Common/MsgEngine/src/private/MsgDefPrivate.h +++ b/src/Common/MsgEngine/src/private/MsgDefPrivate.h @@ -22,8 +22,8 @@ namespace Msg { // SMIL layout: - const int smilScreenWidth = 480; - const int smilScreenHeight = 800; + const int smilScreenWidthP = 100; + const int smilScreenHeightP = 100; const int smilPosTop = 1; const int smilPosBottom = 50; diff --git a/src/Common/MsgEngine/src/private/MsgMediaPrivate.cpp b/src/Common/MsgEngine/src/private/MsgMediaPrivate.cpp index 9a7de0c..61b6728 100644 --- a/src/Common/MsgEngine/src/private/MsgMediaPrivate.cpp +++ b/src/Common/MsgEngine/src/private/MsgMediaPrivate.cpp @@ -79,15 +79,6 @@ void MsgMediaPrivate::setType(Type type) case TextType: { MsgUtilsPrivate::setStr(m_MsgStruct, MSG_MMS_MEDIA_REGION_ID_STR, textRegionId); - - // Set font style: - msg_struct_t textStyle = msg_create_struct(MSG_STRUCT_MMS_SMIL_TEXT); - msg_set_int_value(textStyle, MSG_MMS_SMIL_TEXT_COLOR_INT, smilDefaultFontColor); - msg_set_int_value(textStyle, MSG_MMS_SMIL_TEXT_SIZE_INT, smilDefaultFontSize); - msg_set_int_value(textStyle, MSG_MMS_SMIL_TEXT_BOLD_BOOL, smilDefaultBold); - msg_set_int_value(textStyle, MSG_MMS_SMIL_TEXT_UNDERLINE_BOOL, smilDefaultUnderline); - msg_set_struct_handle(m_MsgStruct, MSG_MMS_MEDIA_SMIL_TEXT_HND, textStyle); - msg_release_struct(&textStyle); break; } @@ -105,7 +96,6 @@ void MsgMediaPrivate::setFilePath(const std::string &path) { MsgUtilsPrivate::setStr(m_MsgStruct, MSG_MMS_MEDIA_FILEPATH_STR, path); MediaTypeData mediaData = getMsgMediaTypeByFileExt(path); - setMime(mediaData.mime); setType(mediaData.type); } diff --git a/src/Conversation/Body/Controller/src/Body.cpp b/src/Conversation/Body/Controller/src/Body.cpp index 07c95d5..2978569 100644 --- a/src/Conversation/Body/Controller/src/Body.cpp +++ b/src/Conversation/Body/Controller/src/Body.cpp @@ -291,7 +291,6 @@ void Body::readAttachments(MessageMms &msg) msgAttach.setFilePath(resPath); msgAttach.setFileName(attachView->getFileName()); msgAttach.setFileSize((int)fileSize); - msgAttach.setMime(mime); } } diff --git a/src/Conversation/Body/Controller/src/Page.cpp b/src/Conversation/Body/Controller/src/Page.cpp index 74c3d21..8d96e9d 100644 --- a/src/Conversation/Body/Controller/src/Page.cpp +++ b/src/Conversation/Body/Controller/src/Page.cpp @@ -224,16 +224,12 @@ void Page::read(MsgPage &msgPage) void Page::readText(MsgPage &msgPage) { TextPageViewItem *textItem = static_cast(getItem(PageViewItem::TextType)); - if(textItem) + if(textItem && !textItem->isEmpty()) { writeTextToFile(*textItem); MsgMedia &media = msgPage.addMedia(); media.setFilePath(textItem->getResourcePath()); } - else - { - MSG_ASSERT(false, "TextPageViewItem is null"); - } } void Page::readSound(MsgPage &msgPage)