Fixed SVACE Issues

Change-Id: Id738164680b39784eefa18582e675e067d468e9c
Signed-off-by: Shivam Varshney/Core S/W Group /SRI-Delhi/Engineer/Samsung Electronics <shivam.v2@samsung.com>

diff --git a/music-player/MediaContent/AlbumContents.cs b/music-player/MediaContent/AlbumContents.cs
index e61e7537599f16c9e5a49d590128deaefdaae993..28be47d08d9e030c9fdb844ac7f654ae5f4e21d2 100755 (executable)
--- a/music-player/MediaContent/AlbumContents.cs
+++ b/music-player/MediaContent/AlbumContents.cs
@@ -1,5 +1,4 @@
-using System;\r
-using System.Collections.Generic;\r
+using System.Collections.Generic;\r
 using Tizen.Content.MediaContent;\r
 using MusicPlayer.Common;\r
 \r
@@ -21,7 +20,10 @@ namespace MusicPlayer.Media
                 // TODO use countmember instead of select memeber.\r
                 MediaDataReader<MediaInfo> albumDataReader = albumInfo.SelectMember(album.Id, audioSelectArguments);\r
                 if (albumDataReader.Read())\r
+                {\r
                     albumList.Add(album);\r
+                }\r
+                albumDataReader.Dispose();\r
             }\r
             Tizen.Log.Debug(AppConstants.LogTag, "Total album retrived from database: " + albumList.Count);\r
             dataReader.Dispose();\r
@@ -57,7 +59,9 @@ namespace MusicPlayer.Media
             {\r
                 MediaInfo info = dataReader.Current;\r
                 if (!string.IsNullOrEmpty(info.ThumbnailPath))\r
+                {\r
                     path = info.ThumbnailPath;\r
+                }\r
             }\r
             dataReader.Dispose();\r
             return path;\r
@@ -76,7 +80,9 @@ namespace MusicPlayer.Media
                 SelectArguments audioSelectArguments = CreateSelectArgument(MEDIA_STORAGE_TYPE_QUERY, MediaInfoColumns.Title + MEDIA_SORT_ORDER_ASC);\r
                 MediaDataReader<MediaInfo> albumDataReader = albumInfo.SelectMember(info.Id, audioSelectArguments);\r
                 if (albumDataReader.Read())\r
+                {\r
                     albumList.Add(info);\r
+                }\r
                 albumDataReader.Dispose();\r
             }\r
             Tizen.Log.Debug(AppConstants.LogTag, "Total album retrived from database that match text: " + searchText + " are : " + albumList.Count);\r

diff --git a/music-player/MediaContent/ArtistContents.cs b/music-player/MediaContent/ArtistContents.cs
index 2cdc77856a0ebdb12c82300b02524703813e5749..89b77824c58c9e3cddc955d0fc6595bce3f9b978 100755 (executable)
--- a/music-player/MediaContent/ArtistContents.cs
+++ b/music-player/MediaContent/ArtistContents.cs
@@ -1,5 +1,4 @@
-using System.Collections.Specialized;\r
-using System.Collections.Generic;\r
+using System.Collections.Generic;\r
 using Tizen.Content.MediaContent;\r
 using System;\r
 using MusicPlayer.Common;\r
@@ -37,8 +36,11 @@ namespace MusicPlayer.Media
                 Album info = dataReader.Current;\r
                 SelectArguments audioSelectArguments = CreateSelectArgument(MEDIA_STORAGE_TYPE_QUERY, MediaInfoColumns.Title + MEDIA_SORT_ORDER_ASC);\r
                 MediaDataReader<MediaInfo> albumDataReader = albumInfo.SelectMember(info.Id, audioSelectArguments);\r
-                if(albumDataReader.Read())\r
+                if (albumDataReader.Read())\r
+                {\r
                     albumList.Add(info);\r
+                }\r
+                albumDataReader.Dispose();\r
             }\r
             dataReader.Dispose();\r
             Tizen.Log.Debug(AppConstants.LogTag, "Total Albums retrived from Artist: " + albumList.Count);\r
