Fixed SVACE issues

Change-Id: Ia7745520193ff4085329a1c34ca6dfab1a4c3225
Signed-off-by: shivamv <shivam.v2@samsung.com>

diff --git a/music-player/MediaContent/TrackContents.cs b/music-player/MediaContent/TrackContents.cs
index 97b3b1897f1b9de9a3d39908934b993d32500c55..f57e80ed1cd984fa7261a4d03da4873045f35e6b 100755 (executable)
--- a/music-player/MediaContent/TrackContents.cs
+++ b/music-player/MediaContent/TrackContents.cs
@@ -44,6 +44,10 @@ namespace MusicPlayer.Media
             foreach (string id in trackList)\r
             {\r
                 MediaInfo info = mediaInfo.SelectMedia(id);\r
+                if (info == null)\r
+                {\r
+                    continue;\r
+                }\r
                 string filePath = @info.Path;\r
                 try\r
                 {\r
@@ -85,7 +89,10 @@ namespace MusicPlayer.Media
             foreach (string id in trackList)\r
             {\r
                 MediaInfo info = mediaInfo.SelectMedia(id);\r
-                Tizen.Log.Debug(AppConstants.LogTag, "Track Path: " + info.Path);\r
+                if (info == null)\r
+                {\r
+                    continue;\r
+                }\r
                 string filePath = @info.Path;\r
                 try\r
                 {\r

diff --git a/music-player/Models/SearchModel.cs b/music-player/Models/SearchModel.cs
index d9057ab8d317e7dc4a6a980ace22a59b139a5a2e..56e029b45fc8188a421b8d2b47b63f1f238448ff 100755 (executable)
--- a/music-player/Models/SearchModel.cs
+++ b/music-player/Models/SearchModel.cs
@@ -15,19 +15,19 @@ namespace MusicPlayer.Models
             ArtistDetail = artist;
             TrackDetail = track;
             ItemType = type;
-            if(type ==0)
+            if(type ==0 && artist != null)
             {
                 Thumbnail = artist.AlbumArtPath;
                 Title = artist.ArtistName;
                 SubTitle = "";
             }
-            else if (type == 1)
+            else if (type == 1 && musicAlbum != null)
             {
                 Thumbnail = musicAlbum.AlbumArtPath;
                 Title = musicAlbum.AlbumName;
                 SubTitle = musicAlbum.ArtistName;
             }
-            else if (type == 2)
+            else if (type == 2 && track != null)
             {
                 Thumbnail = track.ThumbnailPath;
                 Title = track.TrackTitle;

diff --git a/music-player/ViewModels/LyricsViewModel.cs b/music-player/ViewModels/LyricsViewModel.cs
index 6ffff18cc7b4d050cd3ea3329570c850746b2961..b9db5a364ef63a88bf67c0274c8bd13642c0c2ac 100755 (executable)
--- a/music-player/ViewModels/LyricsViewModel.cs
+++ b/music-player/ViewModels/LyricsViewModel.cs
@@ -52,6 +52,7 @@ namespace MusicPlayer.ViewModels
                 var metadataExtractor = new MetadataExtractor(path);
                 Metadata metadata = metadataExtractor.GetMetadata();
                 lyrics = metadata.UnsyncLyrics;
+                metadataExtractor.Dispose();
             }
             catch(System.IO.FileNotFoundException ex)
             {

diff --git a/music-player/ViewModels/PlayerViewModel.cs b/music-player/ViewModels/PlayerViewModel.cs
index d4ab8547973faaeee1f7aec69e1310a7f94b9627..f2882c0352bafc2fa882662ae562bd9bddc09e86 100755 (executable)
--- a/music-player/ViewModels/PlayerViewModel.cs
+++ b/music-player/ViewModels/PlayerViewModel.cs
@@ -257,7 +257,11 @@ namespace MusicPlayer.ViewModels
 
         public void StartShuffledTrack()
         {
-            SetCurrentTrack(playingListViewModel.FirstShuffledTrack());
+            Track track = playingListViewModel.FirstShuffledTrack();
+            if (track != null)
+            {
+                SetCurrentTrack(track);
+            }
         }
 
         private void UpdatePlayingStatus(PlayingStatus status)
@@ -438,14 +442,16 @@ namespace MusicPlayer.ViewModels
                 Tizen.Log.Info(AppConstants.LogTag, "Palette or palatte values not valid, adding default gradient");
                 ImageVisual imageVisual = CreateImageVisual();
                 PlayerBackground = imageVisual.OutputVisualMap;
-                return;
+                imageVisual.Dispose();
             }
             else
             {
                 Tizen.Log.Info(AppConstants.LogTag, "setting palette color");
                 GradientVisual gradientVisual = CreateGradientVisual(stopColor);
                 PlayerBackground = gradientVisual.OutputVisualMap;
+                gradientVisual.Dispose();
             }
+            stopColor.Dispose();
         }
     }
 }

diff --git a/music-player/Views/SearchView.cs b/music-player/Views/SearchView.cs
index 44b713a49021508437c515e675f214d2418449c2..3a6ed41bfffc31dfdd362276b73e51929af9eff7 100755 (executable)
--- a/music-player/Views/SearchView.cs
+++ b/music-player/Views/SearchView.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using Tizen.NUI.Components;
 using Tizen.NUI.BaseComponents;
 using Tizen.NUI;
@@ -312,5 +313,71 @@ namespace MusicPlayer.Views
                 noItemFound = true;
             }
         }
+
+        protected override void Dispose(DisposeTypes type)
+        {
+            if (Disposed)
+            {
+                return;
+            }
+            if (type == DisposeTypes.Explicit)
+            {
+                if (searchBox != null)
+                {
+                    List<View> children = searchBox.Children;
+                    foreach (View child in children)
+                    {
+                        searchBox.Remove(child);
+                        child.Dispose();
+                    }
+                    textField = null;
+                    crossButton = null;
+                }
+
+                if (topView != null)
+                {
+                    List<View> children = topView.Children;
+                    foreach (View child in children)
+                    {
+                        topView.Remove(child);
+                        child.Dispose();
+                    }
+                    backButton = null;
+                    searchBox = null;
+                    base.Remove(topView);
+                    topView.Dispose();
+                    topView = null;
+                }
+
+                if (!noItemFound && collectionView != null)
+                {
+                    base.Remove(collectionView);
+                }
+                else if(noItemFound && noItemView != null)
+                {
+                    base.Remove(noItemView);
+                }
+
+                if (collectionView != null)
+                {
+                    collectionView.Dispose();
+                    collectionView = null;
+                }
+
+                if (noItemView != null)
+                {
+                    List<View> children = noItemView.Children;
+                    foreach (View child in children)
+                    {
+                        noItemView.Remove(child);
+                        child.Dispose();
+                    }
+                    noItemView.Dispose();
+                    noItemView = null;
+                }
+            }
+
+            base.Dispose(type);
+        }
     }
 }

diff --git a/packaging/org.tizen.MusicPlayer-1.0.0.tpk b/packaging/org.tizen.MusicPlayer-1.0.0.tpk
index 68af2f89eec6fcbbb9ea33cb1b44c30574f8bad9..a542c52434fb507637eebd82be97fb6ed3cfb309 100755 (executable)
Binary files a/packaging/org.tizen.MusicPlayer-1.0.0.tpk and b/packaging/org.tizen.MusicPlayer-1.0.0.tpk differ