Resolved Nabi issues

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

diff --git a/src/MsgAttachListPanel.cpp b/src/MsgAttachListPanel.cpp
index 5e57066..53211e0 100644 (file)
--- a/src/MsgAttachListPanel.cpp
+++ b/src/MsgAttachListPanel.cpp
@@ -173,7 +173,7 @@ AttachListPanel::OnListViewItemStateChanged(ListView& listView, int index,
        AppLogDebug("ENTER");\r
        bool saveAllExist(__pAttachFileArray->GetCount() > 1);\r
        result r = E_FAILURE;\r
-       String msg;\r
+       String msg(IDS_BLANK);\r
        switch (status)\r
        {\r
        case LIST_ITEM_STATUS_SELECTED:\r
@@ -198,6 +198,10 @@ AttachListPanel::OnListViewItemStateChanged(ListView& listView, int index,
                                ContentManager::ScanDirectory(downloadFileDir,true, null, rqstId);\r
                                Application::GetInstance()->GetAppResource()->GetString(L"IDS_MSGF_POP_SAVED_IN_MY_FILES", msg);\r
                        }\r
+                       else\r
+                       {\r
+                               AppLogDebug("Error in copying file to destination - %s ",GetErrorMessage(r));\r
+                       }\r
                }\r
                else if (elementId == LIST_ELEMENT_SAVE_IMAGE)\r
                {\r
@@ -220,8 +224,15 @@ AttachListPanel::OnListViewItemStateChanged(ListView& listView, int index,
                                ContentManager::ScanDirectory(downloadFileDir,true, null, rqstId);\r
                                Application::GetInstance()->GetAppResource()->GetString(L"IDS_MSGF_POP_SAVED_IN_MY_FILES", msg);\r
                        }\r
+                       else\r
+                       {\r
+                               AppLogDebug("Error in copying file to destination - %s ",GetErrorMessage(r));\r
+                       }\r
+               }\r
+               if (msg.GetLength())\r
+               {\r
+                       CommonUtil::ShowMessageNotification(msg);\r
                }\r
-               CommonUtil::ShowMessageNotification(msg);\r
        }\r
        break;\r
 \r

diff --git a/src/MsgMediaTextExpandEditArea.cpp b/src/MsgMediaTextExpandEditArea.cpp
index 38cf85b..8dad743 100644 (file)
--- a/src/MsgMediaTextExpandEditArea.cpp
+++ b/src/MsgMediaTextExpandEditArea.cpp
@@ -18,6 +18,7 @@
 
 #include "MsgAttachementControl.h"
 #include "MsgBitmapUtility.h"
+#include "MsgCommonUtil.h"
 #include "MsgISizeChangeEventListener.h"
 #include "MsgMediaControl.h"
 #include "MsgMediaTextExpandEditArea.h"
@@ -208,7 +209,8 @@ MediaTextExpandEditArea::ClearText(void)
                r = RemoveControl(__pAttachCntrl);
                __pAttachCntrl = null;
        }
-       __pExpandEditArea->SetBounds(0, 0, GetWidth(), MIN_COMPOSE_EDITOR_HEIGHT);
+       int adjustHeightForcomposePanel = CommonUtil::GetHeightAdjustment(CommonUtil::GetFontSize(COMPOSER_FORM));
+       __pExpandEditArea->SetBounds(0, 0, GetWidth(), MIN_COMPOSE_EDITOR_HEIGHT + adjustHeightForcomposePanel);
        __prevBounds = __pExpandEditArea->GetBounds();
        SetSize(GetWidth(), __pExpandEditArea->GetHeight());
        AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));

diff --git a/src/MsgMessageComposePanel.cpp b/src/MsgMessageComposePanel.cpp
index b86ccc4..0068230 100644 (file)
--- a/src/MsgMessageComposePanel.cpp
+++ b/src/MsgMessageComposePanel.cpp
@@ -381,7 +381,7 @@ MessageComposePanel::InsertFileToPage(const String& selectFilepath)
                                mmsDataPath.Append(File::GetFileName(__pSelectFilePath));
                                AppLogDebug("MMS DATA PATH (new file name): %S", mmsDataPath.GetPointer());
                                r = File::Copy(__pSelectFilePath, mmsDataPath, true);
-                               AppLogDebug("File to inserted copy result : %s ", r);
+                               AppLogDebug("File to inserted copy result : %s ", GetErrorMessage(r));
                                i++;
                        }
                        ComposeBaseControl* pPageInFocus = __pFocusControl;

diff --git a/src/MsgMmsDetailForm.cpp b/src/MsgMmsDetailForm.cpp
index 2660bac..bde9662 100644 (file)
--- a/src/MsgMmsDetailForm.cpp
+++ b/src/MsgMmsDetailForm.cpp
@@ -1420,6 +1420,7 @@ MmsDetailForm::PreviousSlide(void)
        if (__currentSlideIndex > 0)
        {
                __currentSlideIndex--;
+               __isSlideShowInPrgress = true;
                ShowSlide(__currentSlideIndex);
                __timeElapsed = __pMmsSlideData->GetSlideStartTime(__currentSlideIndex);
                __pTimer->StartAsRepeatable(TIME_INTERVAL);