Change wrong API. Change Async to Sync

foreach CAPIs are not async

Change-Id: Ie1128af63b24844e9e388d2aaf6bf8e4072f99af
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

diff --git a/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Album.cs b/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Album.cs
index 63715b2..dd089b0 100755 (executable)
--- a/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Album.cs
+++ b/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Album.cs
@@ -165,9 +165,8 @@ namespace Tizen.Content.MediaContent
         /// </summary>
         /// <param name="filter">ContentFilter used to match media content from the media database.</param>
         /// <returns>List of content media items matching the passed filter</returns>
-        public override Task<IEnumerable<MediaInformation>> GetMediaInformationsAsync(ContentFilter filter)
+        public override IEnumerable<MediaInformation> GetMediaInformations(ContentFilter filter)
         {
-            var tcs = new TaskCompletionSource<IEnumerable<MediaInformation>>();
             List<MediaInformation> mediaContents = new List<MediaInformation>();
 
             IntPtr handle = (filter != null) ? filter.Handle : IntPtr.Zero;
@@ -213,8 +212,7 @@ namespace Tizen.Content.MediaContent
             MediaContentValidator.ThrowIfError(
                 Interop.Group.MediaAlbumForeachMediaFromDb(Id, handle, callback, IntPtr.Zero), "Failed to get information");
 
-            tcs.TrySetResult(mediaContents);
-            return tcs.Task;
+            return mediaContents;
         }
     }
 }

diff --git a/Tizen.Content.MediaContent/Tizen.Content.MediaContent/AudioInformation.cs b/Tizen.Content.MediaContent/Tizen.Content.MediaContent/AudioInformation.cs
index 90aeea2..c6298f4 100755 (executable)
--- a/Tizen.Content.MediaContent/Tizen.Content.MediaContent/AudioInformation.cs
+++ b/Tizen.Content.MediaContent/Tizen.Content.MediaContent/AudioInformation.cs
@@ -363,10 +363,8 @@ namespace Tizen.Content.MediaContent
         /// Task to get all the Bookmarks
         /// </returns>
         /// <param name="filter"> filter for the Tags</param>
-        public Task<IEnumerable<MediaBookmark>> GetMediaBookmarksAsync(ContentFilter filter)
+        public IEnumerable<MediaBookmark> GetMediaBookmarks(ContentFilter filter)
         {
-            var task = new TaskCompletionSource<IEnumerable<MediaBookmark>>();
-
             Collection<MediaBookmark> coll = new Collection<MediaBookmark>();
             IntPtr filterHandle = (filter != null) ? filter.Handle : IntPtr.Zero;
             Interop.MediaInformation.MediaBookmarkCallback callback = (IntPtr handle, IntPtr userData) =>
@@ -381,8 +379,7 @@ namespace Tizen.Content.MediaContent
             MediaContentValidator.ThrowIfError(
                 Interop.MediaInformation.GetAllBookmarks(MediaId, filterHandle, callback, IntPtr.Zero), "Failed to get value");
 
-            task.SetResult(coll);
-            return task.Task;
+            return coll;
         }
 
         /// <summary>
@@ -392,14 +389,14 @@ namespace Tizen.Content.MediaContent
         /// <returns>
         /// Task with newly added MediaBookmark instance.
         /// </returns>
