From: Shivam Varshney/Core S/W Group /SRI-Delhi/Engineer/Samsung Electronics Date: Tue, 10 May 2022 10:52:53 +0000 (+0530) Subject: Fixed SVACE Issues X-Git-Tag: submit/tizen/20220510.125505~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3014814cf145307e6fe5da0979a977268e624268;p=profile%2Fiot%2Fapps%2Fdotnet%2Fmusic-player.git Fixed SVACE Issues Change-Id: Id738164680b39784eefa18582e675e067d468e9c Signed-off-by: Shivam Varshney/Core S/W Group /SRI-Delhi/Engineer/Samsung Electronics --- diff --git a/music-player/MediaContent/AlbumContents.cs b/music-player/MediaContent/AlbumContents.cs index e61e753..28be47d 100755 --- a/music-player/MediaContent/AlbumContents.cs +++ b/music-player/MediaContent/AlbumContents.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using Tizen.Content.MediaContent; using MusicPlayer.Common; @@ -21,7 +20,10 @@ namespace MusicPlayer.Media // TODO use countmember instead of select memeber. MediaDataReader albumDataReader = albumInfo.SelectMember(album.Id, audioSelectArguments); if (albumDataReader.Read()) + { albumList.Add(album); + } + albumDataReader.Dispose(); } Tizen.Log.Debug(AppConstants.LogTag, "Total album retrived from database: " + albumList.Count); dataReader.Dispose(); @@ -57,7 +59,9 @@ namespace MusicPlayer.Media { MediaInfo info = dataReader.Current; if (!string.IsNullOrEmpty(info.ThumbnailPath)) + { path = info.ThumbnailPath; + } } dataReader.Dispose(); return path; @@ -76,7 +80,9 @@ namespace MusicPlayer.Media SelectArguments audioSelectArguments = CreateSelectArgument(MEDIA_STORAGE_TYPE_QUERY, MediaInfoColumns.Title + MEDIA_SORT_ORDER_ASC); MediaDataReader albumDataReader = albumInfo.SelectMember(info.Id, audioSelectArguments); if (albumDataReader.Read()) + { albumList.Add(info); + } albumDataReader.Dispose(); } Tizen.Log.Debug(AppConstants.LogTag, "Total album retrived from database that match text: " + searchText + " are : " + albumList.Count); diff --git a/music-player/MediaContent/ArtistContents.cs b/music-player/MediaContent/ArtistContents.cs index 2cdc778..89b7782 100755 --- a/music-player/MediaContent/ArtistContents.cs +++ b/music-player/MediaContent/ArtistContents.cs @@ -1,5 +1,4 @@ -using System.Collections.Specialized; -using System.Collections.Generic; +using System.Collections.Generic; using Tizen.Content.MediaContent; using System; using MusicPlayer.Common; @@ -37,8 +36,11 @@ namespace MusicPlayer.Media Album info = dataReader.Current; SelectArguments audioSelectArguments = CreateSelectArgument(MEDIA_STORAGE_TYPE_QUERY, MediaInfoColumns.Title + MEDIA_SORT_ORDER_ASC); MediaDataReader albumDataReader = albumInfo.SelectMember(info.Id, audioSelectArguments); - if(albumDataReader.Read()) + if (albumDataReader.Read()) + { albumList.Add(info); + } + albumDataReader.Dispose(); } dataReader.Dispose(); Tizen.Log.Debug(AppConstants.LogTag, "Total Albums retrived from Artist: " + albumList.Count); @@ -80,13 +82,11 @@ namespace MusicPlayer.Media while (dataReader.Read()) { Album info = dataReader.Current; - string path = ""; - if (!string.IsNullOrEmpty(info.AlbumArtPath)) - path = info.AlbumArtPath; - else - path = GetAlbumArtPath(info.Id); + string path = string.IsNullOrEmpty(info.AlbumArtPath) ? GetAlbumArtPath(info.Id) : info.AlbumArtPath; if (!string.IsNullOrEmpty(path)) + { albumArtPath = path; + } } dataReader.Dispose(); return albumArtPath; @@ -106,7 +106,10 @@ namespace MusicPlayer.Media SelectArguments audioSelectArguments = CreateSelectArgument(MEDIA_STORAGE_TYPE_QUERY, MediaInfoColumns.Title + MEDIA_SORT_ORDER_ASC); MediaDataReader albumDataReader = albumInfo.SelectMember(info.Id, audioSelectArguments); if (albumDataReader.Read()) + { count++; + } + albumDataReader.Dispose(); } dataReader.Dispose(); return count; diff --git a/music-player/MediaContent/PlaylistContents.cs b/music-player/MediaContent/PlaylistContents.cs index e37c026..ed43161 100755 --- a/music-player/MediaContent/PlaylistContents.cs +++ b/music-player/MediaContent/PlaylistContents.cs @@ -16,6 +16,7 @@ namespace MusicPlayer.Media Playlist playlist = dataReader.Current; playlists.Add(playlist); } + dataReader.Dispose(); Tizen.Log.Debug(AppConstants.LogTag, "PlayLists Count : " + playlists.Count); return playlists; } @@ -31,6 +32,7 @@ namespace MusicPlayer.Media { list = dataReader.Current; } + dataReader.Dispose(); return list; } @@ -68,6 +70,7 @@ namespace MusicPlayer.Media PlaylistMember playlist = dataReader.Current; memberList.Add(playlist); } + dataReader.Dispose(); return memberList; } diff --git a/music-player/ViewModels/ListViewModel.cs b/music-player/ViewModels/ListViewModel.cs index 654e40c..5a96393 100755 --- a/music-player/ViewModels/ListViewModel.cs +++ b/music-player/ViewModels/ListViewModel.cs @@ -19,16 +19,19 @@ namespace MusicPlayer.ViewModels { Add((T)Activator.CreateInstance(typeof(T), new object[] { (U)item.Value })); } - Tizen.Log.Debug(AppConstants.LogTag, "Observable list item count: " + this.Count); + Tizen.Log.Debug(AppConstants.LogTag, "Observable list item count: " + Count); } public void CreateData(List list) { - foreach (var item in list) + foreach (U item in list) { - Add((T)Activator.CreateInstance(typeof(T), new object[] { (U)item })); + if (item != null) + { + Add((T)Activator.CreateInstance(typeof(T), new object[] { item })); + } } - Tizen.Log.Debug(AppConstants.LogTag, "Observable list item count: " + this.Count); + Tizen.Log.Debug(AppConstants.LogTag, "Observable list item count: " + Count); } } } diff --git a/music-player/ViewModels/PlaylistDetailViewModel.cs b/music-player/ViewModels/PlaylistDetailViewModel.cs index f07fc22..36c3082 100755 --- a/music-player/ViewModels/PlaylistDetailViewModel.cs +++ b/music-player/ViewModels/PlaylistDetailViewModel.cs @@ -117,8 +117,8 @@ namespace MusicPlayer.ViewModels List audioList = new List(); 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 ce4ac29..7916cb7 100755 --- 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 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 b4f6498..63ccfbc 100755 --- 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 favouriteTrackList = new List(); 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 userListViewModel = new ListViewModel(); if (ListViewModel.Count <= 2) + { return userListViewModel; - for(int i = 2; i= 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 f38f9fd..66d6cab 100755 --- 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 4ba9244..74f46c6 100755 Binary files a/packaging/org.tizen.MusicPlayer-1.0.0.tpk and b/packaging/org.tizen.MusicPlayer-1.0.0.tpk differ