From 911118b2c81b27058251e8caccdbe1e496374e3f Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Thu, 10 Sep 2020 13:31:47 +0900 Subject: [PATCH] Fix external storage related code Fixed an issue where media was visible even when external storage was unmounted. Change-Id: I5f8fae3f956cb87986a8b921021d635ee0e78c77 Signed-off-by: Minje Ahn --- src/common/media-common-db-svc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/media-common-db-svc.c b/src/common/media-common-db-svc.c index 451dae8..32e54fc 100644 --- a/src/common/media-common-db-svc.c +++ b/src/common/media-common-db-svc.c @@ -385,7 +385,7 @@ int ms_delete_invalid_items(sqlite3 *handle, const char *storage_id, uid_t uid) char *sql = sqlite3_mprintf("SELECT media_thumbnail_path FROM '%q' WHERE validity IN (%d, %d) AND media_thumbnail_path IS NOT NULL", storage_id, MS_INVALID, MS_SCANNING); #else - char *sql = sqlite3_mprintf("SELECT media_thumbnail_path FROM media WHERE validity IN (%d, %d) AND media_thumbnail_path IS NOT NULL", MS_INVALID, MS_SCANNING); + char *sql = sqlite3_mprintf("SELECT media_thumbnail_path FROM media WHERE validity IN (%d, %d) AND media_thumbnail_path IS NOT NULL AND storage_uuid=%Q", MS_INVALID, MS_SCANNING, storage_id); #endif MS_DBG_SLOG("[SQL query] : %s", sql); @@ -406,7 +406,7 @@ int ms_delete_invalid_items(sqlite3 *handle, const char *storage_id, uid_t uid) #ifdef _USE_TVPD_MODE sql = sqlite3_mprintf("DELETE FROM '%q' WHERE validity IN (%d, %d)", storage_id, MS_INVALID, MS_SCANNING); #else - sql = sqlite3_mprintf("DELETE FROM media WHERE validity IN (%d, %d)", MS_INVALID, MS_SCANNING); + sql = sqlite3_mprintf("DELETE FROM media WHERE validity IN (%d, %d) AND storage_uuid=%Q", MS_INVALID, MS_SCANNING, storage_id); #endif ret = media_db_update_db_direct(sql, uid); @@ -537,7 +537,7 @@ int ms_delete_invalid_folder(const char *storage_id, uid_t uid) sql = sqlite3_mprintf("DELETE FROM folder WHERE storage_uuid='%q' AND validity IN (%d, %d)", storage_id, MS_INVALID, MS_SCANNING); #else - sql = sqlite3_mprintf("DELETE FROM folder WHERE validity IN (%d, %d)", MS_INVALID, MS_SCANNING); + sql = sqlite3_mprintf("DELETE FROM folder WHERE validity IN (%d, %d) AND storage_uuid=%Q", MS_INVALID, MS_SCANNING, storage_id); #endif ret = media_db_update_db_direct(sql, uid); -- 2.7.4