NABI issue resolution

Change-Id: I1ed5ddad46b4967e62b317af31e1c65c1f2c8f45
Signed-off-by: GAURAV JAIN <gaurav.j3@samsung.com>

diff --git a/res/screen-size-normal/IDL_MMS_DETAIL_FORM.xml b/res/screen-size-normal/IDL_MMS_DETAIL_FORM.xml
index 78d3497..a150e34 100644 (file)
--- a/res/screen-size-normal/IDL_MMS_DETAIL_FORM.xml
+++ b/res/screen-size-normal/IDL_MMS_DETAIL_FORM.xml
@@ -45,7 +45,7 @@
     </Button>
     <Progress id="IDC_PROGRESS" parent="IDC_PLAY_CONTROLS_PANEL">
         <property backgroundColor="" barColor="#FFFFFF" leftText="" max="20" min="0" rightText="" showValueState="true" value="0"/>
-        <layout height="35" mode="Portrait" style="PROGRESS_STYLE_NONE" width="486" x="119" y="50"/>
+        <layout height="65" mode="Portrait" style="PROGRESS_STYLE_NONE" width="524" x="100" y="30"/>
         <layout height="356" mode="Landscape" style="PROGRESS_STYLE_NONE" width="144" x="39" y="0"/>
     </Progress>
     <Label id="IDC_TIME_ELAPSED_LABEL" parent="IDC_PLAY_CONTROLS_PANEL">

diff --git a/res/screen-size-normal/IDL_MSG_OPTION_DETAILS_POPUP.xml b/res/screen-size-normal/IDL_MSG_OPTION_DETAILS_POPUP.xml
index 9004365..e0cd63c 100644 (file)
--- a/res/screen-size-normal/IDL_MSG_OPTION_DETAILS_POPUP.xml
+++ b/res/screen-size-normal/IDL_MSG_OPTION_DETAILS_POPUP.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!--\r
-       This XML file was automatically generated by UiBuilder - do not modify by hand.\r
--->\r
-<!DOCTYPE ScenePopup SYSTEM "UIForm.dtd">\r
-<ScenePopup Bversion="3.0.0.201212201745" Dversion="20120315">\r
-    <Popup id="IDL_MSG_OPTION_DETAILS_POPUP">\r
-        <property color="" titleText="::IDS_MSGF_HEADER_MESSAGE_DETAILS" titleTextColor=""/>\r
-        <layout height="502" mode="Portrait" style="" type="LAYOUT_RELATIVE" width="720"/>\r
-        <layout height="502" mode="Landscape" style="" type="LAYOUT_RELATIVE" width="720"/>\r
-    </Popup>\r
-    <Label id="IDC_POPUP_LABEL" parent="IDL_MSG_OPTION_DETAILS_POPUP">\r
-        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="36" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="false" height="96" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="648" x="0" y="309"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="96" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="648" x="0" y="309"/>\r
-    </Label>\r
-    <Button id="IDC_MSG_CLOSE_BUTTON" parent="IDL_MSG_OPTION_DETAILS_POPUP">\r
-        <property disableTextColor="" disabledBitmapPath="00_button_popup_dim.9.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="00_button_popup_normal.#.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="00_button_popup_press.#.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="::IDS_COM_POP_CLOSE" textSize="33" verticalAlign="ALIGN_MIDDLE"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="false" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="300" x="174" y="321"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="288" x="174" y="321"/>\r
-    </Button>\r
-    <TextBox id="IDC_TEXTBOX_MSG_DETAILS" parent="IDL_MSG_OPTION_DETAILS_POPUP">\r
-        <property disabledBackgroundBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" highlightedBackgroundBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" lineSpacingExtra="1" lineSpacingMultiplier="1" normalBackgroundBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" text="" textAlignment="" textSize="45" textboxBorder="TEXT_BOX_BORDER_ROUNDED"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="297" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="648" x="0" y="0"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="297" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="648" x="0" y="0"/>\r
-    </TextBox>\r
-</ScenePopup>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+       This XML file was automatically generated by UiBuilder - do not modify by hand.
+-->
+<!DOCTYPE ScenePopup SYSTEM "UIForm.dtd">
+<ScenePopup Bversion="2.0.0.201304041646" Dversion="20120315">
+    <Popup id="IDL_MSG_OPTION_DETAILS_POPUP">
+        <property accessibilityHint="" color="" titleText="::IDS_MSGF_HEADER_MESSAGE_DETAILS" titleTextColor=""/>
+        <layout height="502.0" mode="Portrait" style="" type="LAYOUT_RELATIVE" width="720.0"/>
+        <layout height="502.0" mode="Landscape" style="" type="LAYOUT_RELATIVE" width="720.0"/>
+    </Popup>
+    <Label id="IDC_POPUP_LABEL" parent="IDL_MSG_OPTION_DETAILS_POPUP">
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="36.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="false" height="96.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0" y="309.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="96.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="648.0" x="0.0" y="309.0"/>
+    </Label>
+    <Button id="IDC_MSG_CLOSE_BUTTON" parent="IDL_MSG_OPTION_DETAILS_POPUP">
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="00_button_popup_dim.9.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="00_button_popup_normal.#.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="00_button_popup_press.#.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="::IDS_COM_POP_CLOSE" textSize="33.0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="false" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="300.0" x="210.0" y="321.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="288.0" x="174.0" y="321.0"/>
+    </Button>
+    <TextBox id="IDC_TEXTBOX_MSG_DETAILS" parent="IDL_MSG_OPTION_DETAILS_POPUP">
+        <property accessibilityHint="" disabledBackgroundBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" highlightedBackgroundBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" lineSpacingExtra="1.0" lineSpacingMultiplier="1.0" normalBackgroundBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" text="" textAlignment="" textSize="45.0" textboxBorder="TEXT_BOX_BORDER_ROUNDED"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="297.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_CONTENT" width="648.0" x="0.0" y="0.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="297.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_CONTENT" width="648.0" x="0.0" y="0.0"/>
+    </TextBox>
+</ScenePopup>

