From 046b5556bae4b92ef6e8d8fb7eb2d52bfd5f2a2e Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Thu, 10 Sep 2020 13:34:25 +0900 Subject: [PATCH] Fix external storage related code Fixed an issue where media was visible even when external storage was unmounted. Change-Id: If9a41404970cfb7d9a90e6c8db60abf5d1268312 Signed-off-by: Minje Ahn --- src/common/media-svc-storage.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/common/media-svc-storage.c b/src/common/media-svc-storage.c index 1cbf692..c2bc9ca 100755 --- a/src/common/media-svc-storage.c +++ b/src/common/media-svc-storage.c @@ -145,11 +145,13 @@ int _media_svc_update_storage_validity(const char *storage_id, int validity, uid int ret = MS_MEDIA_ERR_NONE; char *sql = NULL; - if (storage_id == NULL) - sql = sqlite3_mprintf("UPDATE %q SET validity=%d", DB_TABLE_STORAGE, validity); - else - sql = sqlite3_mprintf("UPDATE %q SET validity=%d WHERE storage_id=%Q", DB_TABLE_STORAGE, validity, storage_id); - + if (storage_id == NULL) { + sql = sqlite3_mprintf("UPDATE %q SET validity=%d;UPDATE %q SET validity=%d WHERE folder_storage_type > 0;UPDATE %q SET validity=%d WHERE media_storage_type > 0;", + DB_TABLE_STORAGE, validity, DB_TABLE_FOLDER, validity, DB_TABLE_MEDIA, validity); + } else { + sql = sqlite3_mprintf("UPDATE %q SET validity=%d WHERE storage_id=%Q;UPDATE %q SET validity=%d WHERE storage_uuid=%Q;UPDATE %q SET validity=%d WHERE storage_uuid=%Q;", + DB_TABLE_STORAGE, validity, storage_id, DB_TABLE_FOLDER, validity, storage_id, DB_TABLE_MEDIA, validity, storage_id); + } ret = _media_svc_sql_query_direct(sql, uid); SQLITE3_SAFE_FREE(sql); -- 2.7.4