Contact edit changes

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

diff --git a/inc/MsgBasePresentationModel.h b/inc/MsgBasePresentationModel.h
index 883265e..3688de4 100644 (file)
--- a/inc/MsgBasePresentationModel.h
+++ b/inc/MsgBasePresentationModel.h
@@ -120,9 +120,9 @@ public:
         *
         * @param messageId     - Message which move to be SIM
         *
-        * @return bool  - In case of succes return true else false.
+        * @return int  - The values for this type SHOULD be in _MSG_ERROR_E
         */
-       bool MoveMessageToSIM(int messageId);
+       int MoveMessageToSIM(int messageId);
 
        /**
         * Move seleted message to phone

diff --git a/inc/MsgContactList.h b/inc/MsgContactList.h
index c42046f..580f57c 100644 (file)
--- a/inc/MsgContactList.h
+++ b/inc/MsgContactList.h
@@ -54,7 +54,7 @@ class ContactList
 {\r
 \r
 public:\r
-       ContactList(void);\r
+       ContactList(Tizen::Ui::Control* pParentControl = null);\r
        virtual ~ContactList(void);\r
 \r
        result Construct(Tizen::Base::Collection::ArrayList* pPhoneNumberList);\r
@@ -106,6 +106,7 @@ private:
        Tizen::Base::String __titleName;\r
        Tizen::Base::String __contactNumber;\r
        Tizen::Ui::Controls::Popup* __pBlockConfirmPopup;\r
+       Tizen::Ui::Control* __pParentControl;\r
 };\r
 \r
 #endif // _MSG_CONTACT_LIST_H_\r

diff --git a/inc/MsgContactUtility.h b/inc/MsgContactUtility.h
index 57737f3..e505f76 100644 (file)
--- a/inc/MsgContactUtility.h
+++ b/inc/MsgContactUtility.h
@@ -77,6 +77,7 @@ public:
        static result ViewContact(const Tizen::Base::String& recipientAddr, bool isEmail );\r
        static Tizen::Social::Contact* GetContact(Tizen::Base::Collection::IList* pContactList, const Tizen::Base::String& phoneNumber );\r
        static Tizen::Social::Contact* GetContactByEmail(Tizen::Base::Collection::IList* pContactList, const Tizen::Base::String& emailAddr );\r
+       static Tizen::Base::String GetContactName(Tizen::Base::Collection::IList* pContactList, const Tizen::Base::String& phoneNumber);\r
 };\r
 \r
 \r

diff --git a/inc/MsgConversationForm.h b/inc/MsgConversationForm.h
index 57ef2d4..5879471 100644 (file)
--- a/inc/MsgConversationForm.h
+++ b/inc/MsgConversationForm.h
@@ -324,6 +324,7 @@ private:
        void UnBlockPhoneNumber(const Tizen::Base::String& phoneNumber);\r
 \r
        void SetConvFormButtonsEnabled(bool state = false);\r
+       void CreateDraftMessage(void);\r
 \r
 \r
 private:\r

diff --git a/inc/MsgThreadListForm.h b/inc/MsgThreadListForm.h
index ca961f9..8efd00b 100644 (file)
--- a/inc/MsgThreadListForm.h
+++ b/inc/MsgThreadListForm.h
@@ -118,9 +118,9 @@ protected:
 \r
        // From IKeypadEventListener\r
        virtual void OnKeypadActionPerformed(Tizen::Ui::Control& source, Tizen::Ui::KeypadAction keypadAction);\r
-       virtual void OnKeypadClosed(Tizen::Ui::Control& source){};\r
-       virtual void OnKeypadOpened(Tizen::Ui::Control& source){};\r
-       virtual void OnKeypadWillOpen(Tizen::Ui::Control& source){};\r
+       virtual void OnKeypadClosed(Tizen::Ui::Control& source);\r
+       virtual void OnKeypadOpened(Tizen::Ui::Control& source);\r
+       virtual void OnKeypadWillOpen(Tizen::Ui::Control& source);\r
 \r
        //From ITouchEventListener\r
        virtual void OnTouchPressed(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo);\r
@@ -317,6 +317,7 @@ private:
        Tizen::Ui::Controls::ListContextItem* __pItemContextUnblock;\r
        int __blockGroupIndex;\r
        int __blockItemIndex;\r
+       bool __isKeypadOpen;\r
 };\r
 \r
 \r

diff --git a/inc/MsgTypes.h b/inc/MsgTypes.h
index 0e223d2..bb4d1a0 100644 (file)
--- a/inc/MsgTypes.h
+++ b/inc/MsgTypes.h
@@ -426,6 +426,7 @@ enum RequestType
        REQUEST_LOAD_ATTACHMENTS_APPCONTROL,
        REQUEST_MSGCOMPOSEPANEL_BUTTON_STATE,
        REQUEST_HEADER_BUTTON_STATE,
+       REQUEST_HIDE_RECIPIENT_LIST,
 };
 
 enum SpamFilterType

diff --git a/res/screen-size-normal/IDL_MMS_DETAIL_FORM.xml b/res/screen-size-normal/IDL_MMS_DETAIL_FORM.xml
index a150e34..67456bf 100644 (file)
--- a/res/screen-size-normal/IDL_MMS_DETAIL_FORM.xml
+++ b/res/screen-size-normal/IDL_MMS_DETAIL_FORM.xml
@@ -3,10 +3,10 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
-<Scene Bversion="2.0.0.201303041025" Dversion="20120315">
+<Scene Bversion="2.0.0.201304191935" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_MMS_DETAIL_FORM">
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
+        <property backgroundColor="" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
         <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>
         <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>
     </Form>
@@ -15,79 +15,79 @@
         <itemSet/>
     </Footer>
     <Header>
-        <property backgroundBitmapPath="" color="" colorOpacity="0" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" titleIconPath="" titleText="" titleTextColor=""/>
+        <property accessibilityHint="" backgroundBitmapPath="" color="" colorOpacity="0" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" showBackButton="false" titleIconPath="" titleText="" titleTextColor=""/>
         <itemSet/>
     </Header>
     <Panel id="IDC_PLAY_CONTROLS_PANEL" parent="IDL_MMS_DETAIL_FORM">
         <property backgroundColor="#4D4D4D" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
-        <layout bottomRelation="IDL_MMS_DETAIL_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="216" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="795"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="46" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="533" x="90" y="418"/>
+        <layout bottomRelation="IDL_MMS_DETAIL_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="216.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="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="795.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="46.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="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="533.0" x="90.0" y="418.0"/>
     </Panel>
     <Button id="IDC_VOLUME_BUTTON" parent="IDC_PLAY_CONTROLS_PANEL">
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="M01_play_btn_volume_press.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="M01_play_btn_volume_press.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="20" verticalAlign="ALIGN_MIDDLE"/>
-        <layout height="74" mode="Portrait" width="74" x="32" y="120"/>
-        <layout height="356" mode="Landscape" width="78" x="4" y="0"/>
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="M01_play_btn_volume_press.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="M01_play_btn_volume_press.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="20.0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout height="74.0" mode="Portrait" width="74.0" x="32.0" y="120.0"/>
+        <layout height="356.0" mode="Landscape" width="78.0" x="4.0" y="0.0"/>
     </Button>
     <Button id="IDC_NEXT_BUTTON" parent="IDC_PLAY_CONTROLS_PANEL">
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="M01_play_btn_next_press.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="M01_play_btn_next_press.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="M01_play_btn_next_press.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>
-        <layout height="74" mode="Portrait" width="74" x="466" y="120"/>
-        <layout height="356" mode="Landscape" width="78" x="14" y="0"/>
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="M01_play_btn_next_press.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="M01_play_btn_next_press.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="M01_play_btn_next_press.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33.0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout height="74.0" mode="Portrait" width="74.0" x="466.0" y="120.0"/>
+        <layout height="356.0" mode="Landscape" width="78.0" x="14.0" y="0.0"/>
     </Button>
     <Button id="IDC_PLAY_PAUSE_BUTTON" parent="IDC_PLAY_CONTROLS_PANEL">
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>
-        <layout height="74" mode="Portrait" width="74" x="322" y="120"/>
-        <layout height="356" mode="Landscape" width="78" x="14" y="0"/>
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33.0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout height="74.0" mode="Portrait" width="74.0" x="322.0" y="120.0"/>
+        <layout height="356.0" mode="Landscape" width="78.0" x="14.0" y="0.0"/>
     </Button>
     <Button id="IDC_PREVIOUS_BUTTON" parent="IDC_PLAY_CONTROLS_PANEL">
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="M01_play_btn_previous_press.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="M01_play_btn_previous_press.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="M01_play_btn_previous_press.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>
-        <layout height="74" mode="Portrait" width="74" x="178" y="120"/>
-        <layout height="356" mode="Landscape" width="78" x="14" y="0"/>
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="M01_play_btn_previous_press.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="M01_play_btn_previous_press.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="M01_play_btn_previous_press.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33.0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout height="74.0" mode="Portrait" width="74.0" x="178.0" y="120.0"/>
+        <layout height="356.0" mode="Landscape" width="78.0" x="14.0" y="0.0"/>
     </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="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"/>
+        <property accessibilityHint="" backgroundColor="" barBackgroundColor="" barColor="#FFFFFF" leftText="" max="20" min="0" rightText="" showValueState="true" value="0"/>
+        <layout height="65.0" mode="Portrait" style="PROGRESS_STYLE_NONE" width="524.0" x="100.0" y="30.0"/>
+        <layout height="356.0" mode="Landscape" style="PROGRESS_STYLE_NONE" width="144.0" x="39.0" y="0.0"/>
     </Progress>
     <Label id="IDC_TIME_ELAPSED_LABEL" parent="IDC_PLAY_CONTROLS_PANEL">
-        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_CENTER" text="00:00" textColor="#FFFFFF" textSize="18" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_MIDDLE"/>
-        <layout height="28" mode="Portrait" width="85" x="20" y="50"/>
-        <layout height="28" mode="Landscape" width="85" x="20" y="0"/>
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_CENTER" leftMargin="16" text="00:00" textColor="#FFFFFF" textSize="18.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout height="28.0" mode="Portrait" width="85.0" x="20.0" y="50.0"/>
+        <layout height="28.0" mode="Landscape" width="85.0" x="20.0" y="0.0"/>
     </Label>
     <Label id="IDC_TOTAL_TIME_DURATION_LABEL" parent="IDC_PLAY_CONTROLS_PANEL">
-        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_CENTER" text="00:05" textColor="#FFFFFF" textSize="18" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_MIDDLE"/>
-        <layout height="28" mode="Portrait" width="85" x="623" y="50"/>
-        <layout height="28" mode="Landscape" width="85" x="623" y="0"/>
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_CENTER" leftMargin="16" text="00:05" textColor="#FFFFFF" textSize="18.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout height="28.0" mode="Portrait" width="85.0" x="623.0" y="50.0"/>
+        <layout height="28.0" mode="Landscape" width="85.0" x="623.0" y="0.0"/>
     </Label>
     <Label id="IDC_PAGE_NUMBER_LABEL" parent="IDL_MMS_DETAIL_FORM">
-        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_RIGHT" text="" textColor="" textSize="29" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="56" 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="155" x="564" y="5"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="52" 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="533" x="236" y="0"/>
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_RIGHT" leftMargin="16" text="" textColor="" textSize="29.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="56.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="155.0" x="564.0" y="5.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="52.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="533.0" x="236.0" y="0.0"/>
     </Label>
     <Label id="IDC_LABEL_SUBJECT" parent="IDL_MMS_DETAIL_FORM">
-        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="29" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="56" 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="564" x="0" y="5"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="52" 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="533" x="96" y="0"/>
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="29.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="56.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MMS_DETAIL_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="564.0" x="0.0" y="5.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="52.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="533.0" x="96.0" y="0.0"/>
     </Label>
     <Label id="IDC_ATTACH_FILES_INFO_LABEL" parent="IDL_MMS_DETAIL_FORM">
-        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="#1E90FF" textSize="29" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="64" 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="688" x="16" y="82"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="52" 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="533" x="248" y="0"/>
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="#1E90FF" textSize="29.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="64.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="688.0" x="16.0" y="82.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="52.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="533.0" x="248.0" y="0.0"/>
     </Label>
     <ScrollPanel id="IDC_SCROLLPANEL" parent="IDL_MMS_DETAIL_FORM">
         <property autoResizingEnabled="true" backgroundColor="" backgroundColorOpacity="0" clientAreaHeight="0" clientAreaWidth="0" pageScrollEnabled="true" scrollBarVisible="true" scrollDirection="SCROLL_PANEL_SCROLL_DIRECTION_VERTICAL" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION"/>
-        <panelLayout height="905" mode="Portrait" width="688"/>
-        <panelLayout height="152" mode="Landscape" width="533"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="905" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="688" x="16" y="82"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="52" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="533" x="42" y="370"/>
+        <panelLayout height="905.0" mode="Portrait" width="688.0"/>
+        <panelLayout height="538.0" mode="Landscape" width="533.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="905.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="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="688.0" x="16.0" y="82.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="52.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="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="533.0" x="42.0" y="370.0"/>
     </ScrollPanel>
     <TextBox id="IDC_MMS_TEXT" parent="IDC_SCROLLPANEL">
-        <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"/>
-        <layout height="193" mode="Portrait" width="688" x="0" y="0"/>
-        <layout height="538" mode="Landscape" width="115" x="18" y="0"/>
+        <property accessibilityHint="" disabledBackgroundBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" highlightedBackgroundBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" lineSpacingExtra="1.0" lineSpacingMultiplier="1" normalBackgroundBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" text="" textAlignment="" textSize="45.0" textboxBorder="TEXT_BOX_BORDER_ROUNDED"/>
+        <layout height="193.0" mode="Portrait" width="688.0" x="0.0" y="0.0"/>
+        <layout height="538.0" mode="Landscape" width="115.0" x="18.0" y="0.0"/>
     </TextBox>
     <Gallery id="IDC_GALLERY_MMS_IMAGE" parent="IDC_SCROLLPANEL">
-        <property backgroundColor="" bitmapPathOfEmptyGallery="" slideShowAnimation="GALLERY_ANIMATION_PAGE" slideShowAnimationDuration="3000" slideShowViewDuration="10" textOfEmptyGallery="" zoomingEnabled="true"/>
-        <layout height="438" mode="Portrait" width="688" x="0" y="0"/>
-        <layout height="466" mode="Landscape" width="115" x="14" y="0"/>
+        <property accessibilityHint="" backgroundColor="" bitmapPathOfEmptyGallery="" slideShowAnimation="GALLERY_ANIMATION_PAGE" slideShowAnimationDuration="3000" slideShowViewDuration="10" textOfEmptyGallery="" zoomingEnabled="true"/>
+        <layout height="438.0" mode="Portrait" width="688.0" x="0.0" y="0.0"/>
+        <layout height="466.0" mode="Landscape" width="115.0" x="14.0" y="0.0"/>
     </Gallery>
 </Scene>

diff --git a/src/MsgBasePresentationModel.cpp b/src/MsgBasePresentationModel.cpp
index f94259f..d1e75fa 100644 (file)
--- a/src/MsgBasePresentationModel.cpp
+++ b/src/MsgBasePresentationModel.cpp
@@ -20,7 +20,6 @@
 #include <FSocial.h>
 
 #include "MsgBasePresentationModel.h"
-#include "MsgCommonUtil.h"
 #include "MsgContactUtility.h"
 #include "MsgContactList.h"
 #include "MsgDeleteHandler.h"
@@ -246,17 +245,17 @@ BasePresentationModel::GetMessageDeliveryStatus(int messageId)
        return reportStatus;
 }
 
-bool
+int
 BasePresentationModel::MoveMessageToSIM(int messageId)
 {
        AppLogDebug("ENTER");
 
        msg_message_id_t msgId = messageId;
        msg_storage_id_t storageId = MSG_STORAGE_SIM;
-       msg_error_t err = msg_move_msg_to_storage(__pMsgHandle, msgId, storageId);
-
+       int err = (msg_error_t) msg_move_msg_to_storage(__pMsgHandle, msgId, storageId);
+       AppLogDebug("msg_error_t: %d", err);
        AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));
-       return (err == MSG_SUCCESS);
+       return err;
 }
 
 bool

diff --git a/src/MsgCommonUtil.cpp b/src/MsgCommonUtil.cpp
index b746bd9..a017fc8 100644 (file)
--- a/src/MsgCommonUtil.cpp
+++ b/src/MsgCommonUtil.cpp
@@ -409,6 +409,8 @@ CommonUtil::ShowInfoPopup(const String& info, const String& title, MessageBoxSty
 void\r
 CommonUtil::ShowErrorInfo(msg_error_t err)\r
 {\r
+       AppLogDebug("ENTER");\r
+\r
        AppResource* pAppResource = Application::GetInstance()->GetAppResource();\r
        if (pAppResource)\r
        {\r
@@ -429,6 +431,8 @@ CommonUtil::ShowErrorInfo(msg_error_t err)
                }\r
                ShowInfoPopup(strText);\r
        }\r
+\r
+       AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));\r
        return;\r
 }\r
 \r

diff --git a/src/MsgContactList.cpp b/src/MsgContactList.cpp
index 5c8d837..f6d37ce 100644 (file)
--- a/src/MsgContactList.cpp
+++ b/src/MsgContactList.cpp
@@ -31,10 +31,11 @@ using namespace Tizen::Graphics;
 using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 
-ContactList::ContactList(void)
+ContactList::ContactList(Control* pParentControl)
        : __pContactList(null)
        , __pContactPopup(null)
        , __pBlockConfirmPopup(null)
+       , __pParentControl(pParentControl)
 {
        //Empty Implementation
 }
@@ -188,6 +189,10 @@ ContactList::OnPopupListItemSelected(const Control& popup, int selectedItem, con
                AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));
                return;
        }
+       if(__pParentControl)
+       {
+               __pParentControl->SendUserEvent(REQUEST_HIDE_RECIPIENT_LIST,null);
+       }
        const PopupListItem* pPopupSelectItem = (PopupListItem*) pPopupListItem;
        switch (pPopupSelectItem->GetActionId())
        {
@@ -248,10 +253,15 @@ ContactList::OnPopupListItemSelected(const Control& popup, int selectedItem, con
 void
 ContactList::OnPopupClose(Object* pObject)
 {
+       AppLogDebug("ENTER");
        if (__pContactPopup && __pContactPopup->Equals(*pObject))
        {
                delete __pContactPopup;
                __pContactPopup = null;
+               if(__pParentControl)
+               {
+                       __pParentControl->SendUserEvent(REQUEST_HIDE_RECIPIENT_LIST,null);
+               }
        }
 
        if (__pBlockConfirmPopup && __pBlockConfirmPopup->Equals(*pObject))
@@ -259,6 +269,7 @@ ContactList::OnPopupClose(Object* pObject)
                delete __pBlockConfirmPopup;
                __pBlockConfirmPopup = null;
        }
+       AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));
 }
 
 

diff --git a/src/MsgContactUtility.cpp b/src/MsgContactUtility.cpp
index b71eff2..e9dca5d 100644 (file)
--- a/src/MsgContactUtility.cpp
+++ b/src/MsgContactUtility.cpp
@@ -224,6 +224,18 @@ ContactUtility::GetContact(IList* pContactList, const String& phoneNumber)
        return null;
 }
 
+String
+ContactUtility::GetContactName(IList* pContactList, const String& phoneNumber)
+{
+               String recipientName;
+               Contact* pRecipientContact = GetContact(pContactList, phoneNumber);
+               if (pRecipientContact)
+               {
+                       pRecipientContact->GetValue(CONTACT_PROPERTY_ID_DISPLAY_NAME,recipientName);
+               }
+               return recipientName;
+}
+
 Contact*
 ContactUtility::GetContactByEmail(IList* pContactList, const String& emailAddr)
 {

diff --git a/src/MsgConversationForm.cpp b/src/MsgConversationForm.cpp
index 2a32ee4..4a14f10 100644 (file)
--- a/src/MsgConversationForm.cpp
+++ b/src/MsgConversationForm.cpp
@@ -458,7 +458,7 @@ ConversationForm::OnSceneActivatedN(const SceneId& previousSceneId,
                                                                        const SceneId& currentSceneId, IList* pArgs)
 {
        AppLogDebug("ENTER");
-
+       SetFocus();
        if (pArgs)
        {
                if (__pCurrentThreadEntry)
@@ -575,44 +575,7 @@ ConversationForm::OnActionPerformed(const Control& source, int actionId)
        {
                // Back to thread list view.
                __pMsgComposePanel->HideKeypad(); // To avoid control overlapping
-               // Save SMS to draft
-               MessageComposeData* pComposeData = __pMsgComposePanel->GetMessageComposeDataN();
-               if (pComposeData)
-               {
-                       ConversationPresentationModel* pConvPrModel = ConversationPresentationModel::GetInstance();\r
-                       int draftId(-1);\r
-                       if (pConvPrModel)\r
-                       {\r
-                               const MessageData* pDraftMessage = pConvPrModel->GetDraftMessage();\r
-                               if (pDraftMessage)\r
-                               {\r
-                                       draftId = pDraftMessage->GetEntryId();\r
-                               }\r
-                       }\r
-                       MessagePresentationModel* pMessagePresentationModel = MessagePresentationModel::GetInstance();
-                       if (pMessagePresentationModel)
-                       {
-                               pMessagePresentationModel->SaveMessage(*pComposeData, __pCurrentThreadEntry->GetEntryId());
-                       }
-                       if (draftId > -1)\r
-                       {\r
-                               pConvPrModel->Delete(draftId, REQUEST_DELETE_MESSAGE);\r
-                       }\r
-                       delete pComposeData;
-               }
-               else
-               {
-                       // If draft entry text deleted, then delete message
-                       ConversationPresentationModel* pConvPrModel = ConversationPresentationModel::GetInstance();
-                       if (pConvPrModel)
-                       {
-                               const MessageData* pDraftMessage = pConvPrModel->GetDraftMessage();
-                               if (pDraftMessage)
-                               {
-                                       pConvPrModel->Delete(pDraftMessage->GetEntryId(), REQUEST_DELETE_MESSAGE);
-                               }
-                       }
-               }
+               CreateDraftMessage();
                SceneManager* pSceneManager = SceneManager::GetInstance();
                pSceneManager->GoBackward(BackwardSceneTransition(IDSCN_THREAD_LIST, SCENE_TRANSITION_ANIMATION_TYPE_NONE));
        }
@@ -653,6 +616,7 @@ ConversationForm::OnActionPerformed(const Control& source, int actionId)
        {
                ArrayList* pArgList = new (std::nothrow) ArrayList();
                __pMsgComposePanel->HideKeypad();
+               CreateDraftMessage();
                if (pArgList)
                {
                        //Transfer ownership
@@ -1344,6 +1308,15 @@ ConversationForm::OnUserEventReceivedN(RequestId requestId, IList* pArgs)
        }
        break;
 
+       case REQUEST_HIDE_RECIPIENT_LIST:
+       {
+               if(__pList)
+               {
+                       __pList->SetShowState(false);
+               }
+       }
+       break;
+
        case REQUEST_HEADER_BUTTON_STATE:
        {
                int state = ((Integer*) pArgs->GetAt(0))->ToInt();
@@ -1728,7 +1701,7 @@ ConversationForm::ShowContactList(bool value)
        {
                if (__pList == null)
                {
-                       __pConContactList = new (std::nothrow) ContactList();
+                       __pConContactList = new (std::nothrow) ContactList(this);
                        __pConContactList->Construct(__pContactDetails);
                        __pList = new (std::nothrow) ListView();
                        if (__pContactDetails->GetCount() < 3)
@@ -2657,3 +2630,47 @@ ConversationForm::ShowDeleteConfirmPopup(void)
        AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));
        return;
 }
+
+void
+ConversationForm::CreateDraftMessage(void)
+{
+       // Save SMS to draft
+       MessageComposeData* pComposeData = __pMsgComposePanel->GetMessageComposeDataN();
+       if (pComposeData)
+       {
+               ConversationPresentationModel* pConvPrModel = ConversationPresentationModel::GetInstance();
+               int draftId(-1);
+               if (pConvPrModel)
+               {
+                       const MessageData* pDraftMessage = pConvPrModel->GetDraftMessage();
+                       if (pDraftMessage)
+                       {
+                               draftId = pDraftMessage->GetEntryId();
+                       }
+               }
+               MessagePresentationModel* pMessagePresentationModel = MessagePresentationModel::GetInstance();
+               if (pMessagePresentationModel)
+               {
+                       pMessagePresentationModel->SaveMessage(*pComposeData, __pCurrentThreadEntry->GetEntryId());
+               }
+               if (draftId > -1)
+               {
+                       pConvPrModel->Delete(draftId, REQUEST_DELETE_MESSAGE);
+               }
+               delete pComposeData;
+       }
+       else
+       {
+               // If draft entry text deleted, then delete message
+               ConversationPresentationModel* pConvPrModel = ConversationPresentationModel::GetInstance();
+               if (pConvPrModel)
+               {
+                       const MessageData* pDraftMessage = pConvPrModel->GetDraftMessage();
+                       if (pDraftMessage)
+                       {
+                               pConvPrModel->Delete(pDraftMessage->GetEntryId(), REQUEST_DELETE_MESSAGE);
+                       }
+               }
+       }
+
+}

diff --git a/src/MsgMessagesApp.cpp b/src/MsgMessagesApp.cpp
index fd51c3c..bce0d06 100644 (file)
--- a/src/MsgMessagesApp.cpp
+++ b/src/MsgMessagesApp.cpp
@@ -258,34 +258,40 @@ MessagesApp::ExtractRecipientAndMsgContent(const String& message, String& recpLi
 
        if(index == -1)
        {
-               //When there is no body
                message.SubString(0, message.GetLength(), recpList);
        }
        else
        {
                message.SubString(0, index, recpList);
                message.SubString(index, message.GetLength() - (index), msgContent);
-               AppLogDebug("URI msgContent :%S ", msgContent.GetPointer());
-
+               AppLogDebug("URI BODY AND SUBJECT :%S ", msgContent.GetPointer());
                if(!msgContent.IsEmpty())
                {
+                       int subIndex = -1;
+                       msgContent.IndexOf(IDS_SUBJECT_DELIMITER,0,subIndex);
                        if(msgContent.Contains(IDS_BODY1_DELIMITER) || msgContent.Contains(IDS_BODY2_DELIMITER))
                        {
-                               AppLogDebug("URI msgContent :%S ", msgContent.GetPointer());
-                               int delimiterlength = String(IDS_BODY_DELIMITER).GetLength();
-                               int index = -1;
-                               msgContent.IndexOf(IDS_BODY_DELIMITER,0,index);
-                               msgContent.SubString(index + delimiterlength,body);
-                               msgContent.Remove(index - 1,delimiterlength + body.GetLength() + 1);
+                               AppLogDebug("URI BODY :%S ", msgContent.GetPointer());
+                               int bodyIndex = -1;
+                               msgContent.IndexOf(IDS_BODY_DELIMITER,0,bodyIndex);
+                               int bodyDelimiterLength = String(IDS_BODY_DELIMITER).GetLength();
+                               if(subIndex < bodyIndex)
+                               {
+                                       msgContent.SubString(bodyIndex + bodyDelimiterLength,body);
+                               }
+                               else
+                               {
+                                       msgContent.SubString(bodyIndex + bodyDelimiterLength,(subIndex - 1) - (bodyIndex + bodyDelimiterLength),body);
+                               }
+                               msgContent.Remove(bodyIndex - 1,bodyDelimiterLength + body.GetLength() + 1);
                        }
-                       // second if condition of second condition can be removed if subject precedes body for sure
+
                        if(!msgContent.IsEmpty() && (msgContent.Contains(IDS_SUBJECT1_DELIMITER) || msgContent.Contains(IDS_SUBJECT2_DELIMITER)))
                        {
-                               AppLogDebug("URI msgContent :%S ", msgContent.GetPointer());
-                               int delimiterlength = String(IDS_SUBJECT_DELIMITER).GetLength();
-                               int index = -1;
-                               msgContent.IndexOf(IDS_SUBJECT_DELIMITER,0,index);
-                               msgContent.Remove(index - 1,delimiterlength + 1);
+                               AppLogDebug("URI SUBJECT :%S ", msgContent.GetPointer());
+                               int subjectDelimiterLength = String(IDS_SUBJECT_DELIMITER).GetLength();
+                               msgContent.IndexOf(IDS_SUBJECT_DELIMITER,0,subIndex);
+                               msgContent.Remove(subIndex - 1,subjectDelimiterLength + 1);
                                subject.Append(msgContent);
                        }
                }
@@ -379,43 +385,43 @@ MessagesApp::OnAppControlRequestReceived(RequestId reqId, const String& operatio
                                        msgTypeMms = pMsgType->Equals(COMPOSE_MSG_TYPE_MMS, false);
                                        AppLogDebug("Key: %S Value: %S", typeKey.GetPointer(), pMsgType->GetPointer());
                                }
-                       pCompseData->SetComposeMms(msgTypeMms);
-                       // Check To field for SMS/MMS
-                       const String toKey(COMPOSE_KEY_TO);
-                       const String* pRecipients = (String*) pArgs->GetValue(toKey);
-                       if (pRecipients)
-                       {
-                               UpdateRecipients(*pCompseData, *pRecipients);
-                               AppLogDebug("Recipient Key: %S Value: %S", toKey.GetPointer(), pRecipients->GetPointer());
-                       }
-                       // Get Body text.
-                       const String textKey(COMPOSE_KEY_TEXT);
-                       const String* pBodyText = (String*) pArgs->GetValue(textKey);
-                       // Body text exist
-                       if (pBodyText)
-                       {
-                               pCompseData->SetSmsBody(*pBodyText);
-                               AppLogDebug("pBodyText Key: %S Value: %S", textKey.GetPointer(), pBodyText->GetPointer());
-                       }
-                       // For MMS fetch attach file path
-                       if (msgTypeMms)
-                       {
-                               const String subjectKey(COMPOSE_KEY_SUBJECT);
-                               const String* pSubjectText = (String*) pArgs->GetValue(subjectKey);
-                               if (pSubjectText)
+                               pCompseData->SetComposeMms(msgTypeMms);
+                               // Check To field for SMS/MMS
+                               const String toKey(COMPOSE_KEY_TO);
+                               const String* pRecipients = (String*) pArgs->GetValue(toKey);
+                               if (pRecipients)
                                {
-                                       pCompseData->SetSubject(*pSubjectText);
-                                       AppLogDebug("Key: %S Value: %S", subjectKey.GetPointer(), pSubjectText->GetPointer());
+                                       UpdateRecipients(*pCompseData, *pRecipients);
+                                       AppLogDebug("Recipient Key: %S Value: %S", toKey.GetPointer(), pRecipients->GetPointer());
                                }
-                               const String attachmentsKey(COMPOSE_KEY_ATTACHMENTS);
-                               const ArrayList* pAttachments = dynamic_cast<ArrayList*>((ArrayList*) pArgs->GetValue(attachmentsKey));
-                               if (pAttachments && pAttachments->GetCount() > 0)
+                               // Get Body text.
+                               const String textKey(COMPOSE_KEY_TEXT);
+                               const String* pBodyText = (String*) pArgs->GetValue(textKey);
+                               // Body text exist
+                               if (pBodyText)
                                {
-                                       for (int index = 0; index < pAttachments->GetCount(); index++)
+                                       pCompseData->SetSmsBody(*pBodyText);
+                                       AppLogDebug("pBodyText Key: %S Value: %S", textKey.GetPointer(), pBodyText->GetPointer());
+                               }
+                               // For MMS fetch attach file path
+                               if (msgTypeMms)
+                               {
+                                       const String subjectKey(COMPOSE_KEY_SUBJECT);
+                                       const String* pSubjectText = (String*) pArgs->GetValue(subjectKey);
+                                       if (pSubjectText)
+                                       {
+                                               pCompseData->SetSubject(*pSubjectText);
+                                               AppLogDebug("Key: %S Value: %S", subjectKey.GetPointer(), pSubjectText->GetPointer());
+                                       }
+                                       const String attachmentsKey(COMPOSE_KEY_ATTACHMENTS);
+                                       const ArrayList* pAttachments = dynamic_cast<ArrayList*>((ArrayList*) pArgs->GetValue(attachmentsKey));
+                                       if (pAttachments && pAttachments->GetCount() > 0)
                                        {
-                                               String* pAttachFilePath = (String*) pAttachments->GetAt(index);
-                                               AppLogDebug("PATH: [%d]: %S", index, pAttachFilePath->GetPointer());
-                                               pCompseData->AddAttachment(*pAttachFilePath);
+                                               for (int index = 0; index < pAttachments->GetCount(); index++)
+                                               {
+                                                       String* pAttachFilePath = (String*) pAttachments->GetAt(index);
+                                                       AppLogDebug("PATH: [%d]: %S", index, pAttachFilePath->GetPointer());
+                                                       pCompseData->AddAttachment(*pAttachFilePath);
                                                }
                                        }
                                }

diff --git a/src/MsgOptionPopup.cpp b/src/MsgOptionPopup.cpp
index 67b4a15..e5b89df 100644 (file)
--- a/src/MsgOptionPopup.cpp
+++ b/src/MsgOptionPopup.cpp
@@ -233,7 +233,11 @@ OptionPopup::OnListViewItemStateChanged(ListView& listView, int index, int eleme
                        MessagePresentationModel* pMsgPrModel = MessagePresentationModel::GetInstance();\r
                        if (pMsgPrModel)\r
                        {\r
-                               pMsgPrModel->MoveMessageToSIM(__pConvData->GetEntryId());\r
+                               int err = pMsgPrModel->MoveMessageToSIM(__pConvData->GetEntryId());\r
+                               if( err !=0)\r
+                               {\r
+                                       CommonUtil::ShowErrorInfo(err);\r
+                               }\r
                        }\r
                }\r
                break;\r

diff --git a/src/MsgRecipientPanel.cpp b/src/MsgRecipientPanel.cpp
index 5e31f1e..b0a6314 100644 (file)
--- a/src/MsgRecipientPanel.cpp
+++ b/src/MsgRecipientPanel.cpp
@@ -224,12 +224,29 @@ RecipientPanel::AddRecipient(const String& recipientAddr, bool needToValidate, b
        {
                AddressInfo* pRecipient = new (std::nothrow) AddressInfo();
                pRecipient->recipientAddr = recipientAddr;
+               pRecipient->displayName = recipientAddr;
+               pRecipient->isContactRecipient = false;
                if (!contactRecipient)
                {
-                       //TODO: Search contact by recipient address.
+                       if(__pAddressBook)
+                       {
+                               IList* pRecipientNameList = __pAddressBook->SearchContactsByPhoneNumberN(recipientAddr);
+                               if (pRecipientNameList)
+                               {
+                                       String recipientName = ContactUtility::GetContactName(pRecipientNameList,recipientAddr);
+                                       if(!recipientName.IsEmpty())
+                                       {
+                                               pRecipient->displayName = recipientName;
+                                               pRecipient->isContactRecipient = true;
+                                       }
+                                       pRecipientNameList->RemoveAll(true);
+                                       delete pRecipientNameList;
+                               }
+                       }
                }
-               pRecipient->displayName = recipientAddr;
                pRecipient->needToValidate = false;
+               AppLogDebug("name : %S",pRecipient->displayName.GetPointer());
+               AppLogDebug("number : %S",pRecipient->recipientAddr.GetPointer());
                __pRecipientAddrList->Add(pRecipient);
                __pExpandEditArea->AppendToken(pRecipient->displayName);
                __pExpandEditArea->Invalidate(true);

diff --git a/src/MsgThreadListForm.cpp b/src/MsgThreadListForm.cpp
index b8fe6b7..06afb6e 100644 (file)
--- a/src/MsgThreadListForm.cpp
+++ b/src/MsgThreadListForm.cpp
@@ -57,6 +57,7 @@ ThreadListForm::ThreadListForm(ThreadListFormType threadListFormType, ThreadList
        , __pItemContextUnblock(null)
        , __blockGroupIndex(0)
        , __blockItemIndex(0)
+       , __isKeypadOpen(false)
 {
        // Empty implementation
 }
@@ -954,7 +955,11 @@ ThreadListForm::OnSearchBarModeChanged(SearchBar& source, SearchBarMode mode)
                btnRight.SetIcon(BUTTON_ITEM_STATUS_PRESSED, pBitMap);
                GetHeader()->SetButton(BUTTON_POSITION_RIGHT, btnRight);
                SetFooter();
-               SetActionBarsVisible(FORM_ACTION_BAR_FOOTER, true);
+               // To avoid footer blink in open keypad
+               if(!__isKeypadOpen)
+               {
+                       SetActionBarsVisible(FORM_ACTION_BAR_FOOTER, true);
+               }
        }
        Invalidate(true);
 
@@ -1398,8 +1403,6 @@ ThreadListForm::OnTouchPressed(const Control& source,
        __pSearchBar->HideKeypad();
        SetActionBarsVisible(FORM_ACTION_BAR_FOOTER, false);
        Invalidate(true);
-       Draw();
-       Show();
 
        AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));
        return;
@@ -1777,6 +1780,50 @@ ThreadListForm::OnKeypadActionPerformed(Control& source, KeypadAction keypadActi
 }
 
 void
+ThreadListForm::OnKeypadClosed(Control& source)
+{
+       AppLogDebug("ENTER");
+
+       __isKeypadOpen = false;
+       bool showFooter(!(__pSearchBar && __pSearchBar->GetShowState()));
+       SetActionBarsVisible(FORM_ACTION_BAR_FOOTER, showFooter);
+       Rectangle clientRect = GetClientAreaBounds();
+       __pSearchBar->SetContentAreaSize(Dimension(clientRect.width, clientRect.height - __pSearchBar->GetHeight()));
+       __pSearchList->SetSize(clientRect.width, clientRect.height - __pSearchBar->GetHeight());
+       __pThreadGroupList->SetBounds(clientRect);
+       Invalidate(true);
+
+       AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));
+}
+
+void
+ThreadListForm::OnKeypadOpened(Control& source)
+{
+       AppLogDebug("ENTER");
+
+       __isKeypadOpen = true;
+       SetActionBarsVisible(FORM_ACTION_BAR_FOOTER, false);
+       Rectangle clientRect = GetClientAreaBounds();
+       __pSearchBar->SetContentAreaSize(Dimension(clientRect.width, clientRect.height - __pSearchBar->GetHeight()));
+       __pSearchList->SetSize(clientRect.width, clientRect.height - __pSearchBar->GetHeight());
+       __pThreadGroupList->SetBounds(clientRect);
+       Invalidate(true);
+
+       AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));
+}
+
+void
+ThreadListForm::OnKeypadWillOpen(Control& source)
+{
+       AppLogDebug("ENTER");
+
+       SetActionBarsVisible(FORM_ACTION_BAR_FOOTER, false);
+       Invalidate(true);
+
+       AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));
+}
+
+void
 ThreadListForm::UpdateMessageThreadList()
 {
        AppLogDebug("ENTER");