From ea1252c07c4a3c210f1d8e5e19d105c1cc255c3b Mon Sep 17 00:00:00 2001 From: Vologhat <47892605+Vologhat@users.noreply.github.com> Date: Sun, 10 Jul 2022 17:31:09 +0300 Subject: [PATCH] add method check --- .../java/ru/vtosters/lite/music/M3UDownloader.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/ru/vtosters/lite/music/M3UDownloader.java b/app/src/main/java/ru/vtosters/lite/music/M3UDownloader.java index e9cdca9cf..4baa08b85 100644 --- a/app/src/main/java/ru/vtosters/lite/music/M3UDownloader.java +++ b/app/src/main/java/ru/vtosters/lite/music/M3UDownloader.java @@ -60,10 +60,13 @@ public class M3UDownloader { String tsURL = parser.getBaseUrl() + ts.getName(); Log.d("M3UDownloader", "Downloading " + tsURL); InputStream is = StreamUtils.openStream(tsURL); - String key = StreamUtils.readAllLines(StreamUtils.openStream(ts.getKeyURL())); - byte[] content = TransportStream.METHOD_AES128.equals(ts.getMethod()) - ? StreamUtils.decodeStream(is, key) - : StreamUtils.readAllBytes(is); + byte[] content; + if (TransportStream.METHOD_AES128.equals(ts.getMethod())) { + String key = StreamUtils.readAllLines(StreamUtils.openStream(ts.getKeyURL())); + content = StreamUtils.decodeStream(is, key); + } else { + content = StreamUtils.readAllBytes(is); + } File tsDump = new File(mOutDir, ts.getName()); StreamUtils.writeToFile(tsDump, content); mCallback.onSizeReceived((long) content.length * tses.size(), parser.getHeapSize());