From 84295eda82c875faa8403a9091b622e193b5391c Mon Sep 17 00:00:00 2001 From: Prathamesh More Date: Fri, 28 Jan 2022 11:10:16 +0530 Subject: [PATCH] Fixed Playlist save --- .../retromusic/extensions/IntentExtensions.kt | 7 ++++--- .../fragments/playlists/PlaylistsFragment.kt | 4 ++-- .../name/monkey/retromusic/helper/M3UWriter.kt | 18 +++++++++--------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/IntentExtensions.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/IntentExtensions.kt index fad431d2c..1d7f25cab 100644 --- a/app/src/main/java/code/name/monkey/retromusic/extensions/IntentExtensions.kt +++ b/app/src/main/java/code/name/monkey/retromusic/extensions/IntentExtensions.kt @@ -21,9 +21,10 @@ fun Fragment.createNewFile( registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result: ActivityResult -> if (result.resultCode == Activity.RESULT_OK) { - context?.contentResolver?.openOutputStream(result.data?.data!!)?.use { os-> - write(os, result.data?.data) - } + write( + context?.contentResolver?.openOutputStream(result.data?.data!!), + result.data?.data + ) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistsFragment.kt index ff17c2ad4..1a928ab27 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistsFragment.kt @@ -40,12 +40,12 @@ class PlaylistsFragment : override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - libraryViewModel.getPlaylists().observe(viewLifecycleOwner, { + libraryViewModel.getPlaylists().observe(viewLifecycleOwner) { if (it.isNotEmpty()) adapter?.swapDataSet(it) else adapter?.swapDataSet(listOf()) - }) + } requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner) { remove() requireActivity().onBackPressed() diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/M3UWriter.kt b/app/src/main/java/code/name/monkey/retromusic/helper/M3UWriter.kt index c1b6cfee3..fb895743e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/helper/M3UWriter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/helper/M3UWriter.kt @@ -72,17 +72,17 @@ object M3UWriter : M3UConstants { it.songPrimaryKey }.toSongs() if (songs.isNotEmpty()) { - outputStream.bufferedWriter().use{ bw-> - bw.write(M3UConstants.HEADER) - songs.forEach { - bw.newLine() - bw.write(M3UConstants.ENTRY + it.duration + M3UConstants.DURATION_SEPARATOR + it.artistName + " - " + it.title) - bw.newLine() - bw.write(it.data) + outputStream.use { os -> + os.bufferedWriter().use { bw-> + bw.write(M3UConstants.HEADER) + songs.forEach { + bw.newLine() + bw.write(M3UConstants.ENTRY + it.duration + M3UConstants.DURATION_SEPARATOR + it.artistName + " - " + it.title) + bw.newLine() + bw.write(it.data) + } } } } - outputStream.flush() - outputStream.close() } }