From a72cf237961febe7f30657545bbcd80757cb32e5 Mon Sep 17 00:00:00 2001 From: Bnyro Date: Thu, 5 Oct 2023 18:37:02 +0200 Subject: [PATCH] refactor: cleanup dynamic data source --- .../mellowmusic/utils/DynamicDataSource.kt | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/app/suhasdissa/mellowmusic/utils/DynamicDataSource.kt b/app/src/main/java/app/suhasdissa/mellowmusic/utils/DynamicDataSource.kt index 3908fcdd..86255b24 100644 --- a/app/src/main/java/app/suhasdissa/mellowmusic/utils/DynamicDataSource.kt +++ b/app/src/main/java/app/suhasdissa/mellowmusic/utils/DynamicDataSource.kt @@ -19,29 +19,25 @@ class DynamicDataSource( private val defaultDataSource: DefaultDataSource ): DataSource { private var isOnline = false + private val dataSource get() = if (isOnline) resolvingDataSource else defaultDataSource override fun read(buffer: ByteArray, offset: Int, length: Int): Int { - return if (isOnline) resolvingDataSource.read(buffer, offset, length) - else defaultDataSource.read(buffer, offset, length) + return dataSource.read(buffer, offset, length) } override fun addTransferListener(transferListener: TransferListener) { - if (isOnline) resolvingDataSource.addTransferListener(transferListener) - else defaultDataSource.addTransferListener(transferListener) + dataSource.addTransferListener(transferListener) } override fun open(dataSpec: DataSpec): Long { isOnline = dataSpec.uri.scheme != "content" - return if (isOnline) resolvingDataSource.open(dataSpec) - else defaultDataSource.open(dataSpec) + return dataSource.open(dataSpec) } - override fun getUri(): Uri? { - return if (isOnline) resolvingDataSource.uri else defaultDataSource.uri - } + override fun getUri(): Uri? = dataSource.uri override fun close() { - if (isOnline) resolvingDataSource.close() else defaultDataSource.close() + dataSource.close() } companion object {