Merge branch 'master' of gitlab.futo.org:videostreaming/grayjay

app/src/main/java/com/futo/platformplayer/Extensions_Polycentric.kt

@@ -1,6 +1,11 @@
 package com.futo.platformplayer
 
+import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.states.AnnouncementType
+import com.futo.platformplayer.states.StateAnnouncement
 import com.futo.platformplayer.states.StatePlatform
+import com.futo.platformplayer.views.adapters.CommentViewHolder
+import com.futo.polycentric.core.ProcessHandle
 import userpackage.Protocol
 import kotlin.math.abs
 import kotlin.math.min
@@ -39,4 +44,21 @@ fun Protocol.Claim.resolveChannelUrl(): String? {
 
 fun Protocol.Claim.resolveChannelUrls(): List<String> {
     return StatePlatform.instance.resolveChannelUrlsByClaimTemplates(this.claimType.toInt(), this.claimFieldsList.associate { Pair(it.key.toInt(), it.value) })
+}
+
+suspend fun ProcessHandle.fullyBackfillServersAnnounceExceptions() {
+    val exceptions = fullyBackfillServers()
+    for (pair in exceptions) {
+        val server = pair.key
+        val exception = pair.value
+
+        StateAnnouncement.instance.registerAnnouncement(
+            "backfill-failed",
+            "Backfill failed",
+            "Failed to backfill server $server. $exception",
+            AnnouncementType.SESSION_RECURRING
+        );
+
+        Logger.e("Backfill", "Failed to backfill server $server.", exception)
+    }
 }

app/src/main/java/com/futo/platformplayer/Extensions_Syntax.kt

@@ -1,5 +1,10 @@
 package com.futo.platformplayer
 
+import android.net.Uri
+import java.net.URI
+import java.net.URISyntaxException
+import java.net.URLEncoder
+
 //Syntax sugaring
 inline fun <reified T> Any.assume(): T?{
     if(this is T)
@@ -16,4 +21,8 @@ inline fun <reified T, R> Any.assume(cb: (T) -> R): R? {
 
 fun String?.yesNoToBoolean(): Boolean {
     return this?.uppercase() == "YES"
+}
+
+fun Boolean?.toYesNo(): String {
+    return if (this == true) "YES" else "NO"
 }

app/src/main/java/com/futo/platformplayer/Settings.kt

@@ -158,7 +158,11 @@ class Settings : FragmentedStorageFileJson() {
         var previewFeedItems: Boolean = true;
 
 
-        @FormField(R.string.clear_hidden, FieldForm.BUTTON, R.string.clear_hidden_description, 7)
+        @FormField(R.string.progress_bar, FieldForm.TOGGLE, R.string.progress_bar_description, 6)
+        var progressBar: Boolean = false;
+
+
+        @FormField(R.string.clear_hidden, FieldForm.BUTTON, R.string.clear_hidden_description, 8)
         @FormFieldButton(R.drawable.ic_visibility_off)
         fun clearHidden() {
             StateMeta.instance.removeAllHiddenCreators();
@@ -185,6 +189,8 @@ class Settings : FragmentedStorageFileJson() {
         @FormField(R.string.preview_feed_items, FieldForm.TOGGLE, R.string.preview_feed_items_description, 5)
         var previewFeedItems: Boolean = true;
 
+        @FormField(R.string.progress_bar, FieldForm.TOGGLE, R.string.progress_bar_description, 6)
+        var progressBar: Boolean = false;
 
 
         fun getSearchFeedStyle(): FeedStyle {
@@ -195,7 +201,17 @@ class Settings : FragmentedStorageFileJson() {
         }
     }
 
-    @FormField(R.string.subscriptions, "group", R.string.configure_how_your_subscriptions_works_and_feels, 3)
+
+    @FormField(R.string.channel, "group", -1, 3)
+    var channel = ChannelSettings();
+    @Serializable
+    class ChannelSettings {
+
+        @FormField(R.string.progress_bar, FieldForm.TOGGLE, R.string.progress_bar_description, 6)
+        var progressBar: Boolean = false;
+    }
+
+    @FormField(R.string.subscriptions, "group", R.string.configure_how_your_subscriptions_works_and_feels, 4)
     var subscriptions = SubscriptionsSettings();
     @Serializable
     class SubscriptionsSettings {
@@ -213,14 +229,17 @@ class Settings : FragmentedStorageFileJson() {
         @FormField(R.string.preview_feed_items, FieldForm.TOGGLE, R.string.preview_feed_items_description, 5)
         var previewFeedItems: Boolean = true;
 
-        @FormField(R.string.fetch_on_app_boot, FieldForm.TOGGLE, R.string.shortly_after_opening_the_app_start_fetching_subscriptions, 6)
+        @FormField(R.string.progress_bar, FieldForm.TOGGLE, R.string.progress_bar_description, 6)
+        var progressBar: Boolean = false;
+
+        @FormField(R.string.fetch_on_app_boot, FieldForm.TOGGLE, R.string.shortly_after_opening_the_app_start_fetching_subscriptions, 7)
         @Serializable(with = FlexibleBooleanSerializer::class)
         var fetchOnAppBoot: Boolean = true;
 
-        @FormField(R.string.fetch_on_tab_opened, FieldForm.TOGGLE, R.string.fetch_on_tab_opened_description, 6)
+        @FormField(R.string.fetch_on_tab_opened, FieldForm.TOGGLE, R.string.fetch_on_tab_opened_description, 8)
         var fetchOnTabOpen: Boolean = true;
 
-        @FormField(R.string.background_update, FieldForm.DROPDOWN, R.string.experimental_background_update_for_subscriptions_cache, 7)
+        @FormField(R.string.background_update, FieldForm.DROPDOWN, R.string.experimental_background_update_for_subscriptions_cache, 9)
         @DropdownFieldOptionsId(R.array.background_interval)
         var subscriptionsBackgroundUpdateInterval: Int = 0;
 
@@ -236,7 +255,7 @@ class Settings : FragmentedStorageFileJson() {
         };
 
 
-        @FormField(R.string.subscription_concurrency, FieldForm.DROPDOWN, R.string.specify_how_many_threads_are_used_to_fetch_channels, 8)
+        @FormField(R.string.subscription_concurrency, FieldForm.DROPDOWN, R.string.specify_how_many_threads_are_used_to_fetch_channels, 10)
         @DropdownFieldOptionsId(R.array.thread_count)
         var subscriptionConcurrency: Int = 3;
 
@@ -244,17 +263,17 @@ class Settings : FragmentedStorageFileJson() {
             return threadIndexToCount(subscriptionConcurrency);
         }
 
-        @FormField(R.string.show_watch_metrics, FieldForm.TOGGLE, R.string.show_watch_metrics_description, 9)
+        @FormField(R.string.show_watch_metrics, FieldForm.TOGGLE, R.string.show_watch_metrics_description, 11)
         var showWatchMetrics: Boolean = false;
 
-        @FormField(R.string.track_playtime_locally, FieldForm.TOGGLE, R.string.track_playtime_locally_description, 10)
+        @FormField(R.string.track_playtime_locally, FieldForm.TOGGLE, R.string.track_playtime_locally_description, 12)
         var allowPlaytimeTracking: Boolean = true;
 
 
-        @FormField(R.string.always_reload_from_cache, FieldForm.TOGGLE, R.string.always_reload_from_cache_description, 11)
+        @FormField(R.string.always_reload_from_cache, FieldForm.TOGGLE, R.string.always_reload_from_cache_description, 13)
         var alwaysReloadFromCache: Boolean = false;
 
-        @FormField(R.string.clear_channel_cache, FieldForm.BUTTON, R.string.clear_channel_cache_description, 12)
+        @FormField(R.string.clear_channel_cache, FieldForm.BUTTON, R.string.clear_channel_cache_description, 14)
         fun clearChannelCache() {
             UIDialogs.toast(SettingsActivity.getActivity()!!, "Started clearing..");
             ChannelContentCache.instance.clear();
@@ -262,7 +281,7 @@ class Settings : FragmentedStorageFileJson() {
         }
     }
 
-    @FormField(R.string.player, "group", R.string.change_behavior_of_the_player, 4)
+    @FormField(R.string.player, "group", R.string.change_behavior_of_the_player, 5)
     var playback = PlaybackSettings();
     @Serializable
     class PlaybackSettings {
@@ -360,7 +379,7 @@ class Settings : FragmentedStorageFileJson() {
         var backgroundSwitchToAudio: Boolean = true;
     }
 
-    @FormField(R.string.comments, "group", R.string.comments_description, 4)
+    @FormField(R.string.comments, "group", R.string.comments_description, 6)
     var comments = CommentSettings();
     @Serializable
     class CommentSettings {
@@ -369,7 +388,7 @@ class Settings : FragmentedStorageFileJson() {
         var defaultCommentSection: Int = 0;
     }
 
-    @FormField(R.string.downloads, "group", R.string.configure_downloading_of_videos, 5)
+    @FormField(R.string.downloads, "group", R.string.configure_downloading_of_videos, 7)
     var downloads = Downloads();
     @Serializable
     class Downloads {
@@ -409,7 +428,7 @@ class Settings : FragmentedStorageFileJson() {
         }
     }
 
-    @FormField(R.string.browsing, "group", R.string.configure_browsing_behavior, 6)
+    @FormField(R.string.browsing, "group", R.string.configure_browsing_behavior, 8)
     var browsing = Browsing();
     @Serializable
     class Browsing {
@@ -418,7 +437,7 @@ class Settings : FragmentedStorageFileJson() {
         var videoCache: Boolean = true;
     }
 
-    @FormField(R.string.casting, "group", R.string.configure_casting, 7)
+    @FormField(R.string.casting, "group", R.string.configure_casting, 9)
     var casting = Casting();
     @Serializable
     class Casting {
@@ -446,8 +465,7 @@ class Settings : FragmentedStorageFileJson() {
         }*/
     }
 
-
-    @FormField(R.string.logging, FieldForm.GROUP, -1, 8)
+    @FormField(R.string.logging, FieldForm.GROUP, -1, 10)
     var logging = Logging();
     @Serializable
     class Logging {
@@ -471,7 +489,7 @@ class Settings : FragmentedStorageFileJson() {
         }
     }
 
-    @FormField(R.string.announcement, FieldForm.GROUP, -1, 10)
+    @FormField(R.string.announcement, FieldForm.GROUP, -1, 11)
     var announcementSettings = AnnouncementSettings();
     @Serializable
     class AnnouncementSettings {
@@ -482,7 +500,7 @@ class Settings : FragmentedStorageFileJson() {
         }
     }
 
-    @FormField(R.string.notifications, FieldForm.GROUP, -1, 11)
+    @FormField(R.string.notifications, FieldForm.GROUP, -1, 12)
     var notifications = NotificationSettings();
     @Serializable
     class NotificationSettings {
@@ -490,7 +508,7 @@ class Settings : FragmentedStorageFileJson() {
         var plannedContentNotification: Boolean = true;
     }
 
-    @FormField(R.string.plugins, FieldForm.GROUP, -1, 12)
+    @FormField(R.string.plugins, FieldForm.GROUP, -1, 13)
     @Transient
     var plugins = Plugins();
     @Serializable
@@ -527,7 +545,7 @@ class Settings : FragmentedStorageFileJson() {
     }
 
 
-    @FormField(R.string.external_storage, FieldForm.GROUP, -1, 13)
+    @FormField(R.string.external_storage, FieldForm.GROUP, -1, 14)
     var storage = Storage();
     @Serializable
     class Storage {
@@ -561,7 +579,7 @@ class Settings : FragmentedStorageFileJson() {
     }
 
 
-    @FormField(R.string.auto_update, "group", R.string.configure_the_auto_updater, 14)
+    @FormField(R.string.auto_update, "group", R.string.configure_the_auto_updater, 15)
     var autoUpdate = AutoUpdate();
     @Serializable
     class AutoUpdate {
@@ -643,7 +661,7 @@ class Settings : FragmentedStorageFileJson() {
         }
     }
 
-    @FormField(R.string.backup, FieldForm.GROUP, -1, 15)
+    @FormField(R.string.backup, FieldForm.GROUP, -1, 16)
     var backup = Backup();
     @Serializable
     class Backup {
@@ -696,7 +714,7 @@ class Settings : FragmentedStorageFileJson() {
         }*/
     }
 
-    @FormField(R.string.payment, FieldForm.GROUP, -1, 16)
+    @FormField(R.string.payment, FieldForm.GROUP, -1, 17)
     var payment = Payment();
     @Serializable
     class Payment {
@@ -713,7 +731,7 @@ class Settings : FragmentedStorageFileJson() {
         }
     }
 
-    @FormField(R.string.other, FieldForm.GROUP, -1, 17)
+    @FormField(R.string.other, FieldForm.GROUP, -1, 18)
     var other = Other();
     @Serializable
     class Other {
@@ -722,7 +740,7 @@ class Settings : FragmentedStorageFileJson() {
         var bypassRotationPrevention: Boolean = false;
     }
 
-    @FormField(R.string.info, FieldForm.GROUP, -1, 18)
+    @FormField(R.string.info, FieldForm.GROUP, -1, 19)
     var info = Info();
     @Serializable
     class Info {

app/src/main/java/com/futo/platformplayer/activities/MainActivity.kt

@@ -8,6 +8,7 @@ import android.content.res.Configuration
 import android.net.Uri
 import android.os.Bundle
 import android.preference.PreferenceManager
+import android.util.Log
 import android.util.TypedValue
 import android.view.View
 import android.widget.FrameLayout
@@ -884,15 +885,20 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
 
         if((fragment?.isOverlay ?: false) && fragBeforeOverlay != null) {
             navigate(fragBeforeOverlay!!, null, false, true);
-
-        }
-        else {
+        } else {
             val last = _queue.lastOrNull();
             if (last != null) {
                 _queue.remove(last);
                 navigate(last.first, last.second, false, true);
-            } else
-                finish();
+            } else {
+                if (_fragVideoDetail.state == VideoDetailFragment.State.CLOSED) {
+                    finish();
+                } else {
+                    UIDialogs.showConfirmationDialog(this, "There is a video playing, are you sure you want to exit the app?", {
+                        finish();
+                    })
+                }
+            }
         }
     }
 

app/src/main/java/com/futo/platformplayer/activities/PolycentricCreateProfileActivity.kt

@@ -10,6 +10,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.R
 import com.futo.platformplayer.UIDialogs
+import com.futo.platformplayer.fullyBackfillServersAnnounceExceptions
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.setNavigationBarColorAndIcons
 import com.futo.platformplayer.states.StateApp
@@ -82,7 +83,7 @@ class PolycentricCreateProfileActivity : AppCompatActivity() {
 
                     try {
                         Logger.i(TAG, "Started backfill");
-                        processHandle.fullyBackfillServers();
+                        processHandle.fullyBackfillServersAnnounceExceptions();
                         Logger.i(TAG, "Finished backfill");
                     } catch (e: Throwable) {
                         Logger.e(TAG, getString(R.string.failed_to_fully_backfill_servers), e);

app/src/main/java/com/futo/platformplayer/activities/PolycentricProfileActivity.kt

@@ -19,6 +19,7 @@ import com.futo.platformplayer.R
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.dialogs.CommentDialog
 import com.futo.platformplayer.dp
+import com.futo.platformplayer.fullyBackfillServersAnnounceExceptions
 import com.futo.platformplayer.images.GlideHelper.Companion.crossfade
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.selectBestImage
@@ -194,7 +195,7 @@ class PolycentricProfileActivity : AppCompatActivity() {
                 if (hasChanges) {
                     try {
                         Logger.i(TAG, "Started backfill");
-                        processHandle.fullyBackfillServers();
+                        processHandle.fullyBackfillServersAnnounceExceptions();
                         Logger.i(TAG, "Finished backfill");
                         withContext(Dispatchers.Main) {
                             UIDialogs.toast(this@PolycentricProfileActivity, getString(R.string.changes_have_been_saved));

app/src/main/java/com/futo/platformplayer/api/http/server/HttpContext.kt

@@ -197,8 +197,13 @@ class HttpContext : AutoCloseable {
     }
     fun respondCode(status: Int, headers: HttpHeaders, body: String? = null) {
         val bytes = body?.toByteArray(Charsets.UTF_8);
-        if(body != null && headers.get("content-length").isNullOrEmpty())
-            headers.put("content-length", bytes!!.size.toString());
+        if(headers.get("content-length").isNullOrEmpty()) {
+            if (body != null) {
+                headers.put("content-length", bytes!!.size.toString());
+            } else {
+                headers.put("content-length", "0")
+            }
+        }
         respond(status, headers) { responseStream ->
             if(body != null) {
                 responseStream.write(bytes!!);

app/src/main/java/com/futo/platformplayer/api/http/server/handlers/HttpOptionsAllowHandler.kt

@@ -4,17 +4,10 @@ import com.futo.platformplayer.api.http.server.HttpContext
 
 class HttpOptionsAllowHandler(path: String) : HttpHandler("OPTIONS", path) {
     override fun handle(httpContext: HttpContext) {
-        //Just allow whatever is requested
-
-        val requestedOrigin = httpContext.headers.getOrDefault("Access-Control-Request-Origin", "");
-        val requestedMethods = httpContext.headers.getOrDefault("Access-Control-Request-Method", "");
-        val requestedHeaders = httpContext.headers.getOrDefault("Access-Control-Request-Headers", "");
-
-        val newHeaders = headers.clone();
-        newHeaders.put("Allow", requestedMethods);
-        newHeaders.put("Access-Control-Allow-Methods", requestedMethods);
-        newHeaders.put("Access-Control-Allow-Headers", "*");
-
+        val newHeaders = headers.clone()
+        newHeaders.put("Access-Control-Allow-Origin", "*")
+        newHeaders.put("Access-Control-Allow-Methods", "*")
+        newHeaders.put("Access-Control-Allow-Headers", "*")
         httpContext.respondCode(200, newHeaders);
     }
 }

app/src/main/java/com/futo/platformplayer/api/http/server/handlers/HttpProxyHandler.kt

@@ -98,11 +98,15 @@ class HttpProxyHandler(method: String, path: String, val targetUrl: String, priv
             proxyHeaders.put("Referer", targetUrl);
 
         val useMethod = if (method == "inherit") context.method else method;
-        Logger.i(TAG, "handleWithTcp Proxied Request ${useMethod}: ${targetUrl}");
+        Logger.i(TAG, "handleWithTcp Proxied Request ${useMethod}: ${parsed}");
         Logger.i(TAG, "handleWithTcp Headers:" + proxyHeaders.map { "${it.key}: ${it.value}" }.joinToString("\n"));
 
+        makeTcpRequest(proxyHeaders, useMethod, parsed, context)
+    }
+
+    private fun makeTcpRequest(proxyHeaders: HashMap<String, String>, useMethod: String, parsed: Uri, context: HttpContext) {
         val requestBuilder = StringBuilder()
-        requestBuilder.append("$useMethod $targetUrl HTTP/1.1\r\n")
+        requestBuilder.append("$useMethod $parsed HTTP/1.1\r\n")
         proxyHeaders.forEach { (key, value) -> requestBuilder.append("$key: $value\r\n") }
         requestBuilder.append("\r\n")
 
@@ -128,23 +132,31 @@ class HttpProxyHandler(method: String, path: String, val targetUrl: String, priv
 
             val inputStream = s.getInputStream()
             val resp = HttpResponseParser(inputStream)
-            val isChunked = resp.transferEncoding.equals("chunked", ignoreCase = true)
-            val contentLength = resp.contentLength.toInt()
+            if (resp.statusCode == 302) {
+                val location = resp.location!!
+                Logger.i(TAG, "handleWithTcp Proxied ${resp.statusCode} following redirect to $location");
+                makeTcpRequest(proxyHeaders, useMethod, Uri.parse(location)!!, context)
+            } else {
+                val isChunked = resp.transferEncoding.equals("chunked", ignoreCase = true)
+                val contentLength = resp.contentLength.toInt()
 
-            val headersFiltered = HttpHeaders(resp.headers.filter { !_ignoreResponseHeaders.contains(it.key.lowercase()) });
-            for(newHeader in headers)
-                headersFiltered.put(newHeader.key, newHeader.value);
+                val headersFiltered = HttpHeaders(resp.headers.filter { !_ignoreResponseHeaders.contains(it.key.lowercase()) });
+                for (newHeader in headers)
+                    headersFiltered.put(newHeader.key, newHeader.value);
 
-            context.respond(resp.statusCode, headersFiltered) { responseStream ->
-                if (isChunked) {
-                    Logger.i(TAG, "handleWithTcp handleChunkedTransfer");
-                    handleChunkedTransfer(inputStream, responseStream)
-                } else if (contentLength != -1) {
-                    Logger.i(TAG, "handleWithTcp transferFixedLengthContent $contentLength");
-                    transferFixedLengthContent(inputStream, responseStream, contentLength)
-                } else {
-                    Logger.i(TAG, "handleWithTcp transferUntilEndOfStream");
-                    transferUntilEndOfStream(inputStream, responseStream)
+                context.respond(resp.statusCode, headersFiltered) { responseStream ->
+                    if (isChunked) {
+                        Logger.i(TAG, "handleWithTcp handleChunkedTransfer");
+                        handleChunkedTransfer(inputStream, responseStream)
+                    } else if (contentLength > 0) {
+                        Logger.i(TAG, "handleWithTcp transferFixedLengthContent $contentLength");
+                        transferFixedLengthContent(inputStream, responseStream, contentLength)
+                    } else if (contentLength == -1) {
+                        Logger.i(TAG, "handleWithTcp transferUntilEndOfStream");
+                        transferUntilEndOfStream(inputStream, responseStream)
+                    } else {
+                        Logger.i(TAG, "handleWithTcp no content");
+                    }
                 }
             }
         }
@@ -156,7 +168,6 @@ class HttpProxyHandler(method: String, path: String, val targetUrl: String, priv
 
         while (inputStream.readLine().also { line = it } != null) {
             val size = line!!.trim().toInt(16)
-            Logger.i(TAG, "handleWithTcp handleChunkedTransfer chunk size $size")
 
             responseStream.write(line!!.encodeToByteArray())
             responseStream.write("\r\n".encodeToByteArray())

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/internal/JSHttpClient.kt

@@ -6,10 +6,13 @@ import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.platforms.js.SourceAuth
 import com.futo.platformplayer.api.media.platforms.js.SourceCaptchaData
+import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
+import com.futo.platformplayer.engine.exceptions.ScriptImplementationException
 import com.futo.platformplayer.matchesDomain
 
 class JSHttpClient : ManagedHttpClient {
     private val _jsClient: JSClient?;
+    private val _jsConfig: SourcePluginConfig?;
     private val _auth: SourceAuth?;
     private val _captcha: SourceCaptchaData?;
 
@@ -20,8 +23,9 @@ class JSHttpClient : ManagedHttpClient {
 
     private var _currentCookieMap: HashMap<String, HashMap<String, String>>;
 
-    constructor(jsClient: JSClient?, auth: SourceAuth? = null, captcha: SourceCaptchaData? = null) : super() {
+    constructor(jsClient: JSClient?, auth: SourceAuth? = null, captcha: SourceCaptchaData? = null, config: SourcePluginConfig? = null) : super() {
         _jsClient = jsClient;
+        _jsConfig = config;
         _auth = auth;
         _captcha = captcha;
 
@@ -87,7 +91,11 @@ class JSHttpClient : ManagedHttpClient {
             }
         }
 
-        _jsClient?.validateUrlOrThrow(request.url.toString());
+        if(_jsClient != null)
+            _jsClient?.validateUrlOrThrow(request.url.toString());
+        else if (_jsConfig != null && !_jsConfig.isUrlAllowed(request.url.toString()))
+            throw ScriptImplementationException(_jsConfig, "Attempted to access non-whitelisted url: ${request.url.toString()}\nAdd it to your config");
+
         return newBuilder?.let { it.build() } ?: request;
     }
 

app/src/main/java/com/futo/platformplayer/api/media/structures/DedupContentPager.kt

@@ -52,7 +52,7 @@ class DedupContentPager : IPager<IPlatformContent>, IAsyncPager<IPlatformContent
             val sameItems = results.filter { isSameItem(result, it) };
             val platformItemMap = sameItems.groupBy { it.id.pluginId }.mapValues { (_, items) -> items.first() }
             val bestPlatform = _preferredPlatform.map { it.lowercase() }.firstOrNull { platformItemMap.containsKey(it) }
-            val bestItem = platformItemMap[bestPlatform] ?: sameItems.first()
+            val bestItem = platformItemMap[bestPlatform] ?: sameItems.firstOrNull();
 
             resultsToRemove.addAll(sameItems.filter { it != bestItem });
         }

app/src/main/java/com/futo/platformplayer/casting/ChomecastCastingDevice.kt

@@ -69,7 +69,7 @@ class ChromecastCastingDevice : CastingDevice {
             return;
         }
 
-        Logger.i(FastCastCastingDevice.TAG, "Start streaming (streamType: $streamType, contentType: $contentType, contentId: $contentId, resumePosition: $resumePosition, duration: $duration)");
+        Logger.i(TAG, "Start streaming (streamType: $streamType, contentType: $contentType, contentId: $contentId, resumePosition: $resumePosition, duration: $duration)");
 
         time = resumePosition;
         _streamType = streamType;

app/src/main/java/com/futo/platformplayer/casting/StateCasting.kt

@@ -334,20 +334,25 @@ class StateCasting {
         }
 
         if (sourceCount > 1) {
-            if (ad is AirPlayCastingDevice) {
-                StateApp.withContext(false) { context -> UIDialogs.toast(context, "AirPlay does not support DASH. Try ChromeCast or FastCast for casting this video."); };
-                ad.stopCasting();
-                return false;
-            }
-
             if (videoSource is LocalVideoSource || audioSource is LocalAudioSource || subtitleSource is LocalSubtitleSource) {
-                castLocalDash(video, videoSource as LocalVideoSource?, audioSource as LocalAudioSource?, subtitleSource as LocalSubtitleSource?, resumePosition);
+                if (ad is AirPlayCastingDevice) {
+                    Logger.i(TAG, "Casting as local HLS");
+                    castLocalHls(video, videoSource as LocalVideoSource?, audioSource as LocalAudioSource?, subtitleSource as LocalSubtitleSource?, resumePosition);
+                } else {
+                    Logger.i(TAG, "Casting as local DASH");
+                    castLocalDash(video, videoSource as LocalVideoSource?, audioSource as LocalAudioSource?, subtitleSource as LocalSubtitleSource?, resumePosition);
+                }
             } else {
                 StateApp.instance.scope.launch(Dispatchers.IO) {
                     try {
                         if (ad is FastCastCastingDevice) {
+                            Logger.i(TAG, "Casting as DASH direct");
                             castDashDirect(contentResolver, video, videoSource as IVideoUrlSource?, audioSource as IAudioUrlSource?, subtitleSource, resumePosition);
+                        } else if (ad is AirPlayCastingDevice) {
+                            Logger.i(TAG, "Casting as HLS indirect");
+                            castHlsIndirect(contentResolver, video, videoSource as IVideoUrlSource?, audioSource as IAudioUrlSource?, subtitleSource, resumePosition);
                         } else {
+                            Logger.i(TAG, "Casting as DASH indirect");
                             castDashIndirect(contentResolver, video, videoSource as IVideoUrlSource?, audioSource as IAudioUrlSource?, subtitleSource, resumePosition);
                         }
                     } catch (e: Throwable) {
@@ -356,27 +361,35 @@ class StateCasting {
                 }
             }
         } else {
-            if (videoSource is IVideoUrlSource)
+            if (videoSource is IVideoUrlSource) {
+                Logger.i(TAG, "Casting as singular video");
                 ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", videoSource.container, videoSource.getVideoUrl(), resumePosition, video.duration.toDouble());
-            else if (audioSource is IAudioUrlSource)
+            } else if (audioSource is IAudioUrlSource) {
+                Logger.i(TAG, "Casting as singular audio");
                 ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", audioSource.container, audioSource.getAudioUrl(), resumePosition, video.duration.toDouble());
-            else if(videoSource is IHLSManifestSource) {
+            } else if(videoSource is IHLSManifestSource) {
                 if (ad is ChromecastCastingDevice) {
-                    castHlsIndirect(video, videoSource.url, resumePosition);
+                    Logger.i(TAG, "Casting as proxied HLS");
+                    castProxiedHls(video, videoSource.url, resumePosition);
                 } else {
+                    Logger.i(TAG, "Casting as non-proxied HLS");
                     ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", videoSource.container, videoSource.url, resumePosition, video.duration.toDouble());
                 }
             } else if(audioSource is IHLSManifestAudioSource) {
                 if (ad is ChromecastCastingDevice) {
-                    castHlsIndirect(video, audioSource.url, resumePosition);
+                    Logger.i(TAG, "Casting as proxied audio HLS");
+                    castProxiedHls(video, audioSource.url, resumePosition);
                 } else {
+                    Logger.i(TAG, "Casting as non-proxied audio HLS");
                     ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", audioSource.container, audioSource.url, resumePosition, video.duration.toDouble());
                 }
-            } else if (videoSource is LocalVideoSource)
+            } else if (videoSource is LocalVideoSource) {
+                Logger.i(TAG, "Casting as local video");
                 castLocalVideo(video, videoSource, resumePosition);
-            else if (audioSource is LocalAudioSource)
+            } else if (audioSource is LocalAudioSource) {
+                Logger.i(TAG, "Casting as local audio");
                 castLocalAudio(video, audioSource, resumePosition);
-            else {
+            } else {
                 var str = listOf(
                     if(videoSource != null) "Video: ${videoSource::class.java.simpleName}" else null,
                     if(audioSource != null) "Audio: ${audioSource::class.java.simpleName}" else null,
@@ -413,6 +426,14 @@ class StateCasting {
         return true;
     }
 
+    private fun castVideoIndirect() {
+
+    }
+
+    private fun castAudioIndirect() {
+
+    }
+
     private fun castLocalVideo(video: IPlatformVideoDetails, videoSource: LocalVideoSource, resumePosition: Double) : List<String> {
         val ad = activeDevice ?: return listOf();
 
@@ -451,6 +472,101 @@ class StateCasting {
         return listOf(audioUrl);
     }
 
+    private fun castLocalHls(video: IPlatformVideoDetails, videoSource: LocalVideoSource?, audioSource: LocalAudioSource?, subtitleSource: LocalSubtitleSource?, resumePosition: Double): List<String> {
+        val ad = activeDevice ?: return listOf()
+
+        val url = "http://${ad.localAddress.toString().trim('/')}:${_castServer.port}"
+        val id = UUID.randomUUID()
+
+        val hlsPath = "/hls-${id}"
+        val videoPath = "/video-${id}"
+        val audioPath = "/audio-${id}"
+        val subtitlePath = "/subtitle-${id}"
+
+        val hlsUrl = url + hlsPath
+        val videoUrl = url + videoPath
+        val audioUrl = url + audioPath
+        val subtitleUrl = url + subtitlePath
+
+        val mediaRenditions = arrayListOf<HLS.MediaRendition>()
+        val variantPlaylistReferences = arrayListOf<HLS.VariantPlaylistReference>()
+
+        if (videoSource != null) {
+            _castServer.addHandler(
+                HttpFileHandler("GET", videoPath, videoSource.container, videoSource.filePath)
+                    .withHeader("Access-Control-Allow-Origin", "*"), true
+            ).withTag("castLocalHls")
+
+            val duration = videoSource.duration
+            val videoVariantPlaylistPath = "/video-playlist-${id}"
+            val videoVariantPlaylistUrl = url + videoVariantPlaylistPath
+            val videoVariantPlaylistSegments = listOf(HLS.MediaSegment(duration.toDouble(), videoUrl))
+            val videoVariantPlaylist = HLS.VariantPlaylist(3, duration.toInt(), 0, 0, null, null, videoVariantPlaylistSegments)
+
+            _castServer.addHandler(
+                HttpConstantHandler("GET", videoVariantPlaylistPath, videoVariantPlaylist.buildM3U8(),
+                    "application/vnd.apple.mpegurl")
+                    .withHeader("Access-Control-Allow-Origin", "*"), true
+            ).withTag("castLocalHls")
+
+            variantPlaylistReferences.add(HLS.VariantPlaylistReference(videoVariantPlaylistUrl, HLS.StreamInfo(
+                videoSource.bitrate, "${videoSource.width}x${videoSource.height}", videoSource.codec, null, null, if (audioSource != null) "audio" else null, if (subtitleSource != null) "subtitles" else null, null, null)))
+        }
+
+        if (audioSource != null) {
+            _castServer.addHandler(
+                HttpFileHandler("GET", audioPath, audioSource.container, audioSource.filePath)
+                    .withHeader("Access-Control-Allow-Origin", "*"), true
+            ).withTag("castLocalHls")
+
+            val duration = audioSource.duration ?: videoSource?.duration ?: throw Exception("Duration unknown")
+            val audioVariantPlaylistPath = "/audio-playlist-${id}"
+            val audioVariantPlaylistUrl = url + audioVariantPlaylistPath
+            val audioVariantPlaylistSegments = listOf(HLS.MediaSegment(duration.toDouble(), audioUrl))
+            val audioVariantPlaylist = HLS.VariantPlaylist(3, duration.toInt(), 0, 0, null, null, audioVariantPlaylistSegments)
+
+            _castServer.addHandler(
+                HttpConstantHandler("GET", audioVariantPlaylistPath, audioVariantPlaylist.buildM3U8(),
+                    "application/vnd.apple.mpegurl")
+                    .withHeader("Access-Control-Allow-Origin", "*"), true
+            ).withTag("castLocalHls")
+
+            mediaRenditions.add(HLS.MediaRendition("AUDIO", audioVariantPlaylistUrl, "audio", "en", "english", true, true, true))
+        }
+
+        if (subtitleSource != null) {
+            _castServer.addHandler(
+                HttpFileHandler("GET", subtitlePath, subtitleSource.format ?: "text/vtt", subtitleSource.filePath)
+                    .withHeader("Access-Control-Allow-Origin", "*"), true
+            ).withTag("castLocalHls")
+
+            val duration = videoSource?.duration ?: audioSource?.duration ?: throw Exception("Duration unknown")
+            val subtitleVariantPlaylistPath = "/subtitle-playlist-${id}"
+            val subtitleVariantPlaylistUrl = url + subtitleVariantPlaylistPath
+            val subtitleVariantPlaylistSegments = listOf(HLS.MediaSegment(duration.toDouble(), subtitleUrl))
+            val subtitleVariantPlaylist = HLS.VariantPlaylist(3, duration.toInt(), 0, 0, null, null, subtitleVariantPlaylistSegments)
+
+            _castServer.addHandler(
+                HttpConstantHandler("GET", subtitleVariantPlaylistPath, subtitleVariantPlaylist.buildM3U8(),
+                    "application/vnd.apple.mpegurl")
+                    .withHeader("Access-Control-Allow-Origin", "*"), true
+            ).withTag("castLocalHls")
+
+            mediaRenditions.add(HLS.MediaRendition("SUBTITLES", subtitleVariantPlaylistUrl, "subtitles", "en", "english", true, true, true))
+        }
+
+        val masterPlaylist = HLS.MasterPlaylist(variantPlaylistReferences, mediaRenditions, listOf(), true)
+        _castServer.addHandler(
+            HttpConstantHandler("GET", hlsPath, masterPlaylist.buildM3U8(),
+                "application/vnd.apple.mpegurl")
+                .withHeader("Access-Control-Allow-Origin", "*"), true
+        ).withTag("castLocalHls")
+
+        Logger.i(TAG, "added new castLocalHls handlers (hlsPath: $hlsPath, videoPath: $videoPath, audioPath: $audioPath, subtitlePath: $subtitlePath).")
+        ad.loadVideo("BUFFERED", "application/vnd.apple.mpegurl", hlsUrl, resumePosition, video.duration.toDouble())
+
+        return listOf(hlsUrl, videoUrl, audioUrl, subtitleUrl)
+    }
 
     private fun castLocalDash(video: IPlatformVideoDetails, videoSource: LocalVideoSource?, audioSource: LocalAudioSource?, subtitleSource: LocalSubtitleSource?, resumePosition: Double) : List<String> {
         val ad = activeDevice ?: return listOf();
@@ -558,8 +674,8 @@ class StateCasting {
         return listOf(videoSource?.getVideoUrl() ?: "", audioSource?.getAudioUrl() ?: "");
     }
 
-    private fun castHlsIndirect(video: IPlatformVideoDetails, sourceUrl: String, resumePosition: Double): List<String> {
-        _castServer.removeAllHandlers("castHlsIndirectMaster")
+    private fun castProxiedHls(video: IPlatformVideoDetails, sourceUrl: String, resumePosition: Double): List<String> {
+        _castServer.removeAllHandlers("castProxiedHlsMaster")
 
         val ad = activeDevice ?: return listOf();
         val url = "http://${ad.localAddress.toString().trim('/')}:${_castServer.port}";
@@ -570,7 +686,7 @@ class StateCasting {
         Logger.i(TAG, "HLS url: $hlsUrl");
 
         _castServer.addHandler(HttpFuntionHandler("GET", hlsPath) { masterContext ->
-            _castServer.removeAllHandlers("castHlsIndirectVariant")
+            _castServer.removeAllHandlers("castProxiedHlsVariant")
 
             val headers = masterContext.headers.clone()
             headers["Content-Type"] = "application/vnd.apple.mpegurl";
@@ -578,7 +694,7 @@ class StateCasting {
             val masterPlaylist = HLS.downloadAndParseMasterPlaylist(_client, sourceUrl)
             val newVariantPlaylistRefs = arrayListOf<HLS.VariantPlaylistReference>()
             val newMediaRenditions = arrayListOf<HLS.MediaRendition>()
-            val newMasterPlaylist = HLS.MasterPlaylist(newVariantPlaylistRefs, newMediaRenditions, masterPlaylist.independentSegments)
+            val newMasterPlaylist = HLS.MasterPlaylist(newVariantPlaylistRefs, newMediaRenditions, masterPlaylist.sessionDataList, masterPlaylist.independentSegments)
 
             for (variantPlaylistRef in masterPlaylist.variantPlaylistsRefs) {
                 val playlistId = UUID.randomUUID();
@@ -590,10 +706,10 @@ class StateCasting {
                     vpHeaders["Content-Type"] = "application/vnd.apple.mpegurl";
 
                     val variantPlaylist = HLS.downloadAndParseVariantPlaylist(_client, variantPlaylistRef.url)
-                    val proxiedVariantPlaylist = proxyVariantPlaylist(url, playlistId, variantPlaylist)
+                    val proxiedVariantPlaylist = proxyVariantPlaylist(url, playlistId, variantPlaylist, video.isLive)
                     val proxiedVariantPlaylist_m3u8 = proxiedVariantPlaylist.buildM3U8()
                     vpContext.respondCode(200, vpHeaders, proxiedVariantPlaylist_m3u8);
-                }.withHeader("Access-Control-Allow-Origin", "*"), true).withTag("castHlsIndirectVariant")
+                }.withHeader("Access-Control-Allow-Origin", "*"), true).withTag("castProxiedHlsVariant")
 
                 newVariantPlaylistRefs.add(HLS.VariantPlaylistReference(
                     newPlaylistUrl,
@@ -602,19 +718,23 @@ class StateCasting {
             }
 
             for (mediaRendition in masterPlaylist.mediaRenditions) {
-                val playlistId = UUID.randomUUID();
-                val newPlaylistPath = "/hls-playlist-${playlistId}"
-                val newPlaylistUrl = url + newPlaylistPath;
+                val playlistId = UUID.randomUUID()
 
-                _castServer.addHandler(HttpFuntionHandler("GET", newPlaylistPath) { vpContext ->
-                    val vpHeaders = vpContext.headers.clone()
-                    vpHeaders["Content-Type"] = "application/vnd.apple.mpegurl";
+                var newPlaylistUrl: String? = null
+                if (mediaRendition.uri != null) {
+                    val newPlaylistPath = "/hls-playlist-${playlistId}"
+                    newPlaylistUrl = url + newPlaylistPath
 
-                    val variantPlaylist = HLS.downloadAndParseVariantPlaylist(_client, mediaRendition.uri)
-                    val proxiedVariantPlaylist = proxyVariantPlaylist(url, playlistId, variantPlaylist)
-                    val proxiedVariantPlaylist_m3u8 = proxiedVariantPlaylist.buildM3U8()
-                    vpContext.respondCode(200, vpHeaders, proxiedVariantPlaylist_m3u8);
-                }.withHeader("Access-Control-Allow-Origin", "*"), true).withTag("castHlsIndirectVariant")
+                    _castServer.addHandler(HttpFuntionHandler("GET", newPlaylistPath) { vpContext ->
+                        val vpHeaders = vpContext.headers.clone()
+                        vpHeaders["Content-Type"] = "application/vnd.apple.mpegurl";
+
+                        val variantPlaylist = HLS.downloadAndParseVariantPlaylist(_client, mediaRendition.uri)
+                        val proxiedVariantPlaylist = proxyVariantPlaylist(url, playlistId, variantPlaylist, video.isLive)
+                        val proxiedVariantPlaylist_m3u8 = proxiedVariantPlaylist.buildM3U8()
+                        vpContext.respondCode(200, vpHeaders, proxiedVariantPlaylist_m3u8);
+                    }.withHeader("Access-Control-Allow-Origin", "*"), true).withTag("castProxiedHlsVariant")
+                }
 
                 newMediaRenditions.add(HLS.MediaRendition(
                     mediaRendition.type,
@@ -629,20 +749,27 @@ class StateCasting {
             }
 
             masterContext.respondCode(200, headers, newMasterPlaylist.buildM3U8());
-        }.withHeader("Access-Control-Allow-Origin", "*"), true).withTag("castHlsIndirectMaster")
+        }.withHeader("Access-Control-Allow-Origin", "*"), true).withTag("castProxiedHlsMaster")
 
         Logger.i(TAG, "added new castHlsIndirect handlers (hlsPath: $hlsPath).");
-        ad.loadVideo("BUFFERED", "application/vnd.apple.mpegurl", hlsUrl, resumePosition, video.duration.toDouble());
+
+        //ChromeCast is sometimes funky with resume position 0
+        val hackfixResumePosition = if (ad is ChromecastCastingDevice && !video.isLive && resumePosition == 0.0) 1.0 else resumePosition;
+        ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", "application/vnd.apple.mpegurl", hlsUrl, hackfixResumePosition, video.duration.toDouble());
 
         return listOf(hlsUrl);
     }
 
-    private fun proxyVariantPlaylist(url: String, playlistId: UUID, variantPlaylist: HLS.VariantPlaylist): HLS.VariantPlaylist {
+    private fun proxyVariantPlaylist(url: String, playlistId: UUID, variantPlaylist: HLS.VariantPlaylist, isLive: Boolean, proxySegments: Boolean = true): HLS.VariantPlaylist {
         val newSegments = arrayListOf<HLS.Segment>()
 
-        variantPlaylist.segments.forEachIndexed { index, segment ->
-            val sequenceNumber = variantPlaylist.mediaSequence + index.toLong()
-            newSegments.add(proxySegment(url, playlistId, segment, sequenceNumber))
+        if (proxySegments) {
+            variantPlaylist.segments.forEachIndexed { index, segment ->
+                val sequenceNumber = variantPlaylist.mediaSequence + index.toLong()
+                newSegments.add(proxySegment(url, playlistId, segment, sequenceNumber))
+            }
+        } else {
+            newSegments.addAll(variantPlaylist.segments)
         }
 
         return HLS.VariantPlaylist(
@@ -651,26 +778,166 @@ class StateCasting {
             variantPlaylist.mediaSequence,
             variantPlaylist.discontinuitySequence,
             variantPlaylist.programDateTime,
+            variantPlaylist.playlistType,
             newSegments
         )
     }
 
     private fun proxySegment(url: String, playlistId: UUID, segment: HLS.Segment, index: Long): HLS.Segment {
-        val newSegmentPath = "/hls-playlist-${playlistId}-segment-${index}"
-        val newSegmentUrl = url + newSegmentPath;
+        if (segment is HLS.MediaSegment) {
+            val newSegmentPath = "/hls-playlist-${playlistId}-segment-${index}"
+            val newSegmentUrl = url + newSegmentPath;
+
+            if (_castServer.getHandler("GET", newSegmentPath) == null) {
+                _castServer.addHandler(
+                    HttpProxyHandler("GET", newSegmentPath, segment.uri, true)
+                        .withInjectedHost()
+                        .withHeader("Access-Control-Allow-Origin", "*"), true
+                ).withTag("castProxiedHlsVariant")
+            }
+
+            return HLS.MediaSegment(
+                segment.duration,
+                newSegmentUrl
+            )
+        } else {
+            return segment
+        }
+    }
+
+    private suspend fun castHlsIndirect(contentResolver: ContentResolver, video: IPlatformVideoDetails, videoSource: IVideoUrlSource?, audioSource: IAudioUrlSource?, subtitleSource: ISubtitleSource?, resumePosition: Double) : List<String> {
+        val ad = activeDevice ?: return listOf();
+        val url = "http://${ad.localAddress.toString().trim('/')}:${_castServer.port}";
+        val id = UUID.randomUUID();
+
+        val hlsPath = "/hls-${id}"
+
+        val hlsUrl = url + hlsPath;
+        Logger.i(TAG, "HLS url: $hlsUrl");
+
+        val mediaRenditions = arrayListOf<HLS.MediaRendition>()
+        val variantPlaylistReferences = arrayListOf<HLS.VariantPlaylistReference>()
+
+        if (audioSource != null) {
+            val audioPath = "/audio-${id}"
+            val audioUrl = url + audioPath
+
+            val duration = audioSource.duration ?: videoSource?.duration ?: throw Exception("Duration unknown")
+            val audioVariantPlaylistPath = "/audio-playlist-${id}"
+            val audioVariantPlaylistUrl = url + audioVariantPlaylistPath
+            val audioVariantPlaylistSegments = listOf(HLS.MediaSegment(duration.toDouble(), audioUrl))
+            val audioVariantPlaylist = HLS.VariantPlaylist(3, duration.toInt(), 0, 0, null, null, audioVariantPlaylistSegments)
 
-        if (_castServer.getHandler("GET", newSegmentPath) == null) {
             _castServer.addHandler(
-                HttpProxyHandler("GET", newSegmentPath, segment.uri, true)
+                HttpConstantHandler("GET", audioVariantPlaylistPath, audioVariantPlaylist.buildM3U8(),
+                    "application/vnd.apple.mpegurl")
+                    .withHeader("Access-Control-Allow-Origin", "*"), true
+            ).withTag("castHlsIndirectVariant");
+            _castServer.addHandler(HttpOptionsAllowHandler(audioVariantPlaylistPath).withHeader("Access-Control-Allow-Origin", "*")).withTag("castHlsIndirectVariant");
+
+            mediaRenditions.add(HLS.MediaRendition("AUDIO", audioVariantPlaylistUrl, "audio", "en", "english", true, true, true))
+
+            _castServer.addHandler(
+                HttpProxyHandler("GET", audioPath, audioSource.getAudioUrl(), true)
                     .withInjectedHost()
                     .withHeader("Access-Control-Allow-Origin", "*"), true
-            ).withTag("castHlsIndirectVariant")
+            ).withTag("castHlsIndirectVariant");
+            _castServer.addHandler(HttpOptionsAllowHandler(audioPath).withHeader("Access-Control-Allow-Origin", "*")).withTag("castHlsIndirectVariant");
         }
 
-        return HLS.Segment(
-            segment.duration,
-            newSegmentUrl
-        )
+        val subtitlesUri = if (subtitleSource != null) withContext(Dispatchers.IO) {
+            return@withContext subtitleSource.getSubtitlesURI();
+        } else null;
+
+        var subtitlesUrl: String? = null;
+        if (subtitlesUri != null) {
+            val subtitlePath = "/subtitles-${id}"
+            if(subtitlesUri.scheme == "file") {
+                var content: String? = null;
+                val inputStream = contentResolver.openInputStream(subtitlesUri);
+                inputStream?.use { stream ->
+                    val reader = stream.bufferedReader();
+                    content = reader.use { it.readText() };
+                }
+
+                if (content != null) {
+                    _castServer.addHandler(
+                        HttpConstantHandler("GET", subtitlePath, content!!, subtitleSource?.format ?: "text/vtt")
+                            .withHeader("Access-Control-Allow-Origin", "*"), true
+                    ).withTag("castHlsIndirectVariant");
+                    _castServer.addHandler(HttpOptionsAllowHandler(subtitlePath).withHeader("Access-Control-Allow-Origin", "*")).withTag("castHlsIndirectVariant");
+                }
+
+                subtitlesUrl = url + subtitlePath;
+            } else {
+                subtitlesUrl = subtitlesUri.toString();
+            }
+        }
+
+        if (subtitlesUrl != null) {
+            val duration = videoSource?.duration ?: audioSource?.duration ?: throw Exception("Duration unknown")
+            val subtitleVariantPlaylistPath = "/subtitle-playlist-${id}"
+            val subtitleVariantPlaylistUrl = url + subtitleVariantPlaylistPath
+            val subtitleVariantPlaylistSegments = listOf(HLS.MediaSegment(duration.toDouble(), subtitlesUrl))
+            val subtitleVariantPlaylist = HLS.VariantPlaylist(3, duration.toInt(), 0, 0, null, null, subtitleVariantPlaylistSegments)
+
+            _castServer.addHandler(
+                HttpConstantHandler("GET", subtitleVariantPlaylistPath, subtitleVariantPlaylist.buildM3U8(),
+                    "application/vnd.apple.mpegurl")
+                    .withHeader("Access-Control-Allow-Origin", "*"), true
+            ).withTag("castHlsIndirectVariant");
+            _castServer.addHandler(HttpOptionsAllowHandler(subtitleVariantPlaylistPath).withHeader("Access-Control-Allow-Origin", "*")).withTag("castHlsIndirectVariant");
+
+            mediaRenditions.add(HLS.MediaRendition("SUBTITLES", subtitleVariantPlaylistUrl, "subtitles", "en", "english", true, true, true))
+        }
+
+        if (videoSource != null) {
+            val videoPath = "/video-${id}"
+            val videoUrl = url + videoPath
+
+            val duration = videoSource.duration
+            val videoVariantPlaylistPath = "/video-playlist-${id}"
+            val videoVariantPlaylistUrl = url + videoVariantPlaylistPath
+            val videoVariantPlaylistSegments = listOf(HLS.MediaSegment(duration.toDouble(), videoUrl))
+            val videoVariantPlaylist = HLS.VariantPlaylist(3, duration.toInt(), 0, 0, null, null, videoVariantPlaylistSegments)
+
+            _castServer.addHandler(
+                HttpConstantHandler("GET", videoVariantPlaylistPath, videoVariantPlaylist.buildM3U8(),
+                    "application/vnd.apple.mpegurl")
+                    .withHeader("Access-Control-Allow-Origin", "*"), true
+            ).withTag("castHlsIndirectVariant");
+            _castServer.addHandler(HttpOptionsAllowHandler(videoVariantPlaylistPath).withHeader("Access-Control-Allow-Origin", "*")).withTag("castHlsIndirectVariant");
+
+            variantPlaylistReferences.add(HLS.VariantPlaylistReference(videoVariantPlaylistUrl, HLS.StreamInfo(
+                videoSource.bitrate ?: 0,
+                "${videoSource.width}x${videoSource.height}",
+                videoSource.codec,
+                null,
+                null,
+                if (audioSource != null) "audio" else null,
+                if (subtitleSource != null) "subtitles" else null,
+                null, null)))
+
+            _castServer.addHandler(
+                HttpProxyHandler("GET", videoPath, videoSource.getVideoUrl(), true)
+                    .withInjectedHost()
+                    .withHeader("Access-Control-Allow-Origin", "*"), true
+            ).withTag("castHlsIndirectVariant");
+            _castServer.addHandler(HttpOptionsAllowHandler(videoPath).withHeader("Access-Control-Allow-Origin", "*")).withTag("castHlsIndirectVariant");
+        }
+
+        val masterPlaylist = HLS.MasterPlaylist(variantPlaylistReferences, mediaRenditions, listOf(), true)
+        _castServer.addHandler(
+            HttpConstantHandler("GET", hlsPath, masterPlaylist.buildM3U8(),
+                "application/vnd.apple.mpegurl")
+                .withHeader("Access-Control-Allow-Origin", "*"), true
+        ).withTag("castHlsIndirectMaster")
+        _castServer.addHandler(HttpOptionsAllowHandler(hlsPath).withHeader("Access-Control-Allow-Origin", "*")).withTag("castHlsIndirectVariant");
+
+        Logger.i(TAG, "added new castHls handlers (hlsPath: $hlsPath).");
+        ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", "application/vnd.apple.mpegurl", hlsUrl, resumePosition, video.duration.toDouble());
+
+        return listOf(hlsUrl, videoSource?.getVideoUrl() ?: "", audioSource?.getAudioUrl() ?: "", subtitlesUri.toString());
     }
 
     private suspend fun castDashIndirect(contentResolver: ContentResolver, video: IPlatformVideoDetails, videoSource: IVideoUrlSource?, audioSource: IAudioUrlSource?, subtitleSource: ISubtitleSource?, resumePosition: Double) : List<String> {
@@ -678,8 +945,6 @@ class StateCasting {
         val proxyStreams = ad !is FastCastCastingDevice;
 
         val url = "http://${ad.localAddress.toString().trim('/')}:${_castServer.port}";
-        Logger.i(TAG, "DASH url: $url");
-
         val id = UUID.randomUUID();
 
         val dashPath = "/dash-${id}"
@@ -688,6 +953,8 @@ class StateCasting {
         val subtitlePath = "/subtitle-${id}"
 
         val dashUrl = url + dashPath;
+        Logger.i(TAG, "DASH url: $dashUrl");
+
         val videoUrl = if(proxyStreams) url + videoPath else videoSource?.getVideoUrl();
         val audioUrl = if(proxyStreams) url + audioPath else audioSource?.getAudioUrl();
 
@@ -713,6 +980,7 @@ class StateCasting {
                         HttpConstantHandler("GET", subtitlePath, content!!, subtitleSource?.format ?: "text/vtt")
                             .withHeader("Access-Control-Allow-Origin", "*"), true
                     ).withTag("cast");
+                    _castServer.addHandler(HttpOptionsAllowHandler(subtitlePath).withHeader("Access-Control-Allow-Origin", "*")).withTag("cast");
                 }
 
                 subtitlesUrl = url + subtitlePath;
@@ -726,33 +994,37 @@ class StateCasting {
                 "application/dash+xml")
                 .withHeader("Access-Control-Allow-Origin", "*"), true
         ).withTag("cast");
+        _castServer.addHandler(
+            HttpOptionsAllowHandler(dashPath)
+                .withHeader("Access-Control-Allow-Origin", "*")
+        ).withTag("cast");
+
         if (videoSource != null) {
             _castServer.addHandler(
-                HttpProxyHandler("GET", videoPath, videoSource.getVideoUrl())
+                HttpProxyHandler("GET", videoPath, videoSource.getVideoUrl(), true)
                     .withInjectedHost()
                     .withHeader("Access-Control-Allow-Origin", "*"), true
             ).withTag("cast");
             _castServer.addHandler(
                 HttpOptionsAllowHandler(videoPath)
                 .withHeader("Access-Control-Allow-Origin", "*")
-                .withHeader("Connection", "keep-alive"))
-                .withTag("cast");
+            ).withTag("cast");
         }
         if (audioSource != null) {
             _castServer.addHandler(
-                HttpProxyHandler("GET", audioPath, audioSource.getAudioUrl())
+                HttpProxyHandler("GET", audioPath, audioSource.getAudioUrl(), true)
                     .withInjectedHost()
                     .withHeader("Access-Control-Allow-Origin", "*"), true
             ).withTag("cast");
             _castServer.addHandler(
                 HttpOptionsAllowHandler(audioPath)
                     .withHeader("Access-Control-Allow-Origin", "*")
-                    .withHeader("Connection", "keep-alivcontexte"))
+            )
                 .withTag("cast");
         }
 
         Logger.i(TAG, "added new castDash handlers (dashPath: $dashPath, videoPath: $videoPath, audioPath: $audioPath).");
-        ad.loadVideo("BUFFERED", "application/dash+xml", dashUrl, resumePosition, video.duration.toDouble());
+        ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", "application/dash+xml", dashUrl, resumePosition, video.duration.toDouble());
 
         return listOf(dashUrl, videoUrl ?: "", audioUrl ?: "", subtitlesUrl ?: "", videoSource?.getVideoUrl() ?: "", audioSource?.getAudioUrl() ?: "", subtitlesUri.toString());
     }

app/src/main/java/com/futo/platformplayer/developer/DeveloperEndpoints.kt

@@ -24,6 +24,7 @@ import com.google.gson.JsonArray
 import com.google.gson.JsonParser
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
+import java.lang.reflect.InvocationTargetException
 import java.util.UUID
 import kotlin.reflect.jvm.jvmErasure
 
@@ -185,7 +186,11 @@ class DeveloperEndpoints(private val context: Context) {
         val config = context.readContentJson<SourcePluginConfig>()
         try {
             _testPluginVariables.clear();
-            _testPlugin = V8Plugin(StateApp.instance.context, config);
+
+            val client = JSHttpClient(null, null, null, config);
+            val clientAuth = JSHttpClient(null, null, null, config);
+            _testPlugin = V8Plugin(StateApp.instance.context, config, null, client, clientAuth);
+
             context.respondJson(200, testPluginOrThrow.getPackageVariables());
         }
         catch(ex: Throwable) {
@@ -235,7 +240,7 @@ class DeveloperEndpoints(private val context: Context) {
             }
             LoginActivity.showLogin(StateApp.instance.context, config) {
                 _testPluginVariables.clear();
-                _testPlugin = V8Plugin(StateApp.instance.context, config, null, JSHttpClient(null), JSHttpClient(null, it));
+                _testPlugin = V8Plugin(StateApp.instance.context, config, null, JSHttpClient(null, null, null, config), JSHttpClient(null, it, null, config));
 
             };
             context.respondCode(200, "Login started");
@@ -311,6 +316,11 @@ class DeveloperEndpoints(private val context: Context) {
             val json = wrapRemoteResult(callResult, false);
             context.respondCode(200, json, "application/json");
         }
+        catch(invocation: InvocationTargetException) {
+            val innerException = invocation.targetException;
+            Logger.e("DeveloperEndpoints", innerException.message, innerException);
+            context.respondCode(500, innerException::class.simpleName + ":" + innerException.message ?: "", "text/plain")
+        }
         catch(ilEx: IllegalArgumentException) {
             if(ilEx.message?.contains("does not exist") ?: false) {
                 context.respondCode(400, ilEx.message ?: "", "text/plain");

app/src/main/java/com/futo/platformplayer/dialogs/CommentDialog.kt

@@ -20,6 +20,7 @@ import com.futo.platformplayer.api.media.models.comments.PolycentricPlatformComm
 import com.futo.platformplayer.api.media.models.ratings.RatingLikeDislikes
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.dp
+import com.futo.platformplayer.fullyBackfillServersAnnounceExceptions
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.selectBestImage
 import com.futo.platformplayer.states.StateApp
@@ -97,7 +98,7 @@ class CommentDialog(context: Context?, val contextUrl: String, val ref: Protocol
             StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
                 try {
                     Logger.i(TAG, "Started backfill");
-                    processHandle.fullyBackfillServers()
+                    processHandle.fullyBackfillServersAnnounceExceptions()
                     Logger.i(TAG, "Finished backfill");
                 } catch (e: Throwable) {
                     Logger.e(TAG, "Failed to backfill servers.", e);

app/src/main/java/com/futo/platformplayer/fragment/channel/tab/ChannelContentsFragment.kt

@@ -11,6 +11,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StatePlatform
 import com.futo.platformplayer.R
+import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.api.media.models.PlatformAuthorLink
 import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
@@ -58,6 +59,7 @@ class ChannelContentsFragment : Fragment(), IChannelTabFragment {
     val onChannelClicked = Event1<PlatformAuthorLink>();
     val onAddToClicked = Event1<IPlatformContent>();
     val onAddToQueueClicked = Event1<IPlatformContent>();
+    val onLongPress = Event1<IPlatformContent>();
 
     private fun getContentPager(channel: IPlatformChannel): IPager<IPlatformContent> {
         Logger.i(TAG, "getContentPager");
@@ -151,13 +153,14 @@ class ChannelContentsFragment : Fragment(), IChannelTabFragment {
 
         _recyclerResults = view.findViewById(R.id.recycler_videos);
 
-        _adapterResults = PreviewContentListAdapter(view.context, FeedStyle.THUMBNAIL, _results).apply {
+        _adapterResults = PreviewContentListAdapter(view.context, FeedStyle.THUMBNAIL, _results, null, Settings.instance.channel.progressBar).apply {
             this.onContentUrlClicked.subscribe(this@ChannelContentsFragment.onContentUrlClicked::emit);
             this.onUrlClicked.subscribe(this@ChannelContentsFragment.onUrlClicked::emit);
             this.onContentClicked.subscribe(this@ChannelContentsFragment.onContentClicked::emit);
             this.onChannelClicked.subscribe(this@ChannelContentsFragment.onChannelClicked::emit);
             this.onAddToClicked.subscribe(this@ChannelContentsFragment.onAddToClicked::emit);
             this.onAddToQueueClicked.subscribe(this@ChannelContentsFragment.onAddToQueueClicked::emit);
+            this.onLongPress.subscribe(this@ChannelContentsFragment.onLongPress::emit);
         }
 
         _llmVideo = LinearLayoutManager(view.context);

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ChannelFragment.kt

@@ -223,6 +223,12 @@ class ChannelFragment : MainFragment() {
                     else -> {};
                 }
             }
+            adapter.onLongPress.subscribe { content ->
+                _overlayContainer.let {
+                    if(content is IPlatformVideo)
+                        _slideUpOverlay = UISlideOverlays.showVideoOptionsOverlay(content, it);
+                }
+            }
             viewPager.adapter = adapter;
 
             val tabLayoutMediator = TabLayoutMediator(tabs, viewPager) { tab, position ->

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ContentFeedView.kt

@@ -37,6 +37,7 @@ abstract class ContentFeedView<TFragment> : FeedView<TFragment, IPlatformContent
     override val visibleThreshold: Int get() = if (feedStyle == FeedStyle.PREVIEW) { 5 } else { 10 };
     protected lateinit var headerView: LinearLayout;
     private var _videoOptionsOverlay: SlideUpMenuOverlay? = null;
+    protected open val shouldShowTimeBar: Boolean get() = true
 
     constructor(fragment: TFragment, inflater: LayoutInflater, cachedRecyclerData: RecyclerData<InsertedViewAdapterWithLoader<ContentPreviewViewHolder>, LinearLayoutManager, IPager<IPlatformContent>, IPlatformContent, IPlatformContent, InsertedViewHolder<ContentPreviewViewHolder>>? = null) : super(fragment, inflater, cachedRecyclerData) {
 
@@ -57,7 +58,7 @@ abstract class ContentFeedView<TFragment> : FeedView<TFragment, IPlatformContent
         };
         headerView = v;
 
-        return PreviewContentListAdapter(context, feedStyle, dataset, player, _previewsEnabled, arrayListOf(v)).apply {
+        return PreviewContentListAdapter(context, feedStyle, dataset, player, _previewsEnabled, arrayListOf(v), arrayListOf(), shouldShowTimeBar).apply {
             attachAdapterEvents(this);
         }
     }

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ContentSearchResultsFragment.kt

@@ -84,6 +84,7 @@ class ContentSearchResultsFragment : MainFragment() {
         private var _channelUrl: String? = null;
 
         private val _taskSearch: TaskHandler<String, IPager<IPlatformContent>>;
+        override val shouldShowTimeBar: Boolean get() = Settings.instance.search.progressBar
 
         constructor(fragment: ContentSearchResultsFragment, inflater: LayoutInflater) : super(fragment, inflater) {
             _taskSearch = TaskHandler<String, IPager<IPlatformContent>>({fragment.lifecycleScope}, { query ->

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/HomeFragment.kt

@@ -95,6 +95,7 @@ class HomeFragment : MainFragment() {
         private var _announcementsView: AnnouncementView;
 
         private val _taskGetPager: TaskHandler<Boolean, IPager<IPlatformContent>>;
+        override val shouldShowTimeBar: Boolean get() = Settings.instance.home.progressBar
 
         constructor(fragment: HomeFragment, inflater: LayoutInflater, cachedRecyclerData: RecyclerData<InsertedViewAdapterWithLoader<ContentPreviewViewHolder>, LinearLayoutManager, IPager<IPlatformContent>, IPlatformContent, IPlatformContent, InsertedViewHolder<ContentPreviewViewHolder>>? = null) : super(fragment, inflater, cachedRecyclerData) {
             _announcementsView = AnnouncementView(context, null).apply {

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/PostDetailFragment.kt

@@ -31,6 +31,7 @@ import com.futo.platformplayer.api.media.models.ratings.RatingLikes
 import com.futo.platformplayer.constructs.TaskHandler
 import com.futo.platformplayer.dp
 import com.futo.platformplayer.fixHtmlWhitespace
+import com.futo.platformplayer.fullyBackfillServersAnnounceExceptions
 import com.futo.platformplayer.images.GlideHelper.Companion.crossfade
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.polycentric.PolycentricCache
@@ -363,7 +364,7 @@ class PostDetailFragment : MainFragment {
                             StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
                                 try {
                                     Logger.i(TAG, "Started backfill");
-                                    args.processHandle.fullyBackfillServers();
+                                    args.processHandle.fullyBackfillServersAnnounceExceptions();
                                     Logger.i(TAG, "Finished backfill");
                                 } catch (e: Throwable) {
                                     Logger.e(TAG, "Failed to backfill servers", e)

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SubscriptionsFeedFragment.kt

@@ -93,6 +93,8 @@ class SubscriptionsFeedFragment : MainFragment() {
 
     @SuppressLint("ViewConstructor")
     class SubscriptionsFeedView : ContentFeedView<SubscriptionsFeedFragment> {
+        override val shouldShowTimeBar: Boolean get() = Settings.instance.subscriptions.progressBar
+
         constructor(fragment: SubscriptionsFeedFragment, inflater: LayoutInflater, cachedRecyclerData: RecyclerData<InsertedViewAdapterWithLoader<ContentPreviewViewHolder>, LinearLayoutManager, IPager<IPlatformContent>, IPlatformContent, IPlatformContent, InsertedViewHolder<ContentPreviewViewHolder>>? = null) : super(fragment, inflater, cachedRecyclerData) {
             Logger.i(TAG, "SubscriptionsFeedFragment constructor()");
             StateSubscriptions.instance.onGlobalSubscriptionsUpdateProgress.subscribe(this) { progress, total ->

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt

@@ -124,6 +124,7 @@ class VideoDetailView : ConstraintLayout {
     private var _searchVideo: IPlatformVideo? = null;
     var video: IPlatformVideoDetails? = null
         private set;
+    var videoLocal: VideoLocal? = null;
     private var _playbackTracker: IPlaybackTracker? = null;
 
     val currentUrl get() = video?.url ?: _searchVideo?.url ?: _url;
@@ -1044,10 +1045,32 @@ class VideoDetailView : ConstraintLayout {
             _player.setPlaybackRate(Settings.instance.playback.getDefaultPlaybackSpeed());
         }
 
-        val video = if(videoDetail is VideoLocal)
-            videoDetail;
-        else //TODO: Update cached video if it exists with video
-            StateDownloads.instance.getCachedVideo(videoDetail.id) ?: videoDetail;
+        var videoLocal: VideoLocal? = null;
+        var video: IPlatformVideoDetails? = null;
+
+       if(videoDetail is VideoLocal) {
+            videoLocal = videoDetail;
+            video = videoDetail;
+            val videoTask = StatePlatform.instance.getContentDetails(videoDetail.url);
+            videoTask.invokeOnCompletion { ex ->
+                if(ex != null) {
+                    Logger.e(TAG, "Failed to fetch live video for offline video", ex);
+                    return@invokeOnCompletion;
+                }
+                val result = videoTask.getCompleted();
+                if(this.video == videoDetail && result != null && result is IPlatformVideoDetails) {
+                    this.video = result;
+                    fragment.lifecycleScope.launch(Dispatchers.Main) {
+                        updateQualitySourcesOverlay(result, videoLocal);
+                    }
+                }
+            };
+        }
+        else { //TODO: Update cached video if it exists with video
+            videoLocal = StateDownloads.instance.getCachedVideo(videoDetail.id);
+            video = videoDetail;
+        }
+        this.videoLocal = videoLocal;
         this.video = video;
         this._playbackTracker = null;
 
@@ -1082,9 +1105,13 @@ class VideoDetailView : ConstraintLayout {
                         me._playbackTracker = tracker;
                 }
                 catch(ex: Throwable) {
-                    withContext(Dispatchers.Main) {
-                        UIDialogs.showGeneralErrorDialog(context, context.getString(R.string.failed_to_get_playback_tracker), ex);
+                    Logger.e(TAG, "Playback tracker failed", ex);
+                    if(me.video?.isLive == true) withContext(Dispatchers.Main) {
+                        UIDialogs.toast(context, context.getString(R.string.failed_to_get_playback_tracker));
                     };
+                    else withContext(Dispatchers.Main) {
+                        UIDialogs.showGeneralErrorDialog(context, context.getString(R.string.failed_to_get_playback_tracker), ex);
+                    }
                 }
             };
         }
@@ -1181,7 +1208,7 @@ class VideoDetailView : ConstraintLayout {
                             fragment.lifecycleScope.launch(Dispatchers.IO) {
                                 try {
                                     Logger.i(TAG, "Started backfill");
-                                    args.processHandle.fullyBackfillServers();
+                                    args.processHandle.fullyBackfillServersAnnounceExceptions();
                                     Logger.i(TAG, "Finished backfill");
                                 } catch (e: Throwable) {
                                     Logger.e(TAG, "Failed to backfill servers", e)
@@ -1235,7 +1262,7 @@ class VideoDetailView : ConstraintLayout {
 
 
         //Overlay
-        updateQualitySourcesOverlay(video);
+        updateQualitySourcesOverlay(video, videoLocal);
 
         setLoading(false);
 
@@ -1486,6 +1513,7 @@ class VideoDetailView : ConstraintLayout {
         _overlay_quality_selector?.selectOption("audio", _lastAudioSource);
         _overlay_quality_selector?.selectOption("subtitles", _lastSubtitleSource);
         _overlay_quality_selector?.show();
+        _slideUpOverlay = _overlay_quality_selector;
     }
 
     fun prevVideo() {
@@ -1513,9 +1541,9 @@ class VideoDetailView : ConstraintLayout {
     //Quality Selector data
     private fun updateQualityFormatsOverlay(liveStreamVideoFormats : List<Format>?, liveStreamAudioFormats : List<Format>?) {
         val v = video ?: return;
-        updateQualitySourcesOverlay(v, liveStreamVideoFormats, liveStreamAudioFormats);
+        updateQualitySourcesOverlay(v, videoLocal, liveStreamVideoFormats, liveStreamAudioFormats);
     }
-    private fun updateQualitySourcesOverlay(videoDetails: IPlatformVideoDetails?, liveStreamVideoFormats: List<Format>? = null, liveStreamAudioFormats: List<Format>? = null) {
+    private fun updateQualitySourcesOverlay(videoDetails: IPlatformVideoDetails?, videoLocal: VideoLocal? = null, liveStreamVideoFormats: List<Format>? = null, liveStreamAudioFormats: List<Format>? = null) {
         Logger.i(TAG, "updateQualitySourcesOverlay");
 
         val video: IPlatformVideoDetails?;
@@ -1523,24 +1551,35 @@ class VideoDetailView : ConstraintLayout {
         val localAudioSource: List<LocalAudioSource>?;
         val localSubtitleSources: List<LocalSubtitleSource>?;
 
+        val videoSources: List<IVideoSource>?;
+        val audioSources: List<IAudioSource>?;
+
         if(videoDetails is VideoLocal) {
-            video = videoDetails.videoSerialized;
+            video = videoLocal?.videoSerialized;
             localVideoSources = videoDetails.videoSource.toList();
             localAudioSource = videoDetails.audioSource.toList();
             localSubtitleSources = videoDetails.subtitlesSources.toList();
+            videoSources = null
+            audioSources = null;
         }
         else {
             video = videoDetails;
-            localVideoSources = null;
-            localAudioSource = null;
-            localSubtitleSources = null;
+            videoSources = video?.video?.videoSources?.toList();
+            audioSources = if(video?.video?.isUnMuxed == true)
+                (video.video as VideoUnMuxedSourceDescriptor).audioSources.toList()
+            else null
+            if(videoLocal != null) {
+                localVideoSources = videoLocal.videoSource.toList();
+                localAudioSource = videoLocal.audioSource.toList();
+                localSubtitleSources = videoLocal.subtitlesSources.toList();
+            }
+            else {
+                localVideoSources = null;
+                localAudioSource = null;
+                localSubtitleSources = null;
+            }
         }
 
-        val videoSources = video?.video?.videoSources?.toList();
-        val audioSources = if(video?.video?.isUnMuxed == true)
-            (video.video as VideoUnMuxedSourceDescriptor).audioSources.toList()
-        else null
-
         val bestVideoSources = videoSources?.map { it.height * it.width }
             ?.distinct()
             ?.map { x -> VideoHelper.selectBestVideoSource(videoSources.filter { x == it.height * it.width }, -1, FutoVideoPlayerBase.PREFERED_VIDEO_CONTAINERS) }
@@ -1568,7 +1607,7 @@ class VideoDetailView : ConstraintLayout {
 
             if(localVideoSources?.isNotEmpty() == true)
                 SlideUpMenuGroup(this.context, context.getString(R.string.offline_video), "video",
-                    *localVideoSources.stream()
+                    *localVideoSources
                         .map {
                             SlideUpMenuItem(this.context, R.drawable.ic_movie, it!!.name, "${it.width}x${it.height}", it,
                                 { handleSelectVideoTrack(it) });
@@ -1576,7 +1615,7 @@ class VideoDetailView : ConstraintLayout {
             else null,
             if(localAudioSource?.isNotEmpty() == true)
                 SlideUpMenuGroup(this.context, context.getString(R.string.offline_audio), "audio",
-                    *localAudioSource.stream()
+                    *localAudioSource
                         .map {
                             SlideUpMenuItem(this.context, R.drawable.ic_music, it.name, it.bitrate.toHumanBitrate(), it,
                                 { handleSelectAudioTrack(it) });
@@ -1592,7 +1631,7 @@ class VideoDetailView : ConstraintLayout {
             else null,
             if(liveStreamVideoFormats?.isEmpty() == false)
                 SlideUpMenuGroup(this.context, context.getString(R.string.stream_video), "video",
-                    *liveStreamVideoFormats.stream()
+                    *liveStreamVideoFormats
                         .map {
                             SlideUpMenuItem(this.context, R.drawable.ic_movie, it?.label ?: it.containerMimeType ?: it.bitrate.toString(), "${it.width}x${it.height}", it,
                                 { _player.selectVideoTrack(it.height) });
@@ -1600,7 +1639,7 @@ class VideoDetailView : ConstraintLayout {
             else null,
             if(liveStreamAudioFormats?.isEmpty() == false)
                 SlideUpMenuGroup(this.context, context.getString(R.string.stream_audio), "audio",
-                    *liveStreamAudioFormats.stream()
+                    *liveStreamAudioFormats
                         .map {
                             SlideUpMenuItem(this.context, R.drawable.ic_music, "${it?.label ?: it.containerMimeType} ${it.bitrate}", "", it,
                                 { _player.selectAudioTrack(it.bitrate) });
@@ -1609,7 +1648,7 @@ class VideoDetailView : ConstraintLayout {
 
             if(bestVideoSources.isNotEmpty())
                 SlideUpMenuGroup(this.context, context.getString(R.string.video), "video",
-                    *bestVideoSources.stream()
+                    *bestVideoSources
                         .map {
                             SlideUpMenuItem(this.context, R.drawable.ic_movie, it!!.name, if (it.width > 0 && it.height > 0) "${it.width}x${it.height}" else "", it,
                                 { handleSelectVideoTrack(it) });
@@ -1617,7 +1656,7 @@ class VideoDetailView : ConstraintLayout {
             else null,
             if(bestAudioSources.isNotEmpty())
                 SlideUpMenuGroup(this.context, context.getString(R.string.audio), "audio",
-                    *bestAudioSources.stream()
+                    *bestAudioSources
                         .map {
                             SlideUpMenuItem(this.context, R.drawable.ic_music, it.name, it.bitrate.toHumanBitrate(), it,
                                 { handleSelectAudioTrack(it) });
@@ -1840,7 +1879,7 @@ class VideoDetailView : ConstraintLayout {
     private fun setCastEnabled(isCasting: Boolean) {
         Logger.i(TAG, "setCastEnabled(isCasting=$isCasting)")
 
-        video?.let { updateQualitySourcesOverlay(it); };
+        video?.let { updateQualitySourcesOverlay(it, videoLocal); };
 
         _isCasting = isCasting;
 

app/src/main/java/com/futo/platformplayer/parsers/HLS.kt

@@ -1,6 +1,7 @@
 package com.futo.platformplayer.parsers
 
 import com.futo.platformplayer.api.http.ManagedHttpClient
+import com.futo.platformplayer.toYesNo
 import com.futo.platformplayer.yesNoToBoolean
 import java.net.URI
 import java.time.ZonedDateTime
@@ -18,6 +19,7 @@ class HLS {
 
             val variantPlaylists = mutableListOf<VariantPlaylistReference>()
             val mediaRenditions = mutableListOf<MediaRendition>()
+            val sessionDataList = mutableListOf<SessionData>()
             var independentSegments = false
 
             masterPlaylistContent.lines().forEachIndexed { index, line ->
@@ -37,10 +39,15 @@ class HLS {
                     line == "#EXT-X-INDEPENDENT-SEGMENTS" -> {
                         independentSegments = true
                     }
+
+                    line.startsWith("#EXT-X-SESSION-DATA") -> {
+                        val sessionData = parseSessionData(line)
+                        sessionDataList.add(sessionData)
+                    }
                 }
             }
 
-            return MasterPlaylist(variantPlaylists, mediaRenditions, independentSegments)
+            return MasterPlaylist(variantPlaylists, mediaRenditions, sessionDataList, independentSegments)
         }
 
         fun downloadAndParseVariantPlaylist(client: ManagedHttpClient, sourceUrl: String): VariantPlaylist {
@@ -59,22 +66,26 @@ class HLS {
             val programDateTime = lines.find { it.startsWith("#EXT-X-PROGRAM-DATE-TIME:") }?.substringAfter(":")?.let {
                 ZonedDateTime.parse(it, DateTimeFormatter.ISO_DATE_TIME)
             }
+            val playlistType = lines.find { it.startsWith("#EXT-X-PLAYLIST-TYPE:") }?.substringAfter(":")
 
             val segments = mutableListOf<Segment>()
-            var currentSegment: Segment? = null
+            var currentSegment: MediaSegment? = null
             lines.forEach { line ->
                 when {
                     line.startsWith("#EXTINF:") -> {
                         val duration = line.substringAfter(":").substringBefore(",").toDoubleOrNull()
                             ?: throw Exception("Invalid segment duration format")
-                        currentSegment = Segment(duration = duration)
+                        currentSegment = MediaSegment(duration = duration)
                     }
-                    line.startsWith("#") -> {
-                        // Handle other tags if necessary
+                    line == "#EXT-X-DISCONTINUITY" -> {
+                        segments.add(DiscontinuitySegment())
+                    }
+                    line =="#EXT-X-ENDLIST" -> {
+                        segments.add(EndListSegment())
                     }
                     else -> {
                         currentSegment?.let {
-                            it.uri = line
+                            it.uri = resolveUrl(sourceUrl, line)
                             segments.add(it)
                         }
                         currentSegment = null
@@ -82,13 +93,20 @@ class HLS {
                 }
             }
 
-            return VariantPlaylist(version, targetDuration, mediaSequence, discontinuitySequence, programDateTime, segments)
+            return VariantPlaylist(version, targetDuration, mediaSequence, discontinuitySequence, programDateTime, playlistType, segments)
         }
 
         private fun resolveUrl(baseUrl: String, url: String): String {
-            return if (URI(url).isAbsolute) url else baseUrl + url
-        }
+            val baseUri = URI(baseUrl)
+            val urlUri = URI(url)
 
+            return if (urlUri.isAbsolute) {
+                url
+            } else {
+                val resolvedUri = baseUri.resolve(urlUri)
+                resolvedUri.toString()
+            }
+        }
 
         private fun parseStreamInfo(content: String): StreamInfo {
             val attributes = parseAttributes(content)
@@ -99,17 +117,18 @@ class HLS {
                 frameRate = attributes["FRAME-RATE"],
                 videoRange = attributes["VIDEO-RANGE"],
                 audio = attributes["AUDIO"],
+                video = attributes["VIDEO"],
+                subtitles = attributes["SUBTITLES"],
                 closedCaptions = attributes["CLOSED-CAPTIONS"]
             )
         }
 
         private fun parseMediaRendition(client: ManagedHttpClient, line: String, baseUrl: String): MediaRendition {
             val attributes = parseAttributes(line)
-            val uri = attributes["URI"]!!
-            val url = resolveUrl(baseUrl, uri)
+            val uri = attributes["URI"]?.let { resolveUrl(baseUrl, it) }
             return MediaRendition(
                 type = attributes["TYPE"],
-                uri = url,
+                uri = uri,
                 groupID = attributes["GROUP-ID"],
                 language = attributes["LANGUAGE"],
                 name = attributes["NAME"],
@@ -119,6 +138,13 @@ class HLS {
             )
         }
 
+        private fun parseSessionData(line: String): SessionData {
+            val attributes = parseAttributes(line)
+            val dataId = attributes["DATA-ID"]!!
+            val value = attributes["VALUE"]!!
+            return SessionData(dataId, value)
+        }
+
         private fun parseAttributes(content: String): Map<String, String> {
             val attributes = mutableMapOf<String, String>()
             val attributePairs = content.substringAfter(":").splitToSequence(',')
@@ -138,7 +164,7 @@ class HLS {
             return attributes
         }
 
-        private val _quoteList = listOf("GROUP-ID", "NAME", "URI", "CODECS", "AUDIO")
+        private val _quoteList = listOf("GROUP-ID", "NAME", "URI", "CODECS", "AUDIO", "VIDEO")
         private fun shouldQuote(key: String, value: String?): Boolean {
             if (value == null)
                 return false;
@@ -158,6 +184,20 @@ class HLS {
         }
     }
 
+    data class SessionData(
+        val dataId: String,
+        val value: String
+    ) {
+        fun toM3U8Line(): String = buildString {
+            append("#EXT-X-SESSION-DATA:")
+            appendAttributes(this,
+                "DATA-ID" to dataId,
+                "VALUE" to value
+            )
+            append("\n")
+        }
+    }
+
     data class StreamInfo(
         val bandwidth: Int?,
         val resolution: String?,
@@ -165,12 +205,14 @@ class HLS {
         val frameRate: String?,
         val videoRange: String?,
         val audio: String?,
+        val video: String?,
+        val subtitles: String?,
         val closedCaptions: String?
     )
 
     data class MediaRendition(
         val type: String?,
-        val uri: String,
+        val uri: String?,
         val groupID: String?,
         val language: String?,
         val name: String?,
@@ -186,17 +228,19 @@ class HLS {
                 "GROUP-ID" to groupID,
                 "LANGUAGE" to language,
                 "NAME" to name,
-                "DEFAULT" to isDefault?.toString()?.uppercase(),
-                "AUTOSELECT" to isAutoSelect?.toString()?.uppercase(),
-                "FORCED" to isForced?.toString()?.uppercase()
+                "DEFAULT" to isDefault.toYesNo(),
+                "AUTOSELECT" to isAutoSelect.toYesNo(),
+                "FORCED" to isForced.toYesNo()
             )
             append("\n")
         }
     }
 
+
     data class MasterPlaylist(
         val variantPlaylistsRefs: List<VariantPlaylistReference>,
         val mediaRenditions: List<MediaRendition>,
+        val sessionDataList: List<SessionData>,
         val independentSegments: Boolean
     ) {
         fun buildM3U8(): String {
@@ -214,6 +258,10 @@ class HLS {
                 builder.append(variant.toM3U8Line())
             }
 
+            sessionDataList.forEach { data ->
+                builder.append(data.toM3U8Line())
+            }
+
             return builder.toString()
         }
     }
@@ -228,6 +276,8 @@ class HLS {
                 "FRAME-RATE" to streamInfo.frameRate,
                 "VIDEO-RANGE" to streamInfo.videoRange,
                 "AUDIO" to streamInfo.audio,
+                "VIDEO" to streamInfo.video,
+                "SUBTITLES" to streamInfo.subtitles,
                 "CLOSED-CAPTIONS" to streamInfo.closedCaptions
             )
             append("\n$url\n")
@@ -240,6 +290,7 @@ class HLS {
         val mediaSequence: Long,
         val discontinuitySequence: Int,
         val programDateTime: ZonedDateTime?,
+        val playlistType: String?,
         val segments: List<Segment>
     ) {
         fun buildM3U8(): String = buildString {
@@ -248,19 +299,44 @@ class HLS {
             append("#EXT-X-TARGETDURATION:$targetDuration\n")
             append("#EXT-X-MEDIA-SEQUENCE:$mediaSequence\n")
             append("#EXT-X-DISCONTINUITY-SEQUENCE:$discontinuitySequence\n")
+
+            playlistType?.let {
+                append("#EXT-X-PLAYLIST-TYPE:$it\n")
+            }
+
             programDateTime?.let {
                 append("#EXT-X-PROGRAM-DATE-TIME:${it.format(DateTimeFormatter.ISO_DATE_TIME)}\n")
             }
 
             segments.forEach { segment ->
-                append("#EXTINF:${segment.duration},\n")
-                append(segment.uri + "\n")
+                append(segment.toM3U8Line())
             }
         }
     }
 
-    data class Segment(
+    abstract class Segment {
+        abstract fun toM3U8Line(): String
+    }
+
+    data class MediaSegment (
         val duration: Double,
         var uri: String = ""
-    )
+    ) : Segment() {
+        override fun toM3U8Line(): String = buildString {
+            append("#EXTINF:${duration},\n")
+            append(uri + "\n")
+        }
+    }
+
+    class DiscontinuitySegment : Segment() {
+        override fun toM3U8Line(): String = buildString {
+            append("#EXT-X-DISCONTINUITY\n")
+        }
+    }
+
+    class EndListSegment : Segment() {
+        override fun toM3U8Line(): String = buildString {
+            append("#EXT-X-ENDLIST\n")
+        }
+    }
 }

app/src/main/java/com/futo/platformplayer/parsers/HttpResponseParser.kt

@@ -14,6 +14,7 @@ class HttpResponseParser : AutoCloseable {
 
     var contentType: String? = null;
     var transferEncoding: String? = null;
+    var location: String? = null;
     var contentLength: Long = -1L;
 
     var statusCode: Int = -1;
@@ -47,6 +48,7 @@ class HttpResponseParser : AutoCloseable {
                     "content-length" -> contentLength = headerValue.toLong();
                     "content-type" -> contentType = headerValue;
                     "transfer-encoding" -> transferEncoding = headerValue;
+                    "location" -> location = headerValue;
                 }
                 if(line.isNullOrEmpty())
                     break;

app/src/main/java/com/futo/platformplayer/views/adapters/ChannelViewPagerAdapter.kt

@@ -20,6 +20,7 @@ class ChannelViewPagerAdapter(fragmentManager: FragmentManager, lifecycle: Lifec
     val onChannelClicked = Event1<PlatformAuthorLink>();
     val onAddToClicked = Event1<IPlatformContent>();
     val onAddToQueueClicked = Event1<IPlatformContent>();
+    val onLongPress = Event1<IPlatformContent>();
 
     override fun getItemCount(): Int {
         return _cache.size;
@@ -55,6 +56,7 @@ class ChannelViewPagerAdapter(fragmentManager: FragmentManager, lifecycle: Lifec
                 onChannelClicked.subscribe(this@ChannelViewPagerAdapter.onChannelClicked::emit);
                 onAddToClicked.subscribe(this@ChannelViewPagerAdapter.onAddToClicked::emit);
                 onAddToQueueClicked.subscribe(this@ChannelViewPagerAdapter.onAddToQueueClicked::emit);
+                onLongPress.subscribe(this@ChannelViewPagerAdapter.onLongPress::emit);
             };
             1 -> ChannelListFragment.newInstance().apply { onClickChannel.subscribe(onChannelClicked::emit) };
             //2 -> ChannelStoreFragment.newInstance();

app/src/main/java/com/futo/platformplayer/views/adapters/CommentViewHolder.kt

@@ -75,7 +75,7 @@ class CommentViewHolder : ViewHolder {
             StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
                 try {
                     Logger.i(TAG, "Started backfill");
-                    args.processHandle.fullyBackfillServers();
+                    args.processHandle.fullyBackfillServersAnnounceExceptions();
                     Logger.i(TAG, "Finished backfill");
                 } catch (e: Throwable) {
                     Logger.e(TAG, "Failed to backfill servers.", e)

app/src/main/java/com/futo/platformplayer/views/adapters/feedtypes/PreviewContentListAdapter.kt

@@ -29,6 +29,7 @@ class PreviewContentListAdapter : InsertedViewAdapterWithLoader<ContentPreviewVi
     private val _exoPlayer: PlayerManager?;
     private val _feedStyle : FeedStyle;
     private var _paused: Boolean = false;
+    private val _shouldShowTimeBar: Boolean
 
     val onUrlClicked = Event1<String>();
     val onContentUrlClicked = Event2<String, ContentType>();
@@ -48,12 +49,13 @@ class PreviewContentListAdapter : InsertedViewAdapterWithLoader<ContentPreviewVi
 
     constructor(context: Context, feedStyle : FeedStyle, dataSet: ArrayList<IPlatformContent>, exoPlayer: PlayerManager? = null,
                 initialPlay: Boolean = false, viewsToPrepend: ArrayList<View> = arrayListOf(),
-                viewsToAppend: ArrayList<View> = arrayListOf()) : super(context, viewsToPrepend, viewsToAppend) {
+                viewsToAppend: ArrayList<View> = arrayListOf(), shouldShowTimeBar: Boolean = true) : super(context, viewsToPrepend, viewsToAppend) {
 
         this._feedStyle = feedStyle;
         this._dataSet = dataSet;
         this._initialPlay = initialPlay;
         this._exoPlayer = exoPlayer;
+        this._shouldShowTimeBar = shouldShowTimeBar
     }
 
     override fun getChildCount(): Int = _dataSet.size;
@@ -97,7 +99,7 @@ class PreviewContentListAdapter : InsertedViewAdapterWithLoader<ContentPreviewVi
     };
     private fun createPlaceholderViewHolder(viewGroup: ViewGroup): PreviewPlaceholderViewHolder
         = PreviewPlaceholderViewHolder(viewGroup, _feedStyle);
-    private fun createVideoPreviewViewHolder(viewGroup: ViewGroup): PreviewVideoViewHolder = PreviewVideoViewHolder(viewGroup, _feedStyle, _exoPlayer).apply {
+    private fun createVideoPreviewViewHolder(viewGroup: ViewGroup): PreviewVideoViewHolder = PreviewVideoViewHolder(viewGroup, _feedStyle, _exoPlayer, _shouldShowTimeBar).apply {
             this.onVideoClicked.subscribe(this@PreviewContentListAdapter.onContentClicked::emit);
             this.onChannelClicked.subscribe(this@PreviewContentListAdapter.onChannelClicked::emit);
             this.onAddToClicked.subscribe(this@PreviewContentListAdapter.onAddToClicked::emit);

app/src/main/java/com/futo/platformplayer/views/adapters/feedtypes/PreviewVideoView.kt

@@ -27,9 +27,11 @@ import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.polycentric.PolycentricCache
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StateDownloads
+import com.futo.platformplayer.states.StatePlaylists
 import com.futo.platformplayer.video.PlayerManager
 import com.futo.platformplayer.views.others.CreatorThumbnail
 import com.futo.platformplayer.views.FeedStyle
+import com.futo.platformplayer.views.others.ProgressBar
 import com.futo.platformplayer.views.platform.PlatformIndicator
 import com.futo.platformplayer.views.video.FutoThumbnailPlayer
 import com.futo.polycentric.core.toURLInfoSystemLinkUrl
@@ -67,6 +69,8 @@ open class PreviewVideoView : LinearLayout {
             Logger.w(TAG, "Failed to load profile.", it);
         };
 
+    private val _timeBar: ProgressBar?;
+
     val onVideoClicked = Event2<IPlatformVideo, Long>();
     val onLongPress = Event1<IPlatformVideo>();
     val onChannelClicked = Event1<PlatformAuthorLink>();
@@ -77,10 +81,12 @@ open class PreviewVideoView : LinearLayout {
         private set
 
     val content: IPlatformContent? get() = currentVideo;
+    val shouldShowTimeBar: Boolean
 
-    constructor(context: Context, feedStyle : FeedStyle, exoPlayer: PlayerManager? = null) : super(context) {
+    constructor(context: Context, feedStyle : FeedStyle, exoPlayer: PlayerManager? = null, shouldShowTimeBar: Boolean = true) : super(context) {
         inflate(feedStyle);
         _feedStyle = feedStyle;
+        this.shouldShowTimeBar = shouldShowTimeBar
         val playerContainer = findViewById<FrameLayout>(R.id.player_container);
 
         val displayMetrics = Resources.getSystem().displayMetrics;
@@ -117,6 +123,7 @@ open class PreviewVideoView : LinearLayout {
         _button_add_to = findViewById(R.id.button_add_to);
         _imageNeopassChannel = findViewById(R.id.image_neopass_channel);
         _layoutDownloaded = findViewById(R.id.layout_downloaded);
+        _timeBar = findViewById(R.id.time_bar)
 
         this._exoPlayer = exoPlayer
 
@@ -235,13 +242,26 @@ open class PreviewVideoView : LinearLayout {
                 _containerLive.visibility = GONE;
                 _containerDuration.visibility = VISIBLE;
             }
+
+            val timeBar = _timeBar
+            if (timeBar != null) {
+                if (shouldShowTimeBar) {
+                    val historyPosition = StatePlaylists.instance.getHistoryPosition(video.url)
+                    timeBar.visibility = if (historyPosition > 0) VISIBLE else GONE
+                    timeBar.progress = historyPosition.toFloat() / video.duration.toFloat()
+                } else {
+                    timeBar.visibility = GONE
+                }
+            }
         }
         else {
             currentVideo = null;
             _imageVideo.setImageResource(0);
             _containerDuration.visibility = GONE;
             _containerLive.visibility = GONE;
+            _timeBar?.visibility = GONE;
         }
+
         _textVideoMetadata.text = metadata + timeMeta;
     }
 

app/src/main/java/com/futo/platformplayer/views/adapters/feedtypes/PreviewVideoViewHolder.kt

@@ -27,8 +27,8 @@ class PreviewVideoViewHolder : ContentPreviewViewHolder {
 
     private val view: PreviewVideoView get() = itemView as PreviewVideoView;
 
-    constructor(viewGroup: ViewGroup, feedStyle : FeedStyle, exoPlayer: PlayerManager? = null): super(
-        PreviewVideoView(viewGroup.context, feedStyle, exoPlayer)
+    constructor(viewGroup: ViewGroup, feedStyle : FeedStyle, exoPlayer: PlayerManager? = null, shouldShowTimeBar: Boolean = true): super(
+        PreviewVideoView(viewGroup.context, feedStyle, exoPlayer, shouldShowTimeBar)
     ) {
         view.onVideoClicked.subscribe(onVideoClicked::emit);
         view.onChannelClicked.subscribe(onChannelClicked::emit);

app/src/main/java/com/futo/platformplayer/views/overlays/LiveChatOverlay.kt

@@ -308,13 +308,21 @@ class LiveChatOverlay : LinearLayout {
             }
         };
     }
+    private var _dedupHackfix = "";
     fun addDonation(donation: LiveEventDonation) {
+        val uniqueIdentifier = "${donation.name}${donation.amount}${donation.message}";
         if(donation.hasExpired()) {
             Logger.i(TAG, "Donation that is already expired: [${donation.amount}]" + donation.name + ":" + donation.message + " EXPIRE: ${donation.expire}");
             return;
         }
+        else if(_dedupHackfix == uniqueIdentifier) {
+            Logger.i(TAG, "Donation duplicate found, ignoring");
+            return;
+        }
         else
             Logger.i(TAG, "Donation Added: [${donation.amount}]" + donation.name + ":" + donation.message + " EXPIRE: ${donation.expire}");
+        _dedupHackfix = uniqueIdentifier;
+
         val view = LiveChatDonationPill(context, donation);
         view.setOnClickListener {
             showDonation(donation);

app/src/main/res/drawable/background_donation.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#2A2A2A" />
+    <corners android:radius="500dp" />
+    <size android:height="20dp" />
+    <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
+</shape>

app/src/main/res/layout/list_donation.xml

@@ -9,7 +9,7 @@
     android:paddingStart="7dp"
     android:paddingEnd="12dp"
     android:layout_marginEnd="5dp"
-    android:background="@drawable/background_pill"
+    android:background="@drawable/background_donation"
     android:orientation="vertical"
     android:id="@+id/root">
 
@@ -24,7 +24,7 @@
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
             android:layout_marginRight="5dp"
-            android:layout_marginLeft="5dp"
+            android:layout_marginLeft="0dp"
             android:scaleType="fitCenter"
             app:srcCompat="@drawable/placeholder_profile" />
 
@@ -32,7 +32,7 @@
             android:id="@+id/donation_amount"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_marginLeft="5dp"
+            android:layout_marginLeft="3dp"
             app:layout_constraintLeft_toRightOf="@id/donation_author_image"
             app:layout_constraintTop_toTopOf="parent"
             android:textColor="@color/white"

app/src/main/res/layout/list_video_preview.xml

@@ -32,6 +32,20 @@
                 android:scaleType="centerCrop"
                 tools:srcCompat="@drawable/placeholder_video_thumbnail" />
 
+            <com.futo.platformplayer.views.others.ProgressBar
+                android:id="@+id/time_bar"
+                android:layout_width="match_parent"
+                android:layout_height="2dp"
+                android:layout_gravity="bottom"
+                android:layout_marginBottom="6dp"
+                app:progress="60%"
+                app:inactiveColor="#55EEEEEE"
+                app:radiusBottomLeft="0dp"
+                app:radiusBottomRight="0dp"
+                app:radiusTopLeft="0dp"
+                app:radiusTopRight="0dp"
+                android:visibility="visible"/>
+
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">

app/src/main/res/layout/list_video_thumbnail.xml

@@ -117,6 +117,20 @@
                     android:layout_gravity="end"
                     android:layout_marginStart="4dp"
                     android:layout_marginBottom="4dp" />
+
+                <com.futo.platformplayer.views.others.ProgressBar
+                    android:id="@+id/time_bar"
+                    android:layout_width="match_parent"
+                    android:layout_height="2dp"
+                    android:layout_alignParentStart="true"
+                    android:layout_alignParentBottom="true"
+                    app:progress="60%"
+                    app:inactiveColor="#55EEEEEE"
+                    app:radiusBottomLeft="4dp"
+                    app:radiusBottomRight="4dp"
+                    app:radiusTopLeft="0dp"
+                    app:radiusTopRight="0dp"
+                    android:visibility="visible"/>
             </RelativeLayout>
         </FrameLayout>
 

app/src/main/res/layout/overlay_livechat.xml

@@ -46,10 +46,9 @@
             app:layout_constraintLeft_toRightOf="@id/ic_viewers"
             tools:text="1536 viewers"/>
 
-        <ScrollView
+        <HorizontalScrollView
             android:layout_width="match_parent"
             android:layout_height="35dp"
-            android:orientation="horizontal"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent">
@@ -61,7 +60,7 @@
                 android:layout_height="match_parent">
 
             </LinearLayout>
-        </ScrollView>
+        </HorizontalScrollView>
 
         <ImageView
             android:id="@+id/button_close"

app/src/main/res/values/strings.xml

@@ -8,7 +8,10 @@
     <string name="lorem_ipsum" translatable="false">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</string>
     <string name="add_to_queue">Add to queue</string>
     <string name="general">General</string>
+    <string name="channel">Channel</string>
     <string name="home">Home</string>
+    <string name="progress_bar">Progress Bar</string>
+    <string name="progress_bar_description">If a historical progress bar should be shown</string>
     <string name="recommendations">Recommendations</string>
     <string name="more">More</string>
     <string name="playlists">Playlists</string>
@@ -299,6 +302,8 @@
     <string name="clears_cookies_when_you_log_out">Clears cookies when you log out</string>
     <string name="clears_in_app_browser_cookies">Clears in-app browser cookies</string>
     <string name="configure_browsing_behavior">Configure browsing behavior</string>
+    <string name="time_bar">Time bar</string>
+    <string name="configure_if_historical_time_bar_should_be_shown">Configure if historical time bars should be shown</string>
     <string name="configure_casting">Configure casting</string>
     <string name="configure_daily_backup_in_case_of_catastrophic_failure">Configure daily backup in case of catastrophic failure</string>
     <string name="configure_downloading_of_videos">Configure downloading of videos</string>