-        public async Task<MediaBookmark> AddBookmark(uint offset)
+        public MediaBookmark AddBookmark(uint offset)
         {
             MediaBookmark result = null;
             ContentManager.Database.Insert(MediaId, offset, null);
             ContentFilter bookmarkfilter = new ContentFilter();
             bookmarkfilter.Condition = "BOOKMARK_MARKED_TIME = " + offset;
             IEnumerable<MediaBookmark> bookmarksList = null;
-            bookmarksList = await GetMediaBookmarksAsync(bookmarkfilter);
+            bookmarksList = GetMediaBookmarks(bookmarkfilter);
             foreach (MediaBookmark bookmark in bookmarksList)
             {
                 if (bookmark.Offset == offset)

diff --git a/Tizen.Content.MediaContent/Tizen.Content.MediaContent/ContentCollection.cs b/Tizen.Content.MediaContent/Tizen.Content.MediaContent/ContentCollection.cs
index 1ddaa4f..dd4a247 100755 (executable)
--- a/Tizen.Content.MediaContent/Tizen.Content.MediaContent/ContentCollection.cs
+++ b/Tizen.Content.MediaContent/Tizen.Content.MediaContent/ContentCollection.cs
@@ -42,6 +42,6 @@ namespace Tizen.Content.MediaContent
         /// </summary>
         /// <param name="filter">The media filter</param>
         /// <returns>Task with Media Information list</returns>
-        public abstract Task<IEnumerable<MediaInformation>> GetMediaInformationsAsync(ContentFilter filter);
+        public abstract IEnumerable<MediaInformation> GetMediaInformations(ContentFilter filter);
     }
 }

diff --git a/Tizen.Content.MediaContent/Tizen.Content.MediaContent/ContentDatabase.cs b/Tizen.Content.MediaContent/Tizen.Content.MediaContent/ContentDatabase.cs
index 89bda70..02b077a 100755 (executable)
--- a/Tizen.Content.MediaContent/Tizen.Content.MediaContent/ContentDatabase.cs
+++ b/Tizen.Content.MediaContent/Tizen.Content.MediaContent/ContentDatabase.cs
@@ -446,47 +446,46 @@ namespace Tizen.Content.MediaContent
         /// <returns>
         /// Task with the list of the ContentCollection
         /// </returns>
-        public Task<IEnumerable<T>> SelectAsync<T>(ContentFilter filter)
+        public IEnumerable<T> SelectAll<T>(ContentFilter filter)
         {
             ConnectToDB();
-            var task = new TaskCompletionSource<IEnumerable<T>>();
             if (typeof(T) == typeof(MediaInformation))
             {
                 IEnumerable<MediaInformation> mediaList = GetMediaInformations(filter);
-                task.TrySetResult((IEnumerable<T>)mediaList);
+                return (IEnumerable<T>)mediaList;
             }
             else if (typeof(T) == typeof(Album))
             {
                 IEnumerable<Album> collectionList = ForEachAlbum(filter);
-                task.TrySetResult((IEnumerable<T>)collectionList);
+                return (IEnumerable<T>)collectionList;
             }
             else if (typeof(T) == typeof(MediaFolder))
             {
                 IEnumerable<MediaFolder> collectionList = ForEachFolder(filter);
-                task.TrySetResult((IEnumerable<T>)collectionList);
+                return (IEnumerable<T>)collectionList;
             }
             else if (typeof(T) == typeof(Group))
             {
                 IEnumerable<Group> collectionList = ForEachGroup(filter);
-                task.TrySetResult((IEnumerable<T>)collectionList);
+                return (IEnumerable<T>)collectionList;
             }
             else if (typeof(T) == typeof(Storage))
             {
                 IEnumerable<Storage> collectionList = ForEachStorage(filter);
-                task.TrySetResult((IEnumerable<T>)collectionList);
+                return (IEnumerable<T>)collectionList;
             }
             else if (typeof(T) == typeof(Tag))
             {
                 IEnumerable<Tag> collectionList = ForEachTag(filter);
-                task.TrySetResult((IEnumerable<T>)collectionList);
+                return (IEnumerable<T>)collectionList;
             }
             else if (typeof(T) == typeof(PlayList))
             {
                 IEnumerable<PlayList> collectionList = ForEachPlayList(filter);
-                task.TrySetResult((IEnumerable<T>)collectionList);
+                return (IEnumerable<T>)collectionList;
             }
 
-            return task.Task;
+            return null;
         }
 
         /// <summary>

