Fixed memory leaks
[apps/osp/Gallery.git] / src / GlAlbumListPresentationModel.cpp
index 3324fcb..4f604a2 100644 (file)
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
-// Licensed under the Flora License, Version 1.0 (the License);
+// Licensed under the Flora License, Version 1.1 (the License);
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
@@ -27,6 +27,7 @@
 #include "GlAlbumListPresentationModel.h"
 #include "GlAlbumRenameEventListener.h"
 #include "GlContentUpdateEventListener.h"
+#include "GlFileListPresentationModel.h"
 #include "GlGalleryApp.h"
 #include "GlThumbnailEvent.h"
 #include "GlThumbnailEventArg.h"
@@ -94,8 +95,9 @@ IList* AlbumListPresentationModel::__pAlbumInfoList = null;
 
 AlbumListPresentationModel::AlbumListPresentationModel(void)
        : __pFolderBackgroundBitmap(null)
+       , __pContentManager(null)
        , __pAlbumListener(null)
-       , __appControlMode(APP_CONTROL_MODE_MAIN)
+       , __appControlMode(APPCONTROL_MODE_MAIN)
        , __appControlMediaType(APPCONTROL_MEDIA_TYPE_IMAGE)
        , __appControlSelectionMode(APPCONTROL_SELECTION_MODE_SINGLE)
        , __updateProgressStatus(false)
@@ -107,6 +109,7 @@ AlbumListPresentationModel::AlbumListPresentationModel(void)
 AlbumListPresentationModel::~AlbumListPresentationModel(void)
 {
        AppLogDebug("ENTER");
+       DeviceManager::RemoveDeviceEventListener(DEVICE_TYPE_STORAGE_CARD, *this);
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }
 
@@ -151,11 +154,11 @@ AlbumListPresentationModel::Construct(void)
 
        if (operationId.CompareTo(APPCONTROL_OPERATION_ID_MAIN) == 0)
        {
-               __appControlMode = APP_CONTROL_MODE_MAIN;
+               __appControlMode = APPCONTROL_MODE_MAIN;
        }
        else if (operationId.CompareTo(APPCONTROL_OPERATION_ID_PICK) == 0)
        {
-               __appControlMode = APP_CONTROL_MODE_PICK;
+               __appControlMode = APPCONTROL_MODE_PICK;
 
                String mimeType = pApp->GetMimeType();
                if (mimeType.IsEmpty() != true)
@@ -173,16 +176,11 @@ AlbumListPresentationModel::Construct(void)
                        {
                                __appControlSelectionMode = APPCONTROL_SELECTION_MODE_MULTIPLE;
                        }
-
-                       if (pApp->GetMimeType().StartsWith(APPCONTROL_DATA_VIDEO, 0) == true)
-                       {
-                               __appControlMediaType = APPCONTROL_MEDIA_TYPE_VIDEO;
-                       }
                }
        }
        else if (operationId.CompareTo(APPCONTROL_OPERATION_ID_CONFIGURE) == 0)
        {
-               __appControlMode = APP_CONTROL_MODE_SETTING;
+               __appControlMode = APPCONTROL_MODE_SETTING;
        }
 
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
@@ -313,20 +311,24 @@ AlbumListPresentationModel::RenameAlbum(const String& orgPath, const String& new
        else
        {
                __pAlbumListener = pAlbumListener;
-               r = ContentManager::ScanDirectory(Tizen::System::Environment::GetMediaPath(), true, this, __reqId);
+               __renameNewPath = newPath;\r
+               r = ContentManager::ScanDirectory(newPath, true, NULL, __reqId);\r
+               AppLogDebug("Content scan failed (%s)", GetErrorMessage(r));
+               r = ContentManager::ScanDirectory(orgPath, true, NULL, __reqId);\r
                AppLogDebug("Content scan failed (%s)", GetErrorMessage(r));
        }
        AppLogDebug("EXIT");
        return r;
 }
 