@@ -80,13 +82,11 @@ namespace MusicPlayer.Media
             while (dataReader.Read())\r
             {\r
                 Album info = dataReader.Current;\r
-                string path = "";\r
-                if (!string.IsNullOrEmpty(info.AlbumArtPath))\r
-                    path = info.AlbumArtPath;\r
-                else\r
-                    path = GetAlbumArtPath(info.Id);\r
+                string path = string.IsNullOrEmpty(info.AlbumArtPath) ? GetAlbumArtPath(info.Id) : info.AlbumArtPath;\r
                 if (!string.IsNullOrEmpty(path))\r
+                {\r
                     albumArtPath = path;\r
+                }\r
             }\r
             dataReader.Dispose();\r
             return albumArtPath;\r
@@ -106,7 +106,10 @@ namespace MusicPlayer.Media
                 SelectArguments audioSelectArguments = CreateSelectArgument(MEDIA_STORAGE_TYPE_QUERY, MediaInfoColumns.Title + MEDIA_SORT_ORDER_ASC);\r
                 MediaDataReader<MediaInfo> albumDataReader = albumInfo.SelectMember(info.Id, audioSelectArguments);\r
                 if (albumDataReader.Read())\r
+                {\r
                     count++;\r
+                }\r
+                albumDataReader.Dispose();\r
             }\r
             dataReader.Dispose();\r
             return count;\r

diff --git a/music-player/MediaContent/PlaylistContents.cs b/music-player/MediaContent/PlaylistContents.cs
index e37c0269aa390cbeb4f0da4a6f34a7863771d710..ed4316184fbb8610360c283d5246e21c1b228996 100755 (executable)
--- a/music-player/MediaContent/PlaylistContents.cs
+++ b/music-player/MediaContent/PlaylistContents.cs
@@ -16,6 +16,7 @@ namespace MusicPlayer.Media
                 Playlist playlist = dataReader.Current;\r
                 playlists.Add(playlist);\r
             }\r
+            dataReader.Dispose();\r
             Tizen.Log.Debug(AppConstants.LogTag, "PlayLists Count : " + playlists.Count);\r
             return playlists;\r
         }\r
@@ -31,6 +32,7 @@ namespace MusicPlayer.Media
             {\r
                 list = dataReader.Current;\r
             }\r
+            dataReader.Dispose();\r
             return list;\r
         }\r
 \r
@@ -68,6 +70,7 @@ namespace MusicPlayer.Media
                 PlaylistMember playlist = dataReader.Current;\r
                 memberList.Add(playlist);\r
             }\r
+            dataReader.Dispose();\r
             return memberList;\r
         }\r
 \r

diff --git a/music-player/ViewModels/ListViewModel.cs b/music-player/ViewModels/ListViewModel.cs
index 654e40c42059573cd381dd2e38af34b3e8661381..5a96393af293dc0f348b7f492314aefc586f4ec9 100755 (executable)
--- a/music-player/ViewModels/ListViewModel.cs
+++ b/music-player/ViewModels/ListViewModel.cs
@@ -19,16 +19,19 @@ namespace MusicPlayer.ViewModels
             {\r
                 Add((T)Activator.CreateInstance(typeof(T), new object[] { (U)item.Value }));\r
             }\r
-            Tizen.Log.Debug(AppConstants.LogTag, "Observable list item count: " + this.Count);\r
+            Tizen.Log.Debug(AppConstants.LogTag, "Observable list item count: " + Count);\r
         }\r
 \r
         public void CreateData<U>(List<U> list)\r
         {\r
-            foreach (var item in list)\r
+            foreach (U item in list)\r
             {\r
-                Add((T)Activator.CreateInstance(typeof(T), new object[] { (U)item }));\r
+                if (item != null)\r
+                {\r
+                    Add((T)Activator.CreateInstance(typeof(T), new object[] { item }));\r
+                }\r
             }\r
-            Tizen.Log.Debug(AppConstants.LogTag, "Observable list item count: " + this.Count);\r
+            Tizen.Log.Debug(AppConstants.LogTag, "Observable list item count: " + Count);\r
         }\r
     }\r
 }\r