diff --git a/Tizen.Content.MediaContent/Tizen.Content.MediaContent/ContentManager.cs b/Tizen.Content.MediaContent/Tizen.Content.MediaContent/ContentManager.cs
index 6e8f3d7..44a8a22 100755 (executable)
--- a/Tizen.Content.MediaContent/Tizen.Content.MediaContent/ContentManager.cs
+++ b/Tizen.Content.MediaContent/Tizen.Content.MediaContent/ContentManager.cs
@@ -133,14 +133,14 @@ namespace Tizen.Content.MediaContent
         /// If any folder must not be scanned, a blank file ".scan_ignore" has to be created in that folder.
         /// </remarks>
         /// <returns>Task with scanning result</returns>
-        public static Task ScanFolderAsync(string folderPath, bool recursive = true)
+        public static Task<MediaContentError> ScanFolderAsync(string folderPath, bool recursive = true)
         {
-            var task = new TaskCompletionSource<int>();
+            var task = new TaskCompletionSource<MediaContentError>();
 
             Interop.Content.MediaScanCompletedCallback scanCompleted = (MediaContentError scanResult, IntPtr data) =>
             {
                 MediaContentValidator.ThrowIfError(scanResult, "Failed to scan");
-                task.SetResult((int)scanResult);
+                task.SetResult(scanResult);
             };
 
             MediaContentValidator.ThrowIfError(

diff --git a/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Group.cs b/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Group.cs
index e70aee3..247c7fb 100755 (executable)
--- a/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Group.cs
+++ b/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Group.cs
@@ -82,9 +82,8 @@ namespace Tizen.Content.MediaContent
         /// </summary>
         /// <param name="filter">ContentFilter used to match media content from the media database.</param>
         /// <returns>List of content media items matching the passed filter</returns>
-        public override Task<IEnumerable<MediaInformation>> GetMediaInformationsAsync(ContentFilter filter)
+        public override IEnumerable<MediaInformation> GetMediaInformations(ContentFilter filter)
         {
-            var tcs = new TaskCompletionSource<IEnumerable<MediaInformation>>();
             List<MediaInformation> mediaContents = new List<MediaInformation>();
             IntPtr handle = (filter != null) ? filter.Handle : IntPtr.Zero;
             Interop.Group.MediaInfoCallback callback = (IntPtr mediaHandle, IntPtr data) =>
@@ -129,8 +128,7 @@ namespace Tizen.Content.MediaContent
             MediaContentValidator.ThrowIfError(
                 Interop.Group.ForeachMediaFromDb(Name, _groupType, handle, callback, IntPtr.Zero), "Failed to get media information for the group");
 
-            tcs.TrySetResult(mediaContents);
-            return tcs.Task;
+            return mediaContents;
         }
     }
 }

diff --git a/Tizen.Content.MediaContent/Tizen.Content.MediaContent/ImageInformation.cs b/Tizen.Content.MediaContent/Tizen.Content.MediaContent/ImageInformation.cs
index 2aab73d..afd0e06 100755 (executable)
--- a/Tizen.Content.MediaContent/Tizen.Content.MediaContent/ImageInformation.cs
+++ b/Tizen.Content.MediaContent/Tizen.Content.MediaContent/ImageInformation.cs
@@ -246,9 +246,8 @@ namespace Tizen.Content.MediaContent
         /// <returns>
         /// Task to get all the MediaFaces </returns>
         /// <param name="filter"> filter for the Tags</param>
-        public Task<IEnumerable<MediaFace>> GetMediaFacesAsync(ContentFilter filter)
+        public IEnumerable<MediaFace> GetMediaFaces(ContentFilter filter)
         {
-            var task = new TaskCompletionSource<IEnumerable<MediaFace>>();
             Collection<MediaFace> coll = new Collection<MediaFace>();
 
             Interop.MediaInformation.MediaFaceCallback callback = (IntPtr faceHandle, IntPtr userData) =>
@@ -263,8 +262,8 @@ namespace Tizen.Content.MediaContent
             IntPtr filterHandle = (filter != null) ? filter.Handle : IntPtr.Zero;
             MediaContentValidator.ThrowIfError(
                 Interop.MediaInformation.GetAllFaces(MediaId, filterHandle, callback, IntPtr.Zero), "Failed to get value");
-            task.SetResult(coll);
-            return task.Task;
+
+            return coll;
         }
 
         /// <summary>