diff --git a/src/MsgAttachItemCntl.cpp b/src/MsgAttachItemCntl.cpp
index 5685eef..b1cd27f 100644 (file)
--- a/src/MsgAttachItemCntl.cpp
+++ b/src/MsgAttachItemCntl.cpp
@@ -254,7 +254,7 @@ AttachItemCntl::GetMinimumHeight(void) const
                __pEnrichedText->GetTextExtent(startIndex, __pEnrichedText->GetLineLength(0), width, height, length);
                minHeight = __pEnrichedText->GetTotalLineHeight();
        }
-       bool isTitleOnBottom((__attachMentType == ATTACHMENT_TYPE_IMAGE) || (__attachMentType == ATTACHMENT_TYPE_IMAGE));
+       bool isTitleOnBottom((__attachMentType == ATTACHMENT_TYPE_IMAGE) /*|| (__attachMentType == ATTACHMENT_TYPE_IMAGE)*/);
        if (__pNormalAttachIcon)
        {
                if (isTitleOnBottom)
@@ -294,7 +294,7 @@ AttachItemCntl::GetMimimumWidth(void) const
 
        if (__pNormalAttachIcon)
        {
-               bool isTitleOnBottom((__attachMentType == ATTACHMENT_TYPE_IMAGE) || (__attachMentType == ATTACHMENT_TYPE_IMAGE));
+               bool isTitleOnBottom((__attachMentType == ATTACHMENT_TYPE_IMAGE) /*|| (__attachMentType == ATTACHMENT_TYPE_IMAGE)*/);
                if (isTitleOnBottom)
                {
                        if (maxWidth < __pNormalAttachIcon->GetWidth())

diff --git a/src/MsgCommonUtil.cpp b/src/MsgCommonUtil.cpp
index f58a25a..f593061 100644 (file)
--- a/src/MsgCommonUtil.cpp
+++ b/src/MsgCommonUtil.cpp
@@ -58,6 +58,7 @@ CommonUtil::IsImageFile(const String& filePath)
                        imagePath.EndsWith(L".jpeg") ||\r
                        imagePath.EndsWith(L".jpe") ||\r
                        imagePath.EndsWith(L".png") ||\r
+                       imagePath.EndsWith(L".tiff") ||\r
                        imagePath.EndsWith(L".tif") ||\r
                        imagePath.EndsWith(L".pmd") ||\r
                        imagePath.EndsWith(L".bmp") ||\r

diff --git a/src/MsgContactUtility.cpp b/src/MsgContactUtility.cpp
index 339de9d..aae47d8 100644 (file)
--- a/src/MsgContactUtility.cpp
+++ b/src/MsgContactUtility.cpp
@@ -30,7 +30,7 @@ const wchar_t* IDS_TYPE_VOICE = L"voice";
 \r
 const wchar_t* IDS_VIEW_TYPE = L"viewType";\r
 const wchar_t* IDS_VIEW_TYPE_VALUE = L"contact";\r
-const wchar_t* IDS_KEY_CONTACTID = L"contactId";\r
+const wchar_t* IDS_KEY_ITEMID = L"http://tizen.org/appcontrol/data/social/item_id";\r
 const wchar_t* IDS_PATH = L"path:/";\r
 const wchar_t* FILE_EXTENSION_VCF = L".vcf";\r
 const wchar_t* IDS_SLASH = L"/";\r
@@ -148,10 +148,8 @@ ContactUtility::ViewContact(const String& recipientAddr, bool isEmail)
                                        String* pItemKey = new (std::nothrow) String(IDS_SELECTION_ITEM_KEY);\r
                                        String* pItemVal = new (std::nothrow) String(IDS_SELECTION_ITEM_VALUE);\r
                                        pHashMap->Add(pItemKey, pItemVal);\r
-                                       String* pModeKey = new (std::nothrow) String(IDS_VIEW_TYPE);\r
-                                       String* pModeVal = new (std::nothrow) String(IDS_VIEW_TYPE_VALUE);\r
-                                       pHashMap->Add(pModeKey, pModeVal);\r
-                                       String* pTypeKey = new (std::nothrow) String(IDS_KEY_CONTACTID);\r
+\r
+                                       String* pTypeKey = new (std::nothrow) String(IDS_KEY_ITEMID);\r
                                        String* pTypeVal = new (std::nothrow) String(viewContact);\r
                                        pHashMap->Add(pTypeKey, pTypeVal);\r
                                        r = pAppCntl->Start(null, null, pHashMap, null);\r

diff --git a/src/MsgConversationData.cpp b/src/MsgConversationData.cpp
index e9854e3..186a975 100644 (file)
--- a/src/MsgConversationData.cpp
+++ b/src/MsgConversationData.cpp
@@ -171,9 +171,9 @@ ConversationData::CloneN(void)
                convData->__timeStamp = this->__timeStamp;
                convData->__pageCount = this->__pageCount;
                convData->__attachmentCount = this->__attachmentCount;
-               convData->__imagePath = this->__audioPath;
+               convData->__audioPath = this->__audioPath;
                convData->__imagePath = this->__imagePath;
-               convData->__imagePath = this->__videoPath;
+               convData->__videoPath = this->__videoPath;
                convData->__subjectStr = this->__subjectStr;
        }
 
@@ -331,10 +331,13 @@ ConversationData::InitMessageBody(msg_struct_t pMessageInfo)
 
        result r = E_SUCCESS;
        char* pMsgText = new (std::nothrow) char[MAX_MSG_TEXT_LEN + 1];
-       memset(pMsgText, 0, MAX_MSG_TEXT_LEN + 1);
+       if (pMsgText)
+       {
+               memset(pMsgText, 0, MAX_MSG_TEXT_LEN + 1);
+       }
        msg_error_t err = msg_get_str_value(pMessageInfo, MSG_CONV_MSG_TEXT_STR, pMsgText
                                                                           , MAX_MSG_TEXT_LEN);
-       if (err == MSG_SUCCESS && pMsgText && (int) strlen(pMsgText) > 0)
+       if (err == MSG_SUCCESS && (int) strlen(pMsgText) > 0)
        {
                __messageBody.Append(pMsgText);
        }
@@ -444,7 +447,7 @@ ConversationData::InitTimeStampGroupName(void)
 void
 ConversationData::UpdateGroupName(int day,int date, int month)
 {
-       __groupName.Append(L" (");
+       __groupName.Append(L"(");
        switch (day)
        {
        case 1:

diff --git a/src/MsgMediaControl.cpp b/src/MsgMediaControl.cpp
index 5f6c4d4..3191c7d 100644 (file)
--- a/src/MsgMediaControl.cpp
+++ b/src/MsgMediaControl.cpp
@@ -235,8 +235,11 @@ MediaControl::LoadMediaIcon(void)
                VideoFrameExtractor extractor;\r
                extractor.Construct(__mediaPath, MEDIA_PIXEL_FORMAT_BGRA8888);\r
                ImageBuffer* pImage = extractor.GetFrameN(0);\r
-               pBitmap = pImage->GetBitmapN(BITMAP_PIXEL_FORMAT_ARGB8888, BUFFER_SCALING_AUTO);\r
-               delete pImage;\r
+               if (pImage)\r
+               {\r
+                       pBitmap = pImage->GetBitmapN(BITMAP_PIXEL_FORMAT_ARGB8888, BUFFER_SCALING_AUTO);\r
+                       delete pImage;\r
+               }\r
                AppLogDebug("Bitmap Album EXIT: %s", GetErrorMessage(GetLastResult()));\r
        }\r
        else\r

diff --git a/src/MsgMessageComposePanel.cpp b/src/MsgMessageComposePanel.cpp
index 4367a39..453348a 100644 (file)
--- a/src/MsgMessageComposePanel.cpp
+++ b/src/MsgMessageComposePanel.cpp
@@ -479,6 +479,7 @@ MessageComposePanel::OnTimerExpired(Timer& timer)
                __pSizeExceedPopup = null;
        }
        delete &timer;
+       SetFocusToLastPage();
        AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));
 }
 void