diff --git a/music-player/ViewModels/PlaylistDetailViewModel.cs b/music-player/ViewModels/PlaylistDetailViewModel.cs
index f07fc22259c7f8b404f6ad684a405c9a966a47a9..36c308277cb18d9a612929184e00ed02b72bb117 100755 (executable)
--- a/music-player/ViewModels/PlaylistDetailViewModel.cs
+++ b/music-player/ViewModels/PlaylistDetailViewModel.cs
@@ -117,8 +117,8 @@ namespace MusicPlayer.ViewModels
             List<AudioInfo> audioList = new List<AudioInfo>();
             foreach (PlaylistMember member in playlistMembers)
             {
-                MediaInfo mediaInfo = member.MediaInfo;
-                if (mediaInfo.MediaType == MediaType.Music)
+                MediaInfo mediaInfo = member?.MediaInfo;
+                if (mediaInfo?.MediaType == MediaType.Music)
                 {
                     audioList.Add((AudioInfo)mediaInfo);
                 }

diff --git a/music-player/ViewModels/PlaylistSelectorViewModel.cs b/music-player/ViewModels/PlaylistSelectorViewModel.cs
index ce4ac293afc9daa989760cff578d7906ddb04fa2..7916cb74c55e06971b1f421d27c5fdd1b419164e 100755 (executable)
--- a/music-player/ViewModels/PlaylistSelectorViewModel.cs
+++ b/music-player/ViewModels/PlaylistSelectorViewModel.cs
@@ -101,7 +101,7 @@ namespace MusicPlayer.ViewModels
         public bool IsPlaylistExists(string playlistName)
         {
             Playlist playlist = PlaylistManager.Instance.GetPlaylist(playlistName);
-            return playlist == null ? false : true;
+            return playlist != null;
         }
 
         private List<PlaylistData> GeneratePlaylistData()
@@ -112,11 +112,14 @@ namespace MusicPlayer.ViewModels
 
             foreach (Playlist playlist in playlists)
             {
-                if (playlist.Name == AppConstants.FavouritePlaylist || playlist.Name == AppConstants.RecentlyAddedPlaylist)
+                if (playlist != null)
                 {
-                    continue;
+                    if (playlist.Name == AppConstants.FavouritePlaylist || playlist.Name == AppConstants.RecentlyAddedPlaylist)
+                    {
+                        continue;
+                    }
+                    dataList.Add(new PlaylistData(playlist.Id, playlist.Name, GetTrackCountForPlaylist(playlist.Id), playlist.ThumbnailPath));
                 }
-                dataList.Add(new PlaylistData(playlist.Id, playlist.Name, GetTrackCountForPlaylist(playlist.Id), playlist.ThumbnailPath));
             }
             return dataList;
         }
@@ -146,14 +149,7 @@ namespace MusicPlayer.ViewModels
 
         private void UpdateCreatePlaylistState(int playlistCount)
         {
-            if (playlistCount >= AppConstants.MaxPlaylistCount)
-            {
-                CanCreatePlaylist = false;
-            }
-            else
-            {
-                CanCreatePlaylist = true;
-            }
+            CanCreatePlaylist = playlistCount < AppConstants.MaxPlaylistCount;
         }
     }
 }

diff --git a/music-player/ViewModels/PlaylistViewModel.cs b/music-player/ViewModels/PlaylistViewModel.cs
index b4f6498370471045a4d2a01a38284c61cb00db89..63ccfbcfd20bc227c3877432453c33f3cde32841 100755 (executable)
--- a/music-player/ViewModels/PlaylistViewModel.cs
+++ b/music-player/ViewModels/PlaylistViewModel.cs
@@ -51,7 +51,7 @@ namespace MusicPlayer.ViewModels
             get => playlistCount;
             set
             {
-                string countText = string.Equals(value, "1") ? value+" Playlist" : value+" Playlists";
+                string countText = string.Equals(value, "1") ? value + " Playlist" : value + " Playlists";
                 SetProperty(ref playlistCount, countText);
             }
         }
@@ -84,10 +84,13 @@ namespace MusicPlayer.ViewModels
             List<string> favouriteTrackList = new List<string>();
             foreach(AudioInfo track in trackList)
             {
-                recentTrackList.Add(track.Id);
-                if(track.IsFavorite)
+                if (track != null)
                 {
-                    favouriteTrackList.Add(track.Id);
+                    recentTrackList.Add(track.Id);
+                    if (track.IsFavorite)
+                    {
+                        favouriteTrackList.Add(track.Id);
+                    }
                 }
             }
             PlaylistManager.Instance.AddTracks(recentlyAdded.Id, recentTrackList);