diff --git a/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaFolder.cs b/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaFolder.cs
index f232588..2860fc7 100755 (executable)
--- a/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaFolder.cs
+++ b/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaFolder.cs
@@ -267,9 +267,8 @@ namespace Tizen.Content.MediaContent
         /// </summary>
         /// <param name="filter">ContentFilter used to match media content from the media database.</param>
         /// <returns>List of content media items matching the passed filter</returns>
-        public override Task<IEnumerable<MediaInformation>> GetMediaInformationsAsync(ContentFilter filter)
+        public override IEnumerable<MediaInformation> GetMediaInformations(ContentFilter filter)
         {
-            var tcs = new TaskCompletionSource<IEnumerable<MediaInformation>>();
             List<MediaInformation> mediaContents = new List<MediaInformation>();
             IntPtr handle = (filter != null) ? filter.Handle : IntPtr.Zero;
 
@@ -315,8 +314,7 @@ namespace Tizen.Content.MediaContent
             MediaContentValidator.ThrowIfError(
                 Interop.Folder.ForeachMediaFromDb(Id, handle, callback, IntPtr.Zero), "Failed to get information");
 
-            tcs.TrySetResult(mediaContents);
-            return tcs.Task;
+            return mediaContents;
         }
     }
 }

diff --git a/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaInformation.cs b/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaInformation.cs
index 22eebdd..8ba0bdc 100755 (executable)
--- a/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaInformation.cs
+++ b/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaInformation.cs
@@ -80,7 +80,7 @@ namespace Tizen.Content.MediaContent
         /// </summary>
         /// <returns>
         /// Task for creation of Thumbnail </returns>
-        public async Task<string> CreateThumbnailAsync()
+        public Task<string> CreateThumbnailAsync()
         {
             var task = new TaskCompletionSource<string>();
             Interop.MediaInformation.MediaThumbnailCompletedCallback thumbnailResult = (MediaContentError createResult, string path, IntPtr userData) =>
@@ -91,7 +91,7 @@ namespace Tizen.Content.MediaContent
             MediaContentValidator.ThrowIfError(
                 Interop.MediaInformation.CreateThumbnail(_handle, thumbnailResult, IntPtr.Zero), "Failed to create thumbnail");
 
-            return await task.Task;
+            return task.Task;
         }
 
         /// <summary>
@@ -103,7 +103,7 @@ namespace Tizen.Content.MediaContent
         /// <returns>
         /// Task for creation of Thumbnail
         /// </returns>
