folder uuid in folder and storageid table mismatch

Change-Id: I5d24f1a0be1e4b979e1357904575f175c2174637

diff --git a/src/server/media-server-device-block.c b/src/server/media-server-device-block.c
index b3c1723..9b62f38 100755 (executable)
--- a/src/server/media-server-device-block.c
+++ b/src/server/media-server-device-block.c
@@ -105,11 +105,7 @@ int ms_usb_insert_handler(const char *mount_path, const char *mount_uuid)
 
                        MS_DBG_WARN("init storage data in DB");
                        /* update storage_id table set validity=0 first */
-#ifdef _USE_TVPD_MODE
                        ms_validaty_change_all_items(handle, mount_uuid, MS_STORAGE_EXTERNAL_USB, false, uid);
-#else
-                       ms_validaty_change_all_items(handle, mount_uuid, MS_STORAGE_EXTERNAL, false, uid);
-#endif
                        /*update folder table set validity = 0*/
                        ms_set_folder_validity(handle, mount_uuid, storage_path, MS_INVALID, TRUE, uid);
                        /* update folder table set scan_status=0 first */
@@ -699,11 +695,7 @@ int ms_check_mounted_storage(uid_t uid)
 
                                                ms_set_storage_validity(handle, storage_id, 1, uid);
                                                /* update storage_id table set validity=0 first */
-#ifdef _USE_TVPD_MODE
                                                ms_validaty_change_all_items(handle, storage_id, MS_STORAGE_EXTERNAL_USB, false, uid);
-#else
-                                               ms_validaty_change_all_items(handle, storage_id, MS_STORAGE_EXTERNAL, false, uid);
-#endif
                                                ms_set_folder_validity(handle, storage_id, mounted_path, MS_INVALID, TRUE, uid);
                                                /* update folder table set scan_status=0 first */
                                                ms_set_folder_scan_status(handle, storage_id, NULL, MS_DIR_SCAN_NONE, uid);