From c264c288401a74a400ee0099bfb6c3c930b4c185 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Thu, 7 Apr 2022 17:36:24 -0400 Subject: [PATCH] Simplify some LyricUtil methods with Kotlin --- .../name/monkey/retromusic/util/LyricUtil.kt | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/code/name/monkey/retromusic/util/LyricUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/LyricUtil.kt index a77793a1c..66e46929a 100644 --- a/app/src/main/java/code/name/monkey/retromusic/util/LyricUtil.kt +++ b/app/src/main/java/code/name/monkey/retromusic/util/LyricUtil.kt @@ -132,27 +132,14 @@ object LyricUtil { } @Throws(Exception::class) - private fun convertStreamToString(`is`: InputStream): String { - val reader = BufferedReader(InputStreamReader(`is`)) - val sb = StringBuilder() - var line: String? - while (reader.readLine().also { line = it } != null) { - sb.append(line).append("\n") - } - reader.close() - return sb.toString() + private fun convertStreamToString(inputStream: InputStream): String { + return inputStream.bufferedReader().readLines().joinToString(separator = "\n") } fun getStringFromLrc(file: File?): String { try { val reader = BufferedReader(FileReader(file)) - val sb = StringBuilder() - var line: String? - while (reader.readLine().also { line = it } != null) { - sb.append(line).append("\n") - } - reader.close() - return sb.toString() + return reader.readLines().joinToString(separator = "\n") } catch (e: Exception) { Log.i("Error", "Error Occurred") }