-        public async Task<string> CreateThumbnailAsync(CancellationToken cancellationToken)
+        public Task<string> CreateThumbnailAsync(CancellationToken cancellationToken)
         {
             var task = new TaskCompletionSource<string>();
             cancellationToken.Register(() =>
@@ -123,7 +123,7 @@ namespace Tizen.Content.MediaContent
             MediaContentValidator.ThrowIfError(
                 Interop.MediaInformation.CreateThumbnail(_handle, thumbnailResult, IntPtr.Zero), "Failed to create thumbnail");
 
-            return await task.Task;
+            return task.Task;
         }
 
         /// <summary>
@@ -132,9 +132,8 @@ namespace Tizen.Content.MediaContent
         /// <returns>
         /// Task to get all the Tags </returns>
         /// <param name="filter"> The filter for the Tags</param>
-        public Task<IEnumerable<Tag>> GetTagsAsync(ContentFilter filter)
+        public IEnumerable<Tag> GetTags(ContentFilter filter)
         {
-            var task = new TaskCompletionSource<IEnumerable<Tag>>();
             Collection<Tag> coll = new Collection<Tag>();
 
             IntPtr handle = (filter != null) ? filter.Handle : IntPtr.Zero;
@@ -150,8 +149,7 @@ namespace Tizen.Content.MediaContent
             MediaContentValidator.ThrowIfError(
                 Interop.MediaInformation.GetAllTags(MediaId, handle, tagsCallback, IntPtr.Zero), "Failed to get information");
 
-            task.SetResult(coll);
-            return task.Task;
+            return coll;
         }
 
         /// <summary>

diff --git a/Tizen.Content.MediaContent/Tizen.Content.MediaContent/PlayList.cs b/Tizen.Content.MediaContent/Tizen.Content.MediaContent/PlayList.cs
index 9019938..db85d2f 100755 (executable)
--- a/Tizen.Content.MediaContent/Tizen.Content.MediaContent/PlayList.cs
+++ b/Tizen.Content.MediaContent/Tizen.Content.MediaContent/PlayList.cs
@@ -277,9 +277,8 @@ namespace Tizen.Content.MediaContent
         /// </summary>
         /// <param name="filter">ContentFilter used to match media content from the media database.</param>
         /// <returns>List of content media items matching the passed filter</returns>
-        public override Task<IEnumerable<MediaInformation>> GetMediaInformationsAsync(ContentFilter filter)
+        public override IEnumerable<MediaInformation> GetMediaInformations(ContentFilter filter)
         {
-            var tcs = new TaskCompletionSource<IEnumerable<MediaInformation>>();
             List<MediaInformation> mediaContents = new List<MediaInformation>();
             IntPtr handle = (filter != null) ? filter.Handle : IntPtr.Zero;
             Interop.Playlist.PlaylistMemberCallback callback = (int memberId, IntPtr mediaHandle, IntPtr data) =>
@@ -324,8 +323,7 @@ namespace Tizen.Content.MediaContent
             MediaContentValidator.ThrowIfError(
                 Interop.Playlist.ForeachMediaFromDb(Id, handle, callback, IntPtr.Zero), "Failed to get media information");
 
-            tcs.TrySetResult(mediaContents);
-            return tcs.Task;
+            return mediaContents;
         }
     }
 }

diff --git a/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Storage.cs b/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Storage.cs
index 7ec5a60..26c2317 100755 (executable)
--- a/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Storage.cs
+++ b/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Storage.cs
@@ -160,9 +160,8 @@ namespace Tizen.Content.MediaContent
         /// </summary>
         /// <param name="filter">ContentFilter used to match media content from the media database.</param>
         /// <returns>List of content media items matching the passed filter</returns>
-        public override Task<IEnumerable<MediaInformation>> GetMediaInformationsAsync(ContentFilter filter)
+        public override IEnumerable<MediaInformation> GetMediaInformations(ContentFilter filter)
         {
-            var tcs = new TaskCompletionSource<IEnumerable<MediaInformation>>();
             List<MediaInformation> mediaContents = new List<MediaInformation>();
 
             IntPtr handle = (filter != null) ? filter.Handle : IntPtr.Zero;
@@ -208,8 +207,7 @@ namespace Tizen.Content.MediaContent
             MediaContentValidator.ThrowIfError(
                 Interop.Storage.ForeachMediaFromDb(Id, handle, callback, IntPtr.Zero), "Failed to get information");
 
-            tcs.TrySetResult(mediaContents);
-            return tcs.Task;
+            return mediaContents;
         }
     }
 }

diff --git a/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Tag.cs b/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Tag.cs
index 2d7e164..2855a84 100755 (executable)
--- a/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Tag.cs
+++ b/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Tag.cs
@@ -156,9 +156,8 @@ namespace Tizen.Content.MediaContent
         /// </summary>
         /// <param name="filter">ContentFilter used to match media content from the media database.</param>
         /// <returns>List of content media items matching the passed filter</returns>
