NABI issues resolution for 2.2RC10; Second check-in

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

diff --git a/src/MsgAttachListPopup.cpp b/src/MsgAttachListPopup.cpp
index 2a9f436..f9997bf 100644 (file)
--- a/src/MsgAttachListPopup.cpp
+++ b/src/MsgAttachListPopup.cpp
@@ -387,6 +387,7 @@ AttachListPopup::OnKeyReleased(const Tizen::Ui::Control& source, Tizen::Ui::KeyC
        switch (keyCode)\r
        {\r
        case Tizen::Ui::KEY_BACK:\r
+       case Tizen::Ui::KEY_ESC:\r
        {\r
                SetShowState(false);\r
                RequestId requestId = REQUEST_DESTROY_ATTACH_POPUP;\r

diff --git a/src/MsgAttachmentSavePopup.cpp b/src/MsgAttachmentSavePopup.cpp
index 40ff481..27dbd64 100644 (file)
--- a/src/MsgAttachmentSavePopup.cpp
+++ b/src/MsgAttachmentSavePopup.cpp
@@ -434,6 +434,7 @@ AttachementSavePopup::OnKeyReleased(const Tizen::Ui::Control& source, Tizen::Ui:
        switch (keyCode)\r
        {\r
        case KEY_BACK:\r
+       case KEY_ESC:\r
        {\r
                Popup::SetShowState(false);\r
                ExitPopup();\r

diff --git a/src/MsgComposerForm.cpp b/src/MsgComposerForm.cpp
index 4fa0797..45114c0 100644 (file)
--- a/src/MsgComposerForm.cpp
+++ b/src/MsgComposerForm.cpp
@@ -1071,6 +1071,7 @@ ComposerForm::OnKeyReleased(const Control& source, KeyCode keyCode)
        break;
 
        case KEY_BACK:
+       case KEY_ESC:
        {
                if (__pMessagePopup && __pMessagePopup->GetShowState())
                {

diff --git a/src/MsgContactPopup.cpp b/src/MsgContactPopup.cpp
index 84a956c..75f1b6a 100644 (file)
--- a/src/MsgContactPopup.cpp
+++ b/src/MsgContactPopup.cpp
@@ -148,6 +148,7 @@ ContactPopup::OnKeyReleased(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode
        switch (keyCode)
        {
        case KEY_BACK:
+       case KEY_ESC:
        {
                Popup::SetShowState(false);
                __popupListener.OnPopupClose(this);

diff --git a/src/MsgConversationForm.cpp b/src/MsgConversationForm.cpp
index a6294da..71e81fe 100644 (file)
--- a/src/MsgConversationForm.cpp
+++ b/src/MsgConversationForm.cpp
@@ -2232,6 +2232,7 @@ ConversationForm::OnKeyReleased(const Control& source, KeyCode keyCode)
        switch (keyCode)
        {
        case KEY_BACK:
+       case KEY_ESC:
        {
                if (__pOptionPopup && __pOptionPopup->GetShowState())
                {

diff --git a/src/MsgDurationPopup.cpp b/src/MsgDurationPopup.cpp
index 90939ec..38ce667 100644 (file)
--- a/src/MsgDurationPopup.cpp
+++ b/src/MsgDurationPopup.cpp
@@ -179,6 +179,7 @@ DurationPopup::OnKeyReleased(const Tizen::Ui::Control& source, Tizen::Ui::KeyCod
        switch (keyCode)\r
        {\r
        case KEY_BACK:\r
+       case KEY_ESC:\r
        {\r
                SetDuration(__previousValue);\r
                EditField* pDurationField = (EditField*) GetControl(L"IDC_EDITFIELD_DURATION");\r

diff --git a/src/MsgMessageComposePanel.cpp b/src/MsgMessageComposePanel.cpp
index fe69e0e..1d75f8f 100644 (file)
--- a/src/MsgMessageComposePanel.cpp
+++ b/src/MsgMessageComposePanel.cpp
@@ -1448,6 +1448,7 @@ MessageComposePanel::OnKeyReleased(const Control& source, KeyCode keyCode)
                break;
 
                case KEY_BACK:
+               case KEY_ESC:
                {
                        if (__pSizeExceedPopup && __pSizeExceedPopup->GetShowState())
                        {

diff --git a/src/MsgMessagesApp.cpp b/src/MsgMessagesApp.cpp
index bb2d6db..ac5939f 100644 (file)
--- a/src/MsgMessagesApp.cpp
+++ b/src/MsgMessagesApp.cpp
@@ -968,6 +968,7 @@ MessagesApp::OnKeyReleased(const Control& source, KeyCode keyCode)
        {
 
        case KEY_BACK:
+       case KEY_ESC:
        {
                if (__pErrorMessagePopup && __pErrorMessagePopup->GetShowState())
                {

diff --git a/src/MsgMmsDetailForm.cpp b/src/MsgMmsDetailForm.cpp
index 5bfa867..c540f8e 100644 (file)
--- a/src/MsgMmsDetailForm.cpp
+++ b/src/MsgMmsDetailForm.cpp
@@ -211,7 +211,6 @@ MmsDetailForm::OnIntializeHeader(Header& header)
 void
 MmsDetailForm::SetHeader(void)
 {
-       const MessageData* pMessageData = __pMmsSlideData->GetSlideMessageData();
        if (__mmsDetailFormType == MMS_DETAIL_FORM_PREVIEW)
        {
                Header* pHeader = GetHeader();
@@ -238,24 +237,30 @@ MmsDetailForm::SetHeader(void)
                // Set title
                HeaderItem headerLeftItem;
                headerLeftItem.Construct(IDA_MMSDETAIL_FORM_HEADER_TITLEITEM);
-               const ArrayList* pNameList = pMessageData->GetAddressList();
-               if (pNameList)
+               String headerTitleName(IDS_BLANK);
+               if(!__pRecipientNameList || !__pRecipientNameList->GetCount())
+               {
+                       headerTitleName.Append(IDS_UNKNOWN);
+                       return;
+               }
+               ContactDetails* pAddressInfo = (ContactDetails*) __pRecipientNameList->GetAt(0);
+               if (pAddressInfo)
                {
-                       String headerTitleName(IDS_BLANK);
-                       AddressInfo* pAddressInfo = (AddressInfo*) pNameList->GetAt(0);
-                       if (pAddressInfo)
+                       headerTitleName.Append(pAddressInfo->contactAddress);
+                       if(! pAddressInfo->contactName.Equals(String(IDS_UNKNOWN)))
                        {
-                               headerTitleName.Append(pAddressInfo->displayName);
-                               __recipientPhoneNumber.Clear();
-                               __recipientPhoneNumber.Append(pAddressInfo->recipientAddr);
-                               if (pNameList->GetCount() > 1)
-                               {
-                                       headerTitleName.Append(" + ");
-                                       headerTitleName.Append(pNameList->GetCount() - 1);
-                               }
+                               headerTitleName.Clear();
+                               headerTitleName.Append(pAddressInfo->contactName);
+                       }
+                       __recipientPhoneNumber.Clear();
+                       __recipientPhoneNumber.Append(pAddressInfo->contactAddress);
+                       if (__pRecipientNameList->GetCount() > 1)
+                       {
+                               headerTitleName.Append(" + ");
+                               headerTitleName.Append(__pRecipientNameList->GetCount() - 1);
                        }
-                       headerLeftItem.SetText(headerTitleName);
                }
+               headerLeftItem.SetText(headerTitleName);
                GetHeader()->AddItem(headerLeftItem);
                GetHeader()->Invalidate(true);
        }
@@ -337,8 +342,8 @@ MmsDetailForm::OnUserEventReceivedN(RequestId requestId, IList* pArgs)
                                {
                                        __pMmsSlideData = new (std::nothrow) MmsSlideData();
                                        __pMmsSlideData->Construct(pMessageData);
-                                       SetHeader();
                                        PrepareRecipientList();
+                                       SetHeader();
                                }
                        }
                }
@@ -511,9 +516,11 @@ MmsDetailForm::OnSceneActivatedN(const SceneId& previousSceneId,
                __pMmsSlideData = new (std::nothrow) MmsSlideData();
                __pMmsSlideData->Construct(pMessageData);
                delete pArgs;
+
+               PrepareRecipientList();
                SetHeader();
                SetFooter();
-               PrepareRecipientList();
+
                // Get and keep total slide duration
                SetTotalTimeDuration(__pMmsSlideData->GetTotalDuration());
                // MMS slide subject
@@ -1524,8 +1531,10 @@ MmsDetailForm::ShowVolumePopup()
        __pVolumePopup->Construct(L"IDL_VOLUME_POPUP");
        __pMediaVolumeSlider = static_cast<Slider*>(__pVolumePopup->GetControl(L"IDC_MEDIA_VOLUME_SLIDER"));
        __pMediaVolumeSlider->AddAdjustmentEventListener(*this);
+       __pMediaVolumeSlider->AddKeyEventListener(*this);
        __pMediaVolumeSlider->SetRange(0,15);
        __pVolumePopup->AddTouchEventListener(*this);
+       __pVolumePopup->AddKeyEventListener(*this);
        __pMediaVolumeSlider->AddTouchEventListener(*this);
        int mediaVolumeLevel = 4;
        String key(IDS_TIZEN_MEDIA);
@@ -2248,6 +2257,7 @@ MmsDetailForm::OnKeyReleased(const Tizen::Ui::Control& source, Tizen::Ui::KeyCod
        switch (keyCode)
        {
        case KEY_BACK:
+       case KEY_ESC:
        {
                if (__pMessageDetailsPopup && __pMessageDetailsPopup->GetShowState())
                {
@@ -2261,6 +2271,10 @@ MmsDetailForm::OnKeyReleased(const Tizen::Ui::Control& source, Tizen::Ui::KeyCod
                {
                        __pDeletePopup->SetShowState(false);
                }
+               if (__pVolumePopup && __pVolumePopup->GetShowState())
+               {
+                       __pVolumePopup->SetShowState(false);
+               }
        }
        break;
 

diff --git a/src/MsgOptionPopup.cpp b/src/MsgOptionPopup.cpp
index 45afc9b..bb3dbd9 100644 (file)
--- a/src/MsgOptionPopup.cpp
+++ b/src/MsgOptionPopup.cpp
@@ -417,6 +417,7 @@ OptionPopup::OnKeyReleased(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode
        switch (keyCode)\r
        {\r
        case KEY_BACK:\r
+       case KEY_ESC:\r
        {\r
                SetShowState(false);\r
                RequestId requestId = REQUEST_DESTROY_OPTION_POPUP;\r

diff --git a/src/MsgPhoneNumberListPopup.cpp b/src/MsgPhoneNumberListPopup.cpp
index cf14e04..91440c6 100644 (file)
--- a/src/MsgPhoneNumberListPopup.cpp
+++ b/src/MsgPhoneNumberListPopup.cpp
@@ -224,6 +224,7 @@ PhoneNumberListPopup::OnKeyReleased(const Tizen::Ui::Control& source, Tizen::Ui:
        switch (keyCode)\r
        {\r
        case KEY_BACK:\r
+       case KEY_ESC:\r
        {\r
                SetShowState(false);\r
                __popupListener.OnPopupClose(this);\r

diff --git a/src/MsgRecipientPanel.cpp b/src/MsgRecipientPanel.cpp
index e153b47..d9cb784 100644 (file)
--- a/src/MsgRecipientPanel.cpp
+++ b/src/MsgRecipientPanel.cpp
@@ -1141,6 +1141,7 @@ RecipientPanel::OnKeyReleased(const Control& source, KeyCode keyCode)
        break;
 
        case KEY_BACK:
+       case KEY_ESC:
        {
                if (__pErrorMessagePopup && __pErrorMessagePopup->GetShowState())
                {

diff --git a/src/MsgResendDeletePopup.cpp b/src/MsgResendDeletePopup.cpp
index d32e3b4..815daa3 100644 (file)
--- a/src/MsgResendDeletePopup.cpp
+++ b/src/MsgResendDeletePopup.cpp
@@ -107,7 +107,8 @@ MsgResendDeletePopup::OnKeyReleased(const Tizen::Ui::Control& source, Tizen::Ui:
 \r
        switch (keyCode)\r
        {\r
-       case Tizen::Ui::KEY_BACK:\r
+       case KEY_BACK:\r
+       case KEY_ESC:\r
        {\r
                Popup::SetShowState(false);\r
                __popupListener.OnPopupClose(this);\r

diff --git a/src/MsgSpamSettingsForm.cpp b/src/MsgSpamSettingsForm.cpp
index 1c6b380..d4601ef 100644 (file)
--- a/src/MsgSpamSettingsForm.cpp
+++ b/src/MsgSpamSettingsForm.cpp
@@ -583,7 +583,7 @@ SpamSettingsForm::DisplayErrorPopup(const Tizen::Base::String& displayMessage)
        {
                __pSendFailedPopup = new (std::nothrow) Popup();
                __pSendFailedPopup->Construct(L"IDL_MSG_INFO_POPUP");
-
+               __pSendFailedPopup->AddKeyEventListener(*this);
                TextBox* pTextBox = static_cast<TextBox*>(__pSendFailedPopup->GetControl(L"IDC_TEXTBOX1"));
                pTextBox->SetText(displayMessage);
                pTextBox->SetAutoLinkMask(0);
@@ -611,11 +611,16 @@ SpamSettingsForm::OnKeyReleased(const Tizen::Ui::Control& source, Tizen::Ui::Key
        switch (keyCode)
        {
        case KEY_BACK:
+       case KEY_ESC:
        {
                if (__pConfirmationPopup && __pConfirmationPopup->GetShowState())
                {
                        __pConfirmationPopup->SetShowState(false);
                }
+               if (__pSendFailedPopup && __pSendFailedPopup->GetShowState())
+               {
+                       __pSendFailedPopup->SetShowState(false);
+               }
        }
        break;
 

diff --git a/src/MsgThreadListForm.cpp b/src/MsgThreadListForm.cpp
index e478574..a589f0f 100644 (file)
--- a/src/MsgThreadListForm.cpp
+++ b/src/MsgThreadListForm.cpp
@@ -973,6 +973,7 @@ ThreadListForm::OnKeyReleased(const Control& source, KeyCode keyCode)
        break;
 
        case KEY_BACK:
+       case KEY_ESC:
        {
                if (__pDeletePopup && __pDeletePopup->GetShowState())
                {

diff --git a/src/MsgTokenOptionPopup.cpp b/src/MsgTokenOptionPopup.cpp
index d252831..e671f43 100644 (file)
--- a/src/MsgTokenOptionPopup.cpp
+++ b/src/MsgTokenOptionPopup.cpp
@@ -225,6 +225,7 @@ TokenOptionPopup::OnKeyReleased(const Tizen::Ui::Control& source, Tizen::Ui::Key
        switch (keyCode)
        {
        case KEY_BACK:
+       case KEY_ESC:
        {
                SetShowState(false);
                RequestId requestId = REQUEST_DESTROY_TOKEN_OPTION_POPUP;