@@ -126,11 +129,14 @@ namespace MusicPlayer.ViewModels
 
             foreach(Playlist playlist in playlists)
             {
-                if (playlist.Name == AppConstants.FavouritePlaylist || playlist.Name == AppConstants.RecentlyAddedPlaylist)
+                if (playlist != null)
                 {
-                    continue;
+                    if (playlist.Name == AppConstants.FavouritePlaylist || playlist.Name == AppConstants.RecentlyAddedPlaylist)
+                    {
+                        continue;
+                    }
+                    dataList.Add(new PlaylistData(playlist.Id, playlist.Name, GetTrackCountForPlaylist(playlist.Id), playlist.ThumbnailPath));
                 }
-                dataList.Add(new PlaylistData(playlist.Id, playlist.Name, GetTrackCountForPlaylist(playlist.Id), playlist.ThumbnailPath));
             }
             return dataList;
         }
@@ -157,8 +163,10 @@ namespace MusicPlayer.ViewModels
         {
             ListViewModel<PlaylistModel> userListViewModel = new ListViewModel<PlaylistModel>();
             if (ListViewModel.Count <= 2)
+            {
                 return userListViewModel;
-            for(int i = 2; i<ListViewModel.Count; ++i)
+            }
+            for (int i = 2; i < ListViewModel.Count; ++i)
             {
                 userListViewModel.Add(ListViewModel[i]);
             }
@@ -167,14 +175,7 @@ namespace MusicPlayer.ViewModels
 
         private void UpdateCreatePlaylistState(int playlistCount)
         {
-            if(playlistCount >= AppConstants.MaxPlaylistCount)
-            {
-                CanCreatePlaylist = false;
-            }
-            else
-            {
-                CanCreatePlaylist = true;
-            }
+            CanCreatePlaylist = playlistCount < AppConstants.MaxPlaylistCount;
         }
     }
 }

diff --git a/music-player/Views/ViewManager.cs b/music-player/Views/ViewManager.cs
index f38f9fddda655db5e9aeeda0b409dec3bbff68ed..66d6cab617ba22241d7c10cfc453b47619635abf 100755 (executable)
--- a/music-player/Views/ViewManager.cs
+++ b/music-player/Views/ViewManager.cs
@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using System.Diagnostics;
 using Tizen.NUI;
 using Tizen.NUI.Xaml;
 using Tizen.NUI.Components;
@@ -160,15 +159,15 @@ namespace MusicPlayer.Views
                 BaseContentView previousContentView = viewLibrary.GetContentView((ContentViewType)previousIndex);
                 baseView.RemoveContent(previousContentView);
                 previousContentView?.HideView();
-                if(previousContentView != null)
+                if (previousContentView != null)
                 {
                     previousContentView.SubContentViewAdded -= OnSubViewAdded;
                     previousContentView.OperationViewAdded -= OnOperationViewAdded;
                 }
-                Tizen.Log.Error(AppConstants.LogTag, "Removing " + previousContentView.Name);
+                Tizen.Log.Error(AppConstants.LogTag, "Removing " + previousContentView?.Name);
             }
 
-            if(currentIndex >= (int)ContentViewType.Playlist && currentIndex <= (int)ContentViewType.Artist)
+            if (currentIndex >= (int)ContentViewType.Playlist && currentIndex <= (int)ContentViewType.Artist)
             {
                 BaseContentView currentContentView = viewLibrary.GetContentView((ContentViewType)currentIndex);
                 currentContentView?.ShowView();
@@ -178,7 +177,7 @@ namespace MusicPlayer.Views
                     currentContentView.SubContentViewAdded += OnSubViewAdded;
                     currentContentView.OperationViewAdded += OnOperationViewAdded;
                 }
-                Tizen.Log.Error(AppConstants.LogTag, "Adding " + currentContentView.Name);
+                Tizen.Log.Error(AppConstants.LogTag, "Adding " + currentContentView?.Name);
             }
         }
 

diff --git a/packaging/org.tizen.MusicPlayer-1.0.0.tpk b/packaging/org.tizen.MusicPlayer-1.0.0.tpk
index 4ba9244ab1fa4fde4c44f8a5b391126d1cfa602d..74f46c6136ab94808be8e1117e0c5106880673fb 100755 (executable)
Binary files a/packaging/org.tizen.MusicPlayer-1.0.0.tpk and b/packaging/org.tizen.MusicPlayer-1.0.0.tpk differ