-        public override Task<IEnumerable<MediaInformation>> GetMediaInformationsAsync(ContentFilter filter)
+        public override IEnumerable<MediaInformation> GetMediaInformations(ContentFilter filter)
         {
-            var tcs = new TaskCompletionSource<IEnumerable<MediaInformation>>();
             List<MediaInformation> mediaContents = new List<MediaInformation>();
             IntPtr handle = (filter != null) ? filter.Handle : IntPtr.Zero;
 
@@ -205,9 +204,7 @@ namespace Tizen.Content.MediaContent
             MediaContentValidator.ThrowIfError(
                 Interop.Tag.ForeachMediaFromDb(Id, handle, callback, IntPtr.Zero), "Failed to get information");
 
-            tcs.TrySetResult(mediaContents);
-
-            return tcs.Task;
+            return mediaContents;
         }
     }
 }

diff --git a/Tizen.Content.MediaContent/Tizen.Content.MediaContent/VideoInformation.cs b/Tizen.Content.MediaContent/Tizen.Content.MediaContent/VideoInformation.cs
index 6eeeec4..44f1504 100755 (executable)
--- a/Tizen.Content.MediaContent/Tizen.Content.MediaContent/VideoInformation.cs
+++ b/Tizen.Content.MediaContent/Tizen.Content.MediaContent/VideoInformation.cs
@@ -338,10 +338,8 @@ namespace Tizen.Content.MediaContent
         /// <returns>
         /// Task to get all the Bookmarks </returns>
         /// <param name="filter"> filter for the Tags</param>
-        public Task<IEnumerable<MediaBookmark>> GetMediaBookmarksAsync(ContentFilter filter)
+        public IEnumerable<MediaBookmark> GetMediaBookmarks(ContentFilter filter)
         {
-            var task = new TaskCompletionSource<IEnumerable<MediaBookmark>>();
-
             Collection<MediaBookmark> result = new Collection<MediaBookmark>();
             IntPtr filterHandle = (filter != null) ? filter.Handle : IntPtr.Zero;
             Interop.MediaInformation.MediaBookmarkCallback callback = (IntPtr handle, IntPtr userData) =>
@@ -355,8 +353,7 @@ namespace Tizen.Content.MediaContent
             MediaContentValidator.ThrowIfError(
                 Interop.MediaInformation.GetAllBookmarks(MediaId, filterHandle, callback, IntPtr.Zero), "Failed to get value");
 
-            task.SetResult(result);
-            return task.Task;
+            return result;
         }
 
         /// <summary>
@@ -365,14 +362,14 @@ namespace Tizen.Content.MediaContent
         /// <param name="offset">Offset of the video in seconds</param>
         /// <param name="thumbnailPath">Thumbnail path for the bookmark</param>
         /// <returns>Task with added MediaBookmark instance </returns>
-        public async Task<MediaBookmark> AddBookmark(uint offset, string thumbnailPath)
+        public MediaBookmark AddBookmark(uint offset, string thumbnailPath)
         {
             MediaBookmark result = null;
             ContentManager.Database.Insert(MediaId, offset, thumbnailPath);
             ContentFilter bookmarkfilter = new ContentFilter();
             bookmarkfilter.Condition = "BOOKMARK_MARKED_TIME = " + offset;
             IEnumerable<MediaBookmark> bookmarksList = null;
-            bookmarksList = await GetMediaBookmarksAsync(bookmarkfilter);
+            bookmarksList = GetMediaBookmarks(bookmarkfilter);
             foreach (MediaBookmark bookmark in bookmarksList)
             {
                 if (bookmark.Offset == offset)

diff --git a/packaging/csapi-media-content.spec b/packaging/csapi-media-content.spec
index 4830e91..ef2815d 100755 (executable)
--- a/packaging/csapi-media-content.spec
+++ b/packaging/csapi-media-content.spec
@@ -1,6 +1,6 @@
 Name:       csapi-media-content
 Summary:    Tizen Media Content API for C#
-Version:    1.0.14
+Version:    1.0.15
 Release:    1
 Group:      Development/Libraries
 License:    Apache-2.0