@@ -797,6 +798,7 @@ MessageComposePanel::OnActionPerformed(const Control& source, int actionId)
                        delete __pSizeExceedPopup;
                        __pSizeExceedPopup = null;
                }
+               SetFocusToLastPage();
        }
        break;
 
@@ -1215,6 +1217,11 @@ MessageComposePanel::LaunchAppControl(RequestType requestType)
                        r = pAppCntl->Start(pUriData, pMimeType, pHashMap, this);
                        delete pAppCntl;
                }
+               if (pMimeType)
+               {
+                       delete pMimeType;
+                       pMimeType = null;
+               }
                pHashMap->RemoveAll(true);
                delete pHashMap;
        }

diff --git a/src/MsgMessageData.cpp b/src/MsgMessageData.cpp
index 71e9c05..1102064 100644 (file)
--- a/src/MsgMessageData.cpp
+++ b/src/MsgMessageData.cpp
@@ -252,7 +252,7 @@ MessageData::CloneN(void)
                {\r
                        pMsgData->__pPageList = new (std::nothrow) ArrayList();\r
                        pMsgData->__pPageList->Construct();\r
-                       for (int index = 0; index < this->__pAttachList->GetCount(); index++)\r
+                       for (int index = 0; index < this->__pPageList->GetCount(); index++)\r
                        {\r
                                MmsPageData* pMmmsPageData = (MmsPageData*) __pPageList->GetAt(index);\r
                                pMsgData->__pPageList->Add(pMmmsPageData->CloneN());\r

diff --git a/src/MsgMessagesApp.cpp b/src/MsgMessagesApp.cpp
index c118eaf..d990ef7 100644 (file)
--- a/src/MsgMessagesApp.cpp
+++ b/src/MsgMessagesApp.cpp
@@ -300,7 +300,7 @@ MessagesApp::OnAppControlRequestReceived(RequestId reqId, const String& operatio
                                AppLogDebug("Key: %S Value: %S", textKey.GetPointer(), pBodyText->GetPointer());
                        }
                        // For MMS fetch attach file path
-                       //if (msgTypeMms)
+                       if (msgTypeMms)
                        {
                                const String subjectKey(COMPOSE_KEY_SUBJECT);
                                const String* pSubjectText = (String*) pArgs->GetValue(subjectKey);

diff --git a/src/MsgOptionPopup.cpp b/src/MsgOptionPopup.cpp
index 097f145..67b4a15 100644 (file)
--- a/src/MsgOptionPopup.cpp
+++ b/src/MsgOptionPopup.cpp
@@ -390,8 +390,6 @@ OptionPopup::ShowMessageDetails(void)
                if (pMsgPrModel)\r
                {\r
                        TextBox* pTextBox = static_cast<TextBox*>(__pPopup->GetControl(L"IDC_TEXTBOX_MSG_DETAILS"));\r
-                       pTextBox->SetTextColor(TEXT_BOX_TEXT_COLOR_DISABLED, pTextBox->GetTextColor(TEXT_BOX_TEXT_COLOR_NORMAL));\r
-                       pTextBox->SetEnabled(false);\r
                        if (pTextBox)\r
                        {\r
                                String messageDetails;\r

diff --git a/src/MsgRecipientPanel.cpp b/src/MsgRecipientPanel.cpp
index 4dfb0ae..f0aa188 100644 (file)
--- a/src/MsgRecipientPanel.cpp
+++ b/src/MsgRecipientPanel.cpp
@@ -483,6 +483,7 @@ RecipientPanel::OnAppControlCompleteResponseReceived(const AppId& appId, const S
                        {
                                bool isMaximumrecipientreached = false;
                                bool isInvalidPhoneNumber = false;
+                               bool isDuplicateRecipient = false;
                                String invalidRecipient(IDS_BLANK);
                                for (int index = 0; index < pRecipientList->GetCount(); index++)
                                {
@@ -522,7 +523,14 @@ RecipientPanel::OnAppControlCompleteResponseReceived(const AppId& appId, const S
                                                                RecipientError err = AddRecipient(pRecipent);
                                                                if(err != RECIPIENT_ERROR_NONE)
                                                                {
-                                                                       isInvalidPhoneNumber = true;
+                                                                       if (err == RECIPIENT_ERROR_DUPLICATE)
+                                                                       {
+                                                                               isDuplicateRecipient = true;
+                                                                       }
+                                                                       else if (err == RECIPIENT_ERROR_INVALID)
+                                                                       {
+                                                                               isInvalidPhoneNumber = true;
+                                                                       }
                                                                        if (invalidRecipient.GetLength())
                                                                        {
                                                                                invalidRecipient.Append(IDS_COMMA_SPACE);
@@ -554,11 +562,16 @@ RecipientPanel::OnAppControlCompleteResponseReceived(const AppId& appId, const S
                                                }
                                        }
                                }
-                               if (!isMaximumrecipientreached && isInvalidPhoneNumber)
+                               if (isInvalidPhoneNumber)
                                {
                                        __pContactCountLabel->SetShowState(false);
                                        ShowErrorMessage(RECIPIENT_ERROR_INVALID, invalidRecipient);
                                }
+                               else if (isDuplicateRecipient)
+                               {
+                                       __pContactCountLabel->SetShowState(false);
+                                       ShowErrorMessage(RECIPIENT_ERROR_DUPLICATE, invalidRecipient);
+                               }
                                pRecipientList->RemoveAll(true);
                                delete pRecipientList;
                        }
@@ -1284,7 +1297,7 @@ RecipientPanel::OnContactsChanged(const IList& contactChangeInfoList)
                                Contact* pContact = null;
                                pContact = __pAddressBook->GetContactN(recordId);
                                IList* pPhoneNumberList = pContact->GetValuesN(CONTACT_MPROPERTY_ID_PHONE_NUMBERS);
-                               if (((PhoneNumber*) pPhoneNumberList->GetAt(0))->GetPhoneNumber().Equals(pRecipient->recipientAddr, false))
+                               if (pPhoneNumberList && (((PhoneNumber*) pPhoneNumberList->GetAt(0))->GetPhoneNumber().Equals(pRecipient->recipientAddr, false)))
                                {
                                        String contactName;
                                        pContact->GetValue(CONTACT_PROPERTY_ID_DISPLAY_NAME, contactName);

diff --git a/src/MsgSpamSettingsForm.cpp b/src/MsgSpamSettingsForm.cpp
index 296fcd3..94ee3fb 100644 (file)
--- a/src/MsgSpamSettingsForm.cpp
+++ b/src/MsgSpamSettingsForm.cpp
@@ -622,17 +622,14 @@ SpamSettingsForm::OnActionPerformed(const Control& source, int actionId)
                }
                else if (!editFieldText.IsEmpty())
                {
-                       if (__pEditField)
+                       __pEditField->HideKeypad();
+                       if (actionId != IDA_SAVE_REJECT_NUMBER)
                        {
-                               __pEditField->HideKeypad();
-                               if (actionId != IDA_SAVE_REJECT_NUMBER)
-                               {
-                                       ShowConfirmationPopup();
-                               }
-                               else
-                               {
-                                       SaveSpamFilter(SPAM_FILTER_TYPE_BLOCK_NUMBER);
-                               }
+                               ShowConfirmationPopup();
+                       }
+                       else
+                       {
+                               SaveSpamFilter(SPAM_FILTER_TYPE_BLOCK_NUMBER);
                        }
                }
                else
@@ -1784,7 +1781,6 @@ SpamSettingsForm::SelectContact(void)
                pHashMap->Add(new (std::nothrow) String(IDS_SELECTION_MODE_KEY), new (std::nothrow) String(IDS_SELECTION_MODE_SINGLE));
                pHashMap->Add(new (std::nothrow) String(IDS_SELECTION_ITEM_KEY), new (std::nothrow) String(IDS_SELECTION_ITEM_VALUE));
                pHashMap->Add(new (std::nothrow) String(IDS_RET_TYPE_KEY), new (std::nothrow) String("phone"));
-               pAppContl = AppManager::FindAppControlN(IDS_APPCONTROL_PROVIDER_CONTACT, IDS_APPCONTROL_OPERATION_SOCIAL_PICK);
                pAppContl->Start(null, null, pHashMap, this);
                pHashMap->RemoveAll(true);
                delete pHashMap;

diff --git a/src/MsgThreadData.cpp b/src/MsgThreadData.cpp
index baacd12..bbc6cde 100644 (file)
--- a/src/MsgThreadData.cpp
+++ b/src/MsgThreadData.cpp
@@ -383,7 +383,7 @@ ThreadData::InitTimeStampGroupName(void)
 void
 ThreadData::UpdateGroupName(int day,int date, int month)
 {
-       __groupName.Append(L" (");
+       __groupName.Append(L"(");
        switch (day)
        {
        case 1: