fix some playback issues

Author: bengelhaupt

app/src/main/java/de/xikolo/download/hlsvideodownload/HlsVideoDownloadItem.kt

@@ -29,50 +29,40 @@ open class HlsVideoDownloadItem(
     override val title: String
         get() = url ?: ""
 
-    private val cache: Cache
-        get() = if (storage == context.sdcardStorage) {
+    private fun getCache(storage: Storage): Cache {
+        return if (storage == context.sdcardStorage) {
             HlsVideoDownloadHandler.getSdcardStorageCache(context)!!
         } else {
             HlsVideoDownloadHandler.getInternalStorageCache(context)
         }
+    }
 
-    private val indexEntry: Download?
-        get() = HlsVideoDownloadHandler.getManager(context, cache)
+    private fun getIndexEntry(storage: Storage): Download? {
+        return HlsVideoDownloadHandler.getManager(context, getCache(storage))
             .downloadIndex
-            .getDownload(identifier.get())
+            .getDownload(
+                identifier.get()
+            )
+    }
 
-    private val mediaSource: MediaSource
-        get() = HlsMediaSource.Factory(
-            CacheDataSource.Factory()
-                .setCache(cache)
-        ).createMediaSource(request.mediaItem)
+    private fun getMediaSource(storage: Storage): MediaSource? {
+        return getIndexEntry(storage)?.let {
+            return HlsMediaSource.Factory(
+                CacheDataSource.Factory()
+                    .setCache(getCache(storage))
+                    .setCacheWriteDataSinkFactory(null)
+            ).createMediaSource(
+                it.request.toMediaItem()
+            )
+        }
+    }
 
     override val size: Long
-        get() = try {
-            indexEntry!!.bytesDownloaded
-        } catch (e: Exception) {
-            0L
-        }
+        get() = getIndexEntry(storage)?.bytesDownloaded ?: 0L
 
     final override val download: MediaSource?
-        get() {
-            val originalStorage = storage
-            return try {
-                storage = context.internalStorage
-                indexEntry!!
-                mediaSource
-            } catch (e: Exception) {
-                try {
-                    storage = context.sdcardStorage!!
-                    indexEntry!!
-                    mediaSource
-                } catch (e: Exception) {
-                    null
-                }
-            } finally {
-                storage = originalStorage
-            }
-        }
+        get() = getMediaSource(context.internalStorage)
+            ?: context.sdcardStorage?.let { getMediaSource(it) }
 
     /*val subs: Map<String, MediaSource>?
         get() {

app/src/main/java/de/xikolo/download/hlsvideodownload/HlsVideoDownloadRequest.kt

@@ -1,9 +1,5 @@
 package de.xikolo.download.hlsvideodownload
 
-import android.net.Uri
-import com.google.android.exoplayer2.MediaItem
-import com.google.android.exoplayer2.offline.StreamKey
-import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist
 import de.xikolo.download.DownloadCategory
 import de.xikolo.download.DownloadRequest
 import de.xikolo.models.Storage
@@ -32,26 +28,4 @@ class HlsVideoDownloadRequest(
     override val title: String,
     override val showNotification: Boolean,
     override val category: DownloadCategory
-) : DownloadRequest {
-
-    val mediaItem = MediaItem.Builder()
-        .setUri(Uri.parse(url))
-        /*.setSubtitles(
-            subtitles?.map {
-                MediaItem.Subtitle(
-                    Uri.parse(it.value),
-                    MimeTypes.TEXT_VTT,
-                    it.key,
-                    C.SELECTION_FLAG_DEFAULT
-                )
-            }
-        )*/
-        .setStreamKeys(
-            listOf(
-                StreamKey(HlsMasterPlaylist.GROUP_INDEX_VARIANT, 1),
-                StreamKey(HlsMasterPlaylist.GROUP_INDEX_AUDIO, 1),
-                StreamKey(HlsMasterPlaylist.GROUP_INDEX_SUBTITLE, 1)
-            )
-        )
-        .build()
-}
+) : DownloadRequest