Merge pull request #371 from tatsuyafujisaki:simplify-loadJSONFromAsset

PiperOrigin-RevId: 538423581
This commit is contained in:
Tofunmi Adigun-Hameed 2023-06-08 12:34:08 +00:00
commit 9aa519f1ee

View File

@ -20,8 +20,8 @@ import android.net.Uri
import androidx.media3.common.MediaItem
import androidx.media3.common.MediaItem.SubtitleConfiguration
import androidx.media3.common.MediaMetadata
import androidx.media3.common.util.Util
import com.google.common.collect.ImmutableList
import java.io.BufferedReader
import org.json.JSONObject
/**
@ -91,10 +91,8 @@ object MediaItemTree {
.build()
}
private fun loadJSONFromAsset(assets: AssetManager): String {
val buffer = assets.open("catalog.json").use { Util.toByteArray(it) }
return String(buffer, Charsets.UTF_8)
}
private fun loadJSONFromAsset(assets: AssetManager): String =
assets.open("catalog.json").bufferedReader().use(BufferedReader::readText)
fun initialize(assets: AssetManager) {
if (isInitialized) return