[Content] Storage type usage removed

[platform/core/api/webapi-plugins.git] / src / content / content_manager.cc

diff --git a/src/content/content_manager.cc b/src/content/content_manager.cc
index f61279b..ae956a8 100644 (file)
--- a/src/content/content_manager.cc
+++ b/src/content/content_manager.cc
@@ -349,8 +349,7 @@ void ContentToJson(media_info_h info, picojson::object& o) {
 void ContentDirToJson(media_folder_h folder, picojson::object& o) {
   ScopeLogger();
   int ret;
-  char* tmpStr = NULL;
-  media_content_storage_e storage_type;
+  char *tmpStr = NULL;
 
   // id
   ret = media_folder_get_folder_id(folder, &tmpStr);
@@ -385,21 +384,6 @@ void ContentDirToJson(media_folder_h folder, picojson::object& o) {
     }
   }
 
-  // storageType
-  ret = media_folder_get_storage_type(folder, &storage_type);
-  // TODO: The function media_folder_get_storage_type is marked as deprecated since 5.0.
-  // As an alternative, it is recommended to use storage_get_type_dev function. However,
-  // this function does not work with internal storages. The media_folder_get_storage_type
-  // function should be kept or moved to internal header by Native API.
-  if (ret == MEDIA_CONTENT_ERROR_NONE) {
-    if (storage_type == MEDIA_CONTENT_STORAGE_INTERNAL) {
-      o["storageType"] = picojson::value(std::string("INTERNAL"));
-    } else {
-      LoggerD("storageType = %d, assuming EXTERNAL as storage type", storage_type);
-      o["storageType"] = picojson::value(std::string("EXTERNAL"));
-    }
-  }
-
   // modifiedDate
   struct stat stat_res;
   if (stat(folder_path.c_str(), &stat_res) == 0) {
@@ -476,7 +460,6 @@ static void FolderToJson(media_folder_h folder, picojson::object* out) {
   char* id = NULL;
   char* path = NULL;
   time_t date;
-  media_content_storage_e storageType;
 
   int ret;
 
@@ -510,27 +493,10 @@ static void FolderToJson(media_folder_h folder, picojson::object* out) {
   }
   date = stat_res.st_mtime;
 
-  ret = media_folder_get_storage_type(folder, &storageType);
-  // TODO: The function media_folder_get_storage_type is marked as deprecated since 5.0.
-  // As an alternative, it is recommended to use storage_get_type_dev function. However,
-  // this function does not work with internal storages. The media_folder_get_storage_type
-  // function should be kept or moved to internal header by Native API.
-  if (ret != MEDIA_CONTENT_ERROR_NONE) {
-    LogAndReportError(ContentManager::convertError(ret), out,
-                      ("Failed: media_folder_get_storage_type"));
-    return;
-  }
-
   (*out)["id"] = picojson::value(std::string(id));
   (*out)["directoryURI"] = picojson::value(std::string(path));
   (*out)["title"] = picojson::value(std::string(name));
 
-  if (storageType == MEDIA_CONTENT_STORAGE_INTERNAL) {
-    (*out)["storageType"] = picojson::value(std::string("INTERNAL"));
-  } else if (storageType == MEDIA_CONTENT_STORAGE_EXTERNAL) {
-    (*out)["storageType"] = picojson::value(std::string("EXTERNAL"));
-  }
-
   (*out)["modifiedDate"] = picojson::value(static_cast<double>(date));
 }
 
@@ -657,22 +623,10 @@ bool ContentManager::isConnected() {
 void ContentManager::getDirectories(const std::shared_ptr<ReplyCallbackData>& user_data) {
   ScopeLogger();
   int ret;
-  filter_h filter = NULL;
-  ret = media_filter_create(&filter);
-  if (ret != MEDIA_CONTENT_ERROR_NONE) {
-    LoggerE("Failed: media_filter_create failed");
-    return;
-  }
-
-  SCOPE_EXIT {
-    media_filter_destroy(filter);
-  };
-
-  std::string condition = "(FOLDER_STORAGE_TYPE = 0 OR FOLDER_STORAGE_TYPE = 1)";
-  media_filter_set_condition(filter, condition.c_str(), MEDIA_CONTENT_COLLATE_DEFAULT);
 
   picojson::array pico_dirs;
-  ret = media_folder_foreach_folder_from_db(filter, media_foreach_directory_cb, &pico_dirs);
+  ret = media_folder_foreach_folder_from_db(nullptr, media_foreach_directory_cb,
+                                            &pico_dirs);
   if (ret != MEDIA_CONTENT_ERROR_NONE) {
     PlatformResult err = LogAndCreateResult(
         ErrorCode::UNKNOWN_ERR, "Getting the directories failed.",