From f6d640b84aeda9a9cea0f93f44d9ca9f1858b989 Mon Sep 17 00:00:00 2001
From: Prathamesh More <prathameshmm02@gmail.com>
Date: Thu, 24 Mar 2022 19:23:59 +0530
Subject: [PATCH] Fixed crash when clicking on Playlist in the Search Tab

---
 .../code/name/monkey/retromusic/adapter/SearchAdapter.kt  | 7 +++----
 .../name/monkey/retromusic/repository/SearchRepository.kt | 8 ++++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt
index 7013ab681..06ed30be0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt
@@ -28,7 +28,6 @@ import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.retromusic.*
 import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
-import code.name.monkey.retromusic.db.PlaylistEntity
 import code.name.monkey.retromusic.db.PlaylistWithSongs
 import code.name.monkey.retromusic.glide.GlideApp
 import code.name.monkey.retromusic.glide.RetroGlideExtension
@@ -56,7 +55,7 @@ class SearchAdapter(
         if (dataSet[position] is Album) return ALBUM
         if (dataSet[position] is Artist) return if ((dataSet[position] as Artist).isAlbumArtist) ALBUM_ARTIST else ARTIST
         if (dataSet[position] is Genre) return GENRE
-        if (dataSet[position] is PlaylistEntity) return PLAYLIST
+        if (dataSet[position] is PlaylistWithSongs) return PLAYLIST
         return if (dataSet[position] is Song) SONG else HEADER
     }
 
@@ -121,8 +120,8 @@ class SearchAdapter(
                 )
             }
             PLAYLIST -> {
-                val playlist = dataSet[position] as PlaylistEntity
-                holder.title?.text = playlist.playlistName
+                val playlist = dataSet[position] as PlaylistWithSongs
+                holder.title?.text = playlist.playlistEntity.playlistName
                 //holder.text?.text = MusicUtil.playlistInfoString(activity, playlist.songs)
             }
             ALBUM_ARTIST -> {
diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/SearchRepository.kt b/app/src/main/java/code/name/monkey/retromusic/repository/SearchRepository.kt
index abfcd0244..17b555ecd 100644
--- a/app/src/main/java/code/name/monkey/retromusic/repository/SearchRepository.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/repository/SearchRepository.kt
@@ -16,7 +16,7 @@ package code.name.monkey.retromusic.repository
 
 import android.content.Context
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.db.PlaylistEntity
+import code.name.monkey.retromusic.db.PlaylistWithSongs
 import code.name.monkey.retromusic.fragments.search.Filter
 import code.name.monkey.retromusic.model.Album
 import code.name.monkey.retromusic.model.Artist
@@ -93,10 +93,10 @@ class RealSearchRepository(
             }
 
             /** Playlists **/
-            val playlist: List<PlaylistEntity> =
+            val playlist: List<PlaylistWithSongs> =
                 if (filter == Filter.PLAYLISTS || filter == Filter.NO_FILTER) {
-                    roomRepository.playlists().filter { playlist ->
-                        playlist.playlistName.lowercase().contains(searchString.lowercase())
+                    roomRepository.playlistWithSongs().filter { playlist ->
+                        playlist.playlistEntity.playlistName.lowercase().contains(searchString.lowercase())
                     }
                 } else {
                     emptyList()