NABI issue resolution.

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

diff --git a/inc/MsgMediaTextExpandEditArea.h b/inc/MsgMediaTextExpandEditArea.h
index 8c99ad1..5441823 100644 (file)
--- a/inc/MsgMediaTextExpandEditArea.h
+++ b/inc/MsgMediaTextExpandEditArea.h
@@ -76,6 +76,7 @@ protected:
        virtual void OnBoundsChanged(const Tizen::Graphics::Rectangle& oldRect, const Tizen::Graphics::Rectangle& newRect);\r
        // Form ComposeBaseControl\r
        virtual ComposeControlType GetControlType(void) const;\r
+       virtual result OnTerminating(void);\r
 \r
 private:\r
        Tizen::Graphics::Bitmap* __pBgBitmap;\r

diff --git a/inc/MsgMessageComposePanel.h b/inc/MsgMessageComposePanel.h
index ac7bd51..14ccdfb 100644 (file)
--- a/inc/MsgMessageComposePanel.h
+++ b/inc/MsgMessageComposePanel.h
@@ -53,7 +53,7 @@ public:
        // Constructor
        MessageComposePanel(void);
        // Destructor
-       ~MessageComposePanel(void);
+       virtual ~MessageComposePanel(void);
        // 2nd phase constructor
        result Construct(const Tizen::Base::String& resourceId);
        // New API

diff --git a/src/MsgAttachmentSavePopup.cpp b/src/MsgAttachmentSavePopup.cpp
index 2cd2f33..7a68039 100644 (file)
--- a/src/MsgAttachmentSavePopup.cpp
+++ b/src/MsgAttachmentSavePopup.cpp
@@ -162,7 +162,8 @@ AttachementSavePopup::Construct(void)
                // Adjust size and control position.\r
                Rectangle rect = GetClientAreaBounds();\r
                int newHeight = GetHeight() + increaseHeight;\r
-               Popup::SetBounds(0, ((rect.height - newHeight) / 2), GetWidth(), newHeight);\r
+               //Popup::SetBounds(0, ((rect.height - newHeight) / 2), GetWidth(), newHeight);\r
+               Popup::SetSize(Dimension(GetWidth(), GetHeight() + increaseHeight));\r
                pAttachmentsListview->SetSize(pAttachmentsListview->GetWidth(),\r
                                                                          pAttachmentsListview->GetHeight() + increaseHeight);\r
                Point pos = pCancelButton->GetPosition();\r

diff --git a/src/MsgComposerForm.cpp b/src/MsgComposerForm.cpp
index e04ddda..920d6b5 100644 (file)
--- a/src/MsgComposerForm.cpp
+++ b/src/MsgComposerForm.cpp
@@ -845,6 +845,7 @@ ComposerForm::OnKeypadOpened(Control& source)
        AppLogDebug("ENTER");
 
        Rectangle clientArea = GetClientAreaBounds();
+       AppLogDebug("client area height : %d",clientArea.height);
        if (__pMsgComposePanel != null && __pRecipientPanel)
        {
                __pMsgComposePanel->SetMaximumSize(Dimension(__pMsgComposePanel->GetWidth(), clientArea.height - __pRecipientPanel->GetHeight() + 1));

diff --git a/src/MsgMediaTextExpandEditArea.cpp b/src/MsgMediaTextExpandEditArea.cpp
index 7c06f44..41689a1 100644 (file)
--- a/src/MsgMediaTextExpandEditArea.cpp
+++ b/src/MsgMediaTextExpandEditArea.cpp
@@ -56,10 +56,6 @@ MediaTextExpandEditArea::~MediaTextExpandEditArea(void)
 {
        AppLogDebug("ENTER");
        // Remove temporary compose file.
-       if (__pMediaCntl && __isMediaNeedToRemove)
-       {
-               File::Remove(__pMediaCntl->GetMediaPath());
-       }
        if (__pBgBitmap)
        {
                delete __pBgBitmap;
@@ -450,6 +446,27 @@ MediaTextExpandEditArea::OnDraw(void)
        return r;
 }
 
+result
+MediaTextExpandEditArea::OnTerminating(void)
+{
+       AppLogDebug("ENTER");
+
+       result r = E_SUCCESS;
+
+       // Remove temporary compose file.
+       if (__pMediaCntl && __isMediaNeedToRemove)
+       {
+               String tempFilePath(__pMediaCntl->GetMediaPath());
+               if(File::IsFileExist(tempFilePath))
+               {
+                  AppLogDebug("REMOVE FILE PATH: %S", tempFilePath.GetPointer());
+                  File::Remove(tempFilePath);
+               }
+       }
+       AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));
+       return r;
+}
+
 void
 MediaTextExpandEditArea::OnBoundsChanged(const Rectangle& oldRect, const Rectangle& newRect)
 {

diff --git a/src/MsgMessageComposePanel.cpp b/src/MsgMessageComposePanel.cpp
index 7739868..8fc8477 100644 (file)
--- a/src/MsgMessageComposePanel.cpp
+++ b/src/MsgMessageComposePanel.cpp
@@ -228,7 +228,7 @@ MessageComposePanel::CreatePage(const String& pageText)
                pComposePage->SetUpdateActionId(IDA_CHECK_COMPOSE_STATE);
                pComposePage->SetActionEventListener(*this);
                pComposePage->SetText(pageText);
-               pImageTextPanel->AddControl(*pComposePage);
+               pImageTextPanel->AddControl(pComposePage);
                __pScrollPanel->ScrollToBottom();
                if (__pSizeChangeListener)
                {
@@ -1590,7 +1590,7 @@ MessageComposePanel::ClearText(bool redraw)
        pDefaultPage->SetDeleteActionId(IDA_COMPOSE_DELETE_ATTACHEMENT);
        pDefaultPage->SetUpdateActionId(IDA_CHECK_COMPOSE_STATE);
        pDefaultPage->SetActionEventListener(*this);
-       pImageTextSlidePanel->AddControl(*pDefaultPage);
+       pImageTextSlidePanel->AddControl(pDefaultPage);
        if (redraw)
        {
                Draw(); // For immediate refresh, otherwise it will hide behind keypad

diff --git a/src/MsgMmsDetailForm.cpp b/src/MsgMmsDetailForm.cpp
index 5ac6496..51d1313 100644 (file)
--- a/src/MsgMmsDetailForm.cpp
+++ b/src/MsgMmsDetailForm.cpp
@@ -320,6 +320,8 @@ MmsDetailForm::OnUserEventReceivedN(RequestId requestId, IList* pArgs)
                }\r
        }\r
        break;\r
+       default:\r
+               break;\r
        }\r
        // Release resource\r
        if (pArgs)\r