Modify thumbnail creation and cancellation logic

Change-Id: I4d124e37dad4f58df5d2a768b2cd61fe807c8fd5
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

diff --git a/include/media_info_private.h b/include/media_info_private.h
index babbcf2..1058357 100755 (executable)
--- a/include/media_info_private.h
+++ b/include/media_info_private.h
@@ -63,9 +63,6 @@ extern "C" {
 #define SQLITE3_FINALIZE(x)    {if(x != NULL) {sqlite3_finalize(x);}}
 #define SQLITE3_SAFE_FREE(x)   {if(x != NULL) {sqlite3_free(x);x = NULL;}}
 
-
-#define MEDIA_CONTENT_PATH_PHONE       MEDIA_ROOT_PATH_INTERNAL        /**< File path prefix of files stored in phone */
-#define MEDIA_CONTENT_PATH_MMC                 MEDIA_ROOT_PATH_SDCARD          /**< File path prefix of files stored in mmc card */
 #define MEDIA_CONTENT_THUMB_DEFAULT_PATH       tzplatform_mkpath(TZ_USER_SHARE, "media/.thumb/thumb_default.png")
 #define MEDIA_CONTENT_INSERT_FILES_PATH                tzplatform_getenv(TZ_USER_SHARE)
 

diff --git a/src/media_info.c b/src/media_info.c
index cfb2e64..5983791 100755 (executable)
--- a/src/media_info.c
+++ b/src/media_info.c
@@ -3061,7 +3061,7 @@ int media_info_cancel_thumbnail(media_info_h media)
 
        if(_media != NULL && STRING_VALID(_media->media_id) && STRING_VALID(_media->file_path))
        {
-               ret = thumbnail_request_cancel_media(_media->file_path, tzplatform_getuid(TZ_USER_NAME));
+               ret = thumbnail_request_cancel_media(_media->file_path);
                ret = _content_error_capi(MEDIA_THUMBNAIL_TYPE, ret);
        }
        else

diff --git a/test/media-content_test.c b/test/media-content_test.c
index 5993410..eb57af2 100755 (executable)
--- a/test/media-content_test.c
+++ b/test/media-content_test.c
@@ -559,6 +559,13 @@ bool folder_list_cb(media_folder_h folder, void *user_data)
                }
                media_content_debug("folder_id = [%s]", folder_id);
 
+               if(media_folder_get_parent_folder_id(folder, &str_val) != MEDIA_CONTENT_ERROR_NONE)
+               {
+                       media_content_error("[ERROR] media_folder_get_parent_folder_id is failed");
+                       return false;
+               }
+               media_content_debug("parent_folder_id = [%s]", str_val);
+
                if(media_folder_get_path(folder, &str_val) != MEDIA_CONTENT_ERROR_NONE)
                {
                        SAFE_FREE(folder_id);