Fixed detail view when files are hidden

Change-Id: I33a352ed491ca761a71becf81ab91d48de564342
Signed-off-by: bhutani.92 <bhutani.92@samsung.com>

diff --git a/src/common/mp-util.c b/src/common/mp-util.c
index 67a812bb73e76a29c3b8ad424716f421888d5e8e..10b167e1fd711722aaf56fbb186e70d496fd6130 100755 (executable)
--- a/src/common/mp-util.c
+++ b/src/common/mp-util.c
@@ -49,6 +49,8 @@
 bool track_deleted = false;
 #define SINGLE_BYTE_MAX 0x7F
 #define PATH_MAX 4096
+static int externalStorageId = -1;
+static int internalStorageId = -1;
 
 struct index_s {
        const char *index;
@@ -136,8 +138,6 @@ static unsigned char mask_len[] = {
        0xFE, /* 1111 1110 */ 0xFC,     /* 1111 110x */
 };
 
-static int externalStorageId = -1;
-
 extern struct appdata *g_ad;
 
 EXPORT_API struct appdata *mp_util_get_appdata(void) {
@@ -2595,16 +2595,65 @@ mp_util_media_is_uhqa(const char *media_id)
        return (bool)(sample_rate >= 192000);
 }
 
+static bool __mp_get_all_supported_storageids_cb(int storageId, storage_type_e type, storage_state_e state, const char *path, void *userData)
+{
+       if (type == STORAGE_TYPE_EXTERNAL) {
+               externalStorageId = storageId;
+       }
+       if (type == STORAGE_TYPE_INTERNAL) {
+               internalStorageId = storageId;
+       }
+
+       return true;
+}
+
+char *mp_get_media_directory(storage_type_e storage_type) {
+       char *path = NULL;
+       int error_code = storage_foreach_device_supported(__mp_get_all_supported_storageids_cb, NULL);
+       if (error_code != STORAGE_ERROR_NONE) {
+               ERROR_TRACE("Failed to get Storage Id");
+               return NULL;
+       }
+       if (storage_type == STORAGE_TYPE_INTERNAL && internalStorageId != -1) {
+               storage_get_root_directory(internalStorageId, &path);
+       } else if (storage_type == STORAGE_TYPE_EXTERNAL && externalStorageId != -1) {
+               storage_get_root_directory(externalStorageId, &path);
+       } else {
+               ERROR_TRACE("Invalid Storage Id");
+               return NULL;
+       }
+       return path;
+}
+
 mp_dir_e mp_util_get_file_location(const char *uri)
 {
+       int len_phone = 0;
+       int len_memory = 0;
+       int len_http = 0;
+
+       char *externalPath = NULL;
+       char *internalPath = NULL;
+       if (!mp_get_media_directory(STORAGE_TYPE_INTERNAL)) {
+               ERROR_TRACE("Internal Storage Path cannot be determined");
+       } else {
+               internalPath = g_strdup(mp_get_media_directory(STORAGE_TYPE_INTERNAL));
+               len_phone = strlen(internalPath);
+               DEBUG_TRACE("External Storage Path is: %s", externalPath);
+       }
+
+       if (!mp_get_media_directory(STORAGE_TYPE_EXTERNAL)) {
+               ERROR_TRACE("External Storage Path cannot be determined");
+       } else {
+               externalPath = g_strdup(mp_get_media_directory(STORAGE_TYPE_EXTERNAL));
+               len_memory = strlen(externalPath);
+               DEBUG_TRACE("External Storage Path is: %s", externalPath);
+       }
 
-       int len_phone = strlen(MP_MUSIC_DIR);
-       int len_memory = strlen(MP_MMC_DIR);
-       int len_http = strlen(MP_HTTP_DIR);
+       len_http = strlen(MP_HTTP_DIR);
 
-       if (strncmp(uri, MP_MUSIC_DIR, len_phone) == 0) {
+       if (strncmp(uri, internalPath, len_phone) == 0) {
                return MP_DIR_PHONE;
-       } else if (strncmp(uri, MP_MMC_DIR, len_memory) == 0) {
+       } else if (strncmp(uri, externalPath, len_memory) == 0) {
                return MP_DIR_MMC;
        } else if (strncmp(uri, MP_HTTP_DIR, len_http) == 0) {
                return MP_DIR_HTTP;