-void AlbumListPresentationModel::OnContentScanCompleted (RequestId reqId, const Tizen::Base::String &scanPath, result r)
+void AlbumListPresentationModel::OnContentScanCompleted (const Tizen::Base::String &scanPath)\r
 {
-       AppLogDebug("ENTER");
-       if (__pAlbumListener && __reqId == reqId)
+       AppLogDebug("ENTER");\r
+       if (__pAlbumListener && ( scanPath == __renameNewPath))\r
        {
                InitializeAlbumInfoList(CONTENT_TYPE_ALL);
                __pAlbumListener->OnAlbumRenameComplete();
+               __renameNewPath = L"";
        }
        AppLogDebug("EXIT");
 }
@@ -451,7 +453,7 @@ AlbumListPresentationModel::DrawFontImage(Canvas& canvas, AlbumInfo* pAlbumInfo,
 }
 
 Bitmap*
-AlbumListPresentationModel::CreateMergeBitmapN(int index)
+AlbumListPresentationModel::CreateMergeBitmapN(const int index)
 {
        AppLogDebug("ENTER index(%d)", index);
 
@@ -504,6 +506,7 @@ AlbumListPresentationModel::StartAppControl(const String& providerId, const Stri
                IAppControlResponseListener* pListener)
 {
        AppLogDebug("ENTER");
+       FileListPresentationModel::GetInstance()->ClearProviderId();
        AppControl* pAc = AppManager::FindAppControlN(providerId, operationId);
        if (pAc == null)
        {
@@ -527,7 +530,7 @@ AlbumListPresentationModel::StartAppControl(const String& providerId, const Stri
 }
 
 String
-AlbumListPresentationModel::GetDirectoryName(String& directoryPath)
+AlbumListPresentationModel::GetDirectoryName(String& directoryPath) const
 {
        AppLogDebug("ENTER");
        String directoryName;
@@ -541,7 +544,7 @@ AlbumListPresentationModel::GetDirectoryName(String& directoryPath)
 }
 
 int
-AlbumListPresentationModel::GetFolderCount(void)
+AlbumListPresentationModel::GetFolderCount(void) const
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
@@ -561,13 +564,13 @@ AlbumListPresentationModel::InitializeAlbumInfoList(const ContentType& contentTy
 
        if (__pAlbumInfoList != null)
        {
-               AlbumInfo* info = null;
+               AlbumInfo* pInfo = null;
                for (int i = 0; i < __pAlbumInfoList->GetCount(); ++i)
                {
-                       info = static_cast<AlbumInfo*>(__pAlbumInfoList->GetAt(i));
-                       if (info->GetAlbumName().IsEmpty() == false)
+                       pInfo = static_cast<AlbumInfo*>(__pAlbumInfoList->GetAt(i));
+                       if (pInfo->GetAlbumName().IsEmpty() == false)
                        {
-                               AppLog("Print AlbumName(%d)(%ls)", i, info->GetAlbumName().GetPointer());
+                               AppLog("Print AlbumName(%d)(%ls)", i, pInfo->GetAlbumName().GetPointer());
                        }
                }
                delete __pAlbumInfoList;
@@ -578,7 +581,7 @@ AlbumListPresentationModel::InitializeAlbumInfoList(const ContentType& contentTy
 
        if (contentType == CONTENT_TYPE_ALL)
        {
-               IListT< ContentType >* pListT = new (std::nothrow) ArrayListT<ContentType>();
+               IListT<ContentType>* pListT = new (std::nothrow) ArrayListT<ContentType>();
                TryReturnVoid(pListT != null, "Unable to Create ArrayListT");
                pListT->Add(CONTENT_TYPE_IMAGE);
                pListT->Add(CONTENT_TYPE_VIDEO);
@@ -637,6 +640,10 @@ AlbumListPresentationModel::InitializeAlbumInfoList(const ContentType& contentTy
                while (pEnum->MoveNext() == E_SUCCESS)
                {
                        pDirPath = static_cast<String*>(pEnum->GetCurrent());
+                       String mediaPath = RESERVED_MEDIA_PATH;
+                       int length = mediaPath.GetLength();
+                       mediaPath.Remove(length-1,1);
+
                        if (pDirPath == null)
                        {
                                continue;
@@ -667,10 +674,12 @@ AlbumListPresentationModel::InitializeAlbumInfoList(const ContentType& contentTy
 
                                        pAllAlbumInfo->AppendDirectory(*pDirPath);
                                        pAllAlbumInfo->AppendContentIdList(*pContentIdList);
+
+                                       pContentIdList->RemoveAll(true);
                                        delete pContentIdList;
                                }
                        }
-                       else if (*pDirPath == RESERVED_MEDIA_PATH)
+                       else if (*pDirPath == mediaPath)
                        {
                                IList* pContentIdList = GetContentIdListInDirectoryN(*pDirPath, contentType);
 
@@ -681,6 +690,8 @@ AlbumListPresentationModel::InitializeAlbumInfoList(const ContentType& contentTy
 
                                        pAllAlbumInfo->AppendDirectory(*pDirPath);
                                        pAllAlbumInfo->AppendContentIdList(*pContentIdList);
+
+                                       pContentIdList->RemoveAll(true);
                                        delete pContentIdList;
                                }
                        }
@@ -702,9 +713,16 @@ AlbumListPresentationModel::InitializeAlbumInfoList(const ContentType& contentTy
 
                                                pAllAlbumInfo->AppendDirectory(*pDirPath);
                                                pAllAlbumInfo->AppendContentIdList(*pContentIdList);
+
+                                               pSubDirList->RemoveAll(true);
                                                delete pSubDirList;
                                        }
-                                       delete pContentIdList;
+
+                                       if ( pContentIdList != NULL)
+                                       {
+                                               pContentIdList->RemoveAll(true);
+                                               delete pContentIdList;
+                                       }
                                }
                                if (pAlbumInfo != null && pAlbumInfo->GetContentIdCount() > 0)
                                {
@@ -714,6 +732,7 @@ AlbumListPresentationModel::InitializeAlbumInfoList(const ContentType& contentTy
                                {
                                        delete pAlbumInfo;
                                }
+                               pAlbumInfo = null;
                        }
                }
 
@@ -766,32 +785,22 @@ AlbumListPresentationModel::InitializeAlbumInfoList(const ContentType& contentTy
 
        if (pContentDirectoryPathList != null)
        {
+               pContentDirectoryPathList->RemoveAll(true);
                delete pContentDirectoryPathList;
        }
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
        return;
 
 CATCH:
-       if (pContentDirectoryPathList != null)
-       {
-               delete pContentDirectoryPathList;
-       }
-       if (pAllAlbumInfo != null)
-       {
-               delete pAllAlbumInfo;
-       }
-       if (pCameraAlbumInfo != null)
-       {
-               delete pCameraAlbumInfo;
-       }
-       if (pDownloadAlbumInfo != null)
-       {
-               delete pDownloadAlbumInfo;
-       }
-       if (pNoNameAlbumInfo != null)
-       {
-               delete pNoNameAlbumInfo;
-       }
+if (pContentDirectoryPathList != null)
+{
+       pContentDirectoryPathList->RemoveAll(true);
+       delete pContentDirectoryPathList;
+}
+       delete pAllAlbumInfo;
+       delete pCameraAlbumInfo;
+       delete pDownloadAlbumInfo;
+       delete pNoNameAlbumInfo;
 }
 
 String
@@ -831,7 +840,7 @@ AlbumListPresentationModel::GetContentIdListInDirectoryN(const String& directory
        const String contentDirectoryPath = directoryPath;
        if (contentType == CONTENT_TYPE_ALL)
        {
-               IListT< ContentType >* pListT = new (std::nothrow) ArrayListT<ContentType>();
+               IListT<ContentType>* pListT = new (std::nothrow) ArrayListT<ContentType>();
                pListT->Add(CONTENT_TYPE_IMAGE);
                pListT->Add(CONTENT_TYPE_VIDEO);
                result r = directory.Construct(*pListT);
@@ -870,7 +879,13 @@ AlbumListPresentationModel::GetContentIdListInDirectoryN(const String& directory
                }
                delete pEnum;
        }
-       delete pContentInfoList;
+
+       if ( pContentInfoList != NULL)
+       {
+               pContentInfoList->RemoveAll(true);
+               delete pContentInfoList;
+       }
+
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 
        return pContentIdList;
@@ -917,7 +932,7 @@ AlbumListPresentationModel::GetAppControlSelectionMode(void) const
 }
 
 IList*
-AlbumListPresentationModel::GetAlbumInfoList(void)
+AlbumListPresentationModel::GetAlbumInfoList(void) const
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
@@ -925,13 +940,13 @@ AlbumListPresentationModel::GetAlbumInfoList(void)
        return __pAlbumInfoList;
 }
 
-IList* AlbumListPresentationModel::GetContentIdListAtIndexN(const IList& indexList)
+IList* AlbumListPresentationModel::GetContentIdListAtIndexN(const IList& indexList) const
 {
        AppLogDebug("ENTER");
        ContentDirectory directory;
        IList* pContentIdList = new (std::nothrow) ArrayList(SingleObjectDeleter);
 
-       IListT< ContentType >* pListT = new (std::nothrow) ArrayListT<ContentType>();
+       IListT<ContentType>* pListT = new (std::nothrow) ArrayListT<ContentType>();
        TryReturn(pListT != null,null, "Unable to Create ArrayListT");
        pListT->Add(CONTENT_TYPE_IMAGE);
        pListT->Add(CONTENT_TYPE_VIDEO);
@@ -946,11 +961,11 @@ IList* AlbumListPresentationModel::GetContentIdListAtIndexN(const IList& indexLi
                return null;
        }
 
-       IList* pContentDirectoryPathList = directory.GetContentDirectoryPathListN(SORT_ORDER_ASCENDING);
-       String* pDirPath = null;
-       if ((pContentDirectoryPathList != null) && (pContentDirectoryPathList->GetCount() > 0))
+       if (static_cast<const Integer*>(indexList.GetAt(0))->ToInt() == 0) //if all-album is selected, get all files for delete
        {
-               if (static_cast<const Integer*>(indexList.GetAt(0))->ToInt() == 0) //if all-album is selected, get all files for delete
+               IList* pContentDirectoryPathList = directory.GetContentDirectoryPathListN(SORT_ORDER_ASCENDING);
+               String* pDirPath = null;
+               if ((pContentDirectoryPathList != null) && (pContentDirectoryPathList->GetCount() > 0))
                {
                        int loopCount = pContentDirectoryPathList->GetCount();
                        for (int i = 0; i < loopCount; ++i)
@@ -959,18 +974,26 @@ IList* AlbumListPresentationModel::GetContentIdListAtIndexN(const IList& indexLi
                                pContentIdList->AddItems(*(GetContentIdListInDirectoryN(*pDirPath, CONTENT_TYPE_ALL)));
                        }
                }
-               else //get all files in directories which are checked for deletion
+       }
+       else
+       {
+               if(__pAlbumInfoList != null)
                {
                        int loopCount = indexList.GetCount();
+                       AlbumInfo* pInfo = null;
                        for (int i = 0; i < loopCount; ++i)
                        {
-                               const Integer* pIndex = static_cast<const Integer*>(indexList.GetAt(i));
-                               pDirPath = static_cast<String*>(pContentDirectoryPathList->GetAt(pIndex->ToInt() - 1)); //index 0 is all-album which is not counted as a directory. hence delete 1 index
-                               if (pDirPath == null)
+                               int index  = static_cast<const Integer*>(indexList.GetAt(i))->ToInt();
+                               pInfo = static_cast<AlbumInfo*>(__pAlbumInfoList->GetAt(index));
+
+                               if(pInfo != null)
                                {
-                                       continue;
+                                       IList* pList = pInfo->GetContentIdListN();
+                                       if(pList != null)
+                                       {
+                                               pContentIdList->AddItems(*pList);
+                                       }
                                }
-                               pContentIdList->AddItems(*(GetContentIdListInDirectoryN(*pDirPath, CONTENT_TYPE_ALL)));
                        }
                }
        }
@@ -1038,8 +1061,8 @@ AlbumListPresentationModel::OnThumbnailReceivedN(IEventArg& eventArg)
                                int loopCount = pUpdateFolderIndex->GetCount();
                                for (int k = 0; k < loopCount; ++k)
                                {
-                                       Integer *index = (Integer*)pUpdateFolderIndex->GetAt(k);
-                                       int folderIndex = index->ToInt();
+                                       Integer *pIndex = (Integer*)pUpdateFolderIndex->GetAt(k);
+                                       int folderIndex = pIndex->ToInt();
                                        pListener->OnThumbnailDecoded(folderIndex);
                                }
                        }
@@ -1052,7 +1075,7 @@ AlbumListPresentationModel::OnThumbnailReceivedN(IEventArg& eventArg)
 }
 
 void
-AlbumListPresentationModel::OnContentCreated()
+AlbumListPresentationModel::OnContentCreated(void)
 {
        AppLogDebug("ENTER");
        if (__updateProgressStatus == true)
@@ -1075,7 +1098,7 @@ AlbumListPresentationModel::OnContentCreated()
 }
 
 void
-AlbumListPresentationModel::OnContentUpdated()
+AlbumListPresentationModel::OnContentUpdated(void)
 {
        AppLogDebug("ENTER");
        if (__updateProgressStatus == true)
@@ -1095,7 +1118,7 @@ AlbumListPresentationModel::OnContentUpdated()
 }
 
 void
-AlbumListPresentationModel::OnContentDeleted()
+AlbumListPresentationModel::OnContentDeleted(void)
 {
        AppLogDebug("ENTER");
        if (__updateProgressStatus == true)
@@ -1118,22 +1141,11 @@ void
 AlbumListPresentationModel::OnDeviceStateChanged(DeviceType deviceType, const Tizen::Base::String& state)
 {
        AppLogDebug("ENTER");
-       if (deviceType == DEVICE_TYPE_STORAGE_CARD && state == DEVICE_STORAGE_CARD_UNMOUNTED)
-       {
-               IFormContentUpdateEventListener* pInterface = null;
-               IEnumerator* pEventEnum = __pContentEventListener->GetEnumeratorN();
-               while (pEventEnum->MoveNext() == E_SUCCESS)
-               {
-                       pInterface = static_cast<IFormContentUpdateEventListener*>(pEventEnum->GetCurrent());
-                       pInterface->OnContentUpdated();
-               }
-               delete pEventEnum;
-       }
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }
 
 void
-AlbumListPresentationModel::SetUpdateProgressStatus(bool status)
+AlbumListPresentationModel::SetUpdateProgressStatus(const bool status)
 {
        AppLogDebug("ENTER status = %d",status);
        __updateProgressStatus = status;
@@ -1147,7 +1159,7 @@ AlbumListPresentationModel::RotateImage(int index, RotateMode rotateMode)
 }
 
 void
-AlbumListPresentationModel::RequestThumbnail(const int folderIndex, int pathIndex)
+AlbumListPresentationModel::RequestThumbnail(const int folderIndex, const int pathIndex)
 {
        AppLogDebug("ENTER : folderIndex(%d), pathIndex(%d)", folderIndex, pathIndex);
 
@@ -1163,28 +1175,7 @@ AlbumListPresentationModel::RequestThumbnail(const int folderIndex, int pathInde
 }
 
 void
-AlbumListPresentationModel::CancelThumbnailRequest(const int folderIndex)
-{
-       AppLogDebug("ENTER : folderIndex(%d)", folderIndex);
-       if (__pAlbumInfoList != null)
-       {
-               AlbumInfo* pAlbumInfo = static_cast<AlbumInfo*>(__pAlbumInfoList->GetAt(folderIndex));
-               if (pAlbumInfo != null)
-               {
-                       /*
-                       for (int i = 0; i < loopCount ; ++i)
-                       {
-                               contentId = pAlbumInfo->GetContentId(i);
-                               __pThumbnailProvider->CancelThumbnailRequest(contentId, __pThumbnailEvent);
-                       }
-                        */
-               }
-       }
-       AppLogDebug("EXIT");
-}
-
-void
-AlbumListPresentationModel::ClearThumbnailRequests(bool appTerminating)
+AlbumListPresentationModel::ClearThumbnailRequests(const bool appTerminating)
 {
        AppLogDebug("ENTER");
        if (__pThumbnailProvider != null)