Improved V8 locking, comment section on diff thread than video, global mapping of v8runtimes to plugins

Improved locking
Submods
2026-05-18 13:52:39 +02:00 · 2025-06-17 11:45:02 +02:00 · 2025-06-16 19:30:52 +02:00 · 2025-06-16 18:34:37 +02:00 · 2025-06-16 17:56:04 +02:00 · 2025-06-16 15:48:01 +00:00
194 changed files with 5863 additions and 1931 deletions
@@ -0,0 +1,2 @@
+aar/* filter=lfs diff=lfs merge=lfs -text
+app/aar/* filter=lfs diff=lfs merge=lfs -text
@@ -1,6 +1,9 @@
 name: Bug Report
 description: Let us know about an unexpected error, a crash, or an incorrect behavior.
-labels: ["Bug"]
+labels: ["Bug", "Android"]
+title: "Bug: "
+type: bug
+projects: ["futo-org/19"]
 body:
  - type: markdown
    attributes:
@@ -18,11 +21,33 @@ body:
        * if you've found out a particular series of UI interactions can introduce buggy behavior, please label those steps 1-n with markdown

  - type: textarea
-    id: what-happened
+    id: reproduction-steps
    attributes:
-      label: What happened?
-      description: What did you expect to happen?
-      placeholder: Tell us what you see!
+      label: Reproduction steps
+      description: Please provide us with the steps to reproduce the issue if possible. This step makes a big difference if we are going to be able to fix it so be as precise as possible.
+      placeholder: |
+        0. Play a Youtube video
+        1. Press on Download button
+        2. Select quality 1440p
+        3. Grayjay crashes when attempting to download
+    validations:
+      required: true
+
+  - type: textarea
+    id: actual-result
+    attributes:
+      label: Actual result
+      description: What happend?
+      placeholder: Tell us what you saw!
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected-result
+    attributes:
+      label: Expected result
+      description: What was suppose to happen?
+      placeholder: Tell us what you expected to happen!
    validations:
      required: true

@@ -31,7 +56,7 @@ body:
    attributes:
      label: Grayjay Version
      description: In the application, select More > Settings, scroll to the bottom and locate the value next to "Version Name".
-      placeholder: "242"
+      placeholder: "311"
    validations:
      required: true

@@ -42,19 +67,23 @@ body:
      multiple: true
      options:
        - "All"
-        - "Youtube"
-        - "Odysee"
-        - "Rumble"
-        - "Kick"
-        - "Twitch"
-        - "PeerTube"
-        - "Patreon"
-        - "Nebula"
+        - "Apple Podcasts"
        - "BiliBili (CN)"
        - "Bitchute"
-        - "SoundCloud"
+        - "Crunchyroll"
+        - "CuriosityStream"
        - "Dailymotion"
-        - "Apple Podcasts"
+        - "Kick"
+        - "Nebula"
+        - "Odysee"
+        - "Patreon"
+        - "PeerTube"
+        - "Rumble"
+        - "SoundCloud"
+        - "Spotify"
+        - "TedTalks"
+        - "Twitch"
+        - "Youtube"
        - "Other"
    validations:
      required: true
@@ -66,6 +95,30 @@ body:
      description: In the application, select Sources > [the broken plugin], write down the value under "Version".
      placeholder: "12"

+  - type: input
+    id: android-version
+    attributes:
+      label: Which android version are you using?
+      placeholder: "Android 15"
+    validations:
+      required: true
+
+  - type: input
+    id: phone-model
+    attributes:
+      label: Which device are you using?
+      placeholder: "Google Pixel 9"
+    validations:
+      required: true
+
+  - type: input
+    id: os-version
+    attributes:
+      label: Which operating system are you using?
+      placeholder: "GrapheneOS/CalyxOS/Tizen/HyperOS 2/..."
+    validations:
+      required: true
+
  - type: checkboxes
    id: login
    attributes:
@@ -86,9 +139,28 @@ body:
    validations:
      required: true

+  - type: textarea
+    id: grayjay-references
+    attributes:
+      label: References
+      description: |
+        Are there any other GitHub issues, whether open or closed, that are related to the problem you've described above? If so, please create a list below that mentions each of them. For example:
+        ```
+          - #10
+        ```
+      placeholder:
+      value:
+    validations:
+      required: false
+
  - type: textarea
    id: logs
    attributes:
      label: Relevant log output
      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
      render: shell
+
+  - type: markdown
+    attributes:
+      value: |
+        **Note:** If the submit button is disabled and you have filled out all required fields, please check that you did not forget a **Title** for the issue.
@@ -1,13 +1,16 @@
 name: Feature Request
 description: Suggest a new feature or other enhancement.
-labels: ["Enhancement"]
+labels: ["Enhancement", "Android"]
+title: "Feature request: "
+type: feature
+projects: ["futo-org/19"]
 body:
  - type: markdown
    attributes:
      value: |
        # Thank you for opening a feature request.

-        The [grayjay-android](https://github.com/futo-org/grayjay-android) issue tracker is reserved for issues relating to the Grayjay Android Application
+        The [grayjay-android](https://github.com/futo-org/grayjay-android) issue tracker is reserved for issues and feature requests relating to the Grayjay android application

        For discussion related to enhancements, please see: [The FUTO Grayjay Zulip Channel](https://chat.futo.org/#narrow/stream/46-Grayjay)

@@ -1,13 +1,16 @@
 name: Documentation Issue
 description: Report an issue or suggest a change in the documentation.
 labels: ["Documentation"]
+title: "Documentation: "
+type: task
+projects: ["futo-org/19"]
 body:
  - type: markdown
    attributes:
      value: |
        # Thank you for opening a documentation change request.

-        The [grayjay-android](https://github.com/futo-org/grayjay-android) issue tracker is reserved for issues relating to the Grayjay Android Application. Use the `Documentation` issue type to report problems with the documentation in our code repositories, inside the application, or on [https://grayjay.app](https://grayjay.app)
+        The [grayjay-android](https://github.com/futo-org/grayjay-android) issue tracker is reserved for issues relating to the Grayjay android application. Use the `Documentation` issue type to report problems with the documentation in our code repositories, inside the application, or on [https://grayjay.app](https://grayjay.app)
        Technical writers monitor this issue type, so report Grayjay bugs or feature requests with the `Bug report` or `Feature Request` issue types instead to get engineering attention.

        For general usage questions, please see: [The Official FUTO Grayjay Zulip Channel](https://chat.futo.org/#narrow/stream/46-Grayjay)
@@ -94,3 +94,15 @@
 [submodule "app/src/unstable/assets/sources/tedtalks"]
 	path = app/src/unstable/assets/sources/tedtalks
 	url = ../plugins/tedtalks.git
+[submodule "app/src/stable/assets/sources/curiositystream"]
+	path = app/src/stable/assets/sources/curiositystream
+	url = ../plugins/curiositystream.git
+[submodule "app/src/unstable/assets/sources/curiositystream"]
+	path = app/src/unstable/assets/sources/curiositystream
+	url = ../plugins/curiositystream.git
+[submodule "app/src/unstable/assets/sources/crunchyroll"]
+	path = app/src/unstable/assets/sources/crunchyroll
+	url = ../plugins/crunchyroll.git
+[submodule "app/src/stable/assets/sources/crunchyroll"]
+	path = app/src/stable/assets/sources/crunchyroll
+	url = ../plugins/crunchyroll.git
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ea10d3c5562c9f449a4e89e9c3dfcf881ed79a952f3409bc005bcc62c2cf4b81
+size 65512557
@@ -179,7 +179,8 @@ dependencies {
    implementation 'com.google.code.gson:gson:2.10.1' //Used for complex/anonymous cases like during development conversions (eg. V8RemoteObject)

    //JS
-    implementation("com.caoccao.javet:javet-android:3.0.2")
+    //implementation("com.caoccao.javet:javet-android:3.0.2")
+    implementation 'com.caoccao.javet:javet-v8-android:4.1.4'

    //Exoplayer
    implementation 'androidx.media3:media3-exoplayer:1.2.1'
@@ -197,7 +198,8 @@ dependencies {
    implementation 'org.jsoup:jsoup:1.15.3'
    implementation 'com.google.android.flexbox:flexbox:3.0.0'
    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-    implementation 'com.arthenica:ffmpeg-kit-full:6.0-2.LTS'
+    implementation fileTree(dir: 'aar', include: ['*.aar'])
+    implementation 'com.arthenica:smart-exception-java:0.2.1'
    implementation 'org.jetbrains.kotlin:kotlin-reflect:1.9.0'
    implementation 'com.github.dhaval2404:imagepicker:2.1'
    implementation 'com.google.zxing:core:3.4.1'
@@ -11,7 +11,7 @@ import java.nio.ByteBuffer
 import kotlin.random.Random
 import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
-
+/*
 class SyncServerTests {

    //private val relayHost = "relay.grayjay.app"
@@ -335,4 +335,4 @@ class SyncServerTests {

 class AlwaysAuthorized : IAuthorizable {
    override val isAuthorized: Boolean get() = true
-}
+}*/
@@ -13,7 +13,7 @@ import kotlin.random.Random
 import java.io.InputStream
 import java.io.OutputStream
 import kotlin.time.Duration.Companion.seconds
-
+/*
 data class PipeStreams(
    val initiatorInput: LittleEndianDataInputStream,
    val initiatorOutput: LittleEndianDataOutputStream,
@@ -509,4 +509,4 @@ class Authorized : IAuthorizable {

 class Unauthorized : IAuthorizable {
    override val isAuthorized: Boolean = false
-}
+}*/
@@ -55,7 +55,7 @@

        <activity
            android:name=".activities.MainActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout|uiMode"
            android:exported="true"
            android:theme="@style/Theme.FutoVideo.NoActionBar"
            android:launchMode="singleInstance"
@@ -239,4 +239,4 @@
            android:screenOrientation="sensorPortrait"
            android:theme="@style/Theme.FutoVideo.NoActionBar" />
    </application>
-</manifest>
+</manifest>
@@ -32,7 +32,8 @@ let Type = {
    Text: {
        RAW: 0,
        HTML: 1,
-        MARKUP: 2
+        MARKUP: 2,
+        CODE: 3
    },
    Chapter: {
        NORMAL: 0,
@@ -102,6 +103,12 @@ class UnavailableException extends ScriptException {
        super("UnavailableException", msg);
    }
 }
+class ReloadRequiredException extends ScriptException {
+    constructor(msg, reloadData) {
+        super("ReloadRequiredException", msg);
+        this.reloadData = reloadData;
+    }
+}
 class AgeException extends ScriptException {
    constructor(msg) {
        super("AgeException", msg);
@@ -291,15 +298,39 @@ class PlatformPostDetails extends PlatformPost {
    }
 }

-class PlatformArticleDetails extends PlatformContent {
+class PlatformWeb extends PlatformContent {
+    constructor(obj) {
+        super(obj, 7);
+        obj = obj ?? {};
+        this.plugin_type = "PlatformWeb";
+    }
+}
+class PlatformWebDetails extends PlatformWeb {
+    constructor(obj) {
+        super(obj, 7);
+        obj = obj ?? {};
+        this.plugin_type = "PlatformWebDetails";
+        this.html = obj.html;
+    }
+}
+
+class PlatformArticle extends PlatformContent {
+    constructor(obj) {
+        super(obj, 3);
+        obj = obj ?? {};
+        this.plugin_type = "PlatformArticle";
+        this.rating = obj.rating ?? new RatingLikes(-1);
+        this.summary = obj.summary ?? "";
+        this.thumbnails = obj.thumbnails ?? new Thumbnails([]);
+    }
+}
+class PlatformArticleDetails extends PlatformArticle {
    constructor(obj) {
        super(obj, 3);
        obj = obj ?? {};
        this.plugin_type = "PlatformArticleDetails";
        this.rating = obj.rating ?? new RatingLikes(-1);
-        this.summary = obj.summary ?? "";
        this.segments = obj.segments ?? [];
-        this.thumbnails = obj.thumbnails ?? new Thumbnails([]);
    }
 }
 class ArticleSegment {
@@ -315,9 +346,17 @@ class ArticleTextSegment extends ArticleSegment {
    }
 }
 class ArticleImagesSegment extends ArticleSegment {
-    constructor(images) {
+    constructor(images, caption) {
        super(2);
        this.images = images;
+        this.caption = caption;
+    }
+}
+class ArticleHeaderSegment extends ArticleSegment {
+    constructor(content, level) {
+        super(3);
+        this.level = level;
+        this.content = content;
    }
 }
 class ArticleNestedSegment extends ArticleSegment {
@@ -595,6 +634,8 @@ class PlatformComment {
        this.date = obj.date ?? 0;
        this.replyCount = obj.replyCount ?? 0;
        this.context = obj.context ?? {};
+        if(obj.getReplies)
+            this.getReplies = obj.getReplies;
    }
 }

@@ -399,9 +399,11 @@ fun String.matchesDomain(queryDomain: String): Boolean {

 fun String.getSubdomainWildcardQuery(): String {
    val domainParts = this.split(".");
-    val sldParts = "." + domainParts[domainParts.size - 2].lowercase() + "." + domainParts[domainParts.size - 1].lowercase();
-    if(slds.contains(sldParts))
-        return "." + domainParts.drop(domainParts.size - 3).joinToString(".");
+    var wildcardDomain = if(domainParts.size > 2)
+        "." + domainParts.drop(1).joinToString(".")
    else
-        return "." + domainParts.drop(domainParts.size - 2).joinToString(".");
+        "." + domainParts.joinToString(".");
+    if(slds.contains(wildcardDomain.lowercase()))
+        "." + domainParts.joinToString(".");
+    return wildcardDomain;
 }
@@ -217,9 +217,9 @@ private fun ByteArray.toInetAddress(): InetAddress {
 }

 fun getConnectedSocket(attemptAddresses: List<InetAddress>, port: Int): Socket? {
-    val timeout = 2000
-
+    ensureNotMainThread()

+    val timeout = 10000
    val addresses = if(!Settings.instance.casting.allowIpv6) attemptAddresses.filterIsInstance<Inet4Address>() else attemptAddresses;
    if(addresses.isEmpty())
        throw IllegalStateException("No valid addresses found (ipv6: ${(if(Settings.instance.casting.allowIpv6) "enabled" else "disabled")})");
@@ -241,8 +241,11 @@ fun getConnectedSocket(attemptAddresses: List<InetAddress>, port: Int): Socket?
        return null;
    }

+    val sortedAddresses: List<InetAddress> = addresses
+        .sortedBy { addr -> addressScore(addr) }
+
    val sockets: ArrayList<Socket> = arrayListOf();
-    for (i in addresses.indices) {
+    for (i in sortedAddresses.indices) {
        sockets.add(Socket());
    }

@@ -250,7 +253,7 @@ fun getConnectedSocket(attemptAddresses: List<InetAddress>, port: Int): Socket?
    var connectedSocket: Socket? = null;
    val threads: ArrayList<Thread> = arrayListOf();
    for (i in 0 until sockets.size) {
-        val address = addresses[i];
+        val address = sortedAddresses[i];
        val socket = sockets[i];
        val thread = Thread {
            try {
@@ -7,6 +7,9 @@ import java.net.InetAddress
 import java.net.URI
 import java.net.URISyntaxException
 import java.net.URLEncoder
+import java.time.Instant
+import java.time.OffsetDateTime
+import java.time.ZoneOffset

 //Syntax sugaring
 inline fun <reified T> Any.assume(): T?{
@@ -33,13 +36,37 @@ fun Boolean?.toYesNo(): String {
 fun InetAddress?.toUrlAddress(): String {
    return when (this) {
        is Inet6Address -> {
-            "[${hostAddress}]"
+            val hostAddr = this.hostAddress ?: throw Exception("Invalid address: hostAddress is null")
+            val index = hostAddr.indexOf('%')
+            if (index != -1) {
+                val addrPart = hostAddr.substring(0, index)
+                val scopeId = hostAddr.substring(index + 1)
+                "[${addrPart}%25${scopeId}]" // %25 is URL-encoded '%'
+            } else {
+                "[$hostAddr]"
+            }
        }
        is Inet4Address -> {
-            hostAddress
+            this.hostAddress ?: throw Exception("Invalid address: hostAddress is null")
        }
        else -> {
            throw Exception("Invalid address type")
        }
    }
+}
+
+fun Long?.sToOffsetDateTimeUTC(): OffsetDateTime {
+    if (this == null || this < 0)
+        return OffsetDateTime.MIN
+    if(this > 4070912400)
+        return OffsetDateTime.MAX;
+    return OffsetDateTime.ofInstant(Instant.ofEpochSecond(this), ZoneOffset.UTC)
+}
+
+fun Long?.msToOffsetDateTimeUTC(): OffsetDateTime {
+    if (this == null || this < 0)
+        return OffsetDateTime.MIN
+    if(this > 4070912400)
+        return OffsetDateTime.MAX;
+    return OffsetDateTime.ofInstant(Instant.ofEpochMilli(this), ZoneOffset.UTC)
 }
@@ -5,7 +5,9 @@ import com.caoccao.javet.values.primitive.*
 import com.caoccao.javet.values.reference.V8ValueArray
 import com.caoccao.javet.values.reference.V8ValueObject
 import com.futo.platformplayer.engine.IV8PluginConfig
+import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.engine.exceptions.ScriptImplementationException
+import com.futo.platformplayer.logging.Logger


 //V8
@@ -24,6 +26,10 @@ fun <R> V8Value?.orDefault(default: R, handler: (V8Value)->R): R {
        return handler(this);
 }

+inline fun V8Value.getSourcePlugin(): V8Plugin? {
+    return V8Plugin.getPluginFromRuntime(this.v8Runtime);
+}
+
 inline fun <reified T> V8Value.expectOrThrow(config: IV8PluginConfig, contextName: String): T  {
    if(this !is T)
        throw ScriptImplementationException(config, "Expected ${contextName} to be of type ${T::class.simpleName}, but found ${this::class.simpleName}");
@@ -90,6 +96,20 @@ inline fun <reified T> V8ValueArray.expectV8Variants(config: IV8PluginConfig, co
 }

 inline fun <reified T> V8Value.expectV8Variant(config: IV8PluginConfig, contextName: String): T {
+    if(false)
+    {
+        this?.getSourcePlugin()?.let {
+            if (!it.isThreadAlreadyBusy()) {
+                val stacktrace = Thread.currentThread().stackTrace;
+                Logger.w("Extensions_V8",
+                    "V8 USE OUTSIDE BUSY: " + stacktrace.drop(3)?.firstOrNull().toString() +
+                            ", " + stacktrace.drop(4)?.firstOrNull().toString() +
+                            ", " + stacktrace.drop(5)?.firstOrNull()?.toString() +
+                            ", " + stacktrace.drop(6)?.firstOrNull()?.toString()
+                )
+            }
+        }
+    }
    return when(T::class) {
        String::class -> this.expectOrThrow<V8ValueString>(config, contextName).value as T;
        Int::class -> {
@@ -29,6 +29,7 @@ import com.futo.platformplayer.states.StateUpdate
 import com.futo.platformplayer.stores.FragmentedStorage
 import com.futo.platformplayer.stores.FragmentedStorageFileJson
 import com.futo.platformplayer.views.FeedStyle
+import com.futo.platformplayer.views.fields.AdvancedField
 import com.futo.platformplayer.views.fields.DropdownFieldOptionsId
 import com.futo.platformplayer.views.fields.FieldForm
 import com.futo.platformplayer.views.fields.FormField
@@ -175,6 +176,10 @@ class Settings : FragmentedStorageFileJson() {
        }
    }*/

+
+    @FormField(R.string.advanced_settings, FieldForm.TOGGLE, R.string.advanced_settings_description, -1, "advancedSettings")
+    var advancedSettings: Boolean = false;
+
    @FormField(R.string.language, "group", -1, 0)
    var language = LanguageSettings();
    @Serializable
@@ -221,10 +226,11 @@ class Settings : FragmentedStorageFileJson() {
        @FormField(R.string.show_home_filters_plugin_names, FieldForm.TOGGLE, R.string.show_home_filters_plugin_names_description, 5)
        var showHomeFiltersPluginNames: Boolean = false;

+        @AdvancedField
        @FormField(R.string.preview_feed_items, FieldForm.TOGGLE, R.string.preview_feed_items_description, 6)
        var previewFeedItems: Boolean = true;

-
+        @AdvancedField
        @FormField(R.string.progress_bar, FieldForm.TOGGLE, R.string.progress_bar_description, 6)
        var progressBar: Boolean = true;

@@ -253,9 +259,11 @@ class Settings : FragmentedStorageFileJson() {
        @DropdownFieldOptionsId(R.array.feed_style)
        var searchFeedStyle: Int = 1;

+        @AdvancedField
        @FormField(R.string.preview_feed_items, FieldForm.TOGGLE, R.string.preview_feed_items_description, 5)
        var previewFeedItems: Boolean = true;

+        @AdvancedField
        @FormField(R.string.progress_bar, FieldForm.TOGGLE, R.string.progress_bar_description, 6)
        var progressBar: Boolean = true;

@@ -277,6 +285,7 @@ class Settings : FragmentedStorageFileJson() {
    @Serializable
    class ChannelSettings {

+        @AdvancedField
        @FormField(R.string.progress_bar, FieldForm.TOGGLE, R.string.progress_bar_description, 6)
        var progressBar: Boolean = true;
    }
@@ -302,16 +311,20 @@ class Settings : FragmentedStorageFileJson() {
        @FormField(R.string.use_subscription_exchange, FieldForm.TOGGLE, R.string.use_subscription_exchange_description, 6)
        var useSubscriptionExchange: Boolean = false;

+        @AdvancedField
        @FormField(R.string.preview_feed_items, FieldForm.TOGGLE, R.string.preview_feed_items_description, 6)
        var previewFeedItems: Boolean = true;

+        @AdvancedField
        @FormField(R.string.progress_bar, FieldForm.TOGGLE, R.string.progress_bar_description, 7)
        var progressBar: Boolean = true;

+        @AdvancedField
        @FormField(R.string.fetch_on_app_boot, FieldForm.TOGGLE, R.string.shortly_after_opening_the_app_start_fetching_subscriptions, 8)
        @Serializable(with = FlexibleBooleanSerializer::class)
        var fetchOnAppBoot: Boolean = true;

+        @AdvancedField
        @FormField(R.string.fetch_on_tab_opened, FieldForm.TOGGLE, R.string.fetch_on_tab_opened_description, 9)
        var fetchOnTabOpen: Boolean = true;

@@ -342,13 +355,16 @@ class Settings : FragmentedStorageFileJson() {
        @FormField(R.string.show_watch_metrics, FieldForm.TOGGLE, R.string.show_watch_metrics_description, 12)
        var showWatchMetrics: Boolean = false;

+        @AdvancedField
        @FormField(R.string.track_playtime_locally, FieldForm.TOGGLE, R.string.track_playtime_locally_description, 13)
        var allowPlaytimeTracking: Boolean = true;


+        @AdvancedField
        @FormField(R.string.always_reload_from_cache, FieldForm.TOGGLE, R.string.always_reload_from_cache_description, 14)
        var alwaysReloadFromCache: Boolean = false;

+        @AdvancedField
        @FormField(R.string.peek_channel_contents, FieldForm.TOGGLE, R.string.peek_channel_contents_description, 15)
        var peekChannelContents: Boolean = false;

@@ -425,9 +441,11 @@ class Settings : FragmentedStorageFileJson() {
        var preferredPreviewQuality: Int = 5;
        fun getPreferredPreviewQualityPixelCount(): Int = preferedQualityToPixels(preferredPreviewQuality);

+        @AdvancedField
        @FormField(R.string.simplify_sources, FieldForm.TOGGLE, R.string.simplify_sources_description, 4)
        var simplifySources: Boolean = true;

+        @AdvancedField
        @FormField(R.string.always_allow_reverse_landscape_auto_rotate, FieldForm.TOGGLE, R.string.always_allow_reverse_landscape_auto_rotate_description, 5)
        var alwaysAllowReverseLandscapeAutoRotate: Boolean = true

@@ -438,6 +456,7 @@ class Settings : FragmentedStorageFileJson() {
        fun isBackgroundContinue() = backgroundPlay == 1;
        fun isBackgroundPictureInPicture() = backgroundPlay == 2;

+        @AdvancedField
        @FormField(R.string.resume_after_preview, FieldForm.DROPDOWN, R.string.when_watching_a_video_in_preview_mode_resume_at_the_position_when_opening_the_video_code, 7)
        @DropdownFieldOptionsId(R.array.resume_after_preview)
        var resumeAfterPreview: Int = 1;
@@ -464,14 +483,10 @@ class Settings : FragmentedStorageFileJson() {
            };
        }

+        @AdvancedField
        @FormField(R.string.live_chat_webview, FieldForm.TOGGLE, R.string.use_the_live_chat_web_window_when_available_over_native_implementation, 9)
        var useLiveChatWindow: Boolean = true;

-
-
-        @FormField(R.string.background_switch_audio, FieldForm.TOGGLE, R.string.background_switch_audio_description, 10)
-        var backgroundSwitchToAudio: Boolean = true;
-
        @FormField(R.string.restart_after_audio_focus_loss, FieldForm.DROPDOWN, R.string.restart_playback_when_gaining_audio_focus_after_a_loss, 11)
        @DropdownFieldOptionsId(R.array.restart_playback_after_loss)
        var restartPlaybackAfterLoss: Int = 1;
@@ -497,8 +512,96 @@ class Settings : FragmentedStorageFileJson() {
        @FormField(R.string.autoplay, FieldForm.TOGGLE, R.string.autoplay, 21)
        var autoplay: Boolean = false;

+        @AdvancedField
        @FormField(R.string.delete_watchlist_on_finish, FieldForm.TOGGLE, R.string.delete_watchlist_on_finish_description, 22)
        var deleteFromWatchLaterAuto: Boolean = true;
+
+        @FormField(R.string.seek_offset, FieldForm.DROPDOWN, R.string.seek_offset_description, 23)
+        @DropdownFieldOptionsId(R.array.seek_offset_duration)
+        var seekOffset: Int = 2;
+
+        fun getSeekOffset(): Long {
+          return when(seekOffset) {
+            0 -> 3_000L;
+            1 -> 5_000L;
+            2 -> 10_000L;
+            3 -> 20_000L;
+            4 -> 30_000L;
+            5 -> 60_000L;
+            else -> 10_000L;
+          }
+        }
+
+
+        @FormField(R.string.min_playback_speed, FieldForm.DROPDOWN, R.string.min_playback_speed_description, 25)
+        @DropdownFieldOptionsId(R.array.min_playback_speed)
+        var minimumPlaybackSpeed: Int = 0;
+        @FormField(R.string.max_playback_speed, FieldForm.DROPDOWN, R.string.max_playback_speed_description, 26)
+        @DropdownFieldOptionsId(R.array.max_playback_speed)
+        var maximumPlaybackSpeed: Int = 2;
+        @FormField(R.string.step_playback_speed, FieldForm.DROPDOWN, R.string.step_playback_speed_description, 26)
+        @DropdownFieldOptionsId(R.array.step_playback_speed)
+        var stepPlaybackSpeed: Int = 1;
+
+        fun getPlaybackSpeedStep(): Double {
+            return when(stepPlaybackSpeed) {
+                0 -> 0.05
+                1 -> 0.1
+                2 -> 0.25
+                else -> 0.1;
+            }
+        }
+        fun getPlaybackSpeeds(): List<Double> {
+            val playbackSpeeds = mutableListOf<Double>();
+            playbackSpeeds.add(1.0);
+            val minSpeed = when(minimumPlaybackSpeed) {
+                0 -> 0.25
+                1 -> 0.5
+                2 -> 1.0
+                else -> 0.25
+            }
+            val maxSpeed = when(maximumPlaybackSpeed) {
+                0 -> 2.0
+                1 -> 2.25
+                2 -> 3.0
+                3 -> 4.0
+                4 -> 5.0
+                else -> 2.25;
+            }
+            var testSpeed = 1.0;
+
+            while(testSpeed > minSpeed) {
+                val nextSpeed = (testSpeed - 0.25) as Double;
+                testSpeed = Math.max(nextSpeed, minSpeed);
+                playbackSpeeds.add(testSpeed);
+            }
+            testSpeed = 1.0;
+            while(testSpeed < maxSpeed) {
+                val nextSpeed = (testSpeed + if(testSpeed < 2) 0.25 else 1.0) as Double;
+                testSpeed = Math.min(nextSpeed, maxSpeed);
+                playbackSpeeds.add(testSpeed);
+            }
+            playbackSpeeds.sort();
+            return playbackSpeeds;
+        }
+
+        @FormField(R.string.hold_playback_speed, FieldForm.DROPDOWN, R.string.hold_playback_speed_description, 27)
+        @DropdownFieldOptionsId(R.array.hold_playback_speeds)
+        var holdPlaybackSpeed: Int = 3;
+
+        fun getHoldPlaybackSpeed(): Double {
+            return when(holdPlaybackSpeed) {
+                0 -> 1.25
+                1 -> 1.5
+                2 -> 1.75
+                3 -> 2.0
+                4 -> 2.25
+                5 -> 2.5
+                6 -> 2.75
+                7 -> 3.0
+                else -> 2.0
+            }
+        }
    }

    @FormField(R.string.comments, "group", R.string.comments_description, 6)
@@ -514,6 +617,7 @@ class Settings : FragmentedStorageFileJson() {
        @FormField(R.string.default_recommendations, FieldForm.TOGGLE, R.string.default_recommendations_description, 0)
        var recommendationsDefault: Boolean = false;

+        @AdvancedField
        @FormField(R.string.hide_recommendations, FieldForm.TOGGLE, R.string.hide_recommendations_description, 0)
        var hideRecommendations: Boolean = false;

@@ -550,10 +654,12 @@ class Settings : FragmentedStorageFileJson() {
        var preferredAudioQuality: Int = 1;
        fun isHighBitrateDefault(): Boolean = preferredAudioQuality > 0;

+        @AdvancedField
        @FormField(R.string.byte_range_download, FieldForm.TOGGLE, R.string.attempt_to_utilize_byte_ranges, 4)
        @Serializable(with = FlexibleBooleanSerializer::class)
        var byteRangeDownload: Boolean = true;

+        @AdvancedField
        @FormField(R.string.byte_range_concurrency, FieldForm.DROPDOWN, R.string.number_of_concurrent_threads_to_multiply_download_speeds_from_throttled_sources, 5)
        @DropdownFieldOptionsId(R.array.thread_count)
        var byteRangeConcurrency: Int = 3;
@@ -583,15 +689,21 @@ class Settings : FragmentedStorageFileJson() {
        @Serializable(with = FlexibleBooleanSerializer::class)
        var keepScreenOn: Boolean = true;

+        @AdvancedField
        @FormField(R.string.always_proxy_requests, FieldForm.TOGGLE, R.string.always_proxy_requests_description, 3)
        @Serializable(with = FlexibleBooleanSerializer::class)
        var alwaysProxyRequests: Boolean = false;

-
+        @AdvancedField
        @FormField(R.string.allow_ipv6, FieldForm.TOGGLE, R.string.allow_ipv6_description, 4)
        @Serializable(with = FlexibleBooleanSerializer::class)
        var allowIpv6: Boolean = true;

+        @AdvancedField
+        @FormField(R.string.allow_ipv4, FieldForm.TOGGLE, R.string.allow_ipv4_description, 5)
+        @Serializable(with = FlexibleBooleanSerializer::class)
+        var allowLinkLocalIpv4: Boolean = false;
+
        /*TODO: Should we have a different casting quality?
        @FormField("Preferred Casting Quality", FieldForm.DROPDOWN, "", 3)
        @DropdownFieldOptionsId(R.array.preferred_quality_array)
@@ -659,9 +771,11 @@ class Settings : FragmentedStorageFileJson() {
    @Serializable
    class Plugins {

+        @AdvancedField
        @FormField(R.string.check_disabled_plugin_updates, FieldForm.TOGGLE, R.string.check_disabled_plugin_updates_description, -1)
        var checkDisabledPluginsForUpdates: Boolean = false;

+        @AdvancedField
        @FormField(R.string.clear_cookies_on_logout, FieldForm.TOGGLE, R.string.clears_cookies_when_you_log_out, 0)
        var clearCookiesOnLogout: Boolean = true;

@@ -862,7 +976,23 @@ class Settings : FragmentedStorageFileJson() {
        @FormField(R.string.payment_status, FieldForm.READONLYTEXT, -1, 1)
        val paymentStatus: String get() = SettingsActivity.getActivity()?.let { if (StatePayment.instance.hasPaid) it.getString(R.string.paid) else it.getString(R.string.not_paid); } ?: "Unknown";

-        @FormField(R.string.clear_payment, FieldForm.BUTTON, R.string.deletes_license_keys_from_app, 2)
+        @FormField(R.string.license_status, FieldForm.BUTTON, R.string.view_license_status, 2)
+        fun viewLicenseStatus() {
+            SettingsActivity.getActivity()?.let {
+                try {
+                    if (StatePayment.instance.hasPaid) {
+                        val paymentKey = StatePayment.instance.getPaymentKey()
+                        UIDialogs.showDialogOk(it, R.drawable.ic_paid, "License activated\n" + paymentKey.first)
+                    } else {
+                        UIDialogs.showDialogOk(it, R.drawable.ic_paid, "No license activated")
+                    }
+                } catch (e: Throwable) {
+                    Logger.e(TAG, "Failed to show license status dialog", e)
+                }
+            }
+        }
+
+        @FormField(R.string.clear_payment, FieldForm.BUTTON, R.string.deletes_license_keys_from_app, 3)
        fun clearPayment() {
            SettingsActivity.getActivity()?.let { context ->
                UIDialogs.showConfirmationDialog(context, "Are you sure you want to delete your license?", {
@@ -880,15 +1010,20 @@ class Settings : FragmentedStorageFileJson() {
    var other = Other();
    @Serializable
    class Other {
+        @AdvancedField
        @FormField(R.string.playlist_delete_confirmation, FieldForm.TOGGLE, R.string.playlist_delete_confirmation_description, 2)
        var playlistDeleteConfirmation: Boolean = true;
+        @AdvancedField
        @FormField(R.string.playlist_allow_dups, FieldForm.TOGGLE, R.string.playlist_allow_dups_description, 3)
        var playlistAllowDups: Boolean = true;

-        @FormField(R.string.enable_polycentric, FieldForm.TOGGLE, R.string.can_be_disabled_when_you_are_experiencing_issues, 4)
+        @FormField(R.string.watch_later_add_start, FieldForm.TOGGLE, R.string.watch_later_add_start_description, 4)
+        var watchLaterAddStart: Boolean = true;
+
+        @FormField(R.string.enable_polycentric, FieldForm.TOGGLE, R.string.can_be_disabled_when_you_are_experiencing_issues, 5)
        var polycentricEnabled: Boolean = true;

-        @FormField(R.string.polycentric_local_cache, FieldForm.TOGGLE, R.string.polycentric_local_cache_description, 5)
+        @FormField(R.string.polycentric_local_cache, FieldForm.TOGGLE, R.string.polycentric_local_cache_description, 7)
        var polycentricLocalCache: Boolean = true;
    }

@@ -926,7 +1061,7 @@ class Settings : FragmentedStorageFileJson() {
    @Serializable
    class Synchronization {
        @FormField(R.string.enabled, FieldForm.TOGGLE, R.string.enabled_description, 1)
-        var enabled: Boolean = true;
+        var enabled: Boolean = false;

        @FormField(R.string.broadcast, FieldForm.TOGGLE, R.string.broadcast_description, 1)
        var broadcast: Boolean = false;
@@ -948,6 +1083,9 @@ class Settings : FragmentedStorageFileJson() {

        @FormField(R.string.connect_local_direct_through_relay, FieldForm.TOGGLE, R.string.connect_local_direct_through_relay_description, 3)
        var connectLocalDirectThroughRelay: Boolean = true;
+
+        @FormField(R.string.local_connections, FieldForm.TOGGLE, R.string.local_connections_description, 3)
+        var localConnections: Boolean = true;
    }

    @FormField(R.string.info, FieldForm.GROUP, -1, 21)
@@ -1016,4 +1154,4 @@ class Settings : FragmentedStorageFileJson() {
        }
    }
    //endregion
-}
+}
@@ -319,7 +319,11 @@ class UIDialogs {
                        closeAction?.invoke()
                    }, UIDialogs.ActionStyle.NONE),
                    UIDialogs.Action(context.getString(R.string.retry), {
-                        retryAction?.invoke();
+                        try {
+                            retryAction?.invoke();
+                        } catch (e: Throwable) {
+                            Logger.e(TAG, "Unhandled exception retrying", e)
+                        }
                    }, UIDialogs.ActionStyle.PRIMARY)
                );
            else
@@ -333,7 +337,11 @@ class UIDialogs {
                        closeAction?.invoke()
                    }, UIDialogs.ActionStyle.NONE),
                    UIDialogs.Action(context.getString(R.string.retry), {
-                        retryAction?.invoke();
+                        try {
+                            retryAction?.invoke();
+                        } catch (e: Throwable) {
+                            Logger.e(TAG, "Unhandled exception retrying", e)
+                        }
                    }, UIDialogs.ActionStyle.PRIMARY)
                );
        }
@@ -4,8 +4,14 @@ import android.app.NotificationManager
 import android.content.ContentResolver
 import android.content.Context
 import android.content.Intent
+import android.net.Uri
 import android.view.View
 import android.view.ViewGroup
+import androidx.annotation.OptIn
+import androidx.media3.common.util.UnstableApi
+import androidx.media3.exoplayer.hls.playlist.DefaultHlsPlaylistParserFactory
+import androidx.media3.exoplayer.hls.playlist.HlsMediaPlaylist
+import androidx.media3.exoplayer.hls.playlist.HlsMultivariantPlaylist
 import androidx.recyclerview.widget.RecyclerView
 import com.futo.platformplayer.activities.MainActivity
 import com.futo.platformplayer.activities.SettingsActivity
@@ -37,6 +43,9 @@ import com.futo.platformplayer.models.Playlist
 import com.futo.platformplayer.models.Subscription
 import com.futo.platformplayer.models.SubscriptionGroup
 import com.futo.platformplayer.parsers.HLS
+import com.futo.platformplayer.parsers.HLS.MediaRendition
+import com.futo.platformplayer.parsers.HLS.StreamInfo
+import com.futo.platformplayer.parsers.HLS.VariantPlaylistReference
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StateDownloads
 import com.futo.platformplayer.states.StateHistory
@@ -63,6 +72,8 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import java.io.ByteArrayInputStream
+import androidx.core.net.toUri

 class UISlideOverlays {
    companion object {
@@ -299,6 +310,7 @@ class UISlideOverlays {

        }

+        @OptIn(UnstableApi::class)
        fun showHlsPicker(video: IPlatformVideoDetails, source: Any, sourceUrl: String, container: ViewGroup): SlideUpMenuOverlay {
            val items = arrayListOf<View>(LoaderView(container.context))
            val slideUpMenuOverlay = SlideUpMenuOverlay(container.context, container, container.context.getString(R.string.download_video), null, true, items)
@@ -310,6 +322,8 @@ class UISlideOverlays {
                val masterPlaylistContent = masterPlaylistResponse.body?.string()
                    ?: throw Exception("Master playlist content is empty")

+                val resolvedPlaylistUrl = masterPlaylistResponse.url
+
                val videoButtons = arrayListOf<SlideUpMenuItem>()
                val audioButtons = arrayListOf<SlideUpMenuItem>()
                //TODO: Implement subtitles
@@ -322,55 +336,103 @@ class UISlideOverlays {

                val masterPlaylist: HLS.MasterPlaylist
                try {
-                    masterPlaylist = HLS.parseMasterPlaylist(masterPlaylistContent, sourceUrl)
+                    val inputStream = ByteArrayInputStream(masterPlaylistContent.toByteArray())
+                    val playlist = DefaultHlsPlaylistParserFactory().createPlaylistParser()
+                        .parse(sourceUrl.toUri(), inputStream)

-                    masterPlaylist.getAudioSources().forEach { it ->
+                    if (playlist is HlsMediaPlaylist) {
+                        if (source is IHLSManifestAudioSource) {
+                            val variant = HLS.mediaRenditionToVariant(MediaRendition("AUDIO", playlist.baseUri, "Single Playlist", null, null, null, null, null))!!

-                        val estSize = VideoHelper.estimateSourceSize(it);
-                        val prefix = if(estSize > 0) "±" + estSize.toHumanBytesSize() + " " else "";
-                        audioButtons.add(SlideUpMenuItem(
-                            container.context,
-                            R.drawable.ic_music,
-                            it.name,
-                            listOf(it.language, it.codec).mapNotNull { x -> x.ifEmpty { null } }.joinToString(", "),
-                            (prefix + it.codec).trim(),
-                            tag = it,
-                            call = {
-                                selectedAudioVariant = it
-                                slideUpMenuOverlay.selectOption(audioButtons, it)
-                                slideUpMenuOverlay.setOk(container.context.getString(R.string.download))
-                            },
-                            invokeParent = false
-                        ))
-                    }
-
-                    /*masterPlaylist.getSubtitleSources().forEach { it ->
-                        subtitleButtons.add(SlideUpMenuItem(container.context, R.drawable.ic_music, it.name, listOf(it.format).mapNotNull { x -> x.ifEmpty { null } }.joinToString(", "), it, {
-                            selectedSubtitleVariant = it
-                            slideUpMenuOverlay.selectOption(subtitleButtons, it)
-                            slideUpMenuOverlay.setOk(container.context.getString(R.string.download))
-                        }, false))
-                    }*/
-
-                    masterPlaylist.getVideoSources().forEach {
-                        val estSize = VideoHelper.estimateSourceSize(it);
-                        val prefix = if(estSize > 0) "±" + estSize.toHumanBytesSize() + " " else "";
-                        videoButtons.add(SlideUpMenuItem(
-                            container.context,
-                            R.drawable.ic_movie,
-                            it.name,
-                            "${it.width}x${it.height}",
-                            (prefix + it.codec).trim(),
-                            tag = it,
-                            call = {
-                                selectedVideoVariant = it
-                                slideUpMenuOverlay.selectOption(videoButtons, it)
-                                if (audioButtons.isEmpty()){
+                            val estSize = VideoHelper.estimateSourceSize(variant);
+                            val prefix = if(estSize > 0) "±" + estSize.toHumanBytesSize() + " " else "";
+                            audioButtons.add(SlideUpMenuItem(
+                                container.context,
+                                R.drawable.ic_music,
+                                variant.name,
+                                listOf(variant.language, variant.codec).mapNotNull { x -> x.ifEmpty { null } }.joinToString(", "),
+                                (prefix + variant.codec).trim(),
+                                tag = variant,
+                                call = {
+                                    selectedAudioVariant = variant
+                                    slideUpMenuOverlay.selectOption(audioButtons, variant)
                                    slideUpMenuOverlay.setOk(container.context.getString(R.string.download))
-                                }
-                            },
-                            invokeParent = false
-                        ))
+                                },
+                                invokeParent = false
+                            ))
+                        } else {
+                            val variant = HLS.variantReferenceToVariant(VariantPlaylistReference(playlist.baseUri, StreamInfo(null, null, null, null, null, null, null, null, null)))
+
+                            val estSize = VideoHelper.estimateSourceSize(variant);
+                            val prefix = if(estSize > 0) "±" + estSize.toHumanBytesSize() + " " else "";
+                            videoButtons.add(SlideUpMenuItem(
+                                container.context,
+                                R.drawable.ic_movie,
+                                variant.name,
+                                "${variant.width}x${variant.height}",
+                                (prefix + variant.codec).trim(),
+                                tag = variant,
+                                call = {
+                                    selectedVideoVariant = variant
+                                    slideUpMenuOverlay.selectOption(videoButtons, variant)
+                                    if (audioButtons.isEmpty()){
+                                        slideUpMenuOverlay.setOk(container.context.getString(R.string.download))
+                                    }
+                                },
+                                invokeParent = false
+                            ))
+                        }
+                    } else if (playlist is HlsMultivariantPlaylist) {
+                        masterPlaylist = HLS.parseMasterPlaylist(masterPlaylistContent, resolvedPlaylistUrl)
+
+                        masterPlaylist.getAudioSources().forEach { it ->
+
+                            val estSize = VideoHelper.estimateSourceSize(it);
+                            val prefix = if(estSize > 0) "±" + estSize.toHumanBytesSize() + " " else "";
+                            audioButtons.add(SlideUpMenuItem(
+                                container.context,
+                                R.drawable.ic_music,
+                                it.name,
+                                listOf(it.language, it.codec).mapNotNull { x -> x.ifEmpty { null } }.joinToString(", "),
+                                (prefix + it.codec).trim(),
+                                tag = it,
+                                call = {
+                                    selectedAudioVariant = it
+                                    slideUpMenuOverlay.selectOption(audioButtons, it)
+                                    slideUpMenuOverlay.setOk(container.context.getString(R.string.download))
+                                },
+                                invokeParent = false
+                            ))
+                        }
+
+                        /*masterPlaylist.getSubtitleSources().forEach { it ->
+                            subtitleButtons.add(SlideUpMenuItem(container.context, R.drawable.ic_music, it.name, listOf(it.format).mapNotNull { x -> x.ifEmpty { null } }.joinToString(", "), it, {
+                                selectedSubtitleVariant = it
+                                slideUpMenuOverlay.selectOption(subtitleButtons, it)
+                                slideUpMenuOverlay.setOk(container.context.getString(R.string.download))
+                            }, false))
+                        }*/
+
+                        masterPlaylist.getVideoSources().forEach {
+                            val estSize = VideoHelper.estimateSourceSize(it);
+                            val prefix = if(estSize > 0) "±" + estSize.toHumanBytesSize() + " " else "";
+                            videoButtons.add(SlideUpMenuItem(
+                                container.context,
+                                R.drawable.ic_movie,
+                                it.name,
+                                "${it.width}x${it.height}",
+                                (prefix + it.codec).trim(),
+                                tag = it,
+                                call = {
+                                    selectedVideoVariant = it
+                                    slideUpMenuOverlay.selectOption(videoButtons, it)
+                                    if (audioButtons.isEmpty()){
+                                        slideUpMenuOverlay.setOk(container.context.getString(R.string.download))
+                                    }
+                                },
+                                invokeParent = false
+                            ))
+                        }
                    }

                    val newItems = arrayListOf<View>()
@@ -398,11 +460,11 @@ class UISlideOverlays {
                    if (masterPlaylistContent.lines().any { it.startsWith("#EXTINF:") }) {
                        withContext(Dispatchers.Main) {
                            if (source is IHLSManifestSource) {
-                                StateDownloads.instance.download(video, HLSVariantVideoUrlSource("variant", 0, 0, "application/vnd.apple.mpegurl", "", null, 0, false, sourceUrl), null, null)
+                                StateDownloads.instance.download(video, HLSVariantVideoUrlSource("variant", 0, 0, "application/vnd.apple.mpegurl", "", null, 0, false, resolvedPlaylistUrl), null, null)
                                UIDialogs.toast(container.context, "Variant video HLS playlist download started")
                                slideUpMenuOverlay.hide()
                            } else if (source is IHLSManifestAudioSource) {
-                                StateDownloads.instance.download(video, null, HLSVariantAudioUrlSource("variant", 0, "application/vnd.apple.mpegurl", "", "", null, false, false, sourceUrl), null)
+                                StateDownloads.instance.download(video, null, HLSVariantAudioUrlSource("variant", 0, "application/vnd.apple.mpegurl", "", "", null, false, false, resolvedPlaylistUrl), null)
                                UIDialogs.toast(container.context, "Variant audio HLS playlist download started")
                                slideUpMenuOverlay.hide()
                            } else {
@@ -984,26 +1046,30 @@ class UISlideOverlays {
                        + actions).filterNotNull()
            ));
            items.add(
-                SlideUpMenuGroup(container.context, container.context.getString(R.string.add_to), "addto",
-                    SlideUpMenuItem(container.context,
+                SlideUpMenuGroup(
+                    container.context, container.context.getString(R.string.add_to), "addto",
+                    SlideUpMenuItem(
+                        container.context,
                        R.drawable.ic_queue_add,
                        container.context.getString(R.string.add_to_queue),
                        "${queue.size} " + container.context.getString(R.string.videos),
                        tag = "queue",
                        call = { StatePlayer.instance.addToQueue(video); }),
-                    SlideUpMenuItem(container.context,
+                    SlideUpMenuItem(
+                        container.context,
                        R.drawable.ic_watchlist_add,
                        "${container.context.getString(R.string.add_to)} " + StatePlayer.TYPE_WATCHLATER + "",
                        "${watchLater.size} " + container.context.getString(R.string.videos),
                        tag = "watch later",
                        call = { StatePlaylists.instance.addToWatchLater(SerializedPlatformVideo.fromVideo(video), true); }),
-                    SlideUpMenuItem(container.context,
+                    SlideUpMenuItem(
+                        container.context,
                        R.drawable.ic_history,
                        container.context.getString(R.string.add_to_history),
                        "Mark as watched",
                        tag = "history",
                        call = { StateHistory.instance.markAsWatched(video); }),
-            ));
+                ));

            val playlistItems = arrayListOf<SlideUpMenuItem>();
            playlistItems.add(SlideUpMenuItem(
@@ -1067,14 +1133,17 @@ class UISlideOverlays {
            val queue = StatePlayer.instance.getQueue();
            val watchLater = StatePlaylists.instance.getWatchLater();
            items.add(
-                SlideUpMenuGroup(container.context, container.context.getString(R.string.other), "other",
-                    SlideUpMenuItem(container.context,
+                SlideUpMenuGroup(
+                    container.context, container.context.getString(R.string.other), "other",
+                    SlideUpMenuItem(
+                        container.context,
                        R.drawable.ic_queue_add,
                        container.context.getString(R.string.queue),
                        "${queue.size} " + container.context.getString(R.string.videos),
                        tag = "queue",
                        call = { StatePlayer.instance.addToQueue(video); }),
-                    SlideUpMenuItem(container.context,
+                    SlideUpMenuItem(
+                        container.context,
                        R.drawable.ic_watchlist_add,
                        StatePlayer.TYPE_WATCHLATER,
                        "${watchLater.size} " + container.context.getString(R.string.videos),
@@ -1082,8 +1151,10 @@ class UISlideOverlays {
                        call = {
                            if(StatePlaylists.instance.addToWatchLater(SerializedPlatformVideo.fromVideo(video), true))
                                UIDialogs.appToast("Added to watch later", false);
+                            else
+                                UIDialogs.toast(container.context.getString(R.string.already_in_watch_later))
                        }),
-                    )
+                )
            );

            val playlistItems = arrayListOf<SlideUpMenuItem>();
@@ -1121,8 +1192,8 @@ class UISlideOverlays {
            return SlideUpMenuOverlay(container.context, container, container.context.getString(R.string.add_to), null, true, items).apply { show() };
        }

-        fun showFiltersOverlay(lifecycleScope: CoroutineScope, container: ViewGroup, enabledClientsIds: List<String>, filterValues: HashMap<String, List<String>>, isChannelSearch: Boolean = false): SlideUpMenuFilters {
-            val overlay = SlideUpMenuFilters(lifecycleScope, container, enabledClientsIds, filterValues, isChannelSearch);
+        fun showFiltersOverlay(lifecycleScope: CoroutineScope, container: ViewGroup, enabledClientsIds: List<String>, filterValues: HashMap<String, List<String>>): SlideUpMenuFilters {
+            val overlay = SlideUpMenuFilters(lifecycleScope, container, enabledClientsIds, filterValues);
            overlay.show();
            return overlay;
        }
@@ -31,6 +31,12 @@ import java.io.ByteArrayOutputStream
 import java.io.IOException
 import java.io.InputStream
 import java.io.OutputStream
+import java.net.Inet4Address
+import java.net.Inet6Address
+import java.net.InetAddress
+import java.net.InterfaceAddress
+import java.net.NetworkInterface
+import java.net.SocketException
 import java.nio.ByteBuffer
 import java.security.SecureRandom
 import java.time.OffsetDateTime
@@ -331,4 +337,125 @@ fun ByteArray.fromGzip(): ByteArray {
        }
    }
    return outputStream.toByteArray()
-}
+}
+
+fun findCandidateAddresses(): List<InetAddress> {
+    val candidates = NetworkInterface.getNetworkInterfaces()
+        .toList()
+        .asSequence()
+        .filter(::isUsableInterface)
+        .flatMap { nif ->
+            nif.interfaceAddresses
+                .asSequence()
+                .mapNotNull { ia ->
+                    ia.address.takeIf(::isUsableAddress)?.let { addr ->
+                        nif to ia
+                    }
+                }
+        }
+        .toList()
+
+    return candidates
+        .sortedWith(
+            compareBy<Pair<NetworkInterface, InterfaceAddress>>(
+                { addressScore(it.second.address) },
+                { interfaceScore(it.first) },
+                { -it.second.networkPrefixLength.toInt() },
+                { -it.first.mtu }
+            )
+        ).map { it.second.address }
+}
+
+fun findPreferredAddress(): InetAddress? {
+    val candidates = NetworkInterface.getNetworkInterfaces()
+        .toList()
+        .asSequence()
+        .filter(::isUsableInterface)
+        .flatMap { nif ->
+            nif.interfaceAddresses
+                .asSequence()
+                .mapNotNull { ia ->
+                    ia.address.takeIf(::isUsableAddress)?.let { addr ->
+                        nif to ia
+                    }
+                }
+        }
+        .toList()
+
+    return candidates
+        .minWithOrNull(
+            compareBy<Pair<NetworkInterface, InterfaceAddress>>(
+                { addressScore(it.second.address) },
+                { interfaceScore(it.first) },
+                { -it.second.networkPrefixLength.toInt() },
+                { -it.first.mtu }
+            )
+        )?.second?.address
+}
+
+private fun isUsableInterface(nif: NetworkInterface): Boolean {
+    val name = nif.name.lowercase()
+    return try {
+        // must be up, not loopback/virtual/PtP, have a MAC, not Docker/tun/etc.
+        nif.isUp
+            && !nif.isLoopback
+            && !nif.isPointToPoint
+            && !nif.isVirtual
+            && !name.startsWith("docker")
+            && !name.startsWith("veth")
+            && !name.startsWith("br-")
+            && !name.startsWith("virbr")
+            && !name.startsWith("vmnet")
+            && !name.startsWith("tun")
+            && !name.startsWith("tap")
+    } catch (e: SocketException) {
+        false
+    }
+}
+
+private fun isUsableAddress(addr: InetAddress): Boolean {
+    return when {
+        addr.isAnyLocalAddress -> false // 0.0.0.0 / ::
+        addr.isLoopbackAddress -> false
+        addr.isLinkLocalAddress -> false // 169.254.x.x or fe80::/10
+        addr.isMulticastAddress -> false
+        else -> true
+    }
+}
+
+private fun interfaceScore(nif: NetworkInterface): Int {
+    val name = nif.name.lowercase()
+    return when {
+        name.matches(Regex("^(eth|enp|eno|ens|em)\\d+")) -> 0
+        name.startsWith("eth") || name.contains("ethernet") -> 0
+        name.matches(Regex("^(wlan|wlp)\\d+")) -> 1
+        name.contains("wi-fi") || name.contains("wifi") -> 1
+        else -> 2
+    }
+}
+
+fun addressScore(addr: InetAddress): Int {
+    return when (addr) {
+        is Inet4Address -> {
+            val octets = addr.address.map { it.toInt() and 0xFF }
+            when {
+                octets[0] == 10 -> 0  // 10/8
+                octets[0] == 192 && octets[1] == 168 -> 0  // 192.168/16
+                octets[0] == 172 && octets[1] in 16..31 -> 0  // 172.16–31/12
+                else -> 1  // public IPv4
+            }
+        }
+        is Inet6Address -> {
+            // ULA (fc00::/7) vs global vs others
+            val b0 = addr.address[0].toInt() and 0xFF
+            when {
+                (b0 and 0xFE) == 0xFC -> 2  // ULA
+                (b0 and 0xE0) == 0x20 -> 3  // global
+                else -> 4
+            }
+        }
+        else -> Int.MAX_VALUE
+    }
+}
+
+fun <T> Enumeration<T>.toList(): List<T> = Collections.list(this)
@@ -2,14 +2,14 @@ package com.futo.platformplayer.activities

 import android.annotation.SuppressLint
 import android.app.AlertDialog
-import android.content.ComponentName
+import android.app.UiModeManager
 import android.content.Context
 import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
 import android.content.pm.PackageManager
 import android.content.res.Configuration
-import android.media.AudioManager
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
 import android.os.StrictMode
 import android.os.StrictMode.VmPolicy
@@ -22,6 +22,7 @@ import android.widget.ImageView
 import androidx.activity.result.ActivityResult
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.annotation.OptIn
 import androidx.appcompat.app.AppCompatActivity
 import androidx.constraintlayout.motion.widget.MotionLayout
 import androidx.core.app.ActivityCompat
@@ -31,6 +32,8 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentContainerView
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.whenStateAtLeast
+import androidx.lifecycle.withStateAtLeast
 import androidx.media3.common.util.UnstableApi
 import com.futo.platformplayer.BuildConfig
 import com.futo.platformplayer.R
@@ -39,7 +42,9 @@ import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.casting.StateCasting
 import com.futo.platformplayer.constructs.Event1
+import com.futo.platformplayer.dp
 import com.futo.platformplayer.fragment.mainactivity.bottombar.MenuBottomBarFragment
+import com.futo.platformplayer.fragment.mainactivity.main.ArticleDetailFragment
 import com.futo.platformplayer.fragment.mainactivity.main.BrowserFragment
 import com.futo.platformplayer.fragment.mainactivity.main.BuyFragment
 import com.futo.platformplayer.fragment.mainactivity.main.ChannelFragment
@@ -66,7 +71,9 @@ import com.futo.platformplayer.fragment.mainactivity.main.SubscriptionsFeedFragm
 import com.futo.platformplayer.fragment.mainactivity.main.SuggestionsFragment
 import com.futo.platformplayer.fragment.mainactivity.main.TutorialFragment
 import com.futo.platformplayer.fragment.mainactivity.main.VideoDetailFragment
+import com.futo.platformplayer.fragment.mainactivity.main.VideoDetailFragment.State
 import com.futo.platformplayer.fragment.mainactivity.main.WatchLaterFragment
+import com.futo.platformplayer.fragment.mainactivity.main.WebDetailFragment
 import com.futo.platformplayer.fragment.mainactivity.topbar.AddTopBarFragment
 import com.futo.platformplayer.fragment.mainactivity.topbar.GeneralTopBarFragment
 import com.futo.platformplayer.fragment.mainactivity.topbar.ImportTopBarFragment
@@ -75,7 +82,6 @@ import com.futo.platformplayer.fragment.mainactivity.topbar.SearchTopBarFragment
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.ImportCache
 import com.futo.platformplayer.models.UrlVideoWithTime
-import com.futo.platformplayer.receivers.MediaButtonReceiver
 import com.futo.platformplayer.setNavigationBarColorAndIcons
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StateBackup
@@ -109,6 +115,7 @@ import java.io.StringWriter
 import java.lang.reflect.InvocationTargetException
 import java.util.LinkedList
 import java.util.Queue
+import java.util.UUID
 import java.util.concurrent.ConcurrentLinkedQueue


@@ -147,6 +154,8 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
    //Frags Main
    lateinit var _fragMainHome: HomeFragment;
    lateinit var _fragPostDetail: PostDetailFragment;
+    lateinit var _fragArticleDetail: ArticleDetailFragment;
+    lateinit var _fragWebDetail: WebDetailFragment;
    lateinit var _fragMainVideoSearchResults: ContentSearchResultsFragment;
    lateinit var _fragMainCreatorSearchResults: CreatorSearchResultsFragment;
    lateinit var _fragMainPlaylistSearchResults: PlaylistSearchResultsFragment;
@@ -176,7 +185,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
    lateinit var _fragVideoDetail: VideoDetailFragment;

    //State
-    private val _queue: Queue<Pair<MainFragment, Any?>> = LinkedList();
+    private val _queue: LinkedList<Pair<MainFragment, Any?>> = LinkedList();
    lateinit var fragCurrent: MainFragment private set;
    private var _parameterCurrent: Any? = null;

@@ -186,6 +195,9 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {

    private var _isVisible = true;
    private var _wasStopped = false;
+    private var _privateModeEnabled = false
+    private var _pictureInPictureEnabled = false
+    private var _isFullscreen = false

    private val _urlQrCodeResultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
        val scanResult = IntentIntegrator.parseActivityResult(result.resultCode, result.data)
@@ -197,7 +209,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
            }

            try {
-                runBlocking {
+                lifecycleScope.launch {
                    handleUrlAll(content)
                }
            } catch (e: Throwable) {
@@ -207,6 +219,8 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
        }
    }

+    val mainId = UUID.randomUUID().toString().substring(0, 5)
+
    constructor() : super() {
        if (BuildConfig.DEBUG) {
            StrictMode.setVmPolicy(
@@ -258,11 +272,15 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {

    @UnstableApi
    override fun onCreate(savedInstanceState: Bundle?) {
-        Logger.i(TAG, "MainActivity Starting");
-        StateApp.instance.setGlobalContext(this, lifecycleScope);
+        Logger.w(TAG, "MainActivity Starting [$mainId]");
+        StateApp.instance.setGlobalContext(this, lifecycleScope, mainId);
        StateApp.instance.mainAppStarting(this);

        super.onCreate(savedInstanceState);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            val uiMode = getSystemService(UiModeManager::class.java)
+            uiMode.setApplicationNightMode(UiModeManager.MODE_NIGHT_YES)
+        }
        setContentView(R.layout.activity_main);
        setNavigationBarColorAndIcons();
        if (Settings.instance.playback.allowVideoToGoUnderCutout)
@@ -270,7 +288,11 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
                WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES

        runBlocking {
-            StatePlatform.instance.updateAvailableClients(this@MainActivity);
+            try {
+                StatePlatform.instance.updateAvailableClients(this@MainActivity);
+            } catch (e: Throwable) {
+                Logger.e(TAG, "Unhandled exception in updateAvailableClients", e)
+            }
        }

        //Preload common files to memory
@@ -314,6 +336,8 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
        _fragMainPlaylist = PlaylistFragment.newInstance();
        _fragMainRemotePlaylist = RemotePlaylistFragment.newInstance();
        _fragPostDetail = PostDetailFragment.newInstance();
+        _fragArticleDetail = ArticleDetailFragment.newInstance();
+        _fragWebDetail = WebDetailFragment.newInstance();
        _fragWatchlist = WatchLaterFragment.newInstance();
        _fragHistory = HistoryFragment.newInstance();
        _fragSourceDetail = SourceDetailFragment.newInstance();
@@ -355,22 +379,18 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
            _fragMainSubscriptionsFeed.setPreviewsEnabled(true);
            _fragContainerVideoDetail.visibility = View.INVISIBLE;
            updateSegmentPaddings();
+            updatePrivateModeVisibility()
        };


        _buttonIncognito = findViewById(R.id.incognito_button);
-        _buttonIncognito.elevation = -99f;
-        _buttonIncognito.alpha = 0f;
+        updatePrivateModeVisibility()
        StateApp.instance.privateModeChanged.subscribe {
            //Messing with visibility causes some issues with layout ordering?
-            if (it) {
-                _buttonIncognito.elevation = 99f;
-                _buttonIncognito.alpha = 1f;
-            } else {
-                _buttonIncognito.elevation = -99f;
-                _buttonIncognito.alpha = 0f;
-            }
+            _privateModeEnabled = it
+            updatePrivateModeVisibility()
        }
+
        _buttonIncognito.setOnClickListener {
            if (!StateApp.instance.privateMode)
                return@setOnClickListener;
@@ -387,19 +407,16 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
        };
        _fragVideoDetail.onFullscreenChanged.subscribe {
            Logger.i(TAG, "onFullscreenChanged ${it}");
+            _isFullscreen = it
+            updatePrivateModeVisibility()
+        }

-            if (it) {
-                _buttonIncognito.elevation = -99f;
-                _buttonIncognito.alpha = 0f;
-            } else {
-                if (StateApp.instance.privateMode) {
-                    _buttonIncognito.elevation = 99f;
-                    _buttonIncognito.alpha = 1f;
-                } else {
-                    _buttonIncognito.elevation = -99f;
-                    _buttonIncognito.alpha = 0f;
-                }
-            }
+        _fragVideoDetail.onMinimize.subscribe {
+            updatePrivateModeVisibility()
+        }
+
+        _fragVideoDetail.onMaximized.subscribe {
+            updatePrivateModeVisibility()
        }

        StatePlayer.instance.also {
@@ -447,6 +464,8 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
        _fragMainPlaylist.topBar = _fragTopBarNavigation;
        _fragMainRemotePlaylist.topBar = _fragTopBarNavigation;
        _fragPostDetail.topBar = _fragTopBarNavigation;
+        _fragArticleDetail.topBar = _fragTopBarNavigation;
+        _fragWebDetail.topBar = _fragTopBarNavigation;
        _fragWatchlist.topBar = _fragTopBarNavigation;
        _fragHistory.topBar = _fragTopBarNavigation;
        _fragSourceDetail.topBar = _fragTopBarNavigation;
@@ -641,15 +660,27 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
        }
    }

+    @OptIn(UnstableApi::class)
+    private fun updatePrivateModeVisibility() {
+        if (_privateModeEnabled && (_fragVideoDetail.state == State.CLOSED || !_pictureInPictureEnabled && !_isFullscreen)) {
+            _buttonIncognito.elevation = 99f;
+            _buttonIncognito.alpha = 1f;
+            _buttonIncognito.translationY = if (_fragVideoDetail.state == State.MINIMIZED) -60.dp(resources).toFloat() else 0f
+        } else {
+            _buttonIncognito.elevation = -99f;
+            _buttonIncognito.alpha = 0f;
+        }
+    }
+
    override fun onResume() {
        super.onResume();
-        Logger.v(TAG, "onResume")
+        Logger.w(TAG, "onResume [$mainId]")
        _isVisible = true;
    }

    override fun onPause() {
        super.onPause();
-        Logger.v(TAG, "onPause")
+        Logger.w(TAG, "onPause [$mainId]")
        _isVisible = false;

        _qrCodeLoadingDialog?.dismiss()
@@ -658,7 +689,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {

    override fun onStop() {
        super.onStop()
-        Logger.v(TAG, "_wasStopped = true");
+        Logger.w(TAG, "onStop [$mainId]");
        _wasStopped = true;
    }

@@ -692,7 +723,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {

            "VIDEO" -> {
                val url = intent.getStringExtra("VIDEO");
-                navigate(_fragVideoDetail, url);
+                navigateWhenReady(_fragVideoDetail, url);
            }

            "IMPORT_OPTIONS" -> {
@@ -710,11 +741,11 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
                    "Sources" -> {
                        runBlocking {
                            StatePlatform.instance.updateAvailableClients(this@MainActivity, true) //Ideally this is not needed..
-                            navigate(_fragMainSources);
+                            navigateWhenReady(_fragMainSources);
                        }
                    };
                    "BROWSE_PLUGINS" -> {
-                        navigate(_fragBrowser, BrowserFragment.NavigateOptions("https://plugins.grayjay.app/phone.html", mapOf(
+                        navigateWhenReady(_fragBrowser, BrowserFragment.NavigateOptions("https://plugins.grayjay.app/phone.html", mapOf(
                            Pair("grayjay") { req ->
                                StateApp.instance.contextOrNull?.let {
                                    if (it is MainActivity) {
@@ -732,8 +763,12 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {

        try {
            if (targetData != null) {
-                runBlocking {
-                    handleUrlAll(targetData)
+                lifecycleScope.launch(Dispatchers.Main) {
+                    try {
+                        handleUrlAll(targetData)
+                    } catch (e: Throwable) {
+                        Logger.e(TAG, "Unhandled exception in handleUrlAll", e)
+                    }
                }
            }
        } catch (ex: Throwable) {
@@ -761,10 +796,10 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
                    startActivity(intent);
                } else if (url.startsWith("grayjay://video/")) {
                    val videoUrl = url.substring("grayjay://video/".length);
-                    navigate(_fragVideoDetail, videoUrl);
+                    navigateWhenReady(_fragVideoDetail, videoUrl);
                } else if (url.startsWith("grayjay://channel/")) {
                    val channelUrl = url.substring("grayjay://channel/".length);
-                    navigate(_fragMainChannel, channelUrl);
+                    navigateWhenReady(_fragMainChannel, channelUrl);
                }
            }

@@ -830,29 +865,29 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {

        return withContext(Dispatchers.IO) {
            Logger.i(TAG, "handleUrl(url=$url) on IO");
-            if (StatePlatform.instance.hasEnabledVideoClient(url)) {
+            if (StatePlatform.instance.hasEnabledContentClient(url)) {
                Logger.i(TAG, "handleUrl(url=$url) found video client");
-                lifecycleScope.launch(Dispatchers.Main) {
+                withContext(Dispatchers.Main) {
                    if (position > 0)
-                        navigate(_fragVideoDetail, UrlVideoWithTime(url, position.toLong(), true));
+                        navigateWhenReady(_fragVideoDetail, UrlVideoWithTime(url, position.toLong(), true));
                    else
-                        navigate(_fragVideoDetail, url);
+                        navigateWhenReady(_fragVideoDetail, url);

                    _fragVideoDetail.maximizeVideoDetail(true);
                }
                return@withContext true;
            } else if (StatePlatform.instance.hasEnabledChannelClient(url)) {
                Logger.i(TAG, "handleUrl(url=$url) found channel client");
-                lifecycleScope.launch(Dispatchers.Main) {
-                    navigate(_fragMainChannel, url);
+                withContext(Dispatchers.Main) {
+                    navigateWhenReady(_fragMainChannel, url);
                    delay(100);
                    _fragVideoDetail.minimizeVideoDetail();
                };
                return@withContext true;
            } else if (StatePlatform.instance.hasEnabledPlaylistClient(url)) {
                Logger.i(TAG, "handleUrl(url=$url) found playlist client");
-                lifecycleScope.launch(Dispatchers.Main) {
-                    navigate(_fragMainRemotePlaylist, url);
+                withContext(Dispatchers.Main) {
+                    navigateWhenReady(_fragMainRemotePlaylist, url);
                    delay(100);
                    _fragVideoDetail.minimizeVideoDetail();
                };
@@ -1064,18 +1099,33 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
        Logger.v(TAG, "onPictureInPictureModeChanged isInPictureInPictureMode=$isInPictureInPictureMode isStop=$isStop")
        _fragVideoDetail.onPictureInPictureModeChanged(isInPictureInPictureMode, isStop, newConfig);
        Logger.v(TAG, "onPictureInPictureModeChanged Ready");
+
+        _pictureInPictureEnabled = isInPictureInPictureMode
+        updatePrivateModeVisibility()
    }

    override fun onDestroy() {
        super.onDestroy();
-        Logger.v(TAG, "onDestroy")
-        StateApp.instance.mainAppDestroyed(this);
+        Logger.w(TAG, "onDestroy [$mainId]")
+        StateApp.instance.mainAppDestroyed(this, mainId);
    }

    inline fun <reified T> isFragmentActive(): Boolean {
        return fragCurrent is T;
    }

+    fun navigateWhenReady(segment: MainFragment, parameter: Any? = null, withHistory: Boolean = true, isBack: Boolean = false) {
+        if (lifecycle.currentState.isAtLeast(Lifecycle.State.RESUMED)) {
+            navigate(segment, parameter, withHistory, isBack)
+        } else {
+            lifecycleScope.launch {
+                lifecycle.withStateAtLeast(Lifecycle.State.RESUMED) {
+                    navigate(segment, parameter, withHistory, isBack)
+                }
+            }
+        }
+    }
+
    /**
     * Navigate takes a MainFragment, and makes them the current main visible view
     * A parameter can be provided which becomes available in the onShow of said fragment
@@ -1137,7 +1187,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
            if (segment.isOverlay && !fragCurrent.isOverlay && withHistory)// && fragCurrent.isHistory)
                fragBeforeOverlay = fragCurrent;

-
            fragCurrent = segment;
            _parameterCurrent = parameter;
        }
@@ -1200,6 +1249,8 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
            PlaylistFragment::class -> _fragMainPlaylist as T;
            RemotePlaylistFragment::class -> _fragMainRemotePlaylist as T;
            PostDetailFragment::class -> _fragPostDetail as T;
+            ArticleDetailFragment::class -> _fragArticleDetail as T;
+            WebDetailFragment::class -> _fragWebDetail as T;
            WatchLaterFragment::class -> _fragWatchlist as T;
            HistoryFragment::class -> _fragHistory as T;
            SourceDetailFragment::class -> _fragSourceDetail as T;
@@ -9,6 +9,8 @@ import android.widget.LinearLayout
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.R
+import com.futo.platformplayer.UIDialogs
+import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.setNavigationBarColorAndIcons
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StateSync
@@ -29,6 +31,16 @@ class SyncHomeActivity : AppCompatActivity() {

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
+
+        if (StateApp.instance.contextOrNull == null) {
+            Logger.w(TAG, "No main activity, restarting main.")
+            val intent = Intent(this, MainActivity::class.java)
+            intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
+            startActivity(intent)
+            finish()
+            return
+        }
+
        setContentView(R.layout.activity_sync_home)
        setNavigationBarColorAndIcons()

@@ -54,7 +66,6 @@ class SyncHomeActivity : AppCompatActivity() {
                val view = _viewMap[publicKey]
                if (!session.isAuthorized) {
                    if (view != null) {
-                        _layoutDevices.removeView(view)
                        _viewMap.remove(publicKey)
                    }
                    return@launch
@@ -89,6 +100,20 @@ class SyncHomeActivity : AppCompatActivity() {
                updateEmptyVisibility()
            }
        }
+
+        StateSync.instance.confirmStarted(this, onStarted = {
+            if (StateSync.instance.syncService?.serverSocketFailedToStart == true) {
+                UIDialogs.toast(this, "Server socket failed to start, is the port in use?", true)
+            }
+            if (StateSync.instance.syncService?.relayConnected == false) {
+                UIDialogs.toast(this, "Not connected to relay, remote connections will work.", false)
+            }
+            if (StateSync.instance.syncService?.serverSocketStarted == false) {
+                UIDialogs.toast(this, "Listener not started, local connections will not work.", false)
+            }
+        }, onNotStarted = {
+            finish()
+        })
    }

    override fun onDestroy() {
@@ -100,11 +125,12 @@ class SyncHomeActivity : AppCompatActivity() {

    private fun updateDeviceView(syncDeviceView: SyncDeviceView, publicKey: String, session: SyncSession?): SyncDeviceView {
        val connected = session?.connected ?: false
+        val authorized = session?.isAuthorized ?: false

        syncDeviceView.setLinkType(session?.linkType ?: LinkType.None)
            .setName(session?.displayName ?: StateSync.instance.getCachedName(publicKey) ?: publicKey)
            //TODO: also display public key?
-            .setStatus(if (connected) "Connected" else "Disconnected")
+            .setStatus(if (connected && authorized) "Connected" else "Disconnected or unauthorized")
        return syncDeviceView
    }

@@ -83,6 +83,7 @@ class SyncPairActivity : AppCompatActivity() {

        _layoutPairingSuccess.setOnClickListener {
            _layoutPairingSuccess.visibility = View.GONE
+            finish()
        }
        _layoutPairingError.setOnClickListener {
            _layoutPairingError.visibility = View.GONE
@@ -109,11 +110,17 @@ class SyncPairActivity : AppCompatActivity() {

            lifecycleScope.launch(Dispatchers.IO) {
                try {
-                    StateSync.instance.connect(deviceInfo) { complete, message ->
+                    StateSync.instance.syncService?.connect(deviceInfo) { complete, message ->
                        lifecycleScope.launch(Dispatchers.Main) {
-                            if (complete != null && complete) {
-                                _layoutPairingSuccess.visibility = View.VISIBLE
-                                _layoutPairing.visibility = View.GONE
+                            if (complete != null) {
+                                if (complete) {
+                                    _layoutPairingSuccess.visibility = View.VISIBLE
+                                    _layoutPairing.visibility = View.GONE
+                                } else {
+                                    _textError.text = message
+                                    _layoutPairingError.visibility = View.VISIBLE
+                                    _layoutPairing.visibility = View.GONE
+                                }
                            } else {
                                _textPairingStatus.text = message
                            }
@@ -137,8 +144,6 @@ class SyncPairActivity : AppCompatActivity() {
            _textError.text = e.message
            _layoutPairing.visibility = View.GONE
            Logger.e(TAG, "Failed to pair", e)
-        } finally {
-            _layoutPairing.visibility = View.GONE
        }
    }

@@ -67,11 +67,18 @@ class SyncShowPairingCodeActivity : AppCompatActivity() {
        }

        val ips = getIPs()
-        val selfDeviceInfo = SyncDeviceInfo(StateSync.instance.publicKey!!, ips.toTypedArray(), StateSync.PORT, StateSync.instance.pairingCode)
-        val json = Json.encodeToString(selfDeviceInfo)
-        val base64 = Base64.encodeToString(json.toByteArray(), Base64.URL_SAFE or Base64.NO_PADDING or Base64.NO_WRAP)
-        val url = "grayjay://sync/${base64}"
-        setCode(url)
+        val publicKey = StateSync.instance.syncService?.publicKey
+        val pairingCode = StateSync.instance.syncService?.pairingCode
+        if (publicKey == null || pairingCode == null) {
+            setCode("Public key or pairing code was not known, is sync enabled?")
+        } else {
+            val selfDeviceInfo = SyncDeviceInfo(publicKey, ips.toTypedArray(), StateSync.PORT, pairingCode)
+            val json = Json.encodeToString(selfDeviceInfo)
+            val base64 = Base64.encodeToString(json.toByteArray(), Base64.URL_SAFE or Base64.NO_PADDING or Base64.NO_WRAP)
+            val url = "grayjay://sync/${base64}"
+            setCode(url)
+        }
+
    }

    fun setCode(code: String?) {
@@ -90,6 +90,7 @@ open class ManagedHttpClient {
    }

    fun tryHead(url: String): Map<String, String>? {
+        ensureNotMainThread()
        try {
            val result = head(url);
            if(result.isOk)
@@ -104,7 +105,7 @@ open class ManagedHttpClient {
    }

    fun socket(url: String, headers: MutableMap<String, String> = HashMap(), listener: SocketListener): Socket {
-
+        ensureNotMainThread()
        val requestBuilder: okhttp3.Request.Builder = okhttp3.Request.Builder()
            .url(url);
        if(user_agent.isNotEmpty() && !headers.any { it.key.lowercase() == "user-agent" })
@@ -300,6 +301,7 @@ open class ManagedHttpClient {
        }

        fun send(msg: String) {
+            ensureNotMainThread()
            socket.send(msg);
        }

@@ -14,14 +14,16 @@ class PlatformClientPool {
    private var _poolCounter = 0;
    private val _poolName: String?;
    private val _privatePool: Boolean;
+    private val _isolatedInitialization: Boolean

    var isDead: Boolean = false
        private set;
    val onDead = Event2<JSClient, PlatformClientPool>();

-    constructor(parentClient: IPlatformClient, name: String? = null, privatePool: Boolean = false) {
+    constructor(parentClient: IPlatformClient, name: String? = null, privatePool: Boolean = false, isolatedInitialization: Boolean = false) {
        _poolName = name;
        _privatePool = privatePool;
+        _isolatedInitialization = isolatedInitialization
        if(parentClient !is JSClient)
            throw IllegalArgumentException("Pooling only supported for JSClients right now");
        Logger.i(TAG, "Pool for ${parentClient.name} was started");
@@ -53,7 +55,7 @@ class PlatformClientPool {
            reserved = _pool.keys.find { !it.isBusy };
            if(reserved == null && _pool.size < capacity) {
                Logger.i(TAG, "Started additional [${_parent.name}] client in pool [${_poolName}] (${_pool.size + 1}/${capacity})");
-                reserved = _parent.getCopy(_privatePool);
+                reserved = _parent.getCopy(_privatePool, _isolatedInitialization);

                reserved?.onCaptchaException?.subscribe { client, ex ->
                    StateApp.instance.handleCaptchaException(client, ex);
@@ -7,13 +7,15 @@ class PlatformMultiClientPool {

    private var _isFake = false;
    private var _privatePool = false;
+    private val _isolatedInitialization: Boolean

-    constructor(name: String, maxCap: Int = -1, isPrivatePool: Boolean = false) {
+    constructor(name: String, maxCap: Int = -1, isPrivatePool: Boolean = false, isolatedInitialization: Boolean = false) {
        _name = name;
        _maxCap = if(maxCap > 0)
            maxCap
        else 99;
        _privatePool = isPrivatePool;
+        _isolatedInitialization = isolatedInitialization
    }

    fun getClientPooled(parentClient: IPlatformClient, capacity: Int = _maxCap): IPlatformClient {
@@ -21,7 +23,7 @@ class PlatformMultiClientPool {
            return parentClient;
        val pool = synchronized(_clientPools) {
            if(!_clientPools.containsKey(parentClient))
-                _clientPools[parentClient] = PlatformClientPool(parentClient, _name, _privatePool).apply {
+                _clientPools[parentClient] = PlatformClientPool(parentClient, _name, _privatePool, _isolatedInitialization).apply {
                    this.onDead.subscribe { _, pool ->
                        synchronized(_clientPools) {
                            if(_clientPools[parentClient] == pool)
@@ -0,0 +1,9 @@
+package com.futo.platformplayer.api.media.models.article
+
+import com.futo.platformplayer.api.media.models.Thumbnails
+import com.futo.platformplayer.api.media.models.contents.IPlatformContent
+
+interface IPlatformArticle: IPlatformContent {
+    val summary: String?;
+    val thumbnails: Thumbnails?;
+}
@@ -0,0 +1,12 @@
+package com.futo.platformplayer.api.media.models.article
+
+import com.futo.platformplayer.api.media.models.Thumbnails
+import com.futo.platformplayer.api.media.models.contents.IPlatformContent
+import com.futo.platformplayer.api.media.models.contents.IPlatformContentDetails
+import com.futo.platformplayer.api.media.models.ratings.IRating
+import com.futo.platformplayer.api.media.platforms.js.models.IJSArticleSegment
+
+interface IPlatformArticleDetails: IPlatformContent, IPlatformArticle, IPlatformContentDetails {
+    val segments: List<IJSArticleSegment>;
+    val rating : IRating;
+}
@@ -8,6 +8,7 @@ enum class ContentType(val value: Int) {
    POST(2),
    ARTICLE(3),
    PLAYLIST(4),
+    WEB(7),

    URL(9),

@@ -5,7 +5,8 @@ import com.futo.platformplayer.api.media.exceptions.UnknownPlatformException
 enum class TextType(val value: Int) {
    RAW(0),
    HTML(1),
-    MARKUP(2);
+    MARKUP(2),
+    CODE(3);

    companion object {
        fun fromInt(value: Int): TextType
@@ -54,8 +54,12 @@ class DevJSClient : JSClient {
        return DevJSClient(context, config, _devScript, _auth, _captcha, devID, descriptor.settings);
    }

-    override fun getCopy(privateCopy: Boolean): JSClient {
-        return DevJSClient(_context, descriptor, _script, if(!privateCopy) _auth else null, _captcha, saveState(), devID);
+    override fun getCopy(privateCopy: Boolean, noSaveState: Boolean): JSClient {
+        val client = DevJSClient(_context, descriptor, _script, if(!privateCopy) _auth else null, _captcha, if (noSaveState) null else saveState(), devID);
+        client.setReloadData(getReloadData(true));
+        if (noSaveState)
+            client.initialize()
+        return client
    }

    override fun initialize() {
@@ -59,9 +59,13 @@ import com.futo.platformplayer.states.AnnouncementType
 import com.futo.platformplayer.states.StateAnnouncement
 import com.futo.platformplayer.states.StatePlatform
 import com.futo.platformplayer.states.StatePlugins
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.runBlocking
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import java.time.OffsetDateTime
+import java.util.Random
 import kotlin.Exception
 import kotlin.reflect.full.findAnnotations
 import kotlin.reflect.jvm.kotlinFunction
@@ -83,6 +87,8 @@ open class JSClient : IPlatformClient {
    private var _channelCapabilities: ResultCapabilities? = null;
    private var _peekChannelTypes: List<String>? = null;

+    private var _usedReloadData: String? = null;
+
    protected val _script: String;

    private var _initialized: Boolean = false;
@@ -98,14 +104,14 @@ open class JSClient : IPlatformClient {
    override val icon: ImageVariable;
    override var capabilities: PlatformClientCapabilities = PlatformClientCapabilities();

-    private val _busyLock = Object();
-    private var _busyCounter = 0;
    private var _busyAction = "";
-    val isBusy: Boolean get() = _busyCounter > 0;
+    val isBusy: Boolean get() = _plugin.isBusy;
    val isBusyAction: String get() {
        return _busyAction;
    }

+    val declareOnEnable = HashMap<String, String>();
+
    val settings: HashMap<String, String?> get() = descriptor.settings;

    val flags: Array<String>;
@@ -195,8 +201,12 @@ open class JSClient : IPlatformClient {
        _plugin.changeAllowDevSubmit(descriptor.appSettings.allowDeveloperSubmit);
    }

-    open fun getCopy(withoutCredentials: Boolean = false): JSClient {
-        return JSClient(_context, descriptor, saveState(), _script, withoutCredentials);
+    open fun getCopy(withoutCredentials: Boolean = false, noSaveState: Boolean = false): JSClient {
+        val client = JSClient(_context, descriptor, if (noSaveState) null else saveState(), _script, withoutCredentials);
+        client.setReloadData(getReloadData(true));
+        if (noSaveState)
+            client.initialize()
+        return client
    }

    fun getUnderlyingPlugin(): V8Plugin {
@@ -210,12 +220,31 @@ open class JSClient : IPlatformClient {
        return plugin.httpClientOthers[id];
    }

+    fun setReloadData(data: String?) {
+        if(data == null) {
+            if(declareOnEnable.containsKey("__reloadData"))
+                declareOnEnable.remove("__reloadData");
+        }
+        else
+            declareOnEnable.put("__reloadData", data ?: "");
+    }
+    fun getReloadData(orLast: Boolean): String? {
+        if(declareOnEnable.containsKey("__reloadData"))
+            return declareOnEnable["__reloadData"];
+        else if(orLast)
+            return _usedReloadData;
+        return null;
+    }
+
    override fun initialize() {
-        Logger.i(TAG, "Plugin [${config.name}] initializing");
+        if (_initialized) return
+
        plugin.start();
+
        plugin.execute("plugin.config = ${Json.encodeToString(config)}");
        plugin.execute("plugin.settings = parseSettings(${Json.encodeToString(descriptor.getSettingsWithDefaults())})");

+
        descriptor.appSettings.loadDefaults(descriptor.config);

        _initialized = true;
@@ -255,19 +284,28 @@ open class JSClient : IPlatformClient {
    }

    @JSDocs(0, "source.enable()", "Called when the plugin is enabled/started")
-    fun enable() {
+    fun enable() = isBusyWith("enable") {
        if(!_initialized)
            initialize();
+        for(toDeclare in declareOnEnable) {
+            plugin.execute("var ${toDeclare.key} = " + Json.encodeToString(toDeclare.value));
+        }
        plugin.execute("source.enable(${Json.encodeToString(config)}, parseSettings(${Json.encodeToString(descriptor.getSettingsWithDefaults())}), ${Json.encodeToString(_injectedSaveState)})");
+
+        if(declareOnEnable.containsKey("__reloadData")) {
+            Logger.i(TAG, "Plugin [${config.name}] enabled with reload data: ${declareOnEnable["__reloadData"]}");
+            _usedReloadData = declareOnEnable["__reloadData"];
+            declareOnEnable.remove("__reloadData");
+        }
        _enabled = true;
    }
    @JSDocs(1, "source.saveState()", "Provide a string that is passed to enable for quicker startup of multiple instances")
-    fun saveState(): String? {
+    fun saveState(): String? = isBusyWith("saveState") {
        ensureEnabled();
        if(!capabilities.hasSaveState)
-            return null;
+            return@isBusyWith null;
        val resp = plugin.executeTyped<V8ValueString>("source.saveState()").value;
-        return resp;
+        return@isBusyWith resp;
    }

    @JSDocs(1, "source.disable()", "Called before the plugin is disabled/stopped")
@@ -370,14 +408,14 @@ open class JSClient : IPlatformClient {

    @JSDocs(6, "source.isChannelUrl(url)", "Validates if an channel url is for this platform")
    @JSDocsParameter("url", "A channel url (May not be your platform)")
-    override fun isChannelUrl(url: String): Boolean {
+    override fun isChannelUrl(url: String): Boolean = isBusyWith("isChannelUrl") {
        try {
-            return plugin.executeTyped<V8ValueBoolean>("source.isChannelUrl(${Json.encodeToString(url)})")
+            return@isBusyWith plugin.executeTyped<V8ValueBoolean>("source.isChannelUrl(${Json.encodeToString(url)})")
                .value;
        }
        catch(ex: Throwable) {
            announcePluginUnhandledException("isChannelUrl", ex);
-            return false;
+            return@isBusyWith false;
        }
    }
    @JSDocs(7, "source.getChannel(channelUrl)", "Gets a channel by its url")
@@ -508,14 +546,14 @@ open class JSClient : IPlatformClient {

    @JSDocs(13, "source.isContentDetailsUrl(url)", "Validates if an content url is for this platform")
    @JSDocsParameter("url", "A content url (May not be your platform)")
-    override fun isContentDetailsUrl(url: String): Boolean {
+    override fun isContentDetailsUrl(url: String): Boolean = isBusyWith("isContentDetailsUrl") {
        try {
-            return plugin.executeTyped<V8ValueBoolean>("source.isContentDetailsUrl(${Json.encodeToString(url)})")
+            return@isBusyWith plugin.executeTyped<V8ValueBoolean>("source.isContentDetailsUrl(${Json.encodeToString(url)})")
                .value;
        }
        catch(ex: Throwable) {
            announcePluginUnhandledException("isContentDetailsUrl", ex);
-            return false;
+            return@isBusyWith false;
        }
    }
    @JSDocs(14, "source.getContentDetails(url)", "Gets content details by its url")
@@ -547,7 +585,7 @@ open class JSClient : IPlatformClient {
        Logger.i(TAG, "JSClient.getPlaybackTracker(${url})");
        val tracker = plugin.executeTyped<V8Value>("source.getPlaybackTracker(${Json.encodeToString(url)})");
        if(tracker is V8ValueObject)
-            return@isBusyWith JSPlaybackTracker(config, tracker);
+            return@isBusyWith JSPlaybackTracker(this, tracker);
        else
            return@isBusyWith null;
    }
@@ -617,17 +655,19 @@ open class JSClient : IPlatformClient {
    @JSOptional
    @JSDocs(20, "source.isPlaylistUrl(url)", "Validates if a playlist url is for this platform")
    @JSDocsParameter("url", "Url of playlist")
-    override fun isPlaylistUrl(url: String): Boolean {
+    override fun isPlaylistUrl(url: String): Boolean = isBusyWith("isPlaylistUrl") {
        if (!capabilities.hasGetPlaylist)
-            return false;
+            return@isBusyWith false;

        try {
-            return plugin.executeTyped<V8ValueBoolean>("source.isPlaylistUrl(${Json.encodeToString(url)})")
-                .value;
+            return@isBusyWith busy {
+                return@busy plugin.executeTyped<V8ValueBoolean>("source.isPlaylistUrl(${Json.encodeToString(url)})")
+                    .value;
+            }
        }
        catch(ex: Throwable) {
            announcePluginUnhandledException("isPlaylistUrl", ex);
-            return false;
+            return@isBusyWith false;
        }
    }
    @JSOptional
@@ -729,19 +769,29 @@ open class JSClient : IPlatformClient {
        return urls;
    }

-
-    private fun <T> isBusyWith(actionName: String, handle: ()->T): T {
-        try {
-            synchronized(_busyLock) {
-                _busyCounter++;
-            }
-            _busyAction = actionName;
-            return handle();
+    fun <T> busy(handle: ()->T): T {
+        return _plugin.busy {
+            return@busy handle();
        }
-        finally {
-            _busyAction = "";
-            synchronized(_busyLock) {
-                _busyCounter--;
+    }
+    fun <T> busyBlockingSuspended(handle: suspend ()->T): T {
+        return _plugin.busy {
+            return@busy runBlocking {
+                return@runBlocking handle();
+            }
+        }
+    }
+
+    fun <T> isBusyWith(actionName: String, handle: ()->T): T {
+        //val busyId = kotlin.random.Random.nextInt(9999);
+        return busy {
+            try {
+                _busyAction = actionName;
+                return@busy handle();
+
+            }
+            finally {
+                _busyAction = "";
            }
        }
    }
@@ -4,6 +4,7 @@ import android.net.Uri
 import com.futo.platformplayer.SignatureProvider
 import com.futo.platformplayer.api.media.Serializer
 import com.futo.platformplayer.engine.IV8PluginConfig
+import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.matchesDomain
 import com.futo.platformplayer.states.StatePlugins
 import kotlinx.serialization.Contextual
@@ -168,12 +169,17 @@ class SourcePluginConfig(
    }

    fun validate(text: String): Boolean {
-        if(scriptPublicKey.isNullOrEmpty())
-            throw IllegalStateException("No public key present");
-        if(scriptSignature.isNullOrEmpty())
-            throw IllegalStateException("No signature present");
+        try {
+            if (scriptPublicKey.isNullOrEmpty())
+                throw IllegalStateException("No public key present");
+            if (scriptSignature.isNullOrEmpty())
+                throw IllegalStateException("No signature present");

-        return SignatureProvider.verify(text, scriptSignature, scriptPublicKey);
+            return SignatureProvider.verify(text, scriptSignature, scriptPublicKey);
+        } catch (e: Throwable) {
+            Logger.e(TAG, "Failed to verify due to an unhandled exception", e)
+            return false
+        }
    }

    fun isUrlAllowed(url: String): Boolean {
@@ -204,6 +210,8 @@ class SourcePluginConfig(
                obj.sourceUrl = sourceUrl;
            return obj;
        }
+
+        private val TAG = "SourcePluginConfig"
    }

    @kotlinx.serialization.Serializable
@@ -67,6 +67,25 @@ class JSHttpClient : ManagedHttpClient {

    }

+    fun resetAuthCookies() {
+        _currentCookieMap.clear();
+        if(!_auth?.cookieMap.isNullOrEmpty()) {
+            for(domainCookies in _auth!!.cookieMap!!)
+                _currentCookieMap.put(domainCookies.key, HashMap(domainCookies.value));
+        }
+        if(!_captcha?.cookieMap.isNullOrEmpty()) {
+            for(domainCookies in _captcha!!.cookieMap!!) {
+                if(_currentCookieMap.containsKey(domainCookies.key))
+                    _currentCookieMap[domainCookies.key]?.putAll(domainCookies.value);
+                else
+                    _currentCookieMap.put(domainCookies.key, HashMap(domainCookies.value));
+            }
+        }
+    }
+    fun clearOtherCookies() {
+        _otherCookieMap.clear();
+    }
+
    override fun clone(): ManagedHttpClient {
        val newClient = JSHttpClient(_jsClient, _auth);
        newClient._currentCookieMap = HashMap(_currentCookieMap.toList().associate { Pair(it.first, HashMap(it.second)) })
@@ -127,7 +146,7 @@ class JSHttpClient : ManagedHttpClient {
        }

        if(doApplyCookies) {
-            if (_currentCookieMap.isNotEmpty()) {
+            if (_currentCookieMap.isNotEmpty() || _otherCookieMap.isNotEmpty()) {
                val cookiesToApply = hashMapOf<String, String>();
                synchronized(_currentCookieMap) {
                    for(cookie in _currentCookieMap
@@ -135,6 +154,12 @@ class JSHttpClient : ManagedHttpClient {
                        .flatMap { it.value.toList() })
                        cookiesToApply[cookie.first] = cookie.second;
                };
+                synchronized(_otherCookieMap) {
+                    for(cookie in _otherCookieMap
+                        .filter { domain.matchesDomain(it.key) }
+                        .flatMap { it.value.toList() })
+                        cookiesToApply[cookie.first] = cookie.second;
+                }

                if(cookiesToApply.size > 0) {
                    val cookieString = cookiesToApply.map { it.key + "=" + it.value }.joinToString("; ");
@@ -27,7 +27,9 @@ interface IJSContent: IPlatformContent  {
                ContentType.NESTED_VIDEO -> JSNestedMediaContent(config, obj);
                ContentType.PLAYLIST -> JSPlaylist(config, obj);
                ContentType.LOCKED -> JSLockedContent(config, obj);
-                ContentType.CHANNEL -> JSChannelContent(config, obj)
+                ContentType.CHANNEL -> JSChannelContent(config, obj);
+                ContentType.ARTICLE -> JSArticle(config, obj);
+                ContentType.WEB -> JSWeb(config, obj);
                else -> throw NotImplementedError("Unknown content type ${type}");
            }
        }
@@ -17,6 +17,7 @@ interface IJSContentDetails: IPlatformContent  {
                ContentType.MEDIA -> JSVideoDetails(plugin, obj);
                ContentType.POST -> JSPostDetails(plugin.config, obj);
                ContentType.ARTICLE -> JSArticleDetails(plugin, obj);
+                ContentType.WEB -> JSWebDetails(plugin, obj);
                else -> throw NotImplementedError("Unknown content type ${type}");
            }
        }
@@ -0,0 +1,39 @@
+package com.futo.platformplayer.api.media.platforms.js.models
+
+import com.caoccao.javet.values.reference.V8ValueObject
+import com.futo.platformplayer.api.media.IPlatformClient
+import com.futo.platformplayer.api.media.IPluginSourced
+import com.futo.platformplayer.api.media.models.Thumbnails
+import com.futo.platformplayer.api.media.models.article.IPlatformArticle
+import com.futo.platformplayer.api.media.models.comments.IPlatformComment
+import com.futo.platformplayer.api.media.models.contents.ContentType
+import com.futo.platformplayer.api.media.models.contents.IPlatformContent
+import com.futo.platformplayer.api.media.models.contents.IPlatformContentDetails
+import com.futo.platformplayer.api.media.models.playback.IPlaybackTracker
+import com.futo.platformplayer.api.media.models.post.IPlatformPost
+import com.futo.platformplayer.api.media.models.post.TextType
+import com.futo.platformplayer.api.media.models.ratings.IRating
+import com.futo.platformplayer.api.media.models.ratings.RatingLikes
+import com.futo.platformplayer.api.media.platforms.js.DevJSClient
+import com.futo.platformplayer.api.media.platforms.js.JSClient
+import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
+import com.futo.platformplayer.api.media.structures.IPager
+import com.futo.platformplayer.getOrDefault
+import com.futo.platformplayer.getOrThrow
+import com.futo.platformplayer.getOrThrowNullableList
+import com.futo.platformplayer.states.StateDeveloper
+
+open class JSArticle : JSContent, IPlatformArticle, IPluginSourced {
+    final override val contentType: ContentType get() = ContentType.ARTICLE;
+
+    override val summary: String;
+    override val thumbnails: Thumbnails?;
+
+    constructor(config: SourcePluginConfig, obj: V8ValueObject): super(config, obj) {
+        val contextName = "PlatformArticle";
+
+        summary = _content.getOrDefault(config, "summary", contextName, "") ?: "";
+        thumbnails = Thumbnails.fromV8(config, _content.getOrThrow(config, "thumbnails", contextName));
+
+    }
+}
@@ -4,6 +4,8 @@ import com.caoccao.javet.values.reference.V8ValueObject
 import com.futo.platformplayer.api.media.IPlatformClient
 import com.futo.platformplayer.api.media.IPluginSourced
 import com.futo.platformplayer.api.media.models.Thumbnails
+import com.futo.platformplayer.api.media.models.article.IPlatformArticle
+import com.futo.platformplayer.api.media.models.article.IPlatformArticleDetails
 import com.futo.platformplayer.api.media.models.comments.IPlatformComment
 import com.futo.platformplayer.api.media.models.contents.ContentType
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
@@ -21,20 +23,20 @@ import com.futo.platformplayer.getOrThrow
 import com.futo.platformplayer.getOrThrowNullableList
 import com.futo.platformplayer.states.StateDeveloper

-open class JSArticleDetails : JSContent, IPluginSourced, IPlatformContentDetails {
+open class JSArticleDetails : JSContent, IPlatformArticleDetails, IPluginSourced, IPlatformContentDetails {
    final override val contentType: ContentType get() = ContentType.ARTICLE;

    private val _hasGetComments: Boolean;
    private val _hasGetContentRecommendations: Boolean;

-    val rating: IRating;
+    override val rating: IRating;

-    val summary: String;
-    val thumbnails: Thumbnails?;
-    val segments: List<IJSArticleSegment>;
+    override val summary: String;
+    override val thumbnails: Thumbnails?;
+    override val segments: List<IJSArticleSegment>;

    constructor(client: JSClient, obj: V8ValueObject): super(client.config, obj) {
-        val contextName = "PlatformPost";
+        val contextName = "PlatformArticle";

        rating = obj.getOrDefault<V8ValueObject>(client.config, "rating", contextName, null)?.let { IRating.fromV8(client.config, it, contextName) } ?: RatingLikes(0);
        summary = _content.getOrThrow(client.config, "summary", contextName);
@@ -99,6 +101,7 @@ open class JSArticleDetails : JSContent, IPluginSourced, IPlatformContentDetails
            return when(SegmentType.fromInt(obj.getOrThrow(client.config, "type", "JSArticle.Segment"))) {
                SegmentType.TEXT -> JSTextSegment(client, obj);
                SegmentType.IMAGES -> JSImagesSegment(client, obj);
+                SegmentType.HEADER -> JSHeaderSegment(client, obj);
                SegmentType.NESTED -> JSNestedSegment(client, obj);
                else -> null;
            }
@@ -110,6 +113,7 @@ enum class SegmentType(val value: Int) {
    UNKNOWN(0),
    TEXT(1),
    IMAGES(2),
+    HEADER(3),

    NESTED(9);

@@ -150,6 +154,17 @@ class JSImagesSegment: IJSArticleSegment {
        caption = obj.getOrDefault(client.config, "caption", contextName, "") ?: "";
    }
 }
+class JSHeaderSegment: IJSArticleSegment {
+    override val type = SegmentType.HEADER;
+    val content: String;
+    val level: Int;
+
+    constructor(client: JSClient, obj: V8ValueObject) {
+        val contextName = "JSHeaderSegment";
+        content = obj.getOrDefault(client.config, "content", contextName, "") ?: "";
+        level = obj.getOrDefault(client.config, "level", contextName, 1) ?: 1;
+    }
+}
 class JSNestedSegment: IJSArticleSegment {
    override val type = SegmentType.NESTED;
    val nested: IPlatformContent;
@@ -29,7 +29,9 @@ abstract class JSPager<T> : IPager<T> {
        this.pager = pager;
        this.config = config;

-        _hasMorePages = pager.getOrDefault(config, "hasMore", "Pager", false) ?: false;
+        plugin.busy {
+            _hasMorePages = pager.getOrDefault(config, "hasMore", "Pager", false) ?: false;
+        }
        getResults();
    }

@@ -44,11 +46,14 @@ abstract class JSPager<T> : IPager<T> {
    override fun nextPage() {
        warnIfMainThread("JSPager.nextPage");

-        pager = plugin.getUnderlyingPlugin().catchScriptErrors("[${plugin.config.name}] JSPager", "pager.nextPage()") {
-            pager.invoke("nextPage", arrayOf<Any>());
-        };
-        _hasMorePages = pager.getOrDefault(config, "hasMore", "Pager", false) ?: false;
-        _resultChanged = true;
+        val pluginV8 = plugin.getUnderlyingPlugin();
+        pluginV8.busy {
+            pager = pluginV8.catchScriptErrors("[${plugin.config.name}] JSPager", "pager.nextPage()") {
+                pager.invoke("nextPage", arrayOf<Any>());
+            };
+            _hasMorePages = pager.getOrDefault(config, "hasMore", "Pager", false) ?: false;
+            _resultChanged = true;
+        }
        /*
        try {
        }
@@ -70,15 +75,18 @@ abstract class JSPager<T> : IPager<T> {
            return previousResults;

        warnIfMainThread("JSPager.getResults");
-        val items = pager.getOrThrow<V8ValueArray>(config, "results", "JSPager");
-        if(items.v8Runtime.isDead || items.v8Runtime.isClosed)
-            throw IllegalStateException("Runtime closed");
-        val newResults = items.toArray()
-            .map { convertResult(it as V8ValueObject) }
-            .toList();
-        _lastResults = newResults;
-        _resultChanged = false;
-        return newResults;
+
+        return plugin.getUnderlyingPlugin().busy {
+            val items = pager.getOrThrow<V8ValueArray>(config, "results", "JSPager");
+            if (items.v8Runtime.isDead || items.v8Runtime.isClosed)
+                throw IllegalStateException("Runtime closed");
+            val newResults = items.toArray()
+                .map { convertResult(it as V8ValueObject) }
+                .toList();
+            _lastResults = newResults;
+            _resultChanged = false;
+            return@busy newResults;
+        }
    }

    abstract fun convertResult(obj: V8ValueObject): T;
@@ -2,37 +2,50 @@ package com.futo.platformplayer.api.media.platforms.js.models

 import com.caoccao.javet.values.reference.V8ValueObject
 import com.futo.platformplayer.api.media.models.playback.IPlaybackTracker
+import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.engine.IV8PluginConfig
 import com.futo.platformplayer.engine.exceptions.ScriptImplementationException
 import com.futo.platformplayer.getOrThrow
 import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.states.StatePlatform
 import com.futo.platformplayer.warnIfMainThread

 class JSPlaybackTracker: IPlaybackTracker {
-    private val _config: IV8PluginConfig;
-    private val _obj: V8ValueObject;
+    private lateinit var _client: JSClient;
+    private lateinit var _config: IV8PluginConfig;
+    private lateinit var _obj: V8ValueObject;

    private var _hasCalledInit: Boolean = false;
-    private val _hasInit: Boolean;
+    private var _hasInit: Boolean = false;

    private var _lastRequest: Long = Long.MIN_VALUE;

-    private val _hasOnConcluded: Boolean;
+    private var _hasOnConcluded: Boolean = false;

    override var nextRequest: Int = 1000
        private set;

-    constructor(config: IV8PluginConfig, obj: V8ValueObject) {
+    constructor(client: JSClient, obj: V8ValueObject) {
        warnIfMainThread("JSPlaybackTracker.constructor");
-        if(!obj.has("onProgress"))
-            throw ScriptImplementationException(config, "Missing onProgress on PlaybackTracker");
-        if(!obj.has("nextRequest"))
-            throw ScriptImplementationException(config, "Missing nextRequest on PlaybackTracker");
-        _hasOnConcluded = obj.has("onConcluded");

-        this._config = config;
-        this._obj = obj;
-        this._hasInit = obj.has("onInit");
+        client.busy {
+            if (!obj.has("onProgress"))
+                throw ScriptImplementationException(
+                    client.config,
+                    "Missing onProgress on PlaybackTracker"
+                );
+            if (!obj.has("nextRequest"))
+                throw ScriptImplementationException(
+                    client.config,
+                    "Missing nextRequest on PlaybackTracker"
+                );
+            _hasOnConcluded = obj.has("onConcluded");
+
+            this._client = client;
+            this._config = client.config;
+            this._obj = obj;
+            this._hasInit = obj.has("onInit");
+        }
    }

    override fun onInit(seconds: Double) {
@@ -40,12 +53,15 @@ class JSPlaybackTracker: IPlaybackTracker {
        synchronized(_obj) {
            if(_hasCalledInit)
                return;
-            if (_hasInit) {
-                Logger.i("JSPlaybackTracker", "onInit (${seconds})");
-                _obj.invokeVoid("onInit", seconds);
+
+            _client.busy {
+                if (_hasInit) {
+                    Logger.i("JSPlaybackTracker", "onInit (${seconds})");
+                    _obj.invokeVoid("onInit", seconds);
+                }
+                nextRequest = Math.max(100, _obj.getOrThrow(_config, "nextRequest", "PlaybackTracker", false));
+                _hasCalledInit = true;
            }
-            nextRequest = Math.max(100, _obj.getOrThrow(_config, "nextRequest", "PlaybackTracker", false));
-            _hasCalledInit = true;
        }
    }

@@ -55,10 +71,12 @@ class JSPlaybackTracker: IPlaybackTracker {
            if(!_hasCalledInit && _hasInit)
                onInit(seconds);
            else {
-                Logger.i("JSPlaybackTracker", "onProgress (${seconds}, ${isPlaying})");
-                _obj.invokeVoid("onProgress", Math.floor(seconds), isPlaying);
-                nextRequest = Math.max(100, _obj.getOrThrow(_config, "nextRequest", "PlaybackTracker", false));
-                _lastRequest = System.currentTimeMillis();
+                _client.busy {
+                    Logger.i("JSPlaybackTracker", "onProgress (${seconds}, ${isPlaying})");
+                    _obj.invokeVoid("onProgress", Math.floor(seconds), isPlaying);
+                    nextRequest = Math.max(100, _obj.getOrThrow(_config, "nextRequest", "PlaybackTracker", false));
+                    _lastRequest = System.currentTimeMillis();
+                }
            }
        }
    }
@@ -67,7 +85,9 @@ class JSPlaybackTracker: IPlaybackTracker {
        if(_hasOnConcluded) {
            synchronized(_obj) {
                Logger.i("JSPlaybackTracker", "onConcluded");
-                _obj.invokeVoid("onConcluded", -1);
+                _client.busy {
+                    _obj.invokeVoid("onConcluded", -1);
+                }
            }
        }
    }
@@ -46,16 +46,18 @@ class JSRequestExecutor {
        if (_executor.isClosed)
            throw IllegalStateException("Executor object is closed");

-        val result = if(_plugin is DevJSClient)
-            StateDeveloper.instance.handleDevCall(_plugin.devID, "requestExecutor.executeRequest()") {
-                V8Plugin.catchScriptErrors<Any>(
-                    _config,
-                    "[${_config.name}] JSRequestExecutor",
-                    "builder.modifyRequest()"
-                ) {
-                    _executor.invoke("executeRequest", url, headers, method, body);
-                } as V8Value;
-            }
+        return _plugin.getUnderlyingPlugin().busy {
+
+            val result = if(_plugin is DevJSClient)
+                StateDeveloper.instance.handleDevCall(_plugin.devID, "requestExecutor.executeRequest()") {
+                    V8Plugin.catchScriptErrors<Any>(
+                        _config,
+                        "[${_config.name}] JSRequestExecutor",
+                        "builder.modifyRequest()"
+                    ) {
+                        _executor.invoke("executeRequest", url, headers, method, body);
+                    } as V8Value;
+                }
            else V8Plugin.catchScriptErrors<Any>(
                _config,
                "[${_config.name}] JSRequestExecutor",
@@ -64,34 +66,35 @@ class JSRequestExecutor {
                _executor.invoke("executeRequest", url, headers, method, body);
            } as V8Value;

-        try {
-            if(result is V8ValueString) {
-                val base64Result = Base64.getDecoder().decode(result.value);
-                return base64Result;
-            }
-            if(result is V8ValueTypedArray) {
-                val buffer = result.buffer;
-                val byteBuffer = buffer.byteBuffer;
-                val bytesResult = ByteArray(result.byteLength);
-                byteBuffer.get(bytesResult, 0, result.byteLength);
-                buffer.close();
-                return bytesResult;
-            }
-            if(result is V8ValueObject && result.has("type")) {
-                val type = result.getOrThrow<Int>(_config, "type", "JSRequestModifier");
-                when(type) {
-                    //TODO: Buffer type?
+            try {
+                if(result is V8ValueString) {
+                    val base64Result = Base64.getDecoder().decode(result.value);
+                    return@busy base64Result;
                }
+                if(result is V8ValueTypedArray) {
+                    val buffer = result.buffer;
+                    val byteBuffer = buffer.byteBuffer;
+                    val bytesResult = ByteArray(result.byteLength);
+                    byteBuffer.get(bytesResult, 0, result.byteLength);
+                    buffer.close();
+                    return@busy bytesResult;
+                }
+                if(result is V8ValueObject && result.has("type")) {
+                    val type = result.getOrThrow<Int>(_config, "type", "JSRequestModifier");
+                    when(type) {
+                        //TODO: Buffer type?
+                    }
+                }
+                if(result is V8ValueUndefined) {
+                    if(_plugin is DevJSClient)
+                        StateDeveloper.instance.logDevException(_plugin.devID, "JSRequestExecutor.executeRequest returned illegal undefined");
+                    throw ScriptImplementationException(_config, "JSRequestExecutor.executeRequest returned illegal undefined", null);
+                }
+                throw NotImplementedError("Executor result type not implemented? " + result.javaClass.name);
            }
-            if(result is V8ValueUndefined) {
-                if(_plugin is DevJSClient)
-                    StateDeveloper.instance.logDevException(_plugin.devID, "JSRequestExecutor.executeRequest returned illegal undefined");
-                throw ScriptImplementationException(_config, "JSRequestExecutor.executeRequest returned illegal undefined", null);
+            finally {
+                result.close();
            }
-            throw NotImplementedError("Executor result type not implemented? " + result.javaClass.name);
-        }
-        finally {
-            result.close();
        }
    }

@@ -99,24 +102,25 @@ class JSRequestExecutor {
    open fun cleanup() {
        if (!hasCleanup || _executor.isClosed)
            return;
-
-       if(_plugin is DevJSClient)
-            StateDeveloper.instance.handleDevCall(_plugin.devID, "requestExecutor.executeRequest()") {
-                V8Plugin.catchScriptErrors<Any>(
-                    _config,
-                    "[${_config.name}] JSRequestExecutor",
-                    "builder.modifyRequest()"
-                ) {
-                    _executor.invokeVoid("cleanup", null);
-                };
-            }
-        else V8Plugin.catchScriptErrors<Any>(
-            _config,
-            "[${_config.name}] JSRequestExecutor",
-            "builder.modifyRequest()"
-        ) {
-           _executor.invokeVoid("cleanup", null);
-        };
+        _plugin.busy {
+            if(_plugin is DevJSClient)
+                StateDeveloper.instance.handleDevCall(_plugin.devID, "requestExecutor.executeRequest()") {
+                    V8Plugin.catchScriptErrors<Any>(
+                        _config,
+                        "[${_config.name}] JSRequestExecutor",
+                        "builder.modifyRequest()"
+                    ) {
+                        _executor.invokeVoid("cleanup", null);
+                    };
+                }
+            else V8Plugin.catchScriptErrors<Any>(
+                _config,
+                "[${_config.name}] JSRequestExecutor",
+                "builder.modifyRequest()"
+            ) {
+                _executor.invokeVoid("cleanup", null);
+            };
+        }
    }

    protected fun finalize() {
@@ -16,7 +16,7 @@ class JSRequestModifier: IRequestModifier {
    private val _plugin: JSClient;
    private val _config: IV8PluginConfig;
    private var _modifier: V8ValueObject;
-    override var allowByteSkip: Boolean;
+    override var allowByteSkip: Boolean = false;

    constructor(plugin: JSClient, modifier: V8ValueObject) {
        this._plugin = plugin;
@@ -24,10 +24,13 @@ class JSRequestModifier: IRequestModifier {
        this._config = plugin.config;
        val config = plugin.config;

-        allowByteSkip = modifier.getOrNull(config, "allowByteSkip", "JSRequestModifier") ?: true;
+        plugin.busy {
+            allowByteSkip = modifier.getOrNull(config, "allowByteSkip", "JSRequestModifier") ?: true;
+
+            if(!modifier.has("modifyRequest"))
+                throw ScriptImplementationException(config, "RequestModifier is missing modifyRequest", null);
+        }

-        if(!modifier.has("modifyRequest"))
-            throw ScriptImplementationException(config, "RequestModifier is missing modifyRequest", null);
    }

    override fun modifyRequest(url: String, headers: Map<String, String>): IRequest {
@@ -35,13 +38,15 @@ class JSRequestModifier: IRequestModifier {
            return Request(url, headers);
        }

-        val result = V8Plugin.catchScriptErrors<Any>(_config, "[${_config.name}] JSRequestModifier", "builder.modifyRequest()") {
-            _modifier.invoke("modifyRequest", url, headers);
-        } as V8ValueObject;
+        return _plugin.busy {
+            val result = V8Plugin.catchScriptErrors<Any>(_config, "[${_config.name}] JSRequestModifier", "builder.modifyRequest()") {
+                _modifier.invoke("modifyRequest", url, headers);
+            } as V8ValueObject;

-        val req = JSRequest(_plugin, result, url, headers);
-        result.close();
-        return req;
+            val req = JSRequest(_plugin, result, url, headers);
+            result.close();
+            return@busy req;
+        }
    }


@@ -27,6 +27,7 @@ import com.futo.platformplayer.getOrThrowNullable
 import com.futo.platformplayer.states.StateDeveloper

 class JSVideoDetails : JSVideo, IPlatformVideoDetails {
+    private val _plugin: JSClient;
    private val _hasGetComments: Boolean;
    private val _hasGetContentRecommendations: Boolean;
    private val _hasGetPlaybackTracker: Boolean;
@@ -48,6 +49,7 @@ class JSVideoDetails : JSVideo, IPlatformVideoDetails {

    constructor(plugin: JSClient, obj: V8ValueObject) : super(plugin.config, obj) {
        val contextName = "VideoDetails";
+        _plugin = plugin;
        val config = plugin.config;
        description = _content.getOrThrow(config, "description", contextName);
        video = JSVideoSourceDescriptor.fromV8(plugin, _content.getOrThrow(config, "video", contextName));
@@ -82,14 +84,16 @@ class JSVideoDetails : JSVideo, IPlatformVideoDetails {
            return getPlaybackTrackerJS();
    }
    private fun getPlaybackTrackerJS(): IPlaybackTracker? {
-        return V8Plugin.catchScriptErrors(_pluginConfig, "VideoDetails", "videoDetails.getPlaybackTracker()") {
-            val tracker = _content.invoke<V8Value>("getPlaybackTracker", arrayOf<Any>())
-                ?: return@catchScriptErrors null;
-            if(tracker is V8ValueObject)
-                return@catchScriptErrors JSPlaybackTracker(_pluginConfig, tracker);
-            else
-                return@catchScriptErrors null;
-        };
+        return _plugin.busy {
+            V8Plugin.catchScriptErrors(_pluginConfig, "VideoDetails", "videoDetails.getPlaybackTracker()") {
+                val tracker = _content.invoke<V8Value>("getPlaybackTracker", arrayOf<Any>())
+                    ?: return@catchScriptErrors null;
+                if(tracker is V8ValueObject)
+                    return@catchScriptErrors JSPlaybackTracker(_plugin, tracker);
+                else
+                    return@catchScriptErrors null;
+            }
+        }
    }

    override fun getContentRecommendations(client: IPlatformClient): IPager<IPlatformContent>? {
@@ -106,8 +110,10 @@ class JSVideoDetails : JSVideo, IPlatformVideoDetails {
        return null;
    }
    private fun getContentRecommendationsJS(client: JSClient): JSContentPager {
-        val contentPager = _content.invoke<V8ValueObject>("getContentRecommendations", arrayOf<Any>());
-        return JSContentPager(_pluginConfig, client, contentPager);
+        return _plugin.busy {
+            val contentPager = _content.invoke<V8ValueObject>("getContentRecommendations", arrayOf<Any>());
+            return@busy JSContentPager(_pluginConfig, client, contentPager);
+        }
    }

    override fun getComments(client: IPlatformClient): IPager<IPlatformComment>? {
@@ -123,10 +129,12 @@ class JSVideoDetails : JSVideo, IPlatformVideoDetails {
    }

    private fun getCommentsJS(client: JSClient): IPager<IPlatformComment>? {
-        val commentPager = _content.invoke<V8Value>("getComments", arrayOf<Any>());
-        if (commentPager !is V8ValueObject) //TODO: Maybe handle this better?
-            return null;
+        return _plugin.busy {
+            val commentPager = _content.invoke<V8Value>("getComments", arrayOf<Any>());
+            if (commentPager !is V8ValueObject) //TODO: Maybe handle this better?
+                return@busy null;

-        return JSCommentPager(_pluginConfig, client, commentPager);
+            return@busy JSCommentPager(_pluginConfig, client, commentPager);
+        }
    }
 }
@@ -0,0 +1,31 @@
+package com.futo.platformplayer.api.media.platforms.js.models
+
+import com.caoccao.javet.values.reference.V8ValueObject
+import com.futo.platformplayer.api.media.IPlatformClient
+import com.futo.platformplayer.api.media.IPluginSourced
+import com.futo.platformplayer.api.media.models.Thumbnails
+import com.futo.platformplayer.api.media.models.comments.IPlatformComment
+import com.futo.platformplayer.api.media.models.contents.ContentType
+import com.futo.platformplayer.api.media.models.contents.IPlatformContent
+import com.futo.platformplayer.api.media.models.contents.IPlatformContentDetails
+import com.futo.platformplayer.api.media.models.playback.IPlaybackTracker
+import com.futo.platformplayer.api.media.models.post.IPlatformPost
+import com.futo.platformplayer.api.media.models.post.TextType
+import com.futo.platformplayer.api.media.models.ratings.IRating
+import com.futo.platformplayer.api.media.models.ratings.RatingLikes
+import com.futo.platformplayer.api.media.platforms.js.DevJSClient
+import com.futo.platformplayer.api.media.platforms.js.JSClient
+import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
+import com.futo.platformplayer.api.media.structures.IPager
+import com.futo.platformplayer.getOrDefault
+import com.futo.platformplayer.getOrThrow
+import com.futo.platformplayer.getOrThrowNullableList
+import com.futo.platformplayer.states.StateDeveloper
+
+open class JSWeb : JSContent, IPluginSourced {
+    final override val contentType: ContentType get() = ContentType.WEB;
+
+    constructor(config: SourcePluginConfig, obj: V8ValueObject): super(config, obj) {
+        val contextName = "PlatformWeb";
+    }
+}
@@ -0,0 +1,41 @@
+package com.futo.platformplayer.api.media.platforms.js.models
+
+import com.caoccao.javet.values.reference.V8ValueObject
+import com.futo.platformplayer.api.media.IPlatformClient
+import com.futo.platformplayer.api.media.IPluginSourced
+import com.futo.platformplayer.api.media.models.Thumbnails
+import com.futo.platformplayer.api.media.models.comments.IPlatformComment
+import com.futo.platformplayer.api.media.models.contents.ContentType
+import com.futo.platformplayer.api.media.models.contents.IPlatformContent
+import com.futo.platformplayer.api.media.models.contents.IPlatformContentDetails
+import com.futo.platformplayer.api.media.models.playback.IPlaybackTracker
+import com.futo.platformplayer.api.media.models.post.TextType
+import com.futo.platformplayer.api.media.models.ratings.IRating
+import com.futo.platformplayer.api.media.models.ratings.RatingLikes
+import com.futo.platformplayer.api.media.platforms.js.DevJSClient
+import com.futo.platformplayer.api.media.platforms.js.JSClient
+import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
+import com.futo.platformplayer.api.media.structures.IPager
+import com.futo.platformplayer.getOrDefault
+import com.futo.platformplayer.getOrThrow
+import com.futo.platformplayer.getOrThrowNullableList
+import com.futo.platformplayer.states.StateDeveloper
+
+open class JSWebDetails : JSContent, IPluginSourced, IPlatformContentDetails {
+    final override val contentType: ContentType get() = ContentType.WEB;
+
+    val html: String?;
+    //TODO: Options?
+
+
+    constructor(client: JSClient, obj: V8ValueObject): super(client.config, obj) {
+        val contextName = "PlatformWeb";
+
+        html = obj.getOrDefault(client.config, "html", contextName, null);
+    }
+
+    override fun getComments(client: IPlatformClient): IPager<IPlatformComment>? = null;
+    override fun getPlaybackTracker(): IPlaybackTracker? = null;
+    override fun getContentRecommendations(client: IPlatformClient): IPager<IPlatformContent>? = null;
+
+}
@@ -62,12 +62,16 @@ class JSDashManifestRawAudioSource : JSSource, IAudioSource, IJSDashManifestRawS
        if(_plugin is DevJSClient)
            result = StateDeveloper.instance.handleDevCall(_plugin.devID, "DashManifestRaw", false) {
                _plugin.getUnderlyingPlugin().catchScriptErrors("DashManifestRaw", "dashManifestRaw.generate()") {
-                    _obj.invokeString("generate");
+                    _plugin.isBusyWith("dashAudio.generate") {
+                        _obj.invokeString("generate");
+                    }
                }
            }
        else
            result = _plugin.getUnderlyingPlugin().catchScriptErrors("DashManifestRaw", "dashManifestRaw.generate()") {
-                _obj.invokeString("generate");
+                _plugin.isBusyWith("dashAudio.generate") {
+                    _obj.invokeString("generate");
+                }
            }

        if(result != null){
@@ -32,7 +32,7 @@ open class JSDashManifestRawSource: JSSource, IVideoSource, IJSDashManifestRawSo
    override val duration: Long;
    override val priority: Boolean;

-    var url: String?;
+    val url: String?;
    override var manifest: String?;

    override val hasGenerate: Boolean;
@@ -67,13 +67,17 @@ open class JSDashManifestRawSource: JSSource, IVideoSource, IJSDashManifestRawSo
        if(_plugin is DevJSClient) {
            result = StateDeveloper.instance.handleDevCall(_plugin.devID, "DashManifestRawSource.generate()") {
                _plugin.getUnderlyingPlugin().catchScriptErrors("DashManifestRaw.generate", "generate()", {
-                    _obj.invokeString("generate");
+                    _plugin.isBusyWith("dashVideo.generate") {
+                        _obj.invokeString("generate");
+                    }
                });
            }
        }
        else
            result = _plugin.getUnderlyingPlugin().catchScriptErrors("DashManifestRaw.generate", "generate()", {
-                _obj.invokeString("generate");
+                _plugin.isBusyWith("dashVideo.generate") {
+                    _obj.invokeString("generate");
+                }
            });

        if(result != null){
@@ -53,36 +53,39 @@ abstract class JSSource {
        hasRequestExecutor = _requestExecutor != null || obj.has("getRequestExecutor");
    }

-    fun getRequestModifier(): IRequestModifier? {
+    fun getRequestModifier(): IRequestModifier? = _plugin.isBusyWith("getRequestModifier") {
        if(_requestModifier != null)
-            return AdhocRequestModifier { url, headers ->
+            return@isBusyWith AdhocRequestModifier { url, headers ->
                  return@AdhocRequestModifier _requestModifier.modify(_plugin, url, headers);
            };

        if (!hasRequestModifier || _obj.isClosed)
-            return null;
+            return@isBusyWith null;

        val result = V8Plugin.catchScriptErrors<Any>(_config, "[${_config.name}] JSVideoUrlSource", "obj.getRequestModifier()") {
            _obj.invoke("getRequestModifier", arrayOf<Any>());
        };

        if (result !is V8ValueObject)
-            return null;
+            return@isBusyWith null;

-        return JSRequestModifier(_plugin, result)
+        return@isBusyWith JSRequestModifier(_plugin, result)
    }
-    open fun getRequestExecutor(): JSRequestExecutor? {
+    open fun getRequestExecutor(): JSRequestExecutor? = _plugin.isBusyWith("getRequestExecutor") {
        if (!hasRequestExecutor || _obj.isClosed)
-            return null;
+            return@isBusyWith null;

+        Logger.v("JSSource", "Request executor for [${type}] requesting");
        val result = V8Plugin.catchScriptErrors<Any>(_config, "[${_config.name}] JSSource", "obj.getRequestExecutor()") {
            _obj.invoke("getRequestExecutor", arrayOf<Any>());
        };

-        if (result !is V8ValueObject)
-            return null;
+        Logger.v("JSSource", "Request executor for [${type}] received");

-        return JSRequestExecutor(_plugin, result)
+        if (result !is V8ValueObject)
+            return@isBusyWith null;
+
+        return@isBusyWith JSRequestExecutor(_plugin, result)
    }

    fun getUnderlyingPlugin(): JSClient? {
@@ -108,7 +108,7 @@ abstract class CastingDevice {

    val expectedCurrentTime: Double
        get() {
-            val diff = (System.currentTimeMillis() - lastTimeChangeTime_ms).toDouble() / 1000.0;
+            val diff = if (isPlaying) ((System.currentTimeMillis() - lastTimeChangeTime_ms).toDouble() / 1000.0) else 0.0;
            return time + diff;
        };
    var connectionState: CastConnectionState = CastConnectionState.DISCONNECTED
@@ -10,7 +10,9 @@ import com.futo.platformplayer.toHexString
 import com.futo.platformplayer.toInetAddress
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancel
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import org.json.JSONObject
@@ -33,7 +35,7 @@ class ChromecastCastingDevice : CastingDevice {
    override var usedRemoteAddress: InetAddress? = null;
    override var localAddress: InetAddress? = null;
    override val canSetVolume: Boolean get() = true;
-    override val canSetSpeed: Boolean get() = false; //TODO: Implement
+    override val canSetSpeed: Boolean get() = true;

    var addresses: Array<InetAddress>? = null;
    var port: Int = 0;
@@ -56,6 +58,10 @@ class ChromecastCastingDevice : CastingDevice {
    private var _mediaSessionId: Int? = null;
    private var _thread: Thread? = null;
    private var _pingThread: Thread? = null;
+    private var _launchRetries = 0
+    private val MAX_LAUNCH_RETRIES = 3
+    private var _lastLaunchTime_ms = 0L
+    private var _retryJob: Job? = null

    constructor(name: String, addresses: Array<InetAddress>, port: Int) : super() {
        this.name = name;
@@ -138,6 +144,23 @@ class ChromecastCastingDevice : CastingDevice {
        sendChannelMessage("sender-0", transportId, "urn:x-cast:com.google.cast.media", json);
    }

+    override fun changeSpeed(speed: Double) {
+        if (invokeInIOScopeIfRequired { changeSpeed(speed) }) return
+
+        val speedClamped = speed.coerceAtLeast(1.0).coerceAtLeast(1.0).coerceAtMost(2.0)
+        setSpeed(speedClamped)
+        val mediaSessionId = _mediaSessionId ?: return
+        val transportId = _transportId ?: return
+        val setSpeedObject = JSONObject().apply {
+            put("type", "SET_PLAYBACK_RATE")
+            put("mediaSessionId", mediaSessionId)
+            put("playbackRate", speedClamped)
+            put("requestId", _requestId++)
+        }
+
+        sendChannelMessage(sourceId = "sender-0", destinationId = transportId, namespace = "urn:x-cast:com.google.cast.media", json = setSpeedObject.toString())
+    }
+
    override fun changeVolume(volume: Double) {
        if (invokeInIOScopeIfRequired({ changeVolume(volume) })) {
            return;
@@ -229,6 +252,7 @@ class ChromecastCastingDevice : CastingDevice {
        launchObject.put("appId", "CC1AD845");
        launchObject.put("requestId", _requestId++);
        sendChannelMessage("sender-0", "receiver-0", "urn:x-cast:com.google.cast.receiver", launchObject.toString());
+        _lastLaunchTime_ms = System.currentTimeMillis()
    }

    private fun getStatus() {
@@ -268,6 +292,7 @@ class ChromecastCastingDevice : CastingDevice {
            _contentType = null;
            _streamType = null;
            _sessionId = null;
+            _launchRetries = 0
            _transportId = null;
        }

@@ -282,6 +307,7 @@ class ChromecastCastingDevice : CastingDevice {

        _started = true;
        _sessionId = null;
+        _launchRetries = 0
        _mediaSessionId = null;

        Logger.i(TAG, "Starting...");
@@ -335,6 +361,10 @@ class ChromecastCastingDevice : CastingDevice {

                //Connection loop
                while (_scopeIO?.isActive == true) {
+                    _sessionId = null;
+                    _launchRetries = 0
+                    _mediaSessionId = null;
+
                    Logger.i(TAG, "Connecting to Chromecast.");
                    connectionState = CastConnectionState.CONNECTING;

@@ -393,7 +423,7 @@ class ChromecastCastingDevice : CastingDevice {
                        try {
                            val inputStream = _inputStream ?: break;

-                            synchronized(_inputStreamLock)
+                            val message = synchronized(_inputStreamLock)
                            {
                                Log.d(TAG, "Receiving next packet...");
                                val b1 = inputStream.readUnsignedByte();
@@ -405,7 +435,7 @@ class ChromecastCastingDevice : CastingDevice {
                                if (size > buffer.size) {
                                    Logger.w(TAG, "Skipping packet that is too large $size bytes.")
                                    inputStream.skip(size.toLong());
-                                    return@synchronized
+                                    return@synchronized null
                                }

                                Log.d(TAG, "Received header indicating $size bytes. Waiting for message.");
@@ -414,15 +444,19 @@ class ChromecastCastingDevice : CastingDevice {
                                //TODO: In the future perhaps this size-1 will cause issues, why is there a 0 on the end?
                                val messageBytes = buffer.sliceArray(IntRange(0, size - 1));
                                Log.d(TAG, "Received $size bytes: ${messageBytes.toHexString()}.");
-                                val message = ChromeCast.CastMessage.parseFrom(messageBytes);
-                                if (message.namespace != "urn:x-cast:com.google.cast.tp.heartbeat") {
-                                    Logger.i(TAG, "Received message: $message");
+                                val msg = ChromeCast.CastMessage.parseFrom(messageBytes);
+                                if (msg.namespace != "urn:x-cast:com.google.cast.tp.heartbeat") {
+                                    Logger.i(TAG, "Received message: $msg");
                                }
+                                return@synchronized msg
+                            }

+                            if (message != null) {
                                try {
                                    handleMessage(message);
                                } catch (e: Throwable) {
                                    Logger.w(TAG, "Failed to handle message.", e);
+                                    break
                                }
                            }
                        } catch (e: java.net.SocketException) {
@@ -486,6 +520,10 @@ class ChromecastCastingDevice : CastingDevice {
            }
        } catch (e: Throwable) {
            Logger.w(TAG, "Failed to send channel message (sourceId: $sourceId, destinationId: $destinationId, namespace: $namespace, json: $json)", e);
+            _socket?.close();
+            Logger.i(TAG, "Socket disconnected.");
+
+            connectionState = CastConnectionState.CONNECTING;
        }
    }

@@ -512,6 +550,7 @@ class ChromecastCastingDevice : CastingDevice {
                            if (_sessionId == null) {
                                connectionState = CastConnectionState.CONNECTED;
                                _sessionId = applicationUpdate.getString("sessionId");
+                                _launchRetries = 0

                                val transportId = applicationUpdate.getString("transportId");
                                connectMediaChannel(transportId);
@@ -526,21 +565,40 @@ class ChromecastCastingDevice : CastingDevice {
                }

                if (!sessionIsRunning) {
-                    _sessionId = null;
-                    _mediaSessionId = null;
-                    setTime(0.0);
-                    _transportId = null;
-                    Logger.w(TAG, "Session not found.");
+                    if (System.currentTimeMillis() - _lastLaunchTime_ms > 5000) {
+                        _sessionId = null
+                        _mediaSessionId = null
+                        setTime(0.0)
+                        _transportId = null

-                    if (_launching) {
-                        Logger.i(TAG, "Player not found, launching.");
-                        launchPlayer();
+                        if (_launching && _launchRetries < MAX_LAUNCH_RETRIES) {
+                            Logger.i(TAG, "No player yet; attempting launch #${_launchRetries + 1}")
+                            _launchRetries++
+                            launchPlayer()
+                        } else if (!_launching && _launchRetries < MAX_LAUNCH_RETRIES) {
+                            // Maybe the first GET_STATUS came back empty; still try launching
+                            Logger.i(TAG, "Player not found; triggering launch #${_launchRetries + 1}")
+                            _launching = true
+                            _launchRetries++
+                            launchPlayer()
+                        } else {
+                            Logger.e(TAG, "Player not found after $_launchRetries attempts; giving up.")
+                            Logger.i(TAG, "Unable to start media receiver on device")
+                            stop()
+                        }
                    } else {
-                        Logger.i(TAG, "Player not found, disconnecting.");
-                        stop();
+                        if (_retryJob == null) {
+                            Logger.i(TAG, "Scheduled retry job over 5 seconds")
+                            _retryJob = _scopeIO?.launch(Dispatchers.IO) {
+                                delay(5000)
+                                getStatus()
+                                _retryJob = null
+                            }
+                        }
                    }
                } else {
-                    _launching = false;
+                    _launching = false
+                    _launchRetries = 0
                }

                val volume = status.getJSONObject("volume");
@@ -567,7 +625,7 @@ class ChromecastCastingDevice : CastingDevice {
                    }

                    isPlaying = playerState == "PLAYING";
-                    if (isPlaying) {
+                    if (isPlaying ||  playerState == "PAUSED") {
                        setTime(currentTime);
                    }

@@ -582,6 +640,8 @@ class ChromecastCastingDevice : CastingDevice {
                if (message.sourceId == "receiver-0") {
                    Logger.i(TAG, "Close received.");
                    stop();
+                } else if (_transportId == message.sourceId) {
+                    throw Exception("Transport id closed.")
                }
            }
        } else {
@@ -616,6 +676,9 @@ class ChromecastCastingDevice : CastingDevice {
        localAddress = null;
        _started = false;

+        _retryJob?.cancel()
+        _retryJob = null
+
        val socket = _socket;
        val scopeIO = _scopeIO;

@@ -10,6 +10,8 @@ import android.os.Build
 import android.os.Looper
 import android.util.Base64
 import android.util.Log
+import java.net.NetworkInterface
+import java.net.Inet4Address
 import androidx.annotation.OptIn
 import androidx.media3.common.util.UnstableApi
 import com.futo.platformplayer.R
@@ -41,12 +43,11 @@ import com.futo.platformplayer.builders.DashBuilder
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.constructs.Event2
 import com.futo.platformplayer.exceptions.UnsupportedCastException
+import com.futo.platformplayer.findPreferredAddress
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.CastingDeviceInfo
 import com.futo.platformplayer.parsers.HLS
 import com.futo.platformplayer.states.StateApp
-import com.futo.platformplayer.states.StateSync
-import com.futo.platformplayer.states.StateSync.Companion
 import com.futo.platformplayer.stores.CastingDeviceInfoStorage
 import com.futo.platformplayer.stores.FragmentedStorage
 import com.futo.platformplayer.toUrlAddress
@@ -57,9 +58,11 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
+import java.net.Inet6Address
 import java.net.InetAddress
 import java.net.URLDecoder
 import java.net.URLEncoder
+import java.util.Collections
 import java.util.UUID

 class StateCasting {
@@ -163,10 +166,11 @@ class StateCasting {
        Logger.i(TAG, "CastingService started.");

        _nsdManager = context.getSystemService(Context.NSD_SERVICE) as NsdManager
+        startDiscovering()
    }

    @Synchronized
-    fun startDiscovering() {
+    private fun startDiscovering() {
        _nsdManager?.apply {
            _discoveryListeners.forEach {
                discoverServices(it.key, NsdManager.PROTOCOL_DNS_SD, it.value)
@@ -175,7 +179,7 @@ class StateCasting {
    }

    @Synchronized
-    fun stopDiscovering() {
+    private fun stopDiscovering() {
        _nsdManager?.apply {
            _discoveryListeners.forEach {
                try {
@@ -485,7 +489,7 @@ class StateCasting {
            }
        } else {
            val proxyStreams = Settings.instance.casting.alwaysProxyRequests;
-            val url = "http://${ad.localAddress.toUrlAddress().trim('/')}:${_castServer.port}";
+            val url = getLocalUrl(ad);
            val id = UUID.randomUUID();

            if (videoSource is IVideoUrlSource) {
@@ -580,7 +584,7 @@ class StateCasting {
    private fun castLocalVideo(video: IPlatformVideoDetails, videoSource: LocalVideoSource, resumePosition: Double, speed: Double?) : List<String> {
        val ad = activeDevice ?: return listOf();

-        val url = "http://${ad.localAddress.toUrlAddress().trim('/')}:${_castServer.port}";
+        val url = getLocalUrl(ad);
        val id = UUID.randomUUID();
        val videoPath = "/video-${id}"
        val videoUrl = url + videoPath;
@@ -599,7 +603,7 @@ class StateCasting {
    private fun castLocalAudio(video: IPlatformVideoDetails, audioSource: LocalAudioSource, resumePosition: Double, speed: Double?) : List<String> {
        val ad = activeDevice ?: return listOf();

-        val url = "http://${ad.localAddress.toUrlAddress().trim('/')}:${_castServer.port}";
+        val url = getLocalUrl(ad);
        val id = UUID.randomUUID();
        val audioPath = "/audio-${id}"
        val audioUrl = url + audioPath;
@@ -618,7 +622,7 @@ class StateCasting {
    private fun castLocalHls(video: IPlatformVideoDetails, videoSource: LocalVideoSource?, audioSource: LocalAudioSource?, subtitleSource: LocalSubtitleSource?, resumePosition: Double, speed: Double?): List<String> {
        val ad = activeDevice ?: return listOf()

-        val url = "http://${ad.localAddress.toUrlAddress().trim('/')}:${_castServer.port}"
+        val url = getLocalUrl(ad)
        val id = UUID.randomUUID()

        val hlsPath = "/hls-${id}"
@@ -714,7 +718,7 @@ class StateCasting {
    private fun castLocalDash(video: IPlatformVideoDetails, videoSource: LocalVideoSource?, audioSource: LocalAudioSource?, subtitleSource: LocalSubtitleSource?, resumePosition: Double, speed: Double?) : List<String> {
        val ad = activeDevice ?: return listOf();

-        val url = "http://${ad.localAddress.toUrlAddress().trim('/')}:${_castServer.port}";
+        val url = getLocalUrl(ad);
        val id = UUID.randomUUID();

        val dashPath = "/dash-${id}"
@@ -764,7 +768,7 @@ class StateCasting {
        val ad = activeDevice ?: return listOf();
        val proxyStreams = Settings.instance.casting.alwaysProxyRequests || ad !is FCastCastingDevice;

-        val url = "http://${ad.localAddress.toUrlAddress().trim('/')}:${_castServer.port}";
+        val url = getLocalUrl(ad);
        val id = UUID.randomUUID();

        val videoPath = "/video-${id}"
@@ -829,7 +833,7 @@ class StateCasting {
        _castServer.removeAllHandlers("castProxiedHlsMaster")

        val ad = activeDevice ?: return listOf();
-        val url = "http://${ad.localAddress.toUrlAddress().trim('/')}:${_castServer.port}";
+        val url = getLocalUrl(ad);

        val id = UUID.randomUUID();
        val hlsPath = "/hls-${id}"
@@ -999,7 +1003,7 @@ class StateCasting {

    private suspend fun castHlsIndirect(contentResolver: ContentResolver, video: IPlatformVideoDetails, videoSource: IVideoUrlSource?, audioSource: IAudioUrlSource?, subtitleSource: ISubtitleSource?, resumePosition: Double, speed: Double?) : List<String> {
        val ad = activeDevice ?: return listOf();
-        val url = "http://${ad.localAddress.toUrlAddress().trim('/')}:${_castServer.port}";
+        val url = getLocalUrl(ad);
        val id = UUID.randomUUID();

        val hlsPath = "/hls-${id}"
@@ -1129,7 +1133,7 @@ class StateCasting {
        val ad = activeDevice ?: return listOf();
        val proxyStreams = Settings.instance.casting.alwaysProxyRequests || ad !is FCastCastingDevice;

-        val url = "http://${ad.localAddress.toUrlAddress().trim('/')}:${_castServer.port}";
+        val url = getLocalUrl(ad);
        val id = UUID.randomUUID();

        val dashPath = "/dash-${id}"
@@ -1215,6 +1219,22 @@ class StateCasting {
        }
    }

+    private fun getLocalUrl(ad: CastingDevice): String {
+        var address = ad.localAddress!!
+        if (Settings.instance.casting.allowLinkLocalIpv4) {
+            if (address.isLinkLocalAddress && address is Inet6Address) {
+                address = findPreferredAddress() ?: address
+                Logger.i(TAG, "Selected casting address: $address")
+            }
+        } else {
+            if (address.isLinkLocalAddress) {
+                address = findPreferredAddress() ?: address
+                Logger.i(TAG, "Selected casting address: $address")
+            }
+        }
+        return "http://${address.toUrlAddress().trim('/')}:${_castServer.port}";
+    }
+
    @OptIn(UnstableApi::class)
    private suspend fun castDashRaw(contentResolver: ContentResolver, video: IPlatformVideoDetails, videoSource: JSDashManifestRawSource?, audioSource: JSDashManifestRawAudioSource?, subtitleSource: ISubtitleSource?, resumePosition: Double, speed: Double?) : List<String> {
        val ad = activeDevice ?: return listOf();
@@ -1222,7 +1242,7 @@ class StateCasting {
        cleanExecutors()
        _castServer.removeAllHandlers("castDashRaw")

-        val url = "http://${ad.localAddress.toUrlAddress().trim('/')}:${_castServer.port}";
+        val url = getLocalUrl(ad);
        val id = UUID.randomUUID();

        val dashPath = "/dash-${id}"
@@ -82,7 +82,11 @@ class TaskHandler<TParameter, TResult> {
                        handled = true;
                    } catch (e: Throwable) {
                        Logger.w(TAG, "Handled exception in TaskHandler onSuccess.", e);
-                        onError.emit(e, parameter);
+                        try {
+                            onError.emit(e, parameter);
+                        } catch (e: Throwable) {
+                            Logger.e(TAG, "Unhandled exception in .exception handler 1", e)
+                        }
                        handled = true;
                    }
                }
@@ -99,10 +103,14 @@ class TaskHandler<TParameter, TResult> {
                    if (id != _idGenerator)
                        return@withContext;

-                    if (!onError.emit(e, parameter)) {
-                        Logger.e(TAG, "Uncaught exception handled by TaskHandler.", e);
-                    } else {
-                        //Logger.w(TAG, "Handled exception in TaskHandler invoke.", e); (Prevents duplicate logs)
+                    try {
+                        if (!onError.emit(e, parameter)) {
+                            Logger.e(TAG, "Uncaught exception handled by TaskHandler.", e);
+                        } else {
+                            //Logger.w(TAG, "Handled exception in TaskHandler invoke.", e); (Prevents duplicate logs)
+                        }
+                    } catch (e: Throwable) {
+                        Logger.e(TAG, "Unhandled exception in .exception handler 2", e)
                    }
                }
            }
@@ -103,7 +103,6 @@ class ConnectCastingDialog(context: Context?) : AlertDialog(context) {
        super.show();
        Logger.i(TAG, "Dialog shown.");

-        StateCasting.instance.startDiscovering()
        (_imageLoader.drawable as Animatable?)?.start();

        synchronized(StateCasting.instance.devices) {
@@ -148,7 +147,6 @@ class ConnectCastingDialog(context: Context?) : AlertDialog(context) {
    override fun dismiss() {
        super.dismiss()
        (_imageLoader.drawable as Animatable?)?.stop()
-        StateCasting.instance.stopDiscovering()
        StateCasting.instance.onDeviceAdded.remove(this)
        StateCasting.instance.onDeviceChanged.remove(this)
        StateCasting.instance.onDeviceRemoved.remove(this)
@@ -47,6 +47,7 @@ import com.futo.platformplayer.states.StatePlatform
 import com.futo.platformplayer.states.StatePlugins
 import com.futo.platformplayer.toHumanBitrate
 import com.futo.platformplayer.toHumanBytesSpeed
+import com.futo.polycentric.core.hexStringToByteArray
 import hasAnySource
 import isDownloadable
 import kotlinx.coroutines.CancellationException
@@ -59,16 +60,21 @@ import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.Contextual
 import kotlinx.serialization.Transient
+import java.io.ByteArrayOutputStream
 import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
 import java.lang.Thread.sleep
+import java.nio.ByteBuffer
 import java.time.OffsetDateTime
 import java.util.UUID
 import java.util.concurrent.Executors
 import java.util.concurrent.ForkJoinPool
 import java.util.concurrent.ForkJoinTask
 import java.util.concurrent.ThreadLocalRandom
+import javax.crypto.Cipher
+import javax.crypto.spec.IvParameterSpec
+import javax.crypto.spec.SecretKeySpec
 import kotlin.coroutines.resumeWithException
 import kotlin.time.times

@@ -564,6 +570,14 @@ class VideoDownload {
        }
    }

+    private fun decryptSegment(encryptedSegment: ByteArray, key: ByteArray, iv: ByteArray): ByteArray {
+        val cipher = Cipher.getInstance("AES/CBC/PKCS5Padding")
+        val secretKey = SecretKeySpec(key, "AES")
+        val ivSpec = IvParameterSpec(iv)
+        cipher.init(Cipher.DECRYPT_MODE, secretKey, ivSpec)
+        return cipher.doFinal(encryptedSegment)
+    }
+
    private suspend fun downloadHlsSource(context: Context, name: String, client: ManagedHttpClient, hlsUrl: String, targetFile: File, onProgress: (Long, Long, Long) -> Unit): Long {
        if(targetFile.exists())
            targetFile.delete();
@@ -579,6 +593,14 @@ class VideoDownload {
                ?: throw Exception("Variant playlist content is empty")

            val variantPlaylist = HLS.parseVariantPlaylist(vpContent, hlsUrl)
+            val decryptionInfo: DecryptionInfo? = if (variantPlaylist.decryptionInfo != null) {
+                val keyResponse = client.get(variantPlaylist.decryptionInfo.keyUrl)
+                check(keyResponse.isOk) { "HLS request failed for decryption key: ${keyResponse.code}" }
+                DecryptionInfo(keyResponse.body!!.bytes(), variantPlaylist.decryptionInfo.iv?.hexStringToByteArray())
+            } else {
+                null
+            }
+
            variantPlaylist.segments.forEachIndexed { index, segment ->
                if (segment !is HLS.MediaSegment) {
                    return@forEachIndexed
@@ -590,7 +612,7 @@ class VideoDownload {
                try {
                    segmentFiles.add(segmentFile)

-                    val segmentLength = downloadSource_Sequential(client, outputStream, segment.uri) { segmentLength, totalRead, lastSpeed ->
+                    val segmentLength = downloadSource_Sequential(client, outputStream, segment.uri, if (index == 0) null else decryptionInfo, index) { segmentLength, totalRead, lastSpeed ->
                        val averageSegmentLength = if (index == 0) segmentLength else downloadedTotalLength / index
                        val expectedTotalLength = averageSegmentLength * (variantPlaylist.segments.size - 1) + segmentLength
                        onProgress(expectedTotalLength, downloadedTotalLength + totalRead, lastSpeed)
@@ -630,10 +652,8 @@ class VideoDownload {

    private suspend fun combineSegments(context: Context, segmentFiles: List<File>, targetFile: File) = withContext(Dispatchers.IO) {
        suspendCancellableCoroutine { continuation ->
-            val fileList = File(context.cacheDir, "fileList-${UUID.randomUUID()}.txt")
-            fileList.writeText(segmentFiles.joinToString("\n") { "file '${it.absolutePath}'" })
-
-            val cmd = "-f concat -safe 0 -i \"${fileList.absolutePath}\" -c copy \"${targetFile.absolutePath}\""
+            val cmd =
+                "-i \"concat:${segmentFiles.joinToString("|")}\" -c copy \"${targetFile.absolutePath}\""

            val statisticsCallback = StatisticsCallback { _ ->
                //TODO: Show progress?
@@ -643,7 +663,6 @@ class VideoDownload {
            val session = FFmpegKit.executeAsync(cmd,
                { session ->
                    if (ReturnCode.isSuccess(session.returnCode)) {
-                        fileList.delete()
                        continuation.resumeWith(Result.success(Unit))
                    } else {
                        val errorMessage = if (ReturnCode.isCancel(session.returnCode)) {
@@ -651,7 +670,6 @@ class VideoDownload {
                        } else {
                            "Command failed with state '${session.state}' and return code ${session.returnCode}, stack trace ${session.failStackTrace}"
                        }
-                        fileList.delete()
                        continuation.resumeWithException(RuntimeException(errorMessage))
                    }
                },
@@ -706,7 +724,7 @@ class VideoDownload {
                val t = cue.groupValues[1];
                val d = cue.groupValues[2];

-                val url = foundTemplateUrl.replace("\$Number\$", indexCounter.toString());
+                val url = foundTemplateUrl.replace("\$Number\$", (indexCounter).toString());

                val data = if(executor != null)
                    executor.executeRequest("GET", url, null, mapOf());
@@ -771,7 +789,7 @@ class VideoDownload {
            else {
                Logger.i(TAG, "Download $name Sequential");
                try {
-                    sourceLength = downloadSource_Sequential(client, fileStream, videoUrl, onProgress);
+                    sourceLength = downloadSource_Sequential(client, fileStream, videoUrl, null, 0, onProgress);
                } catch (e: Throwable) {
                    Logger.w(TAG, "Failed to download sequentially (url = $videoUrl)")
                    throw e
@@ -798,7 +816,31 @@ class VideoDownload {
        }
        return sourceLength!!;
    }
-    private fun downloadSource_Sequential(client: ManagedHttpClient, fileStream: FileOutputStream, url: String, onProgress: (Long, Long, Long) -> Unit): Long {
+
+    data class DecryptionInfo(
+        val key: ByteArray,
+        val iv: ByteArray?
+    ) {
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            if (javaClass != other?.javaClass) return false
+
+            other as DecryptionInfo
+
+            if (!key.contentEquals(other.key)) return false
+            if (!iv.contentEquals(other.iv)) return false
+
+            return true
+        }
+
+        override fun hashCode(): Int {
+            var result = key.contentHashCode()
+            result = 31 * result + iv.contentHashCode()
+            return result
+        }
+    }
+
+    private fun downloadSource_Sequential(client: ManagedHttpClient, fileStream: FileOutputStream, url: String, decryptionInfo: DecryptionInfo?, index: Int, onProgress: (Long, Long, Long) -> Unit): Long {
        val progressRate: Int = 4096 * 5;
        var lastProgressCount: Int = 0;
        val speedRate: Int = 4096 * 5;
@@ -818,6 +860,8 @@ class VideoDownload {
        val sourceLength = result.body.contentLength();
        val sourceStream = result.body.byteStream();

+        val segmentBuffer = ByteArrayOutputStream()
+
        var totalRead: Long = 0;
        try {
            var read: Int;
@@ -828,7 +872,7 @@ class VideoDownload {
                if (read < 0)
                    break;

-                fileStream.write(buffer, 0, read);
+                segmentBuffer.write(buffer, 0, read);

                totalRead += read;

@@ -854,6 +898,21 @@ class VideoDownload {
            result.body.close()
        }

+        if (decryptionInfo != null) {
+            var iv = decryptionInfo.iv
+            if (iv == null) {
+                iv = ByteBuffer.allocate(16)
+                    .putLong(0L)
+                    .putLong(index.toLong())
+                    .array()
+            }
+
+            val decryptedData = decryptSegment(segmentBuffer.toByteArray(), decryptionInfo.key, iv!!)
+            fileStream.write(decryptedData)
+        } else {
+            fileStream.write(segmentBuffer.toByteArray())
+        }
+
        onProgress(sourceLength, totalRead, 0);
        return sourceLength;
    }
@@ -1160,6 +1219,8 @@ class VideoDownload {
        fun audioContainerToExtension(container: String): String {
            if (container.contains("audio/mp4"))
                return "mp4a";
+            else if (container.contains("video/mp4"))
+                return "mp4";
            else if (container.contains("audio/mpeg"))
                return "mpga";
            else if (container.contains("audio/mp3"))
@@ -1167,7 +1228,7 @@ class VideoDownload {
            else if (container.contains("audio/webm"))
                return "webm";
            else if (container == "application/vnd.apple.mpegurl")
-                return "mp4a";
+                return "m4a";
            else
                return "audio";// throw IllegalStateException("Unknown container: " + container)
        }
@@ -69,7 +69,7 @@ class VideoExport {
            outputFile = f;
        } else if (v != null) {
            val outputFileName = videoLocal.name.sanitizeFileName(true) + "." + VideoDownload.videoContainerToExtension(v.container);
-            val f = downloadRoot.createFile(v.container, outputFileName)
+            val f = downloadRoot.createFile(if (v.container == "application/vnd.apple.mpegurl") "video/mp4" else v.container, outputFileName)
                ?: throw Exception("Failed to create file in external directory.");

            Logger.i(TAG, "Copying video.");
@@ -81,8 +81,8 @@ class VideoExport {
            outputFile = f;
        } else if (a != null) {
            val outputFileName = videoLocal.name.sanitizeFileName(true) + "." + VideoDownload.audioContainerToExtension(a.container);
-            val f = downloadRoot.createFile(a.container, outputFileName)
-                ?: throw Exception("Failed to create file in external directory.");
+            val f = downloadRoot.createFile(if (a.container == "application/vnd.apple.mpegurl") "video/mp4" else a.container, outputFileName)
+                    ?: throw Exception("Failed to create file in external directory.");

            Logger.i(TAG, "Copying audio.");

@@ -4,10 +4,9 @@ import android.content.Context
 import com.caoccao.javet.exceptions.JavetCompilationException
 import com.caoccao.javet.exceptions.JavetException
 import com.caoccao.javet.exceptions.JavetExecutionException
+import com.caoccao.javet.interfaces.IJavetEntityError
 import com.caoccao.javet.interop.V8Host
 import com.caoccao.javet.interop.V8Runtime
-import com.caoccao.javet.interop.options.V8Flags
-import com.caoccao.javet.interop.options.V8RuntimeOptions
 import com.caoccao.javet.values.V8Value
 import com.caoccao.javet.values.primitive.V8ValueBoolean
 import com.caoccao.javet.values.primitive.V8ValueInteger
@@ -26,6 +25,7 @@ import com.futo.platformplayer.engine.exceptions.ScriptException
 import com.futo.platformplayer.engine.exceptions.ScriptExecutionException
 import com.futo.platformplayer.engine.exceptions.ScriptImplementationException
 import com.futo.platformplayer.engine.exceptions.ScriptLoginRequiredException
+import com.futo.platformplayer.engine.exceptions.ScriptReloadRequiredException
 import com.futo.platformplayer.engine.exceptions.ScriptTimeoutException
 import com.futo.platformplayer.engine.exceptions.ScriptUnavailableException
 import com.futo.platformplayer.engine.internal.V8Converter
@@ -40,6 +40,8 @@ import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateAssets
 import com.futo.platformplayer.warnIfMainThread
 import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.locks.ReentrantLock
+import kotlin.concurrent.withLock

 class V8Plugin {
    val config: IV8PluginConfig;
@@ -47,10 +49,13 @@ class V8Plugin {
    private val _clientAuth: ManagedHttpClient;
    private val _clientOthers: ConcurrentHashMap<String, JSHttpClient> = ConcurrentHashMap();

+
    val httpClient: ManagedHttpClient get() = _client;
    val httpClientAuth: ManagedHttpClient get() = _clientAuth;
    val httpClientOthers: Map<String, JSHttpClient> get() = _clientOthers;

+    var runtimeId: Int = 0;
+
    fun registerHttpClient(client: JSHttpClient) {
        synchronized(_clientOthers) {
            _clientOthers.put(client.clientId, client);
@@ -67,10 +72,8 @@ class V8Plugin {
    var isStopped = true;
    val onStopped = Event1<V8Plugin>();

-    //TODO: Implement a more universal isBusy system for plugins + JSClient + pooling? TBD if propagation would be beneficial
-    private val _busyCounterLock = Object();
-    private var _busyCounter = 0;
-    val isBusy get() = synchronized(_busyCounterLock) { _busyCounter > 0 };
+    private val _busyLock = ReentrantLock()
+    val isBusy get() = _busyLock.isLocked;

    var allowDevSubmit: Boolean = false
        private set(value) {
@@ -140,6 +143,7 @@ class V8Plugin {
        synchronized(_runtimeLock) {
            if (_runtime != null)
                return;
+            runtimeId = runtimeId + 1;
            //V8RuntimeOptions.V8_FLAGS.setUseStrict(true);
            val host = V8Host.getV8Instance();
            val options = host.jsRuntimeType.getRuntimeOptions();
@@ -148,6 +152,8 @@ class V8Plugin {
            if (!host.isIsolateCreated)
                throw IllegalStateException("Isolate not created");

+            _runtimeMap.put(_runtime!!, this);
+
            //Setup bridge
            _runtime?.let {
                it.converter = V8Converter();
@@ -184,11 +190,23 @@ class V8Plugin {
    }
    fun stop(){
        Logger.i(TAG, "Stopping plugin [${config.name}]");
-        isStopped = true;
-        whenNotBusy {
+        busy {
+            Logger.i(TAG, "Plugin stopping");
            synchronized(_runtimeLock) {
+                if(isStopped)
+                    return@busy;
                isStopped = true;
+                runtimeId = runtimeId + 1;
+
+                //Cleanup http
+                for(pack in _depsPackages) {
+                    if(pack is PackageHttp) {
+                        pack.cleanup();
+                    }
+                }
+
                _runtime?.let {
+                    _runtimeMap.remove(it);
                    _runtime = null;
                    if(!it.isClosed && !it.isDead) {
                        try {
@@ -203,10 +221,20 @@ class V8Plugin {
                    Logger.i(TAG, "Stopped plugin [${config.name}]");
                };
            }
+            Logger.i(TAG, "Plugin stopped");
            onStopped.emit(this);
        }
    }

+    fun isThreadAlreadyBusy(): Boolean {
+        return _busyLock.isHeldByCurrentThread;
+    }
+    fun <T> busy(handle: ()->T): T {
+        _busyLock.withLock {
+            //Logger.i(TAG, "Entered busy: " + Thread.currentThread().stackTrace.drop(3)?.firstOrNull()?.toString() + ", " + Thread.currentThread().stackTrace.drop(4)?.firstOrNull()?.toString());
+            return handle();
+        }
+    }
    fun execute(js: String) : V8Value {
        return executeTyped<V8Value>(js);
    }
@@ -215,49 +243,17 @@ class V8Plugin {
        if(isStopped)
            throw PluginEngineStoppedException(config, "Instance is stopped", js);

-        synchronized(_busyCounterLock) {
-            _busyCounter++;
-        }
+        return busy {

-        val runtime = _runtime ?: throw IllegalStateException("JSPlugin not started yet");
-        try {
-            return catchScriptErrors("Plugin[${config.name}]", js) {
+            val runtime = _runtime ?: throw IllegalStateException("JSPlugin not started yet");
+            return@busy catchScriptErrors("Plugin[${config.name}]", js) {
                runtime.getExecutor(js).execute()
            };
        }
-        finally {
-            synchronized(_busyCounterLock) {
-                //Free busy *after* afterBusy calls are done to prevent calls on dead runtimes
-                try {
-                    afterBusy.emit(_busyCounter - 1);
-                }
-                catch(ex: Throwable) {
-                    Logger.e(TAG, "Unhandled V8Plugin.afterBusy", ex);
-                }
-                _busyCounter--;
-            }
-        }
-    }
-    fun executeBoolean(js: String) : Boolean? = catchScriptErrors("Plugin[${config.name}]") { executeTyped<V8ValueBoolean>(js).value };
-    fun executeString(js: String) : String? = catchScriptErrors("Plugin[${config.name}]") { executeTyped<V8ValueString>(js).value };
-    fun executeInteger(js: String) : Int? = catchScriptErrors("Plugin[${config.name}]") { executeTyped<V8ValueInteger>(js).value };
-
-    fun whenNotBusy(handler: (V8Plugin)->Unit) {
-        synchronized(_busyCounterLock) {
-            if(_busyCounter == 0)
-                handler(this);
-            else {
-                val tag = Object();
-                afterBusy.subscribe(tag) {
-                    if(it == 0) {
-                        Logger.w(TAG, "V8Plugin afterBusy handled");
-                        afterBusy.remove(tag);
-                        handler(this);
-                    }
-                }
-            }
-        }
    }
+    fun executeBoolean(js: String) : Boolean? = busy { catchScriptErrors("Plugin[${config.name}]") { executeTyped<V8ValueBoolean>(js).value } }
+    fun executeString(js: String) : String? = busy { catchScriptErrors("Plugin[${config.name}]") { executeTyped<V8ValueString>(js).value } }
+    fun executeInteger(js: String) : Int? = busy { catchScriptErrors("Plugin[${config.name}]") { executeTyped<V8ValueInteger>(js).value } }

    private fun getPackage(packageName: String, allowNull: Boolean = false): V8Package? {
        //TODO: Auto get all package types?
@@ -284,8 +280,14 @@ class V8Plugin {
        private val REGEX_EX_FALLBACK = Regex(".*throw.*?[\"](.*)[\"].*");
        private val REGEX_EX_FALLBACK2 = Regex(".*throw.*?['](.*)['].*");

+        private val _runtimeMap = ConcurrentHashMap<V8Runtime, V8Plugin>();
+
        val TAG = "V8Plugin";

+        fun getPluginFromRuntime(runtime: V8Runtime): V8Plugin? {
+            return _runtimeMap.getOrDefault(runtime, null);
+        }
+
        fun <T: Any?> catchScriptErrors(config: IV8PluginConfig, context: String, code: String? = null, handle: ()->T): T {
            var codeStripped = code;
            if(codeStripped != null) { //TODO: Improve code stripped
@@ -319,26 +321,38 @@ class V8Plugin {
                throw ScriptCompilationException(config, "Compilation: [${context}]: ${scriptEx.message}\n(${scriptEx.scriptingError.lineNumber})[${scriptEx.scriptingError.startColumn}-${scriptEx.scriptingError.endColumn}]: ${scriptEx.scriptingError.sourceLine}", null, codeStripped);
            }
            catch(executeEx: JavetExecutionException) {
-                if(executeEx.scriptingError?.context?.containsKey("plugin_type") == true) {
-                    val pluginType = executeEx.scriptingError.context["plugin_type"].toString();
+                if(executeEx.scriptingError?.context is IJavetEntityError) {
+                    val obj = executeEx.scriptingError?.context as IJavetEntityError
+                    if(obj.context.containsKey("plugin_type") == true) {
+                        val pluginType = obj.context["plugin_type"].toString();

-                    //Captcha
-                    if (pluginType == "CaptchaRequiredException") {
-                        throw ScriptCaptchaRequiredException(config,
-                            executeEx.scriptingError.context["url"]?.toString(),
-                            executeEx.scriptingError.context["body"]?.toString(),
-                            executeEx, executeEx.scriptingError?.stack, codeStripped);
+                        //Captcha
+                        if (pluginType == "CaptchaRequiredException") {
+                            throw ScriptCaptchaRequiredException(config,
+                                obj.context["url"]?.toString(),
+                                obj.context["body"]?.toString(),
+                                executeEx, executeEx.scriptingError?.stack, codeStripped);
+                        }
+
+                        //Reload Required
+                        if (pluginType == "ReloadRequiredException") {
+                            throw ScriptReloadRequiredException(config,
+                                obj.context["msg"]?.toString(),
+                                obj.context["reloadData"]?.toString(),
+                                executeEx, executeEx.scriptingError?.stack, codeStripped);
+                        }
+
+                        //Others
+                        throwExceptionFromV8(
+                            config,
+                            pluginType,
+                            (extractJSExceptionMessage(executeEx) ?: ""),
+                            executeEx,
+                            executeEx.scriptingError?.stack,
+                            codeStripped
+                        );
                    }

-                    //Others
-                    throwExceptionFromV8(
-                        config,
-                        pluginType,
-                        (extractJSExceptionMessage(executeEx) ?: ""),
-                        executeEx,
-                        executeEx.scriptingError?.stack,
-                        codeStripped
-                    );
                }
                throw ScriptExecutionException(config, extractJSExceptionMessage(executeEx) ?: "", null, executeEx.scriptingError?.stack, codeStripped);
            }
@@ -390,9 +404,4 @@ class V8Plugin {
            return StateAssets.readAsset(context, path) ?: throw java.lang.IllegalStateException("script ${path} not found");
        }
    }
-
-
-    /**
-     * Methods available for scripts (bridge object)
-     */
 }
@@ -0,0 +1,20 @@
+package com.futo.platformplayer.engine.exceptions
+
+import com.caoccao.javet.values.reference.V8ValueObject
+import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
+import com.futo.platformplayer.engine.IV8PluginConfig
+import com.futo.platformplayer.engine.V8PluginConfig
+import com.futo.platformplayer.getOrDefault
+import com.futo.platformplayer.getOrThrow
+
+class ScriptReloadRequiredException(config: IV8PluginConfig, val msg: String?, val reloadData: String?, ex: Exception? = null, stack: String? = null, code: String? = null) : ScriptException(config, msg ?: "ReloadRequired", ex, stack, code) {
+
+    companion object {
+        fun fromV8(config: IV8PluginConfig, obj: V8ValueObject) : ScriptException {
+            val contextName = "ScriptReloadRequiredException";
+            return ScriptReloadRequiredException(config,
+                obj.getOrThrow(config, "message", contextName),
+                obj.getOrDefault<String>(config, "reloadData", contextName, null));
+        }
+    }
+}
@@ -13,8 +13,8 @@ open class V8BindObject : IV8Convertable {

    override fun toV8(runtime: V8Runtime): V8Value? {
        synchronized(this) {
-            if(_runtimeObj != null)
-                return _runtimeObj;
+            //if(_runtimeObj != null)
+            //    return _runtimeObj;

            val v8Obj = runtime.createV8ValueObject();
            v8Obj.bind(this);
@@ -4,6 +4,7 @@ import android.media.MediaCodec
 import android.media.MediaCodecList
 import com.caoccao.javet.annotations.V8Function
 import com.caoccao.javet.annotations.V8Property
+import com.caoccao.javet.interop.callback.JavetCallbackContext
 import com.caoccao.javet.utils.JavetResourceUtils
 import com.caoccao.javet.values.V8Value
 import com.caoccao.javet.values.reference.V8ValueFunction
@@ -12,6 +13,7 @@ import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateDeveloper
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.api.http.ManagedHttpClient
+import com.futo.platformplayer.api.media.models.contents.ContentType
 import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.platforms.js.JSClientConstants
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
@@ -77,6 +79,30 @@ class PackageBridge : V8Package {
        return "android";
    }

+    @V8Property
+    fun supportedFeatures(): Array<String> {
+        return arrayOf(
+            "ReloadRequiredException",
+            "HttpBatchClient"
+        );
+    }
+
+    @V8Property
+    fun supportedContent(): Array<Int> {
+        return arrayOf(
+            ContentType.MEDIA.value,
+            ContentType.POST.value,
+            ContentType.PLAYLIST.value,
+            ContentType.WEB.value,
+            ContentType.URL.value,
+            ContentType.NESTED_VIDEO.value,
+            ContentType.CHANNEL.value,
+            ContentType.LOCKED.value,
+            ContentType.PLACEHOLDER.value,
+            ContentType.DEFERRED.value
+        )
+    }
+
    @V8Function
    fun dispose(value: V8Value) {
        Logger.e(TAG, "Manual dispose: " + value.javaClass.name);
@@ -88,28 +114,38 @@ class PackageBridge : V8Package {
    @V8Function
    fun setTimeout(func: V8ValueFunction, timeout: Long): Int {
        val id = timeoutCounter++;
-
        val funcClone = func.toClone<V8ValueFunction>()

        StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
            delay(timeout);
+            if(_plugin.isStopped)
+                return@launch;
            synchronized(timeoutMap) {
                if(!timeoutMap.contains(id)) {
-                    JavetResourceUtils.safeClose(funcClone);
+                    _plugin.busy {
+                        if(!_plugin.isStopped)
+                            JavetResourceUtils.safeClose(funcClone);
+                    }
                    return@launch;
                }
                timeoutMap.remove(id);
            }
            try {
-                _plugin.whenNotBusy {
-                    funcClone.callVoid(null, arrayOf<Any>());
+                _plugin.busy {
+                    if(!_plugin.isStopped)
+                        funcClone.callVoid(null, arrayOf<Any>());
                }
            }
            catch(ex: Throwable) {
                Logger.e(TAG, "Failed timeout callback", ex);
            }
            finally {
-                JavetResourceUtils.safeClose(funcClone);
+                _plugin.busy {
+                    if(!_plugin.isStopped)
+                        JavetResourceUtils.safeClose(funcClone);
+                }
+                //_plugin.whenNotBusy {
+                //}
            }
        };
        synchronized(timeoutMap) {
@@ -124,13 +160,17 @@ class PackageBridge : V8Package {
                timeoutMap.remove(id);
        }
    }
+    @V8Function
+    fun sleep(length: Int) {
+        Thread.sleep(length.toLong());
+    }

    @V8Function
    fun toast(str: String) {
        Logger.i(TAG, "Plugin toast [${_config.name}]: ${str}");
        StateApp.instance.scopeOrNull?.launch(Dispatchers.Main) {
            try {
-                UIDialogs.toast(str);
+                UIDialogs.appToast(str);
            } catch (e: Throwable) {
                Logger.e(TAG, "Failed to show toast.", e);
            }
@@ -8,9 +8,7 @@ import com.caoccao.javet.enums.V8ProxyMode
 import com.caoccao.javet.interop.V8Runtime
 import com.caoccao.javet.values.V8Value
 import com.caoccao.javet.values.primitive.V8ValueString
-import com.caoccao.javet.values.reference.V8ValueArrayBuffer
 import com.caoccao.javet.values.reference.V8ValueObject
-import com.caoccao.javet.values.reference.V8ValueSharedArrayBuffer
 import com.caoccao.javet.values.reference.V8ValueTypedArray
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
@@ -20,15 +18,9 @@ import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.engine.internal.IV8Convertable
 import com.futo.platformplayer.engine.internal.V8BindObject
 import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.states.StateApp
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
 import java.net.SocketTimeoutException
 import java.util.concurrent.ForkJoinPool
 import java.util.concurrent.ForkJoinTask
-import kotlin.concurrent.thread
-import kotlin.streams.asSequence

 class PackageHttp: V8Package {
    @Transient
@@ -49,6 +41,20 @@ class PackageHttp: V8Package {
    private var _batchPoolLock: Any = Any();
    private var _batchPool: ForkJoinPool? = null;

+    private val aliveSockets = mutableListOf<SocketResult>();
+    private var _cleanedUp = false;
+
+    private val _clients = mutableMapOf<String, PackageHttpClient>()
+
+    fun getClient(id: String?): PackageHttpClient {
+        if(id == null)
+            throw IllegalArgumentException("Http client ${id} doesn't exist");
+        if(_packageClient.clientId() == id)
+            return _packageClient;
+        if(_packageClientAuth.clientId() == id)
+            return _packageClientAuth;
+        return _clients.getOrDefault(id, null) ?: throw IllegalArgumentException("Http client ${id} doesn't exist");
+    }

    constructor(plugin: V8Plugin, config: IV8PluginConfig): super(plugin) {
        _config = config;
@@ -58,6 +64,27 @@ class PackageHttp: V8Package {
        _packageClientAuth = PackageHttpClient(this, _clientAuth);
    }

+    fun cleanup(){
+        Logger.w(TAG, "PackageHttp Cleaning up")
+        val sockets = synchronized(aliveSockets) { aliveSockets.toList() }
+        _cleanedUp = true;
+        for(socket in sockets){
+            try {
+                Logger.w(TAG, "PackageHttp Socket Cleaned Up");
+                socket.close(1001, "Cleanup");
+            }
+            catch(ex: Throwable) {
+                Logger.e(TAG, "Failed to close socket", ex);
+            }
+        }
+        if(sockets.size > 0) {
+            //Thread.sleep(100); //Give sockets a bit
+        }
+        synchronized(aliveSockets) {
+            aliveSockets.clear();
+        }
+    }
+

    /*
    Automatically adjusting threadpool dedicated per PackageHttp for batch requests.
@@ -96,6 +123,8 @@ class PackageHttp: V8Package {
            _plugin.registerHttpClient(httpClient);
        val client = PackageHttpClient(this, httpClient);

+        _clients.put(client.clientId() ?: "", client);
+
        return client;
    }
    @V8Function
@@ -111,24 +140,24 @@ class PackageHttp: V8Package {
    @V8Function
    fun request(method: String, url: String, headers: MutableMap<String, String> = HashMap(), useAuth: Boolean = false, bytesResult: Boolean = false) : IBridgeHttpResponse {
        return if(useAuth)
-            _packageClientAuth.request(method, url, headers, if(bytesResult) ReturnType.BYTES else ReturnType.STRING)
+            _packageClientAuth.requestInternal(method, url, headers, if(bytesResult) ReturnType.BYTES else ReturnType.STRING)
        else
-            _packageClient.request(method, url, headers, if(bytesResult) ReturnType.BYTES else ReturnType.STRING);
+            _packageClient.requestInternal(method, url, headers, if(bytesResult) ReturnType.BYTES else ReturnType.STRING);
    }

    @V8Function
    fun requestWithBody(method: String, url: String, body:String, headers: MutableMap<String, String> = HashMap(), useAuth: Boolean = false, bytesResult: Boolean = false) : IBridgeHttpResponse {
        return if(useAuth)
-            _packageClientAuth.requestWithBody(method, url, body, headers, if(bytesResult) ReturnType.BYTES else ReturnType.STRING)
+            _packageClientAuth.requestWithBodyInternal(method, url, body, headers, if(bytesResult) ReturnType.BYTES else ReturnType.STRING)
        else
-            _packageClient.requestWithBody(method, url, body, headers, if(bytesResult) ReturnType.BYTES else ReturnType.STRING);
+            _packageClient.requestWithBodyInternal(method, url, body, headers, if(bytesResult) ReturnType.BYTES else ReturnType.STRING);
    }
    @V8Function
    fun GET(url: String, headers: MutableMap<String, String> = HashMap(), useAuth: Boolean = false, useByteResponse: Boolean = false) : IBridgeHttpResponse {
        return if(useAuth)
-            _packageClientAuth.GET(url, headers, if(useByteResponse) ReturnType.BYTES else ReturnType.STRING)
+            _packageClientAuth.GETInternal(url, headers, if(useByteResponse) ReturnType.BYTES else ReturnType.STRING)
        else
-            _packageClient.GET(url, headers, if(useByteResponse) ReturnType.BYTES else ReturnType.STRING);
+            _packageClient.GETInternal(url, headers, if(useByteResponse) ReturnType.BYTES else ReturnType.STRING);
    }
    @V8Function
    fun POST(url: String, body: Any, headers: MutableMap<String, String> = HashMap(), useAuth: Boolean = false, useByteResponse: Boolean = false) : IBridgeHttpResponse {
@@ -136,15 +165,15 @@ class PackageHttp: V8Package {
        val client = if(useAuth) _packageClientAuth else _packageClient;

        if(body is V8ValueString)
-            return client.POST(url, body.value, headers, if(useByteResponse) ReturnType.BYTES else ReturnType.STRING);
+            return client.POSTInternal(url, body.value, headers, if(useByteResponse) ReturnType.BYTES else ReturnType.STRING);
        else if(body is String)
-            return client.POST(url, body, headers, if(useByteResponse) ReturnType.BYTES else ReturnType.STRING);
+            return client.POSTInternal(url, body, headers, if(useByteResponse) ReturnType.BYTES else ReturnType.STRING);
        else if(body is V8ValueTypedArray)
-            return client.POST(url, body.toBytes(), headers, if(useByteResponse) ReturnType.BYTES else ReturnType.STRING);
+            return client.POSTInternal(url, body.toBytes(), headers, if(useByteResponse) ReturnType.BYTES else ReturnType.STRING);
        else if(body is ByteArray)
-            return client.POST(url, body, headers, if(useByteResponse) ReturnType.BYTES else ReturnType.STRING);
+            return client.POSTInternal(url, body, headers, if(useByteResponse) ReturnType.BYTES else ReturnType.STRING);
        else if(body is ArrayList<*>) //Avoid this case, used purely for testing
-            return client.POST(url, body.map { (it as Double).toInt().toByte() }.toByteArray(), headers, if(useByteResponse) ReturnType.BYTES else ReturnType.STRING);
+            return client.POSTInternal(url, body.map { (it as Double).toInt().toByte() }.toByteArray(), headers, if(useByteResponse) ReturnType.BYTES else ReturnType.STRING);
        else
            throw NotImplementedError("Body type " + body?.javaClass?.name?.toString() + " not implemented for POST");
    }
@@ -230,18 +259,18 @@ class PackageHttp: V8Package {

        @V8Function
        fun request(method: String, url: String, headers: MutableMap<String, String> = HashMap(), useAuth: Boolean = false) : BatchBuilder {
-            return clientRequest(_package.getDefaultClient(useAuth), method, url, headers);
+            return clientRequest(_package.getDefaultClient(useAuth).clientId(), method, url, headers);
        }
        @V8Function
        fun requestWithBody(method: String, url: String, body:String, headers: MutableMap<String, String> = HashMap(), useAuth: Boolean = false) : BatchBuilder {
-            return clientRequestWithBody(_package.getDefaultClient(useAuth), method, url, body, headers);
+            return clientRequestWithBody(_package.getDefaultClient(useAuth).clientId(), method, url, body, headers);
        }
        @V8Function
        fun GET(url: String, headers: MutableMap<String, String> = HashMap(), useAuth: Boolean = false) : BatchBuilder
-            = clientGET(_package.getDefaultClient(useAuth), url, headers);
+            = clientGET(_package.getDefaultClient(useAuth).clientId(), url, headers);
        @V8Function
        fun POST(url: String, body: String, headers: MutableMap<String, String> = HashMap(), useAuth: Boolean = false) : BatchBuilder
-            = clientPOST(_package.getDefaultClient(useAuth), url, body, headers);
+            = clientPOST(_package.getDefaultClient(useAuth).clientId(), url, body, headers);

        @V8Function
        fun DUMMY(): BatchBuilder {
@@ -252,21 +281,21 @@ class PackageHttp: V8Package {
        //Client-specific

        @V8Function
-        fun clientRequest(client: PackageHttpClient, method: String, url: String, headers: MutableMap<String, String> = HashMap()) : BatchBuilder {
-            _reqs.add(Pair(client, RequestDescriptor(method, url, headers)));
+        fun clientRequest(clientId: String?, method: String, url: String, headers: MutableMap<String, String> = HashMap()) : BatchBuilder {
+            _reqs.add(Pair(_package.getClient(clientId), RequestDescriptor(method, url, headers)));
            return BatchBuilder(_package, _reqs);
        }
        @V8Function
-        fun clientRequestWithBody(client: PackageHttpClient, method: String, url: String, body:String, headers: MutableMap<String, String> = HashMap()) : BatchBuilder {
-            _reqs.add(Pair(client, RequestDescriptor(method, url, headers, body)));
+        fun clientRequestWithBody(clientId: String?, method: String, url: String, body:String, headers: MutableMap<String, String> = HashMap()) : BatchBuilder {
+            _reqs.add(Pair(_package.getClient(clientId), RequestDescriptor(method, url, headers, body)));
            return BatchBuilder(_package, _reqs);
        }
        @V8Function
-        fun clientGET(client: PackageHttpClient, url: String, headers: MutableMap<String, String> = HashMap()) : BatchBuilder
-                = clientRequest(client, "GET", url, headers);
+        fun clientGET(clientId: String?, url: String, headers: MutableMap<String, String> = HashMap()) : BatchBuilder
+                = clientRequest(clientId, "GET", url, headers);
        @V8Function
-        fun clientPOST(client: PackageHttpClient, url: String, body: String, headers: MutableMap<String, String> = HashMap()) : BatchBuilder
-                = clientRequestWithBody(client, "POST", url, body, headers);
+        fun clientPOST(clientId: String?, url: String, body: String, headers: MutableMap<String, String> = HashMap()) : BatchBuilder
+                = clientRequestWithBody(clientId, "POST", url, body, headers);


        //Finalizer
@@ -276,9 +305,9 @@ class PackageHttp: V8Package {
                if(it.second.method == "DUMMY")
                    return@autoParallelPool null;
                if(it.second.body != null)
-                    return@autoParallelPool it.first.requestWithBody(it.second.method, it.second.url, it.second.body!!, it.second.headers, it.second.respType);
+                    return@autoParallelPool it.first.requestWithBodyInternal(it.second.method, it.second.url, it.second.body!!, it.second.headers, it.second.respType);
                else
-                    return@autoParallelPool it.first.request(it.second.method, it.second.url, it.second.headers, it.second.respType);
+                    return@autoParallelPool it.first.requestInternal(it.second.method, it.second.url, it.second.headers, it.second.respType);
            }.map {
                if(it.second != null)
                    throw it.second!!;
@@ -305,6 +334,7 @@ class PackageHttp: V8Package {
        @Transient
        private val _clientId: String?;

+
        @V8Property
        fun clientId(): String? {
            return _clientId;
@@ -317,6 +347,17 @@ class PackageHttp: V8Package {
            _clientId = if(_client is JSHttpClient) _client.clientId else null;
        }

+        @V8Function
+        fun resetAuthCookies(){
+            if(_client is JSHttpClient)
+                _client.resetAuthCookies();
+        }
+        @V8Function
+        fun clearOtherCookies(){
+            if(_client is JSHttpClient)
+                _client.clearOtherCookies();
+        }
+
        @V8Function
        fun setDefaultHeaders(defaultHeaders: Map<String, String>) {
            for(pair in defaultHeaders)
@@ -345,7 +386,9 @@ class PackageHttp: V8Package {
        }

        @V8Function
-        fun request(method: String, url: String, headers: MutableMap<String, String> = HashMap(), returnType: ReturnType) : IBridgeHttpResponse {
+        fun request(method: String, url: String, headers: MutableMap<String, String> = HashMap(), useBytes: Boolean = false) : IBridgeHttpResponse
+            = requestInternal(method, url, headers, if(useBytes) ReturnType.BYTES else ReturnType.STRING);
+        fun requestInternal(method: String, url: String, headers: MutableMap<String, String> = HashMap(), returnType: ReturnType) : IBridgeHttpResponse {
            applyDefaultHeaders(headers);
            return logExceptions {
                return@logExceptions catchHttp {
@@ -364,7 +407,9 @@ class PackageHttp: V8Package {
            };
        }
        @V8Function
-        fun requestWithBody(method: String, url: String, body:String, headers: MutableMap<String, String> = HashMap(), returnType: ReturnType) : IBridgeHttpResponse {
+        fun requestWithBody(method: String, url: String, body:String, headers: MutableMap<String, String> = HashMap(), useBytes: Boolean = false) : IBridgeHttpResponse
+            = requestWithBodyInternal(method, url, body, headers, if(useBytes) ReturnType.BYTES else ReturnType.STRING)
+        fun requestWithBodyInternal(method: String, url: String, body:String, headers: MutableMap<String, String> = HashMap(), returnType: ReturnType) : IBridgeHttpResponse {
            applyDefaultHeaders(headers);
            return logExceptions {
                catchHttp {
@@ -385,7 +430,9 @@ class PackageHttp: V8Package {
        }

        @V8Function
-        fun GET(url: String, headers: MutableMap<String, String> = HashMap(), returnType: ReturnType = ReturnType.STRING) : IBridgeHttpResponse {
+        fun GET(url: String, headers: MutableMap<String, String> = HashMap(), useBytes: Boolean = false) : IBridgeHttpResponse
+            = GETInternal(url, headers, if(useBytes) ReturnType.BYTES else ReturnType.STRING)
+        fun GETInternal(url: String, headers: MutableMap<String, String> = HashMap(), returnType: ReturnType = ReturnType.STRING) : IBridgeHttpResponse {
            applyDefaultHeaders(headers);
            return logExceptions {
                catchHttp {
@@ -407,7 +454,24 @@ class PackageHttp: V8Package {
            };
        }
        @V8Function
-        fun POST(url: String, body: String, headers: MutableMap<String, String> = HashMap(), returnType: ReturnType = ReturnType.STRING) : IBridgeHttpResponse {
+        fun POST(url: String, body: Any, headers: MutableMap<String, String> = HashMap(), useBytes: Boolean = false) : IBridgeHttpResponse {
+            if(body is V8ValueString)
+                return POSTInternal(url, body.value, headers, if(useBytes) ReturnType.BYTES else ReturnType.STRING);
+            else if(body is String)
+                return POSTInternal(url, body, headers, if(useBytes) ReturnType.BYTES else ReturnType.STRING);
+            else if(body is V8ValueTypedArray)
+                return POSTInternal(url, body.toBytes(), headers, if(useBytes) ReturnType.BYTES else ReturnType.STRING);
+            else if(body is ByteArray)
+                return POSTInternal(url, body, headers, if(useBytes) ReturnType.BYTES else ReturnType.STRING);
+            else if(body is ArrayList<*>) //Avoid this case, used purely for testing
+                return POSTInternal(url, body.map { (it as Double).toInt().toByte() }.toByteArray(), headers, if(useBytes) ReturnType.BYTES else ReturnType.STRING);
+            else
+                throw NotImplementedError("Body type " + body?.javaClass?.name?.toString() + " not implemented for POST");
+        }
+
+
+        //    = POSTInternal(url, body, headers, if(useBytes) ReturnType.BYTES else ReturnType.STRING)
+        fun POSTInternal(url: String, body: String, headers: MutableMap<String, String> = HashMap(), returnType: ReturnType = ReturnType.STRING) : IBridgeHttpResponse {
            applyDefaultHeaders(headers);
            return logExceptions {
                catchHttp {
@@ -428,8 +492,7 @@ class PackageHttp: V8Package {
                }
            };
        }
-        @V8Function
-        fun POST(url: String, body: ByteArray, headers: MutableMap<String, String> = HashMap(), returnType: ReturnType = ReturnType.STRING) : IBridgeHttpResponse {
+        fun POSTInternal(url: String, body: ByteArray, headers: MutableMap<String, String> = HashMap(), returnType: ReturnType = ReturnType.STRING) : IBridgeHttpResponse {
            applyDefaultHeaders(headers);
            return logExceptions {
                catchHttp {
@@ -453,9 +516,16 @@ class PackageHttp: V8Package {

        @V8Function
        fun socket(url: String, headers: Map<String, String>? = null): SocketResult {
+            if(_package._cleanedUp)
+                throw IllegalStateException("Plugin shutdown");
            val socketHeaders = headers?.toMutableMap() ?: HashMap();
            applyDefaultHeaders(socketHeaders);
-            return SocketResult(this, _client, url, socketHeaders);
+            val socket = SocketResult(_package, this, _client, url, socketHeaders);
+            Logger.w(TAG, "PackageHttp Socket opened");
+            synchronized(_package.aliveSockets) {
+                _package.aliveSockets.add(socket);
+            }
+            return socket;
        }

        private fun applyDefaultHeaders(headerMap: MutableMap<String, String>) {
@@ -561,13 +631,15 @@ class PackageHttp: V8Package {

        private var _listeners: V8ValueObject? = null;

+        private val _package: PackageHttp;
        private val _packageClient: PackageHttpClient;
        private val _client: ManagedHttpClient;
        private val _url: String;
        private val _headers: Map<String, String>;

-        constructor(pack: PackageHttpClient, client: ManagedHttpClient, url: String, headers: Map<String,String>) {
+        constructor(parent: PackageHttp, pack: PackageHttpClient, client: ManagedHttpClient, url: String, headers: Map<String,String>) {
            _packageClient = pack;
+            _package = parent;
            _client = client;
            _url = url;
            _headers = headers;
@@ -593,9 +665,11 @@ class PackageHttp: V8Package {
                    override fun open() {
                        Logger.i(TAG, "Websocket opened: " + _url);
                        _isOpen = true;
-                        if(hasOpen) {
+                        if(hasOpen && _listeners?.isClosed != true) {
                            try {
-                                _listeners?.invokeVoid("open", arrayOf<Any>());
+                                _package._plugin.busy {
+                                    _listeners?.invokeVoid("open", arrayOf<Any>());
+                                }
                            }
                            catch(ex: Throwable){
                                Logger.e(TAG, "Socket for [${_packageClient.parentConfig.name}] open failed: " + ex.message, ex);
@@ -603,18 +677,22 @@ class PackageHttp: V8Package {
                        }
                    }
                    override fun message(msg: String) {
-                        if(hasMessage) {
+                        if(hasMessage && _listeners?.isClosed != true) {
                            try {
-                                _listeners?.invokeVoid("message", msg);
+                                _package._plugin.busy {
+                                    _listeners?.invokeVoid("message", msg);
+                                }
                            }
                            catch(ex: Throwable) {}
                        }
                    }
                    override fun closing(code: Int, reason: String) {
-                        if(hasClosing)
+                        if(hasClosing && _listeners?.isClosed != true)
                        {
                            try {
-                                _listeners?.invokeVoid("closing", code, reason);
+                                _package._plugin.busy {
+                                    _listeners?.invokeVoid("closing", code, reason);
+                                }
                            }
                            catch(ex: Throwable){
                                Logger.e(TAG, "Socket for [${_packageClient.parentConfig.name}] closing failed: " + ex.message, ex);
@@ -623,21 +701,29 @@ class PackageHttp: V8Package {
                    }
                    override fun closed(code: Int, reason: String) {
                        _isOpen = false;
-                        if(hasClosed) {
+                        if(hasClosed && _listeners?.isClosed != true) {
                            try {
-                                _listeners?.invokeVoid("closed", code, reason);
+                                _package._plugin.busy {
+                                    _listeners?.invokeVoid("closed", code, reason);
+                                }
                            }
                            catch(ex: Throwable){
                                Logger.e(TAG, "Socket for [${_packageClient.parentConfig.name}] closed failed: " + ex.message, ex);
                            }
                        }
+                        Logger.w(TAG, "PackageHttp Socket removed");
+                        synchronized(_package.aliveSockets) {
+                            _package.aliveSockets.remove(this@SocketResult);
+                        }
                    }
                    override fun failure(exception: Throwable) {
                        _isOpen = false;
                        Logger.e(TAG, "Websocket failure: ${exception.message} (${_url})", exception);
-                        if(hasFailure) {
+                        if(hasFailure &&  _listeners?.isClosed != true) {
                            try {
-                                _listeners?.invokeVoid("failure", exception.message);
+                                _package._plugin.busy {
+                                    _listeners?.invokeVoid("failure", exception.message);
+                                }
                            }
                            catch(ex: Throwable){
                                Logger.e(TAG, "Socket for [${_packageClient.parentConfig.name}] closed failed: " + ex.message, ex);
@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.FrameLayout
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.GridLayoutManager
@@ -25,6 +26,7 @@ import com.futo.platformplayer.api.media.structures.MultiPager
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.constructs.Event2
 import com.futo.platformplayer.constructs.TaskHandler
+import com.futo.platformplayer.dp
 import com.futo.platformplayer.engine.exceptions.PluginException
 import com.futo.platformplayer.engine.exceptions.ScriptCaptchaRequiredException
 import com.futo.platformplayer.exceptions.ChannelException
@@ -32,9 +34,11 @@ import com.futo.platformplayer.fragment.mainactivity.main.FeedView
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateCache
 import com.futo.platformplayer.states.StatePlatform
+import com.futo.platformplayer.states.StatePlugins
 import com.futo.platformplayer.states.StatePolycentric
 import com.futo.platformplayer.states.StateSubscriptions
 import com.futo.platformplayer.views.FeedStyle
+import com.futo.platformplayer.views.SearchView
 import com.futo.platformplayer.views.adapters.ContentPreviewViewHolder
 import com.futo.platformplayer.views.adapters.InsertedViewAdapterWithLoader
 import com.futo.platformplayer.views.adapters.feedtypes.PreviewContentListAdapter
@@ -54,6 +58,8 @@ class ChannelContentsFragment(private val subType: String? = null) : Fragment(),
    private var _results: ArrayList<IPlatformContent> = arrayListOf();
    private var _adapterResults: InsertedViewAdapterWithLoader<ContentPreviewViewHolder>? = null;
    private var _lastPolycentricProfile: PolycentricProfile? = null;
+    private var _query: String? = null
+    private var _searchView: SearchView? = null

    val onContentClicked = Event2<IPlatformContent, Long>();
    val onContentUrlClicked = Event2<String, ContentType>();
@@ -68,16 +74,32 @@ class ChannelContentsFragment(private val subType: String? = null) : Fragment(),
    private fun getContentPager(channel: IPlatformChannel): IPager<IPlatformContent> {
        Logger.i(TAG, "getContentPager");

-        val lastPolycentricProfile = _lastPolycentricProfile;
-        var pager: IPager<IPlatformContent>? = null;
-        if (lastPolycentricProfile != null)
-            pager= StatePolycentric.instance.getChannelContent(lifecycleScope, lastPolycentricProfile);
+        var pager: IPager<IPlatformContent>? = null
+        val query = _query
+        if (!query.isNullOrBlank()) {
+            if(subType != null) {
+                Logger.i(TAG, "StatePlatform.instance.searchChannel(channel.url = ${channel.url}, query = ${query}, subType = ${subType})")
+                pager = StatePlatform.instance.searchChannel(channel.url, query, subType);
+            } else {
+                Logger.i(TAG, "StatePlatform.instance.searchChannel(channel.url = ${channel.url}, query = ${query})")
+                pager = StatePlatform.instance.searchChannel(channel.url, query);
+            }
+        } else {
+            val lastPolycentricProfile = _lastPolycentricProfile;
+            if (lastPolycentricProfile != null && StatePolycentric.instance.enabled) {
+                pager = StatePolycentric.instance.getChannelContent(lifecycleScope, lastPolycentricProfile, type = subType);
+                Logger.i(TAG, "StatePolycentric.instance.getChannelContent(lifecycleScope, lastPolycentricProfile, type = ${subType})")
+            }

-        if(pager == null) {
-            if(subType != null)
-                pager = StatePlatform.instance.getChannelContent(channel.url, subType);
-            else
-                pager = StatePlatform.instance.getChannelContent(channel.url);
+            if(pager == null) {
+                if(subType != null) {
+                    pager = StatePlatform.instance.getChannelContent(channel.url, subType);
+                    Logger.i(TAG, "StatePlatform.instance.getChannelContent(channel.url = ${channel.url}, subType = ${subType})")
+                } else {
+                    pager = StatePlatform.instance.getChannelContent(channel.url);
+                    Logger.i(TAG, "StatePlatform.instance.getChannelContent(channel.url = ${channel.url})")
+                }
+            }
        }
        return pager;
    }
@@ -144,19 +166,49 @@ class ChannelContentsFragment(private val subType: String? = null) : Fragment(),

        _taskLoadVideos.cancel();

+        _query = null
        _channel = channel;
+        updateSearchViewVisibility()
        _results.clear();
        _adapterResults?.notifyDataSetChanged();

        loadInitial();
    }

+    private fun updateSearchViewVisibility() {
+        if (subType != null) {
+            _searchView?.visibility = View.GONE
+            return
+        }
+
+        val client = _channel?.id?.pluginId?.let { StatePlatform.instance.getClientOrNull(it) }
+        Logger.i(TAG, "_searchView.visible = ${client?.capabilities?.hasSearchChannelContents == true}")
+        _searchView?.visibility = if (client?.capabilities?.hasSearchChannelContents == true) View.VISIBLE else View.GONE
+    }
+
+    fun setQuery(query: String) {
+        _query = query
+        _taskLoadVideos.cancel()
+        _results.clear()
+        _adapterResults?.notifyDataSetChanged()
+        loadInitial()
+    }
+
    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
        val view = inflater.inflate(R.layout.fragment_channel_videos, container, false);

+        _query = null
        _recyclerResults = view.findViewById(R.id.recycler_videos);

-        _adapterResults = PreviewContentListAdapter(view.context, FeedStyle.THUMBNAIL, _results, null, Settings.instance.channel.progressBar).apply {
+        val searchView = SearchView(requireContext()).apply { layoutParams = FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT) }.apply {
+            onEnter.subscribe {
+                setQuery(it)
+            }
+        }
+        _searchView = searchView
+        updateSearchViewVisibility()
+
+        _adapterResults = PreviewContentListAdapter(view.context, FeedStyle.THUMBNAIL, _results, null, Settings.instance.channel.progressBar, viewsToPrepend = arrayListOf(searchView)).apply {
            this.onContentUrlClicked.subscribe(this@ChannelContentsFragment.onContentUrlClicked::emit);
            this.onUrlClicked.subscribe(this@ChannelContentsFragment.onUrlClicked::emit);
            this.onContentClicked.subscribe(this@ChannelContentsFragment.onContentClicked::emit);
@@ -173,6 +225,7 @@ class ChannelContentsFragment(private val subType: String? = null) : Fragment(),
        _recyclerResults?.layoutManager = _glmVideo;
        _recyclerResults?.addOnScrollListener(_scrollListener);

+
        return view;
    }

@@ -181,6 +234,8 @@ class ChannelContentsFragment(private val subType: String? = null) : Fragment(),
        _recyclerResults?.removeOnScrollListener(_scrollListener);
        _recyclerResults = null;
        _pager = null;
+        _query = null
+        _searchView = null

        _taskLoadVideos.cancel();
        _nextPageHandler.cancel();
@@ -303,6 +358,7 @@ class ChannelContentsFragment(private val subType: String? = null) : Fragment(),
    }

    private fun loadInitial() {
+        Logger.i(TAG, "loadInitial")
        val channel: IPlatformChannel = _channel ?: return;
        setLoading(true);
        _taskLoadVideos.run(channel);
@@ -23,7 +23,7 @@ open class MainActivityFragment : Fragment() {
    fun navigate(frag: MainFragment, parameter: Any? = null, withHistory: Boolean = true) {
        val a = activity
        if (a is MainActivity)
-            (activity as MainActivity).navigate(frag, parameter, withHistory)
+            (activity as MainActivity).navigate(frag, parameter, withHistory, false)
        else
            Log.e(TAG, "Failed to navigate due to activity not being a main activity.")
    }
@@ -330,7 +330,7 @@ class MenuBottomBarFragment : MainActivityFragment() {
            }

            if (!StatePayment.instance.hasPaid) {
-                newCurrentButtonDefinitions.add(ButtonDefinition(98, R.drawable.ic_paid, R.drawable.ic_paid_filled, R.string.buy, canToggle = false, { it.currentMain is BuyFragment }, { it.navigate<BuyFragment>() }))
+                newCurrentButtonDefinitions.add(ButtonDefinition(98, R.drawable.ic_paid, R.drawable.ic_paid_filled, R.string.buy, canToggle = false, { it.currentMain is BuyFragment }, { it.navigate<BuyFragment>(withHistory = true) }))
            }

            //Add conditional buttons here, when you add a conditional button, be sure to add the register and unregister events for when the button needs to be updated
@@ -383,20 +383,20 @@ class MenuBottomBarFragment : MainActivityFragment() {
                    currentMain.scrollToTop(false)
                    currentMain.reloadFeed()
                } else {
-                    it.navigate<HomeFragment>()
+                    it.navigate<HomeFragment>(withHistory = false)
                }
            }),
-            ButtonDefinition(1, R.drawable.ic_subscriptions, R.drawable.ic_subscriptions_filled, R.string.subscriptions, canToggle = true, { it.currentMain is SubscriptionsFeedFragment }, { it.navigate<SubscriptionsFeedFragment>() }),
-            ButtonDefinition(2, R.drawable.ic_creators, R.drawable.ic_creators_filled, R.string.creators, canToggle = false, { it.currentMain is CreatorsFragment }, { it.navigate<CreatorsFragment>() }),
-            ButtonDefinition(3, R.drawable.ic_sources, R.drawable.ic_sources_filled, R.string.sources, canToggle = false, { it.currentMain is SourcesFragment }, { it.navigate<SourcesFragment>() }),
-            ButtonDefinition(4, R.drawable.ic_playlist, R.drawable.ic_playlist_filled, R.string.playlists, canToggle = false, { it.currentMain is PlaylistsFragment }, { it.navigate<PlaylistsFragment>() }),
-            ButtonDefinition(5, R.drawable.ic_history, R.drawable.ic_history, R.string.history, canToggle = false, { it.currentMain is HistoryFragment }, { it.navigate<HistoryFragment>() }),
-            ButtonDefinition(6, R.drawable.ic_download, R.drawable.ic_download, R.string.downloads, canToggle = false, { it.currentMain is DownloadsFragment }, { it.navigate<DownloadsFragment>() }),
-            ButtonDefinition(8, R.drawable.ic_chat, R.drawable.ic_chat_filled, R.string.comments, canToggle = true, { it.currentMain is CommentsFragment }, { it.navigate<CommentsFragment>() }),
-            ButtonDefinition(9, R.drawable.ic_subscriptions, R.drawable.ic_subscriptions_filled, R.string.subscription_group_menu, canToggle = true, { it.currentMain is SubscriptionGroupListFragment }, { it.navigate<SubscriptionGroupListFragment>() }),
-            ButtonDefinition(10, R.drawable.ic_help_square, R.drawable.ic_help_square_fill, R.string.tutorials, canToggle = true, { it.currentMain is TutorialFragment }, { it.navigate<TutorialFragment>() }),
+            ButtonDefinition(1, R.drawable.ic_subscriptions, R.drawable.ic_subscriptions_filled, R.string.subscriptions, canToggle = true, { it.currentMain is SubscriptionsFeedFragment }, { it.navigate<SubscriptionsFeedFragment>(withHistory = false) }),
+            ButtonDefinition(2, R.drawable.ic_creators, R.drawable.ic_creators_filled, R.string.creators, canToggle = false, { it.currentMain is CreatorsFragment }, { it.navigate<CreatorsFragment>(withHistory = false) }),
+            ButtonDefinition(3, R.drawable.ic_sources, R.drawable.ic_sources_filled, R.string.sources, canToggle = false, { it.currentMain is SourcesFragment }, { it.navigate<SourcesFragment>(withHistory = false) }),
+            ButtonDefinition(4, R.drawable.ic_playlist, R.drawable.ic_playlist_filled, R.string.playlists, canToggle = false, { it.currentMain is PlaylistsFragment }, { it.navigate<PlaylistsFragment>(withHistory = false) }),
+            ButtonDefinition(5, R.drawable.ic_history, R.drawable.ic_history, R.string.history, canToggle = false, { it.currentMain is HistoryFragment }, { it.navigate<HistoryFragment>(withHistory = false) }),
+            ButtonDefinition(6, R.drawable.ic_download, R.drawable.ic_download, R.string.downloads, canToggle = false, { it.currentMain is DownloadsFragment }, { it.navigate<DownloadsFragment>(withHistory = false) }),
+            ButtonDefinition(8, R.drawable.ic_chat, R.drawable.ic_chat_filled, R.string.comments, canToggle = true, { it.currentMain is CommentsFragment }, { it.navigate<CommentsFragment>(withHistory = false) }),
+            ButtonDefinition(9, R.drawable.ic_subscriptions, R.drawable.ic_subscriptions_filled, R.string.subscription_group_menu, canToggle = true, { it.currentMain is SubscriptionGroupListFragment }, { it.navigate<SubscriptionGroupListFragment>(withHistory = false) }),
+            ButtonDefinition(10, R.drawable.ic_help_square, R.drawable.ic_help_square_fill, R.string.tutorials, canToggle = true, { it.currentMain is TutorialFragment }, { it.navigate<TutorialFragment>(withHistory = false) }),
            ButtonDefinition(7, R.drawable.ic_settings, R.drawable.ic_settings_filled, R.string.settings, canToggle = false, { false }, {
-                val c = it.context ?: return@ButtonDefinition;
+            val c = it.context ?: return@ButtonDefinition;
                Logger.i(TAG, "settings preventPictureInPicture()");
                it.requireFragment<VideoDetailFragment>().preventPictureInPicture();
                val intent = Intent(c, SettingsActivity::class.java);
@@ -416,7 +416,7 @@ class MenuBottomBarFragment : MainActivityFragment() {
                    }, UIDialogs.ActionStyle.PRIMARY));
            }),
            ButtonDefinition(97, R.drawable.ic_quiz, R.drawable.ic_quiz_fill, R.string.faq, canToggle = true, { false }, {
-                it.navigate<BrowserFragment>(Settings.URL_FAQ);
+                it.navigate<BrowserFragment>(Settings.URL_FAQ, withHistory = false);
            })
            //96 is reserved for privacy button
            //98 is reserved for buy button
@@ -0,0 +1,816 @@
+package com.futo.platformplayer.fragment.mainactivity.main
+
+import android.content.Context
+import android.content.Intent
+import android.graphics.Color
+import android.graphics.Typeface
+import android.graphics.drawable.Animatable
+import android.os.Bundle
+import android.text.Html
+import android.text.method.ScrollingMovementMethod
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.ViewPropertyAnimator
+import android.widget.Button
+import android.widget.FrameLayout
+import android.widget.ImageButton
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.view.children
+import androidx.core.view.isVisible
+import androidx.core.view.setPadding
+import androidx.lifecycle.lifecycleScope
+import com.bumptech.glide.Glide
+import com.futo.platformplayer.R
+import com.futo.platformplayer.Settings
+import com.futo.platformplayer.UIDialogs
+import com.futo.platformplayer.UISlideOverlays
+import com.futo.platformplayer.api.media.PlatformID
+import com.futo.platformplayer.api.media.models.Thumbnails
+import com.futo.platformplayer.api.media.models.article.IPlatformArticle
+import com.futo.platformplayer.api.media.models.article.IPlatformArticleDetails
+import com.futo.platformplayer.api.media.models.comments.PolycentricPlatformComment
+import com.futo.platformplayer.api.media.models.contents.IPlatformContent
+import com.futo.platformplayer.api.media.models.locked.IPlatformLockedContent
+import com.futo.platformplayer.api.media.models.nested.IPlatformNestedContent
+import com.futo.platformplayer.api.media.models.post.IPlatformPost
+import com.futo.platformplayer.api.media.models.post.IPlatformPostDetails
+import com.futo.platformplayer.api.media.models.post.TextType
+import com.futo.platformplayer.api.media.models.ratings.IRating
+import com.futo.platformplayer.api.media.models.ratings.RatingLikeDislikes
+import com.futo.platformplayer.api.media.models.ratings.RatingLikes
+import com.futo.platformplayer.api.media.models.video.IPlatformVideo
+import com.futo.platformplayer.api.media.models.video.SerializedPlatformVideo
+import com.futo.platformplayer.api.media.platforms.js.models.JSArticleDetails
+import com.futo.platformplayer.api.media.platforms.js.models.JSHeaderSegment
+import com.futo.platformplayer.api.media.platforms.js.models.JSImagesSegment
+import com.futo.platformplayer.api.media.platforms.js.models.JSNestedSegment
+import com.futo.platformplayer.api.media.platforms.js.models.JSTextSegment
+import com.futo.platformplayer.api.media.platforms.js.models.SegmentType
+import com.futo.platformplayer.constructs.TaskHandler
+import com.futo.platformplayer.dp
+import com.futo.platformplayer.fixHtmlWhitespace
+import com.futo.platformplayer.images.GlideHelper.Companion.crossfade
+import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.setPlatformPlayerLinkMovementMethod
+import com.futo.platformplayer.sp
+import com.futo.platformplayer.states.StateApp
+import com.futo.platformplayer.states.StatePlatform
+import com.futo.platformplayer.states.StatePlayer
+import com.futo.platformplayer.states.StatePlaylists
+import com.futo.platformplayer.states.StatePolycentric
+import com.futo.platformplayer.toHumanNowDiffString
+import com.futo.platformplayer.toHumanNumber
+import com.futo.platformplayer.views.FeedStyle
+import com.futo.platformplayer.views.adapters.feedtypes.PreviewLockedView
+import com.futo.platformplayer.views.adapters.feedtypes.PreviewNestedVideoView
+import com.futo.platformplayer.views.adapters.feedtypes.PreviewPostView
+import com.futo.platformplayer.views.adapters.feedtypes.PreviewVideoView
+import com.futo.platformplayer.views.comments.AddCommentView
+import com.futo.platformplayer.views.others.CreatorThumbnail
+import com.futo.platformplayer.views.overlays.RepliesOverlay
+import com.futo.platformplayer.views.pills.PillRatingLikesDislikes
+import com.futo.platformplayer.views.platform.PlatformIndicator
+import com.futo.platformplayer.views.segments.CommentsList
+import com.futo.platformplayer.views.subscriptions.SubscribeButton
+import com.futo.polycentric.core.ApiMethods
+import com.futo.polycentric.core.ContentType
+import com.futo.polycentric.core.Models
+import com.futo.polycentric.core.Opinion
+import com.futo.polycentric.core.PolycentricProfile
+import com.futo.polycentric.core.fullyBackfillServersAnnounceExceptions
+import com.google.android.flexbox.FlexboxLayout
+import com.google.android.material.imageview.ShapeableImageView
+import com.google.android.material.shape.CornerFamily
+import com.google.android.material.shape.ShapeAppearanceModel
+import com.google.protobuf.ByteString
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import userpackage.Protocol
+import java.lang.Integer.min
+
+class ArticleDetailFragment : MainFragment {
+    override val isMainView: Boolean = true;
+    override val isTab: Boolean = true;
+    override val hasBottomBar: Boolean get() = true;
+
+    private var _viewDetail: ArticleDetailView? = null;
+
+    constructor() : super() { }
+
+    override fun onBackPressed(): Boolean {
+        return false;
+    }
+
+    override fun onCreateMainView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        val view = ArticleDetailView(inflater.context).applyFragment(this);
+        _viewDetail = view;
+        return view;
+    }
+
+    override fun onDestroyMainView() {
+        super.onDestroyMainView();
+        _viewDetail?.onDestroy();
+        _viewDetail = null;
+    }
+
+    override fun onShownWithView(parameter: Any?, isBack: Boolean) {
+        super.onShownWithView(parameter, isBack);
+
+        if (parameter is IPlatformArticleDetails) {
+            _viewDetail?.clear();
+            _viewDetail?.setArticleDetails(parameter);
+        } else if (parameter is IPlatformArticle) {
+            _viewDetail?.setArticleOverview(parameter);
+        } else if(parameter is String) {
+            _viewDetail?.setPostUrl(parameter);
+        }
+    }
+
+    private class ArticleDetailView : ConstraintLayout {
+        private lateinit var _fragment: ArticleDetailFragment;
+        private var _url: String? = null;
+        private var _isLoading = false;
+        private var _article: IPlatformArticleDetails? = null;
+        private var _articleOverview: IPlatformArticle? = null;
+        private var _polycentricProfile: PolycentricProfile? = null;
+        private var _version = 0;
+        private var _isRepliesVisible: Boolean = false;
+        private var _repliesAnimator: ViewPropertyAnimator? = null;
+
+        private val _creatorThumbnail: CreatorThumbnail;
+        private val _buttonSubscribe: SubscribeButton;
+        private val _channelName: TextView;
+        private val _channelMeta: TextView;
+        private val _textTitle: TextView;
+        private val _textMeta: TextView;
+        private val _textSummary: TextView;
+        private val _containerSegments: LinearLayout;
+        private val _platformIndicator: PlatformIndicator;
+        private val _buttonShare: ImageButton;
+
+        private val _layoutRating: LinearLayout;
+        private val _imageLikeIcon: ImageView;
+        private val _textLikes: TextView;
+        private val _imageDislikeIcon: ImageView;
+        private val _textDislikes: TextView;
+
+        private val _addCommentView: AddCommentView;
+
+        private val _rating: PillRatingLikesDislikes;
+
+        private val _layoutLoadingOverlay: FrameLayout;
+        private val _imageLoader: ImageView;
+
+        private var _overlayContainer: FrameLayout
+        private val _repliesOverlay: RepliesOverlay;
+
+        private val _commentsList: CommentsList;
+
+        private var _commentType: Boolean? = null;
+        private val _buttonPolycentric: Button
+        private val _buttonPlatform: Button
+
+        private val _taskLoadPost = if(!isInEditMode) TaskHandler<String, IPlatformArticleDetails>(
+            StateApp.instance.scopeGetter,
+            {
+                val result = StatePlatform.instance.getContentDetails(it).await();
+                if(result !is IPlatformArticleDetails)
+                    throw IllegalStateException(context.getString(R.string.expected_media_content_found) + " ${result.contentType}");
+                return@TaskHandler result;
+            })
+            .success { setArticleDetails(it) }
+            .exception<Throwable> {
+                Logger.w(ChannelFragment.TAG, context.getString(R.string.failed_to_load_post), it);
+                UIDialogs.showGeneralRetryErrorDialog(context, context.getString(R.string.failed_to_load_post), it, ::fetchPost, null, _fragment);
+            } else TaskHandler(IPlatformPostDetails::class.java) { _fragment.lifecycleScope };
+
+        private val _taskLoadPolycentricProfile = TaskHandler<PlatformID, PolycentricProfile?>(StateApp.instance.scopeGetter, {
+            if (!StatePolycentric.instance.enabled)
+                return@TaskHandler null
+
+            ApiMethods.getPolycentricProfileByClaim(ApiMethods.SERVER, ApiMethods.FUTO_TRUST_ROOT, it.claimFieldType.toLong(), it.claimType.toLong(), it.value!!)
+        })
+            .success { it -> setPolycentricProfile(it, animate = true) }
+            .exception<Throwable> {
+                Logger.w(TAG, "Failed to load claims.", it);
+            };
+
+        constructor(context: Context) : super(context) {
+            inflate(context, R.layout.fragview_article_detail, this);
+
+            val root = findViewById<FrameLayout>(R.id.root);
+
+            _creatorThumbnail = findViewById(R.id.creator_thumbnail);
+            _buttonSubscribe = findViewById(R.id.button_subscribe);
+            _channelName = findViewById(R.id.text_channel_name);
+            _channelMeta = findViewById(R.id.text_channel_meta);
+            _textTitle = findViewById(R.id.text_title);
+            _textMeta = findViewById(R.id.text_meta);
+            _textSummary = findViewById(R.id.text_summary);
+            _containerSegments = findViewById(R.id.container_segments);
+            _platformIndicator = findViewById(R.id.platform_indicator);
+            _buttonShare = findViewById(R.id.button_share);
+
+            _overlayContainer = findViewById(R.id.overlay_container);
+
+            _layoutRating = findViewById(R.id.layout_rating);
+            _imageLikeIcon = findViewById(R.id.image_like_icon);
+            _textLikes = findViewById(R.id.text_likes);
+            _imageDislikeIcon = findViewById(R.id.image_dislike_icon);
+            _textDislikes = findViewById(R.id.text_dislikes);
+
+            _commentsList = findViewById(R.id.comments_list);
+            _addCommentView = findViewById(R.id.add_comment_view);
+
+            _rating = findViewById(R.id.rating);
+
+            _layoutLoadingOverlay = findViewById(R.id.layout_loading_overlay);
+            _imageLoader = findViewById(R.id.image_loader);
+
+
+            _repliesOverlay = findViewById(R.id.replies_overlay);
+
+            _buttonPolycentric = findViewById(R.id.button_polycentric)
+            _buttonPlatform = findViewById(R.id.button_platform)
+
+            _buttonSubscribe.onSubscribed.subscribe {
+                //TODO: add overlay to layout
+                //UISlideOverlays.showSubscriptionOptionsOverlay(it, _overlayContainer);
+            };
+
+            val layoutTop: LinearLayout = findViewById(R.id.layout_top);
+            root.removeView(layoutTop);
+            _commentsList.setPrependedView(layoutTop);
+
+            /*TODO: Why is this here?
+            _commentsList.onCommentsLoaded.subscribe {
+                updateCommentType(false);
+            };*/
+
+            _commentsList.onRepliesClick.subscribe { c ->
+                val replyCount = c.replyCount ?: 0;
+                var metadata = "";
+                if (replyCount > 0) {
+                    metadata += "$replyCount " + context.getString(R.string.replies);
+                }
+
+                if (c is PolycentricPlatformComment) {
+                    var parentComment: PolycentricPlatformComment = c;
+                    _repliesOverlay.load(_commentType!!, metadata, c.contextUrl, c.reference, c,
+                        { StatePolycentric.instance.getCommentPager(c.contextUrl, c.reference) },
+                        {
+                            val newComment = parentComment.cloneWithUpdatedReplyCount((parentComment.replyCount ?: 0) + 1);
+                            _commentsList.replaceComment(parentComment, newComment);
+                            parentComment = newComment;
+                        });
+                } else {
+                    _repliesOverlay.load(_commentType!!, metadata, null, null, c, { StatePlatform.instance.getSubComments(c) });
+                }
+
+                setRepliesOverlayVisible(isVisible = true, animate = true);
+            };
+
+            if (StatePolycentric.instance.enabled) {
+                _buttonPolycentric.setOnClickListener {
+                    updateCommentType(false)
+                }
+            } else {
+                _buttonPolycentric.visibility = View.GONE
+            }
+
+            _buttonPlatform.setOnClickListener {
+                updateCommentType(true)
+            }
+
+            _addCommentView.onCommentAdded.subscribe {
+                _commentsList.addComment(it);
+            };
+
+            _repliesOverlay.onClose.subscribe { setRepliesOverlayVisible(isVisible = false, animate = true); };
+
+            _buttonShare.setOnClickListener { share() };
+
+            _creatorThumbnail.onClick.subscribe { openChannel() };
+            _channelName.setOnClickListener { openChannel() };
+            _channelMeta.setOnClickListener { openChannel() };
+        }
+
+        private fun openChannel() {
+            val author = _article?.author ?: _articleOverview?.author ?: return;
+            _fragment.navigate<ChannelFragment>(author);
+        }
+
+        private fun share() {
+            try {
+                Logger.i(PreviewPostView.TAG, "sharePost")
+
+                val url = _article?.shareUrl ?: _articleOverview?.shareUrl ?: _url;
+                _fragment.startActivity(Intent.createChooser(Intent().apply {
+                    action = Intent.ACTION_SEND;
+                    putExtra(Intent.EXTRA_TEXT, url);
+                    type = "text/plain"; //TODO: Determine alt types?
+                }, null));
+            } catch (e: Throwable) {
+                //Ignored
+                Logger.e(PreviewPostView.TAG, "Failed to share.", e);
+            }
+        }
+
+        private fun updatePolycentricRating() {
+            _rating.visibility = View.GONE;
+
+            val ref = Models.referenceFromBuffer((_article?.url ?: _articleOverview?.url)?.toByteArray() ?: return)
+            val extraBytesRef = (_article?.id?.value ?: _articleOverview?.id?.value)?.let { if (it.isNotEmpty()) it.toByteArray() else null }
+            val version = _version;
+
+            _rating.onLikeDislikeUpdated.remove(this);
+
+            if (!StatePolycentric.instance.enabled)
+                return
+
+            _fragment.lifecycleScope.launch(Dispatchers.IO) {
+                if (version != _version) {
+                    return@launch;
+                }
+
+                try {
+                    val queryReferencesResponse = ApiMethods.getQueryReferences(ApiMethods.SERVER, ref, null,null,
+                        arrayListOf(
+                            Protocol.QueryReferencesRequestCountLWWElementReferences.newBuilder().setFromType(
+                                ContentType.OPINION.value).setValue(
+                                ByteString.copyFrom(Opinion.like.data)).build(),
+                            Protocol.QueryReferencesRequestCountLWWElementReferences.newBuilder().setFromType(
+                                ContentType.OPINION.value).setValue(
+                                ByteString.copyFrom(Opinion.dislike.data)).build()
+                        ),
+                        extraByteReferences = listOfNotNull(extraBytesRef)
+                    );
+
+                    if (version != _version) {
+                        return@launch;
+                    }
+
+                    val likes = queryReferencesResponse.countsList[0];
+                    val dislikes = queryReferencesResponse.countsList[1];
+                    val hasLiked = StatePolycentric.instance.hasLiked(ref.toByteArray())/* || extraBytesRef?.let { StatePolycentric.instance.hasLiked(it) } ?: false*/;
+                    val hasDisliked = StatePolycentric.instance.hasDisliked(ref.toByteArray())/* || extraBytesRef?.let { StatePolycentric.instance.hasDisliked(it) } ?: false*/;
+
+                    withContext(Dispatchers.Main) {
+                        if (version != _version) {
+                            return@withContext;
+                        }
+
+                        _rating.visibility = VISIBLE;
+                        _rating.setRating(RatingLikeDislikes(likes, dislikes), hasLiked, hasDisliked);
+                        _rating.onLikeDislikeUpdated.subscribe(this) { args ->
+                            if (args.hasLiked) {
+                                args.processHandle.opinion(ref, Opinion.like);
+                            } else if (args.hasDisliked) {
+                                args.processHandle.opinion(ref, Opinion.dislike);
+                            } else {
+                                args.processHandle.opinion(ref, Opinion.neutral);
+                            }
+
+                            StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
+                                try {
+                                    Logger.i(TAG, "Started backfill");
+                                    args.processHandle.fullyBackfillServersAnnounceExceptions();
+                                    Logger.i(TAG, "Finished backfill");
+                                } catch (e: Throwable) {
+                                    Logger.e(TAG, "Failed to backfill servers", e)
+                                }
+                            }
+
+                            StatePolycentric.instance.updateLikeMap(ref, args.hasLiked, args.hasDisliked)
+                        };
+                    }
+                } catch (e: Throwable) {
+                    Logger.e(TAG, "Failed to get polycentric likes/dislikes.", e);
+                    _rating.visibility = View.GONE;
+                }
+            }
+        }
+
+        private fun setPlatformRating(rating: IRating?) {
+            if (rating == null) {
+                _layoutRating.visibility = View.GONE;
+                return;
+            }
+
+            _layoutRating.visibility = View.VISIBLE;
+
+            when (rating) {
+                is RatingLikeDislikes -> {
+                    _textLikes.visibility = View.VISIBLE;
+                    _imageLikeIcon.visibility = View.VISIBLE;
+                    _textLikes.text = rating.likes.toHumanNumber();
+
+                    _imageDislikeIcon.visibility = View.VISIBLE;
+                    _textDislikes.visibility = View.VISIBLE;
+                    _textDislikes.text = rating.dislikes.toHumanNumber();
+                }
+                is RatingLikes -> {
+                    _textLikes.visibility = View.VISIBLE;
+                    _imageLikeIcon.visibility = View.VISIBLE;
+                    _textLikes.text = rating.likes.toHumanNumber();
+
+                    _imageDislikeIcon.visibility = View.GONE;
+                    _textDislikes.visibility = View.GONE;
+                }
+                else -> {
+                    _textLikes.visibility = View.GONE;
+                    _imageLikeIcon.visibility = View.GONE;
+                    _imageDislikeIcon.visibility = View.GONE;
+                    _textDislikes.visibility = View.GONE;
+                }
+            }
+        }
+
+        fun applyFragment(frag: ArticleDetailFragment): ArticleDetailView {
+            _fragment = frag;
+            return this;
+        }
+
+        fun clear() {
+            _commentsList.cancel();
+            _taskLoadPost.cancel();
+            _taskLoadPolycentricProfile.cancel();
+            _version++;
+
+            updateCommentType(null)
+            _url = null;
+            _article = null;
+            _articleOverview = null;
+            _creatorThumbnail.clear();
+            //_buttonSubscribe.setSubscribeChannel(null); TODO: clear button
+            _channelName.text = "";
+            setChannelMeta(null);
+            _textTitle.text = "";
+            _textMeta.text = "";
+            setPlatformRating(null);
+            _polycentricProfile = null;
+            _rating.visibility = View.GONE;
+            updatePolycentricRating();
+            setRepliesOverlayVisible(isVisible = false, animate = false);
+
+            _containerSegments.removeAllViews();
+
+            _addCommentView.setContext(null, null);
+            _platformIndicator.clearPlatform();
+        }
+
+        fun setArticleDetails(value: IPlatformArticleDetails) {
+            _url = value.url;
+            _article = value;
+
+            _creatorThumbnail.setThumbnail(value.author.thumbnail, false);
+            _buttonSubscribe.setSubscribeChannel(value.author.url);
+            _channelName.text = value.author.name;
+            setChannelMeta(value);
+            _textTitle.text = value.name;
+            _textMeta.text = value.datetime?.toHumanNowDiffString()?.let { "$it ago" } ?: "" //TODO: Include view count?
+
+            _textSummary.text = value.summary
+            _textSummary.isVisible = !value.summary.isNullOrEmpty()
+
+            _platformIndicator.setPlatformFromClientID(value.id.pluginId);
+            setPlatformRating(value.rating);
+
+            for(seg in value.segments) {
+                when(seg.type) {
+                    SegmentType.HEADER -> {
+                        if(seg is JSHeaderSegment) {
+                            _containerSegments.addView(ArticleHeaderBlock(context, seg.content, seg.level))
+                        }
+                    }
+                    SegmentType.TEXT -> {
+                        if(seg is JSTextSegment) {
+                            _containerSegments.addView(ArticleTextBlock(context, seg.content, seg.textType))
+                        }
+                    }
+                    SegmentType.IMAGES -> {
+                        if(seg is JSImagesSegment) {
+                            if(seg.images.size > 0)
+                                _containerSegments.addView(ArticleImageBlock(context, seg.images[0], seg.caption))
+                        }
+                    }
+                    SegmentType.NESTED -> {
+                        if(seg is JSNestedSegment) {
+                            _containerSegments.addView(ArticleContentBlock(context, seg.nested, _fragment, _overlayContainer));
+                        }
+                    }
+                    else ->{}
+                }
+            }
+
+            //Fetch only when not already called in setPostOverview
+            if (_articleOverview == null) {
+                fetchPolycentricProfile();
+                updatePolycentricRating();
+                _addCommentView.setContext(value.url, Models.referenceFromBuffer(value.url.toByteArray()));
+            }
+
+            val commentType = !Settings.instance.other.polycentricEnabled || Settings.instance.comments.defaultCommentSection == 1
+            updateCommentType(commentType, true);
+            setLoading(false);
+        }
+
+        fun setArticleOverview(value: IPlatformArticle) {
+            clear();
+            _url = value.url;
+            _articleOverview = value;
+
+            _creatorThumbnail.setThumbnail(value.author.thumbnail, false);
+            _buttonSubscribe.setSubscribeChannel(value.author.url);
+            _channelName.text = value.author.name;
+            setChannelMeta(value);
+            _textTitle.text = value.name;
+            _textMeta.text = value.datetime?.toHumanNowDiffString()?.let { "$it ago" } ?: "" //TODO: Include view count?
+
+            _platformIndicator.setPlatformFromClientID(value.id.pluginId);
+            _addCommentView.setContext(value.url, Models.referenceFromBuffer(value.url.toByteArray()));
+
+            updatePolycentricRating();
+            fetchPolycentricProfile();
+            fetchPost();
+        }
+
+
+        private fun setRepliesOverlayVisible(isVisible: Boolean, animate: Boolean) {
+            if (_isRepliesVisible == isVisible) {
+                return;
+            }
+
+            _isRepliesVisible = isVisible;
+            _repliesAnimator?.cancel();
+
+            if (isVisible) {
+                _repliesOverlay.visibility = View.VISIBLE;
+
+                if (animate) {
+                    _repliesOverlay.translationY = _repliesOverlay.height.toFloat();
+
+                    _repliesAnimator = _repliesOverlay.animate()
+                        .setDuration(300)
+                        .translationY(0f)
+                        .withEndAction {
+                            _repliesAnimator = null;
+                        }.apply { start() };
+                }
+            } else {
+                if (animate) {
+                    _repliesOverlay.translationY = 0f;
+
+                    _repliesAnimator = _repliesOverlay.animate()
+                        .setDuration(300)
+                        .translationY(_repliesOverlay.height.toFloat())
+                        .withEndAction {
+                            _repliesOverlay.visibility = GONE;
+                            _repliesAnimator = null;
+                        }.apply { start(); }
+                } else {
+                    _repliesOverlay.visibility = View.GONE;
+                    _repliesOverlay.translationY = _repliesOverlay.height.toFloat();
+                }
+            }
+        }
+
+        private fun fetchPolycentricProfile() {
+            val author = _article?.author ?: _articleOverview?.author ?: return;
+                setPolycentricProfile(null, animate = false);
+                _taskLoadPolycentricProfile.run(author.id);
+        }
+
+        private fun setChannelMeta(value: IPlatformArticle?) {
+            val subscribers = value?.author?.subscribers;
+            if(subscribers != null && subscribers > 0) {
+                _channelMeta.visibility = View.VISIBLE;
+                _channelMeta.text = if((value.author.subscribers ?: 0) > 0) value.author.subscribers!!.toHumanNumber() + " " + context.getString(R.string.subscribers) else "";
+            } else {
+                _channelMeta.visibility = View.GONE;
+                _channelMeta.text = "";
+            }
+        }
+
+        fun setPostUrl(url: String) {
+            clear();
+            _url = url;
+            fetchPost();
+        }
+
+        fun onDestroy() {
+            _commentsList.cancel();
+            _taskLoadPost.cancel();
+            _repliesOverlay.cleanup();
+        }
+
+        private fun setPolycentricProfile(polycentricProfile: PolycentricProfile?, animate: Boolean) {
+            _polycentricProfile = polycentricProfile;
+
+            val pp = _polycentricProfile;
+            if (pp == null) {
+                _creatorThumbnail.setHarborAvailable(false, animate, null);
+                return;
+            }
+
+            _creatorThumbnail.setHarborAvailable(true, animate, pp.system.toProto());
+        }
+
+        private fun fetchPost() {
+            Logger.i(TAG, "fetchVideo")
+            _article = null;
+
+            val url = _url;
+            if (!url.isNullOrBlank()) {
+                setLoading(true);
+                _taskLoadPost.run(url);
+            }
+        }
+
+        private fun fetchComments() {
+            Logger.i(TAG, "fetchComments")
+            _article?.let {
+                _commentsList.load(true) { StatePlatform.instance.getComments(it); };
+            }
+        }
+
+        private fun fetchPolycentricComments() {
+            Logger.i(TAG, "fetchPolycentricComments")
+            val post = _article;
+            val ref = (_article?.url ?: _articleOverview?.url)?.toByteArray()?.let { Models.referenceFromBuffer(it) }
+            val extraBytesRef = (_article?.id?.value ?: _articleOverview?.id?.value)?.let { if (it.isNotEmpty()) it.toByteArray() else null }
+
+            if (ref == null) {
+                Logger.w(TAG, "Failed to fetch polycentric comments because url was not set null")
+                _commentsList.clear();
+                return
+            }
+
+            _commentsList.load(false) { StatePolycentric.instance.getCommentPager(post!!.url, ref, listOfNotNull(extraBytesRef)); };
+        }
+
+        private fun updateCommentType(commentType: Boolean?, forceReload: Boolean = false) {
+            val changed = commentType != _commentType
+            _commentType = commentType
+
+            if (commentType == null) {
+                _buttonPlatform.setTextColor(resources.getColor(R.color.gray_ac))
+                _buttonPolycentric.setTextColor(resources.getColor(R.color.gray_ac))
+            } else {
+                _buttonPlatform.setTextColor(resources.getColor(if (commentType) R.color.white else R.color.gray_ac))
+                _buttonPolycentric.setTextColor(resources.getColor(if (!commentType) R.color.white else R.color.gray_ac))
+
+                if (commentType) {
+                    _addCommentView.visibility = View.GONE;
+
+                    if (forceReload || changed) {
+                        fetchComments();
+                    }
+                } else {
+                    _addCommentView.visibility = View.VISIBLE;
+
+                    if (forceReload || changed) {
+                        fetchPolycentricComments()
+                    }
+                }
+            }
+        }
+
+        private fun setLoading(isLoading : Boolean) {
+            if (_isLoading == isLoading) {
+                return;
+            }
+
+            _isLoading = isLoading;
+
+            if(isLoading) {
+                (_imageLoader.drawable as Animatable?)?.start()
+                _layoutLoadingOverlay.visibility = View.VISIBLE;
+            }
+            else {
+                _layoutLoadingOverlay.visibility = View.GONE;
+                (_imageLoader.drawable as Animatable?)?.stop()
+            }
+        }
+
+        class ArticleHeaderBlock : LinearLayout {
+            constructor(context: Context?, content: String, level: Int) : super(context){
+                inflate(context, R.layout.view_segment_text, this);
+
+                findViewById<TextView>(R.id.text_content)?.let {
+                    it.text = content;
+
+                    val sp = when(level) {
+                        1 -> 6.sp(resources);
+                        2 -> 8.sp(resources);
+                        3 -> 10.sp(resources);
+                        4 -> 12.sp(resources);
+                        5 -> 14.sp(resources);
+                        else -> 6.sp(resources);
+                    }
+                    it.setTextColor(Color.WHITE);
+                    it.setTypeface(Typeface.create(null, 600, false));
+                    it.textSize = sp.toFloat();
+                }
+            }
+        }
+        class ArticleTextBlock : LinearLayout {
+            constructor(context: Context?, content: String, textType: TextType) : super(context){
+                inflate(context, R.layout.view_segment_text, this);
+
+                findViewById<TextView>(R.id.text_content)?.let {
+                    if(textType == TextType.HTML)
+                        it.text = Html.fromHtml(content, Html.FROM_HTML_MODE_COMPACT);
+                    else if(textType == TextType.CODE) {
+                        it.text = content;
+                        it.setPadding(15.dp(resources));
+                        it.setHorizontallyScrolling(true);
+                        it.movementMethod = ScrollingMovementMethod();
+                        it.setTypeface(Typeface.MONOSPACE);
+                        it.setBackgroundResource(R.drawable.background_videodetail_description)
+                    }
+                    else
+                        it.text = content;
+                }
+            }
+        }
+        class ArticleImageBlock: LinearLayout {
+            constructor(context: Context?, image: String, caption: String? = null) : super(context){
+                inflate(context, R.layout.view_segment_image, this);
+
+                findViewById<ImageView>(R.id.image_content)?.let {
+                    Glide.with(it)
+                        .load(image)
+                        .crossfade()
+                        .into(it);
+                }
+                findViewById<TextView>(R.id.text_content)?.let {
+                    if(caption?.isNullOrEmpty() == true)
+                        it.isVisible = false;
+                    else
+                        it.text = caption;
+                }
+            }
+        }
+        class ArticleContentBlock: LinearLayout {
+            constructor(context: Context, content: IPlatformContent?, fragment: ArticleDetailFragment? = null, overlayContainer: FrameLayout? = null): super(context) {
+                if(content != null) {
+                    var view: View? = null;
+                    if(content is IPlatformNestedContent) {
+                        view = PreviewNestedVideoView(context, FeedStyle.THUMBNAIL, null);
+                        view.bind(content);
+                        view.onContentUrlClicked.subscribe { a,b -> }
+                    }
+                    else if(content is IPlatformVideo) {
+                        view = PreviewVideoView(context, FeedStyle.THUMBNAIL, null, true);
+                        view.bind(content);
+                        view.onVideoClicked.subscribe { a,b -> fragment?.navigate<VideoDetailFragment>(a) }
+                        view.onChannelClicked.subscribe { a -> fragment?.navigate<ChannelFragment>(a) }
+                        if(overlayContainer != null) {
+                            view.onAddToClicked.subscribe { a -> UISlideOverlays.showVideoOptionsOverlay(a, overlayContainer) };
+                        }
+                        view.onAddToQueueClicked.subscribe { a -> StatePlayer.instance.addToQueue(a) }
+                        view.onAddToWatchLaterClicked.subscribe { a ->
+                            if(StatePlaylists.instance.addToWatchLater(SerializedPlatformVideo.fromVideo(content), true))
+                                UIDialogs.toast("Added to watch later\n[${content.name}]")
+                            else
+                                UIDialogs.toast(context.getString(R.string.already_in_watch_later))
+                        }
+                    }
+                    else if(content is IPlatformPost) {
+                        view = PreviewPostView(context, FeedStyle.THUMBNAIL);
+                        view.bind(content);
+                        view.onContentClicked.subscribe { a -> fragment?.navigate<PostDetailFragment>(a) }
+                        view.onChannelClicked.subscribe { a -> fragment?.navigate<ChannelFragment>(a) }
+                    }
+                    else if(content is IPlatformArticle) {
+                        view = PreviewPostView(context, FeedStyle.THUMBNAIL);
+                        view.bind(content);
+                        view.onContentClicked.subscribe { a -> fragment?.navigate<ArticleDetailFragment>(a) }
+                        view.onChannelClicked.subscribe { a -> fragment?.navigate<ChannelFragment>(a) }
+                    }
+                    else if(content is IPlatformLockedContent) {
+                        view = PreviewLockedView(context, FeedStyle.THUMBNAIL);
+                        view.bind(content);
+                    }
+                    if(view != null)
+                        addView(view);
+                }
+            }
+        }
+
+
+        companion object {
+            const val TAG = "PostDetailFragment"
+        }
+    }
+
+    companion object {
+        fun newInstance() = ArticleDetailFragment().apply {}
+    }
+}
@@ -1,6 +1,8 @@
 package com.futo.platformplayer.fragment.mainactivity.main

 import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -66,8 +68,7 @@ class BuyFragment : MainFragment() {

            _paymentManager = PaymentManager(StatePayment.instance, fragment, _overlayPaying) { success, _, exception ->
                if(success) {
-                    UIDialogs.showDialog(context, R.drawable.ic_check, context.getString(R.string.payment_succeeded), context.getString(R.string.thanks_for_your_purchase_a_key_will_be_sent_to_your_email_after_your_payment_has_been_received), null, 0,
-                        UIDialogs.Action("Ok", {}, UIDialogs.ActionStyle.PRIMARY));
+                    UIDialogs.showDialog(context, R.drawable.ic_check, context.getString(R.string.payment_succeeded), context.getString(R.string.thanks_for_your_purchase_a_key_will_be_sent_to_your_email_after_your_payment_has_been_received), null, 0, UIDialogs.Action("Ok", {}, UIDialogs.ActionStyle.PRIMARY));
                    _fragment.close(true);
                }
                else {
@@ -115,11 +116,14 @@ class BuyFragment : MainFragment() {
            val licenseInput = SlideUpMenuTextInput(context, context.getString(R.string.license));
            val productLicenseDialog = SlideUpMenuOverlay(context, findViewById<FrameLayout>(R.id.overlay_paid), context.getString(R.string.enter_license_key), context.getString(R.string.ok), true, licenseInput);
            productLicenseDialog.onOK.subscribe {
+                licenseInput.deactivate();
                val licenseText = licenseInput.text;
                if (licenseText.isNullOrEmpty()) {
                    UIDialogs.showDialogOk(context, R.drawable.ic_error_pred, context.getString(R.string.invalid_license_key));
                    return@subscribe;
                }
+                licenseInput.clear();
+                productLicenseDialog.hide(true);

                _fragment.lifecycleScope.launch(Dispatchers.IO) {

@@ -127,17 +131,18 @@ class BuyFragment : MainFragment() {
                        val activationResult = StatePayment.instance.setPaymentLicense(licenseText);

                        withContext(Dispatchers.Main) {
-                            if(activationResult) {
-                                licenseInput.deactivate();
-                                licenseInput.clear();
-                                productLicenseDialog.hide(true);
-
-                                UIDialogs.showDialogOk(context, R.drawable.ic_check, context.getString(R.string.your_license_key_has_been_set_an_app_restart_might_be_required));
-                                _fragment.close(true);
-                            }
-                            else
-                            {
-                                UIDialogs.showDialogOk(context, R.drawable.ic_error_pred, context.getString(R.string.invalid_license_key));
+                            try {
+                                if(activationResult) {
+                                    UIDialogs.showDialogOk(context, R.drawable.ic_check, context.getString(R.string.your_license_key_has_been_set_an_app_restart_might_be_required)) {
+                                        _fragment.close(true)
+                                    }
+                                }
+                                else
+                                {
+                                    UIDialogs.showDialogOk(context, R.drawable.ic_error_pred, context.getString(R.string.invalid_license_key));
+                                }
+                            } catch (e: Throwable) {
+                                Logger.e(TAG, "Failed to update UI after buy complete", e)
                            }
                        }
                    }
@@ -158,5 +163,6 @@ class BuyFragment : MainFragment() {

    companion object {
        fun newInstance() = BuyFragment().apply {}
+        private val TAG = "BuyFragment"
    }
 }
@@ -47,6 +47,7 @@ import com.futo.platformplayer.selectHighestResolutionImage
 import com.futo.platformplayer.states.StatePlatform
 import com.futo.platformplayer.states.StatePlayer
 import com.futo.platformplayer.states.StatePlaylists
+import com.futo.platformplayer.states.StatePolycentric
 import com.futo.platformplayer.states.StateSubscriptions
 import com.futo.platformplayer.toHumanNumber
 import com.futo.platformplayer.views.adapters.ChannelTab
@@ -135,6 +136,8 @@ class ChannelFragment : MainFragment() {
            inflater.inflate(R.layout.fragment_channel, this)
            _taskLoadPolycentricProfile = TaskHandler<PlatformID, PolycentricProfile?>({ fragment.lifecycleScope },
                    { id ->
+                        if (!StatePolycentric.instance.enabled)
+                            return@TaskHandler null
                        return@TaskHandler ApiMethods.getPolycentricProfileByClaim(ApiMethods.SERVER, ApiMethods.FUTO_TRUST_ROOT, id.claimFieldType.toLong(), id.claimType.toLong(), id.value!!)
                    }).success { setPolycentricProfile(it, animate = true) }.exception<Throwable> {
                    Logger.w(TAG, "Failed to load polycentric profile.", it)
@@ -223,6 +226,8 @@ class ChannelFragment : MainFragment() {
                if (content is IPlatformVideo) {
                    if(StatePlaylists.instance.addToWatchLater(SerializedPlatformVideo.fromVideo(content), true))
                        UIDialogs.toast("Added to watch later\n[${content.name}]")
+                    else
+                        UIDialogs.toast(context.getString(R.string.already_in_watch_later))
                }
            }
            adapter.onUrlClicked.subscribe { url ->
@@ -422,17 +427,15 @@ class ChannelFragment : MainFragment() {
            _fragment.lifecycleScope.launch(Dispatchers.IO) {
                val plugin = StatePlatform.instance.getChannelClientOrNull(channel.url)
                withContext(Dispatchers.Main) {
-                    if (plugin != null && plugin.capabilities.hasSearchChannelContents) {
-                        buttons.add(Pair(R.drawable.ic_search) {
-                            _fragment.navigate<SuggestionsFragment>(
-                                SuggestionsFragmentData(
-                                    "", SearchType.VIDEO, channel.url
-                                )
+                    buttons.add(Pair(R.drawable.ic_search) {
+                        _fragment.navigate<SuggestionsFragment>(
+                            SuggestionsFragmentData(
+                                "", SearchType.VIDEO
                            )
-                        })
+                        )
+                    })
+                    _fragment.topBar?.assume<NavigationTopBarFragment>()?.setMenuItems(buttons)

-                        _fragment.topBar?.assume<NavigationTopBarFragment>()?.setMenuItems(buttons)
-                    }
                    if(plugin != null && plugin.capabilities.hasGetChannelCapabilities) {
                        if(plugin.getChannelCapabilities()?.types?.contains(ResultCapabilities.TYPE_SHORTS) ?: false &&
                            !(_viewPager.adapter as ChannelViewPagerAdapter).containsItem(ChannelTab.SHORTS.ordinal.toLong())) {
@@ -10,12 +10,14 @@ import com.futo.platformplayer.R
 import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.UISlideOverlays
+import com.futo.platformplayer.api.media.models.article.IPlatformArticle
 import com.futo.platformplayer.api.media.models.contents.ContentType
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
 import com.futo.platformplayer.api.media.models.playlists.IPlatformPlaylist
 import com.futo.platformplayer.api.media.models.post.IPlatformPost
 import com.futo.platformplayer.api.media.models.video.IPlatformVideo
 import com.futo.platformplayer.api.media.models.video.SerializedPlatformVideo
+import com.futo.platformplayer.api.media.platforms.js.models.JSWeb
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateMeta
@@ -84,6 +86,8 @@ abstract class ContentFeedView<TFragment> : FeedView<TFragment, IPlatformContent
            if(it is IPlatformVideo) {
                if(StatePlaylists.instance.addToWatchLater(SerializedPlatformVideo.fromVideo(it), true))
                    UIDialogs.toast("Added to watch later\n[${it.name}]");
+                else
+                    UIDialogs.toast(context.getString(R.string.already_in_watch_later))
            }
        };
        adapter.onLongPress.subscribe(this) {
@@ -196,7 +200,14 @@ abstract class ContentFeedView<TFragment> : FeedView<TFragment, IPlatformContent
            fragment.navigate<RemotePlaylistFragment>(content);
        } else if (content is IPlatformPost) {
            fragment.navigate<PostDetailFragment>(content);
+        } else if(content is IPlatformArticle) {
+            fragment.navigate<ArticleDetailFragment>(content);
        }
+        else if(content is JSWeb) {
+            fragment.navigate<WebDetailFragment>(content);
+        }
+        else
+            UIDialogs.appToast("Unknown content type [" + content.contentType.name + "]");
    }
    protected open fun onContentUrlClicked(url: String, contentType: ContentType) {
        when(contentType) {
@@ -89,7 +89,6 @@ class ContentSearchResultsFragment : MainFragment() {
        private var _sortBy: String? = null;
        private var _filterValues: HashMap<String, List<String>> = hashMapOf();
        private var _enabledClientIds: List<String>? = null;
-        private var _channelUrl: String? = null;
        private var _searchType: SearchType? = null;

        private val _taskSearch: TaskHandler<String, IPager<IPlatformContent>>;
@@ -98,17 +97,12 @@ class ContentSearchResultsFragment : MainFragment() {
        constructor(fragment: ContentSearchResultsFragment, inflater: LayoutInflater) : super(fragment, inflater) {
            _taskSearch = TaskHandler<String, IPager<IPlatformContent>>({fragment.lifecycleScope}, { query ->
                Logger.i(TAG, "Searching for: $query")
-                val channelUrl = _channelUrl;
-                if (channelUrl != null) {
-                    StatePlatform.instance.searchChannel(channelUrl, query, null, _sortBy, _filterValues, _enabledClientIds)
-                } else {
-                    when (_searchType)
-                    {
-                        SearchType.VIDEO -> StatePlatform.instance.searchRefresh(fragment.lifecycleScope, query, null, _sortBy, _filterValues, _enabledClientIds)
-                        SearchType.CREATOR -> StatePlatform.instance.searchChannelsAsContent(query)
-                        SearchType.PLAYLIST -> StatePlatform.instance.searchPlaylist(query)
-                        else -> throw Exception("Search type must be specified")
-                    }
+                when (_searchType)
+                {
+                    SearchType.VIDEO -> StatePlatform.instance.searchRefresh(fragment.lifecycleScope, query, null, _sortBy, _filterValues, _enabledClientIds)
+                    SearchType.CREATOR -> StatePlatform.instance.searchChannelsAsContent(query)
+                    SearchType.PLAYLIST -> StatePlatform.instance.searchPlaylist(query)
+                    else -> throw Exception("Search type must be specified")
                }
            })
            .success { loadedResult(it); }.exception<ScriptCaptchaRequiredException> {  }
@@ -147,7 +141,6 @@ class ContentSearchResultsFragment : MainFragment() {
        fun onShown(parameter: Any?) {
            if(parameter is SuggestionsFragmentData) {
                setQuery(parameter.query, false);
-                setChannelUrl(parameter.channelUrl, false);
                setSearchType(parameter.searchType, false)

                fragment.topBar?.apply {
@@ -164,7 +157,7 @@ class ContentSearchResultsFragment : MainFragment() {
                    onFilterClick.subscribe(this) {
                        _overlayContainer.let {
                            val filterValuesCopy = HashMap(_filterValues);
-                            val filtersOverlay = UISlideOverlays.showFiltersOverlay(lifecycleScope, it, _enabledClientIds!!, filterValuesCopy, _channelUrl != null);
+                            val filtersOverlay = UISlideOverlays.showFiltersOverlay(lifecycleScope, it, _enabledClientIds!!, filterValuesCopy);
                            filtersOverlay.onOK.subscribe { enabledClientIds, changed ->
                                if (changed) {
                                    setFilterValues(filtersOverlay.commonCapabilities, filterValuesCopy);
@@ -211,11 +204,7 @@ class ContentSearchResultsFragment : MainFragment() {

            fragment.lifecycleScope.launch(Dispatchers.IO) {
                try {
-                    val commonCapabilities =
-                        if(_channelUrl == null)
-                            StatePlatform.instance.getCommonSearchCapabilities(StatePlatform.instance.getEnabledClients().map { it.id });
-                        else
-                            StatePlatform.instance.getCommonSearchChannelContentsCapabilities(StatePlatform.instance.getEnabledClients().map { it.id });
+                    val commonCapabilities = StatePlatform.instance.getCommonSearchCapabilities(StatePlatform.instance.getEnabledClients().map { it.id });
                    val sorts = commonCapabilities?.sorts ?: listOf();
                    if (sorts.size > 1) {
                        withContext(Dispatchers.Main) {
@@ -282,15 +271,6 @@ class ContentSearchResultsFragment : MainFragment() {
            }
        }

-        private fun setChannelUrl(channelUrl: String?, updateResults: Boolean = true) {
-            _channelUrl = channelUrl;
-
-            if (updateResults) {
-                clearResults();
-                loadResults();
-            }
-        }
-
        private fun setSearchType(searchType: SearchType, updateResults: Boolean = true) {
            _searchType = searchType

@@ -16,6 +16,8 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.futo.platformplayer.R
 import com.futo.platformplayer.UISlideOverlays
+import com.futo.platformplayer.stores.FragmentedStorage
+import com.futo.platformplayer.stores.StringStorage
 import com.futo.platformplayer.views.adapters.SubscriptionAdapter

 class CreatorsFragment : MainFragment() {
@@ -29,6 +31,8 @@ class CreatorsFragment : MainFragment() {
    private var _editSearch: EditText? = null;
    private var _textMeta: TextView? = null;
    private var _buttonClearSearch: ImageButton? = null
+    private var _ordering = FragmentedStorage.get<StringStorage>("creators_ordering")
+

    override fun onCreateMainView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
        val view = inflater.inflate(R.layout.fragment_creators, container, false);
@@ -44,7 +48,7 @@ class CreatorsFragment : MainFragment() {
            _buttonClearSearch?.visibility = View.INVISIBLE;
        }

-        val adapter = SubscriptionAdapter(inflater, getString(R.string.confirm_delete_subscription)) { subs ->
+        val adapter = SubscriptionAdapter(inflater, getString(R.string.confirm_delete_subscription), _ordering?.value?.toIntOrNull() ?: 5) { subs ->
            _textMeta?.let {
                it.text = "${subs.size} creator${if(subs.size > 1) "s" else ""}";
            }
@@ -61,6 +65,7 @@ class CreatorsFragment : MainFragment() {
        spinnerSortBy.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
            override fun onItemSelected(parent: AdapterView<*>, view: View?, pos: Int, id: Long) {
                adapter.sortBy = pos;
+                _ordering.setAndSave(pos.toString())
            }
            override fun onNothingSelected(parent: AdapterView<*>?) = Unit
        };
@@ -150,7 +150,7 @@ class DownloadsFragment : MainFragment() {
            spinnerSortBy.adapter = ArrayAdapter(context, R.layout.spinner_item_simple, resources.getStringArray(R.array.downloads_sortby_array)).also {
                it.setDropDownViewResource(R.layout.spinner_dropdownitem_simple);
            };
-            val options = listOf("nameAsc", "nameDesc", "downloadDateAsc", "downloadDateDesc", "releasedAsc", "releasedDesc");
+            val options = listOf("nameAsc", "nameDesc", "downloadDateAsc", "downloadDateDesc", "releasedAsc", "releasedDesc", "sizeAsc", "sizeDesc");
            spinnerSortBy.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
                override fun onItemSelected(parent: AdapterView<*>, view: View?, pos: Int, id: Long) {
                    when(pos) {
@@ -160,6 +160,8 @@ class DownloadsFragment : MainFragment() {
                        3 -> ordering.setAndSave("downloadDateDesc")
                        4 -> ordering.setAndSave("releasedAsc")
                        5 -> ordering.setAndSave("releasedDesc")
+                        6 -> ordering.setAndSave("sizeAsc")
+                        7 -> ordering.setAndSave("sizeDesc")
                        else -> ordering.setAndSave("")
                    }
                    updateContentFilters()
@@ -257,6 +259,8 @@ class DownloadsFragment : MainFragment() {
                    "nameDesc" -> vidsToReturn.sortedByDescending { it.name.lowercase() }
                    "releasedAsc" -> vidsToReturn.sortedBy { it.datetime ?: OffsetDateTime.MAX }
                    "releasedDesc" -> vidsToReturn.sortedByDescending { it.datetime ?: OffsetDateTime.MIN }
+                    "sizeAsc" -> vidsToReturn.sortedBy { it.videoSource.sumOf { it.fileSize } + it.audioSource.sumOf { it.fileSize } }
+                    "sizeDesc" -> vidsToReturn.sortedByDescending { it.videoSource.sumOf { it.fileSize } + it.audioSource.sumOf { it.fileSize } }
                    else -> vidsToReturn
                }
            }
@@ -15,6 +15,8 @@ import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.futo.platformplayer.*
+import com.futo.platformplayer.api.media.models.video.IPlatformVideo
+import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.structures.IAsyncPager
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.constructs.TaskHandler
@@ -22,10 +24,14 @@ import com.futo.platformplayer.fragment.mainactivity.topbar.NavigationTopBarFrag
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.HistoryVideo
 import com.futo.platformplayer.states.StateHistory
+import com.futo.platformplayer.states.StatePlatform
 import com.futo.platformplayer.states.StatePlayer
+import com.futo.platformplayer.states.StatePlugins
+import com.futo.platformplayer.views.ToggleBar
 import com.futo.platformplayer.views.adapters.HistoryListViewHolder
 import com.futo.platformplayer.views.adapters.InsertedViewAdapterWithLoader
 import com.futo.platformplayer.views.others.TagsView
+import com.futo.platformplayer.views.others.Toggle
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -68,6 +74,8 @@ class HistoryFragment : MainFragment() {
        private var _pager: IPager<HistoryVideo>? = null;
        private val _results = arrayListOf<HistoryVideo>();
        private var _loading = false;
+        private val _toggleBar: ToggleBar
+        private var _togglePluginsDisabled = hashSetOf<String>()

        private var _automaticNextPageCounter = 0;

@@ -79,6 +87,7 @@ class HistoryFragment : MainFragment() {
            _clearSearch = findViewById(R.id.button_clear_search);
            _editSearch = findViewById(R.id.edit_search);
            _tagsView = findViewById(R.id.tags_text);
+            _toggleBar = findViewById(R.id.toggle_bar)
            _tagsView.setPairs(listOf(
                Pair(context.getString(R.string.last_hour), 60L),
                Pair(context.getString(R.string.last_24_hours), 24L * 60L),
@@ -88,6 +97,22 @@ class HistoryFragment : MainFragment() {
                Pair(context.getString(R.string.all_time), -1L)
            ));

+            val toggles = StatePlatform.instance.getEnabledClients()
+                .filter { it is JSClient }
+                .map { plugin ->
+                    val pluginName = plugin.name.lowercase()
+                    ToggleBar.Toggle(if(Settings.instance.home.showHomeFiltersPluginNames) pluginName else "", plugin.icon, !_togglePluginsDisabled.contains(plugin.id), { view, active ->
+                        if (active) {
+                            _togglePluginsDisabled.remove(plugin.id)
+                        } else {
+                            _togglePluginsDisabled.add(plugin.id)
+                        }
+
+                        filtersChanged()
+                    }).withTag("plugins")
+                }.toTypedArray()
+            _toggleBar.setToggles(*toggles)
+
            _adapter = InsertedViewAdapterWithLoader(context, arrayListOf(), arrayListOf(),
                { _results.size },
                { view, _ ->
@@ -162,14 +187,15 @@ class HistoryFragment : MainFragment() {
                else
                    it.nextPage();

-                return@TaskHandler it.getResults();
+                return@TaskHandler filterResults(it.getResults());
            }).success {
                setLoading(false);

                val posBefore = _results.size;
-                _results.addAll(it);
-                _adapter.notifyItemRangeInserted(_adapter.childToParentPosition(posBefore), it.size);
-                ensureEnoughContentVisible(it)
+                val res = filterResults(it)
+                _results.addAll(res);
+                _adapter.notifyItemRangeInserted(_adapter.childToParentPosition(posBefore), res.size);
+                ensureEnoughContentVisible(res)
            }.exception<Throwable> {
                Logger.w(TAG, "Failed to load next page.", it);
                UIDialogs.showGeneralRetryErrorDialog(context, context.getString(R.string.failed_to_load_next_page), it, {
@@ -178,6 +204,10 @@ class HistoryFragment : MainFragment() {
            };
        }

+        private fun filtersChanged() {
+            updatePager()
+        }
+
        private fun updatePager() {
            val query = _editSearch.text.toString();
            if (_editSearch.text.isNotEmpty()) {
@@ -246,11 +276,22 @@ class HistoryFragment : MainFragment() {
            _adapter.setLoading(loading);
        }

+        private fun filterResults(a: List<HistoryVideo>): List<HistoryVideo> {
+            val enabledPluginIds = StatePlatform.instance.getEnabledClients().map { it.id }.toHashSet()
+            val disabledPluginIds = _togglePluginsDisabled.toHashSet()
+            return a.filter {
+                val pluginId = it.video.id.pluginId ?: StatePlatform.instance.getContentClientOrNull(it.video.url)?.id ?: return@filter false
+                if (!enabledPluginIds.contains(pluginId))
+                    return@filter false
+                return@filter !disabledPluginIds.contains(pluginId)
+            };
+        }
+
        private fun loadPagerInternal(pager: IPager<HistoryVideo>) {
            Logger.i(TAG, "Setting new internal pager on feed");

            _results.clear();
-            val toAdd = pager.getResults();
+            val toAdd = filterResults(pager.getResults())
            _results.addAll(toAdd);
            _adapter.notifyDataSetChanged();
            ensureEnoughContentVisible(toAdd)
@@ -10,7 +10,6 @@ import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.*
 import com.futo.platformplayer.activities.IWithResultLauncher
 import com.futo.platformplayer.api.media.models.playlists.IPlatformPlaylist
-import com.futo.platformplayer.api.media.models.playlists.IPlatformPlaylistDetails
 import com.futo.platformplayer.api.media.models.video.IPlatformVideo
 import com.futo.platformplayer.api.media.models.video.SerializedPlatformVideo
 import com.futo.platformplayer.constructs.TaskHandler
@@ -165,14 +164,24 @@ class PlaylistFragment : MainFragment() {
                };
        }

-        private fun copyPlaylist(playlist: Playlist) {
+        private fun savePlaylist(playlist: Playlist) {
            StatePlaylists.instance.playlistStore.save(playlist)
-            _fragment.topBar?.assume<NavigationTopBarFragment>()?.setMenuItems(
-                arrayListOf()
-            )
            UIDialogs.toast("Playlist saved")
        }

+        private fun copyPlaylist(playlist: Playlist) {
+            var copyNumber = 1
+            var newName = "${playlist.name} (Copy)"
+            val playlists = StatePlaylists.instance.playlistStore.getItems()
+            while (playlists.any { it.name == newName }) {
+                copyNumber += 1
+                newName = "${playlist.name} (Copy $copyNumber)"
+            }
+            StatePlaylists.instance.playlistStore.save(playlist.makeCopy(newName))
+            _fragment.navigate<PlaylistsFragment>(withHistory = false)
+            UIDialogs.toast("Playlist copied")
+        }
+
        fun onShown(parameter: Any?) {
            _taskLoadPlaylist.cancel()

@@ -188,12 +197,14 @@ class PlaylistFragment : MainFragment() {
                    setButtonExportVisible(false)
                    setButtonEditVisible(true)

-                    if (!StatePlaylists.instance.playlistStore.hasItem { it.id == parameter.id }) {
-                        _fragment.topBar?.assume<NavigationTopBarFragment>()
-                            ?.setMenuItems(arrayListOf(Pair(R.drawable.ic_copy) {
+                    _fragment.topBar?.assume<NavigationTopBarFragment>()
+                        ?.setMenuItems(arrayListOf(Pair(R.drawable.ic_copy) {
+                            if (StatePlaylists.instance.playlistStore.hasItem { it.id == parameter.id }) {
                                copyPlaylist(parameter)
-                            }))
-                    }
+                            } else {
+                                savePlaylist(parameter)
+                            }
+                        }))
                } else {
                    setName(null)
                    setVideos(null, false)
@@ -259,7 +270,7 @@ class PlaylistFragment : MainFragment() {
            val playlist = _playlist ?: return
            if (!StatePlaylists.instance.playlistStore.hasItem { it.id == playlist.id }) {
                UIDialogs.showConfirmationDialog(context, "Playlist must be saved to download", {
-                    copyPlaylist(playlist)
+                    savePlaylist(playlist)
                    download()
                })
                return
@@ -292,7 +303,7 @@ class PlaylistFragment : MainFragment() {
            val playlist = _playlist ?: return
            if (!StatePlaylists.instance.playlistStore.hasItem { it.id == playlist.id }) {
                UIDialogs.showConfirmationDialog(context, "Playlist must be saved to edit the name", {
-                    copyPlaylist(playlist)
+                    savePlaylist(playlist)
                    onEditClick()
                })
                return
@@ -217,7 +217,7 @@ class PlaylistsFragment : MainFragment() {
            var playlistsToReturn = pls;
            if(!_listPlaylistsSearch.text.isNullOrEmpty())
                playlistsToReturn = playlistsToReturn.filter { it.name.contains(_listPlaylistsSearch.text, true) };
-            if(!_ordering.value.isNullOrEmpty()){
+            if(!_ordering.value.isNullOrEmpty()) {
                playlistsToReturn = when(_ordering.value){
                    "nameAsc" -> playlistsToReturn.sortedBy { it.name.lowercase() }
                    "nameDesc" -> playlistsToReturn.sortedByDescending { it.name.lowercase() };
@@ -168,7 +168,12 @@ class PostDetailFragment : MainFragment {
                UIDialogs.showGeneralRetryErrorDialog(context, context.getString(R.string.failed_to_load_post), it, ::fetchPost, null, _fragment);
            } else TaskHandler(IPlatformPostDetails::class.java) { _fragment.lifecycleScope };

-        private val _taskLoadPolycentricProfile = TaskHandler<PlatformID, PolycentricProfile?>(StateApp.instance.scopeGetter, { ApiMethods.getPolycentricProfileByClaim(ApiMethods.SERVER, ApiMethods.FUTO_TRUST_ROOT, it.claimFieldType.toLong(), it.claimType.toLong(), it.value!!) })
+        private val _taskLoadPolycentricProfile = TaskHandler<PlatformID, PolycentricProfile?>(StateApp.instance.scopeGetter, {
+            if (!StatePolycentric.instance.enabled)
+                return@TaskHandler null
+
+            ApiMethods.getPolycentricProfileByClaim(ApiMethods.SERVER, ApiMethods.FUTO_TRUST_ROOT, it.claimFieldType.toLong(), it.claimType.toLong(), it.value!!)
+        })
            .success { it -> setPolycentricProfile(it, animate = true) }
            .exception<Throwable> {
                Logger.w(TAG, "Failed to load claims.", it);
@@ -327,6 +332,10 @@ class PostDetailFragment : MainFragment {
            val version = _version;

            _rating.onLikeDislikeUpdated.remove(this);
+
+            if (!StatePolycentric.instance.enabled)
+                return
+
            _fragment.lifecycleScope.launch(Dispatchers.IO) {
                if (version != _version) {
                    return@launch;
@@ -18,6 +18,7 @@ import com.futo.platformplayer.activities.AddSourceOptionsActivity
 import com.futo.platformplayer.api.media.IPlatformClient
 import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.fragment.mainactivity.topbar.AddTopBarFragment
+import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StatePlatform
 import com.futo.platformplayer.states.StatePlugins
 import com.futo.platformplayer.stores.FragmentedStorage
@@ -44,6 +45,7 @@ class SourcesFragment : MainFragment() {
        if(topBar is AddTopBarFragment) {
            (topBar as AddTopBarFragment).onAdd.clear();
            (topBar as AddTopBarFragment).onAdd.subscribe {
+                StateApp.instance.preventPictureInPicture.emit();
                startActivity(Intent(requireContext(), AddSourceOptionsActivity::class.java));
            };
        }
@@ -93,6 +95,7 @@ class SourcesFragment : MainFragment() {
                findViewById<LinearLayout>(R.id.plugin_disclaimer).isVisible = false;
            }
            findViewById<BigButton>(R.id.button_add_sources).onClick.subscribe {
+                StateApp.instance.preventPictureInPicture.emit();
                fragment.startActivity(Intent(context, AddSourceOptionsActivity::class.java));
            };

@@ -290,8 +290,8 @@ class SubscriptionGroupFragment : MainFragment() {
                image.setImageView(_imageGroup);
            }
            else {
-                _imageGroupBackground.setImageResource(0);
-                _imageGroup.setImageResource(0);
+                _imageGroupBackground.setImageDrawable(null);
+                _imageGroup.setImageDrawable(null);
            }
            updateMeta();
            reloadCreators(group);
@@ -191,7 +191,7 @@ class SubscriptionsFeedFragment : MainFragment() {

        private var _bypassRateLimit = false;
        private val _lastExceptions: List<Throwable>? = null;
-        private val _taskGetPager = TaskHandler<Boolean, IPager<IPlatformContent>>({StateApp.instance.scope}, { withRefresh ->
+        private val _taskGetPager = TaskHandler<Boolean, IPager<IPlatformContent>>({fragment.lifecycleScope}, { withRefresh ->
            val group = subGroup;
            if(!_bypassRateLimit) {
                val subRequestCounts = StateSubscriptions.instance.getSubscriptionRequestCount(group);
@@ -202,7 +202,7 @@ class SubscriptionsFeedFragment : MainFragment() {
                    throw RateLimitException(rateLimitPlugins.map { it.key.id });
            }
            _bypassRateLimit = false;
-            val resp = StateSubscriptions.instance.getGlobalSubscriptionFeed(StateApp.instance.scope, withRefresh, group);
+            val resp = StateSubscriptions.instance.getGlobalSubscriptionFeed(fragment.lifecycleScope, withRefresh, group);
            val feed = StateSubscriptions.instance.getFeed(group?.id);

            val currentExs = feed?.exceptions ?: listOf();
@@ -21,7 +21,7 @@ import com.futo.platformplayer.views.adapters.SearchSuggestionAdapter
 import com.futo.platformplayer.views.others.RadioGroupView
 import com.futo.platformplayer.views.others.TagsView

-data class SuggestionsFragmentData(val query: String, val searchType: SearchType, val channelUrl: String? = null);
+data class SuggestionsFragmentData(val query: String, val searchType: SearchType);

 class SuggestionsFragment : MainFragment {
    override val isMainView : Boolean = true;
@@ -34,7 +34,6 @@ class SuggestionsFragment : MainFragment {
    private val _suggestions: ArrayList<String> = ArrayList();
    private var _query: String? = null;
    private var _searchType: SearchType = SearchType.VIDEO;
-    private var _channelUrl: String? = null;

    private val _adapterSuggestions = SearchSuggestionAdapter(_suggestions);

@@ -52,7 +51,7 @@ class SuggestionsFragment : MainFragment {
        _adapterSuggestions.onClicked.subscribe { suggestion ->
            val storage = FragmentedStorage.get<SearchHistoryStorage>();
            storage.add(suggestion);
-            navigate<ContentSearchResultsFragment>(SuggestionsFragmentData(suggestion, _searchType, _channelUrl));
+            navigate<ContentSearchResultsFragment>(SuggestionsFragmentData(suggestion, _searchType));
        }
        _adapterSuggestions.onRemove.subscribe { suggestion ->
            val index = _suggestions.indexOf(suggestion);
@@ -109,10 +108,8 @@ class SuggestionsFragment : MainFragment {

        if (parameter is SuggestionsFragmentData) {
            _searchType = parameter.searchType;
-            _channelUrl = parameter.channelUrl;
        } else if (parameter is SearchType) {
            _searchType = parameter;
-            _channelUrl = null;
        }

        _radioGroupView?.setOptions(listOf(Pair("Media", SearchType.VIDEO), Pair("Creators", SearchType.CREATOR), Pair("Playlists", SearchType.PLAYLIST)), listOf(_searchType), false, true)
@@ -135,7 +132,7 @@ class SuggestionsFragment : MainFragment {
                        }
                    }
                    else
-                        navigate<ContentSearchResultsFragment>(SuggestionsFragmentData(it, _searchType, _channelUrl));
+                        navigate<ContentSearchResultsFragment>(SuggestionsFragmentData(it, _searchType));
                };

                onTextChange.subscribe(this) {
@@ -101,7 +101,7 @@ class VideoDetailFragment() : MainFragment() {
    }

    private fun isSmallWindow(): Boolean {
-        return resources.configuration.smallestScreenWidthDp < resources.getInteger(R.integer.column_width_dp) * 2
+        return resources.configuration.smallestScreenWidthDp < resources.getInteger(R.integer.smallest_width_dp)
    }

    private fun isAutoRotateEnabled(): Boolean {
@@ -455,6 +455,10 @@ class VideoDetailFragment() : MainFragment() {
                activity?.enterPictureInPictureMode(params);
            }
        }
+
+        if (isFullscreen) {
+            viewDetail?.restoreBrightness()
+        }
    }

    fun forcePictureInPicture() {
@@ -463,10 +467,14 @@ class VideoDetailFragment() : MainFragment() {
            activity?.enterPictureInPictureMode(params);
    }
    fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean, isStop: Boolean, newConfig: Configuration) {
-        if (isInPictureInPictureMode) {
-            _viewDetail?.startPictureInPicture();
-        } else if (isInPictureInPicture) {
-            leavePictureInPictureMode(isStop);
+        try {
+            if (isInPictureInPictureMode) {
+                _viewDetail?.startPictureInPicture();
+            } else if (isInPictureInPicture) {
+                leavePictureInPictureMode(isStop);
+            }
+        } catch (e: Throwable) {
+            Logger.e(TAG, "Failed to handle onPictureInPictureModeChanged", e)
        }
    }
    fun leavePictureInPictureMode(isStop: Boolean) {
@@ -487,6 +495,10 @@ class VideoDetailFragment() : MainFragment() {
        _isActive = true;
        _leavingPiP = false;

+        if (isFullscreen) {
+            _viewDetail?.saveBrightness()
+        }
+
        _viewDetail?.let {
            Logger.v(TAG, "onResume preventPictureInPicture=false");
            it.preventPictureInPicture = false;
@@ -615,11 +627,6 @@ class VideoDetailFragment() : MainFragment() {
            showSystemUI()
        }

-        // temporarily force the device to portrait if auto-rotate is disabled to prevent landscape when exiting full screen on a small device
-//        @SuppressLint("SourceLockedOrientationActivity")
-//        if (!isFullscreen && isSmallWindow() && !isAutoRotateEnabled() && !isMinimizingFromFullScreen) {
-//            activity?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT
-//        }
        updateOrientation();
        _view?.allowMotion = !fullscreen;
    }
@@ -2,6 +2,8 @@ package com.futo.platformplayer.fragment.mainactivity.main

 import android.app.PictureInPictureParams
 import android.app.RemoteAction
+import android.content.ClipData
+import android.content.ClipboardManager
 import android.content.Context
 import android.content.Intent
 import android.content.res.Configuration
@@ -46,6 +48,7 @@ import com.futo.platformplayer.R
 import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.UISlideOverlays
+import com.futo.platformplayer.activities.MainActivity
 import com.futo.platformplayer.api.media.IPluginSourced
 import com.futo.platformplayer.api.media.LiveChatManager
 import com.futo.platformplayer.api.media.PlatformID
@@ -90,6 +93,7 @@ import com.futo.platformplayer.engine.exceptions.ScriptAgeException
 import com.futo.platformplayer.engine.exceptions.ScriptException
 import com.futo.platformplayer.engine.exceptions.ScriptImplementationException
 import com.futo.platformplayer.engine.exceptions.ScriptLoginRequiredException
+import com.futo.platformplayer.engine.exceptions.ScriptReloadRequiredException
 import com.futo.platformplayer.engine.exceptions.ScriptUnavailableException
 import com.futo.platformplayer.exceptions.UnsupportedCastException
 import com.futo.platformplayer.fixHtmlLinks
@@ -148,7 +152,6 @@ import com.futo.platformplayer.views.pills.PillRatingLikesDislikes
 import com.futo.platformplayer.views.pills.RoundButton
 import com.futo.platformplayer.views.pills.RoundButtonGroup
 import com.futo.platformplayer.views.platform.PlatformIndicator
-import com.futo.platformplayer.views.segments.ChaptersList
 import com.futo.platformplayer.views.segments.CommentsList
 import com.futo.platformplayer.views.subscriptions.SubscribeButton
 import com.futo.platformplayer.views.video.FutoVideoPlayer
@@ -172,6 +175,7 @@ import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
 import userpackage.Protocol
 import java.time.OffsetDateTime
+import java.util.Locale
 import kotlin.math.abs
 import kotlin.math.roundToLong

@@ -408,6 +412,14 @@ class VideoDetailView : ConstraintLayout {
            showChaptersUI();
        };

+        _title.setOnLongClickListener {
+            val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager;
+            val clip = ClipData.newPlainText("Video Title", (it as TextView).text);
+            clipboard.setPrimaryClip(clip);
+            UIDialogs.toast(context, "Copied", false)
+            // let other interactions happen based on the touch
+            false
+        }

        _buttonSubscribe.onSubscribed.subscribe {
            _slideUpOverlay = UISlideOverlays.showSubscriptionOptionsOverlay(it, _overlayContainer);
@@ -571,7 +583,7 @@ class VideoDetailView : ConstraintLayout {
            _player.setIsReplay(true);

            val searchVideo = StatePlayer.instance.getCurrentQueueItem();
-            if (searchVideo is SerializedPlatformVideo?) {
+            if (searchVideo is SerializedPlatformVideo? && Settings.instance.playback.deleteFromWatchLaterAuto) {
                searchVideo?.let { StatePlaylists.instance.removeFromWatchLater(it) };
            }

@@ -597,6 +609,10 @@ class VideoDetailView : ConstraintLayout {
            }
        }

+        _player.onReloadRequired.subscribe {
+            fetchVideo();
+        }
+
        _player.onPlayChanged.subscribe {
            if (StateCasting.instance.activeDevice == null) {
                handlePlayChanged(it);
@@ -619,6 +635,7 @@ class VideoDetailView : ConstraintLayout {
                        loadCurrentVideo(lastPositionMilliseconds);
                        updatePillButtonVisibilities();
                        setCastEnabled(false);
+
                    }
                    else -> {}
                }
@@ -647,6 +664,15 @@ class VideoDetailView : ConstraintLayout {
                    _timeBar.setDuration(video?.duration ?: 0);
                }
            };
+
+            _cast.onTimeJobTimeChanged_s.subscribe {
+                if (_isCasting) {
+                    setLastPositionMilliseconds((it * 1000.0).toLong(), true);
+                    _timeBar.setPosition(it);
+                    _timeBar.setBufferedPosition(0);
+                    _timeBar.setDuration(video?.duration ?: 0);
+                }
+            }
        }

        _playerProgress.player = _player.exoPlayer?.player;
@@ -688,6 +714,20 @@ class VideoDetailView : ConstraintLayout {
            Logger.i(TAG, "MediaControlReceiver.onCloseReceived")
            onClose.emit()
        };
+        MediaControlReceiver.onBackgroundReceived.subscribe(this) {
+            Logger.i(TAG, "MediaControlReceiver.onBackgroundReceived")
+            _player.switchToAudioMode();
+            allowBackground = true;
+            StateApp.instance.contextOrNull?.let {
+                try {
+                    if (it is MainActivity) {
+                        it.moveTaskToBack(true)
+                    }
+                } catch (e: Throwable) {
+                    Logger.i(TAG, "Failed to move task to back", e)
+                }
+            }
+        };
        MediaControlReceiver.onSeekToReceived.subscribe(this) { handleSeek(it); };

        _container_content_description.onClose.subscribe { switchContentView(_container_content_main); };
@@ -767,6 +807,7 @@ class VideoDetailView : ConstraintLayout {
            _lastAudioSource = null;
            _lastSubtitleSource = null;
            video = null;
+            _container_content_liveChat?.close();
            _player.clear();
            cleanupPlaybackTracker();
            Logger.i(TAG, "Keep screen on unset onClose")
@@ -1090,7 +1131,7 @@ class VideoDetailView : ConstraintLayout {
            when (Settings.instance.playback.backgroundPlay) {
                0 -> handlePause();
                1 -> {
-                    if(!(video?.isLive ?: false) && Settings.instance.playback.backgroundSwitchToAudio)
+                    if(!(video?.isLive ?: false))
                        _player.switchToAudioMode();
                    StatePlayer.instance.startOrUpdateMediaSession(context, video);
                }
@@ -1141,6 +1182,7 @@ class VideoDetailView : ConstraintLayout {
        MediaControlReceiver.onNextReceived.remove(this);
        MediaControlReceiver.onPreviousReceived.remove(this);
        MediaControlReceiver.onCloseReceived.remove(this);
+        MediaControlReceiver.onBackgroundReceived.remove(this);
        MediaControlReceiver.onSeekToReceived.remove(this);

        val job = _jobHideResume;
@@ -1373,8 +1415,8 @@ class VideoDetailView : ConstraintLayout {
            onVideoChanged.emit(0, 0)
        }

+        val me = this;
        if (video is JSVideoDetails) {
-            val me = this;
            fragment.lifecycleScope.launch(Dispatchers.IO) {
                try {
                    //TODO: Implement video.getContentChapters()
@@ -1431,6 +1473,32 @@ class VideoDetailView : ConstraintLayout {
                }
            };
        }
+        else {
+            fragment.lifecycleScope.launch(Dispatchers.IO) {
+                try {
+                    if (!StateApp.instance.privateMode) {
+                        val stopwatch = com.futo.platformplayer.debug.Stopwatch()
+                        var tracker = video.getPlaybackTracker()
+                        Logger.i(TAG, "video.getPlaybackTracker took ${stopwatch.elapsedMs}ms")
+
+                        if (tracker == null) {
+                            stopwatch.reset()
+                            tracker = StatePlatform.instance.getPlaybackTracker(video.url);
+                            Logger.i(
+                                TAG,
+                                "StatePlatform.instance.getPlaybackTracker took ${stopwatch.elapsedMs}ms"
+                            )
+                        }
+
+                        if (me.video?.url == video.url && !video.url.isNullOrBlank())
+                            me._playbackTracker = tracker;
+                    } else if (me.video == video)
+                        me._playbackTracker = null;
+                } catch (ex: Throwable) {
+                    Logger.e(TAG, "Playback tracker failed", ex);
+                }
+            }
+        }

        val ref = Models.referenceFromBuffer(video.url.toByteArray())
        val extraBytesRef = video.id.value?.let { if (it.isNotEmpty()) it.toByteArray() else null }
@@ -1510,60 +1578,68 @@ class VideoDetailView : ConstraintLayout {

        _rating.visibility = View.GONE;

-        fragment.lifecycleScope.launch(Dispatchers.IO) {
-            try {
-                val queryReferencesResponse = ApiMethods.getQueryReferences(
-                    ApiMethods.SERVER, ref, null, null,
-                    arrayListOf(
-                        Protocol.QueryReferencesRequestCountLWWElementReferences.newBuilder()
-                            .setFromType(ContentType.OPINION.value).setValue(
-                            ByteString.copyFrom(Opinion.like.data)
-                        ).build(),
-                        Protocol.QueryReferencesRequestCountLWWElementReferences.newBuilder()
-                            .setFromType(ContentType.OPINION.value).setValue(
-                            ByteString.copyFrom(Opinion.dislike.data)
-                        ).build()
-                    ),
-                    extraByteReferences = listOfNotNull(extraBytesRef)
-                );
+        if (StatePolycentric.instance.enabled) {
+            fragment.lifecycleScope.launch(Dispatchers.IO) {
+                try {
+                    val queryReferencesResponse = ApiMethods.getQueryReferences(
+                        ApiMethods.SERVER, ref, null, null,
+                        arrayListOf(
+                            Protocol.QueryReferencesRequestCountLWWElementReferences.newBuilder()
+                                .setFromType(ContentType.OPINION.value).setValue(
+                                    ByteString.copyFrom(Opinion.like.data)
+                                ).build(),
+                            Protocol.QueryReferencesRequestCountLWWElementReferences.newBuilder()
+                                .setFromType(ContentType.OPINION.value).setValue(
+                                    ByteString.copyFrom(Opinion.dislike.data)
+                                ).build()
+                        ),
+                        extraByteReferences = listOfNotNull(extraBytesRef)
+                    );

-                val likes = queryReferencesResponse.countsList[0];
-                val dislikes = queryReferencesResponse.countsList[1];
-                val hasLiked = StatePolycentric.instance.hasLiked(ref.toByteArray())/* || extraBytesRef?.let { StatePolycentric.instance.hasLiked(it) } ?: false*/;
-                val hasDisliked = StatePolycentric.instance.hasDisliked(ref.toByteArray())/* || extraBytesRef?.let { StatePolycentric.instance.hasDisliked(it) } ?: false*/;
+                    val likes = queryReferencesResponse.countsList[0];
+                    val dislikes = queryReferencesResponse.countsList[1];
+                    val hasLiked =
+                        StatePolycentric.instance.hasLiked(ref.toByteArray())/* || extraBytesRef?.let { StatePolycentric.instance.hasLiked(it) } ?: false*/;
+                    val hasDisliked =
+                        StatePolycentric.instance.hasDisliked(ref.toByteArray())/* || extraBytesRef?.let { StatePolycentric.instance.hasDisliked(it) } ?: false*/;

-                withContext(Dispatchers.Main) {
-                    _rating.visibility = View.VISIBLE;
-                    _rating.setRating(RatingLikeDislikes(likes, dislikes), hasLiked, hasDisliked);
-                    _rating.onLikeDislikeUpdated.subscribe(this) { args ->
-                        if (args.hasLiked) {
-                            args.processHandle.opinion(ref, Opinion.like);
-                        } else if (args.hasDisliked) {
-                            args.processHandle.opinion(ref, Opinion.dislike);
-                        } else {
-                            args.processHandle.opinion(ref, Opinion.neutral);
-                        }
-
-                        fragment.lifecycleScope.launch(Dispatchers.IO) {
-                            try {
-                                Logger.i(TAG, "Started backfill");
-                                args.processHandle.fullyBackfillServersAnnounceExceptions();
-                                Logger.i(TAG, "Finished backfill");
-                            } catch (e: Throwable) {
-                                Logger.e(TAG, "Failed to backfill servers", e)
+                    withContext(Dispatchers.Main) {
+                        _rating.visibility = View.VISIBLE;
+                        _rating.setRating(
+                            RatingLikeDislikes(likes, dislikes),
+                            hasLiked,
+                            hasDisliked
+                        );
+                        _rating.onLikeDislikeUpdated.subscribe(this) { args ->
+                            if (args.hasLiked) {
+                                args.processHandle.opinion(ref, Opinion.like);
+                            } else if (args.hasDisliked) {
+                                args.processHandle.opinion(ref, Opinion.dislike);
+                            } else {
+                                args.processHandle.opinion(ref, Opinion.neutral);
                            }
-                        }

-                        StatePolycentric.instance.updateLikeMap(
-                            ref,
-                            args.hasLiked,
-                            args.hasDisliked
-                        )
-                    };
+                            fragment.lifecycleScope.launch(Dispatchers.IO) {
+                                try {
+                                    Logger.i(TAG, "Started backfill");
+                                    args.processHandle.fullyBackfillServersAnnounceExceptions();
+                                    Logger.i(TAG, "Finished backfill");
+                                } catch (e: Throwable) {
+                                    Logger.e(TAG, "Failed to backfill servers", e)
+                                }
+                            }
+
+                            StatePolycentric.instance.updateLikeMap(
+                                ref,
+                                args.hasLiked,
+                                args.hasDisliked
+                            )
+                        };
+                    }
+                } catch (e: Throwable) {
+                    Logger.e(TAG, "Failed to get polycentric likes/dislikes.", e);
+                    _rating.visibility = View.GONE;
                }
-            } catch (e: Throwable) {
-                Logger.e(TAG, "Failed to get polycentric likes/dislikes.", e);
-                _rating.visibility = View.GONE;
            }
        }

@@ -1863,8 +1939,8 @@ class VideoDetailView : ConstraintLayout {
            }

            updateQualityFormatsOverlay(
-                videoTrackFormats.distinctBy { it.height }.sortedBy { it.height },
-                audioTrackFormats.distinctBy { it.bitrate }.sortedBy { it.bitrate });
+                videoTrackFormats.distinctBy { it.height }.sortedByDescending { it.height },
+                audioTrackFormats.distinctBy { it.bitrate }.sortedByDescending { it.bitrate });
        }
    }

@@ -2115,23 +2191,40 @@ class VideoDetailView : ConstraintLayout {

        val canSetSpeed = !_isCasting || StateCasting.instance.activeDevice?.canSetSpeed == true
        val currentPlaybackRate = if (_isCasting) StateCasting.instance.activeDevice?.speed else _player.getPlaybackRate()
+        val qualityPlaybackSpeedTitle = if (canSetSpeed) SlideUpMenuTitle(this.context).apply { setTitle(context.getString(R.string.playback_rate) + " (${String.format("%.2f", currentPlaybackRate)})"); } else null;
        _overlay_quality_selector = SlideUpMenuOverlay(this.context, _overlay_quality_container, context.getString(
                    R.string.quality), null, true,
-            if (canSetSpeed) SlideUpMenuTitle(this.context).apply { setTitle(context.getString(R.string.playback_rate)) } else null,
+            qualityPlaybackSpeedTitle,
            if (canSetSpeed) SlideUpMenuButtonList(this.context, null, "playback_rate").apply {
-                setButtons(listOf("0.25", "0.5", "0.75", "1.0", "1.25", "1.5", "1.75", "2.0", "2.25"), currentPlaybackRate!!.toString());
+                val playbackSpeeds = Settings.instance.playback.getPlaybackSpeeds();
+                val format = if(playbackSpeeds.size < 20) "%.2f" else "%.1f";
+                val playbackLabels = playbackSpeeds.map { String.format(Locale.US, format, it) }.toMutableList();
+                playbackLabels.add("+");
+                playbackLabels.add(0, "-");
+
+                setButtons(playbackLabels, String.format(Locale.US, format, currentPlaybackRate));
                onClick.subscribe { v ->
+                    val currentPlaybackSpeed = if (_isCasting) StateCasting.instance.activeDevice?.speed else _player.getPlaybackRate();
+                    var playbackSpeedString = v;
+                    val stepSpeed = Settings.instance.playback.getPlaybackSpeedStep();
+                    if(v == "+")
+                        playbackSpeedString = String.format(Locale.US, "%.2f", Math.min((currentPlaybackSpeed?.toDouble() ?: 1.0) + stepSpeed, 5.0)).toString();
+                    else if(v == "-")
+                        playbackSpeedString = String.format(Locale.US, "%.2f", Math.max(0.1, (currentPlaybackSpeed?.toDouble() ?: 1.0) - stepSpeed)).toString();
+                    val newPlaybackSpeed = playbackSpeedString.toDouble();
                    if (_isCasting) {
                        val ad = StateCasting.instance.activeDevice ?: return@subscribe
                        if (!ad.canSetSpeed) {
                            return@subscribe
                        }

-                        ad.changeSpeed(v.toDouble())
-                        setSelected(v);
+                        qualityPlaybackSpeedTitle?.setTitle(context.getString(R.string.playback_rate) + " (${String.format(Locale.US, "%.2f", newPlaybackSpeed)})");
+                        ad.changeSpeed(newPlaybackSpeed)
+                        setSelected(playbackSpeedString);
                    } else {
-                        _player.setPlaybackRate(v.toFloat());
-                        setSelected(v);
+                        qualityPlaybackSpeedTitle?.setTitle(context.getString(R.string.playback_rate) + " (${String.format(Locale.US, "%.2f", newPlaybackSpeed)})");
+                        _player.setPlaybackRate(playbackSpeedString.toFloat());
+                        setSelected(playbackSpeedString);
                    }
                };
            } else null,
@@ -2404,7 +2497,9 @@ class VideoDetailView : ConstraintLayout {

        val url = _url;
        if (!url.isNullOrBlank()) {
-            setLoading(true);
+            fragment.lifecycleScope.launch(Dispatchers.Main) {
+                setLoading(true);
+            }
            _taskLoadVideo.run(url);
        }
    }
@@ -2413,6 +2508,7 @@ class VideoDetailView : ConstraintLayout {
        Logger.i(TAG, "handleFullScreen(fullscreen=$fullscreen)")

        if(fullscreen) {
+            _container_content.visibility = GONE
            _layoutPlayerContainer.setPadding(0, 0, 0, 0);

            val lp = _container_content.layoutParams as LayoutParams;
@@ -2426,6 +2522,7 @@ class VideoDetailView : ConstraintLayout {
            setProgressBarOverlayed(null);
        }
        else {
+            _container_content.visibility = VISIBLE
            _layoutPlayerContainer.setPadding(0, 0, 0, TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 6.0f, Resources.getSystem().displayMetrics).toInt());

            val lp = _container_content.layoutParams as LayoutParams;
@@ -2485,6 +2582,15 @@ class VideoDetailView : ConstraintLayout {
        }
    }

+    fun saveBrightness() {
+        if (Settings.instance.gestureControls.useSystemBrightness) {
+            _player.gestureControl.saveBrightness()
+        }
+    }
+    fun restoreBrightness() {
+        _player.gestureControl.restoreBrightness()
+    }
+
    fun setFullscreen(fullscreen : Boolean) {
        Logger.i(TAG, "setFullscreen(fullscreen=$fullscreen)")
        _player.setFullScreen(fullscreen)
@@ -2648,9 +2754,10 @@ class VideoDetailView : ConstraintLayout {
                    }

                    onChannelClicked.subscribe {
-                        if(it.url.isNotBlank())
+                        if(it.url.isNotBlank()) {
+                            fragment.minimizeVideoDetail()
                            fragment.navigate<ChannelFragment>(it)
-                        else
+                        } else
                            UIDialogs.appToast("No author url present");
                    }

@@ -2658,6 +2765,8 @@ class VideoDetailView : ConstraintLayout {
                        if(it is IPlatformVideo) {
                            if(StatePlaylists.instance.addToWatchLater(SerializedPlatformVideo.fromVideo(it), true))
                                UIDialogs.toast("Added to watch later\n[${it.name}]");
+                            else
+                                UIDialogs.toast(context.getString(R.string.already_in_watch_later))
                        }
                    }
                    onAddToQueueClicked.subscribe(this) {
@@ -2725,10 +2834,11 @@ class VideoDetailView : ConstraintLayout {
        else
            RemoteAction(Icon.createWithResource(context, R.drawable.ic_play_notif), context.getString(R.string.play), context.getString(R.string.resumes_the_video), MediaControlReceiver.getPlayIntent(context, 6));

+        val toBackgroundAction = RemoteAction(Icon.createWithResource(context, R.drawable.ic_screen_share), context.getString(R.string.background), context.getString(R.string.background_switch_audio), MediaControlReceiver.getToBackgroundIntent(context, 7));
        return PictureInPictureParams.Builder()
            .setAspectRatio(Rational(videoSourceWidth, videoSourceHeight))
            .setSourceRectHint(r)
-            .setActions(listOf(playpauseAction))
+            .setActions(listOf(toBackgroundAction, playpauseAction))
            .build();
    }

@@ -2924,6 +3034,11 @@ class VideoDetailView : ConstraintLayout {
            return@TaskHandler result;
        })
        .success { setVideoDetails(it, true) }
+        .exception<ScriptReloadRequiredException> {
+            StatePlatform.instance.handleReloadRequired(it, {
+                fetchVideo();
+            });
+        }
        .exception<NoPlatformClientException> {
            Logger.w(TAG, "exception<NoPlatformClientException>", it)

@@ -3041,7 +3156,12 @@ class VideoDetailView : ConstraintLayout {
            Logger.w(TAG, "Failed to load recommendations.", it);
        };

-    private val _taskLoadPolycentricProfile = TaskHandler<PlatformID, PolycentricProfile?>(StateApp.instance.scopeGetter, { ApiMethods.getPolycentricProfileByClaim(ApiMethods.SERVER, ApiMethods.FUTO_TRUST_ROOT, it.claimFieldType.toLong(), it.claimType.toLong(), it.value!!) })
+    private val _taskLoadPolycentricProfile = TaskHandler<PlatformID, PolycentricProfile?>(StateApp.instance.scopeGetter, {
+        if (!StatePolycentric.instance.enabled)
+            return@TaskHandler null
+
+        ApiMethods.getPolycentricProfileByClaim(ApiMethods.SERVER, ApiMethods.FUTO_TRUST_ROOT, it.claimFieldType.toLong(), it.claimType.toLong(), it.value!!)
+    })
        .success { it -> setPolycentricProfile(it, animate = true) }
        .exception<Throwable> {
            Logger.w(TAG, "Failed to load claims.", it);
@@ -3113,10 +3233,6 @@ class VideoDetailView : ConstraintLayout {

    fun applyFragment(frag: VideoDetailFragment) {
        fragment = frag;
-        fragment.onMinimize.subscribe {
-            _liveChat?.stop();
-            _container_content_liveChat.close();
-        }
    }


@@ -224,7 +224,8 @@ abstract class VideoListEditorView : LinearLayout {

    fun updateVideoFilters() {
        val videos = _loadedVideos ?: return;
-        _videoListEditorView.setVideos(filterVideos(videos), _loadedVideosCanEdit);
+        val filteredVideos = filterVideos(videos)
+        _videoListEditorView.setVideos(filteredVideos, _loadedVideosCanEdit && filteredVideos.size == videos.size);
    }

    protected fun setButtonDownloadVisible(isVisible: Boolean) {
@@ -0,0 +1,223 @@
+package com.futo.platformplayer.fragment.mainactivity.main
+
+import android.content.Context
+import android.content.Intent
+import android.graphics.drawable.Animatable
+import android.net.Uri
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.ViewPropertyAnimator
+import android.webkit.WebView
+import android.webkit.WebViewClient
+import android.widget.Button
+import android.widget.FrameLayout
+import android.widget.ImageButton
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.view.children
+import androidx.lifecycle.lifecycleScope
+import com.bumptech.glide.Glide
+import com.futo.platformplayer.R
+import com.futo.platformplayer.Settings
+import com.futo.platformplayer.UIDialogs
+import com.futo.platformplayer.api.media.PlatformID
+import com.futo.platformplayer.api.media.models.Thumbnails
+import com.futo.platformplayer.api.media.models.article.IPlatformArticleDetails
+import com.futo.platformplayer.api.media.models.comments.PolycentricPlatformComment
+import com.futo.platformplayer.api.media.models.post.IPlatformPost
+import com.futo.platformplayer.api.media.models.post.IPlatformPostDetails
+import com.futo.platformplayer.api.media.models.ratings.IRating
+import com.futo.platformplayer.api.media.models.ratings.RatingLikeDislikes
+import com.futo.platformplayer.api.media.models.ratings.RatingLikes
+import com.futo.platformplayer.api.media.platforms.js.models.JSWeb
+import com.futo.platformplayer.api.media.platforms.js.models.JSWebDetails
+import com.futo.platformplayer.constructs.TaskHandler
+import com.futo.platformplayer.dp
+import com.futo.platformplayer.fixHtmlWhitespace
+import com.futo.platformplayer.images.GlideHelper.Companion.crossfade
+import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.setPlatformPlayerLinkMovementMethod
+import com.futo.platformplayer.states.StateApp
+import com.futo.platformplayer.states.StatePlatform
+import com.futo.platformplayer.states.StatePolycentric
+import com.futo.platformplayer.toHumanNowDiffString
+import com.futo.platformplayer.toHumanNumber
+import com.futo.platformplayer.views.adapters.ChannelTab
+import com.futo.platformplayer.views.adapters.feedtypes.PreviewPostView
+import com.futo.platformplayer.views.comments.AddCommentView
+import com.futo.platformplayer.views.others.CreatorThumbnail
+import com.futo.platformplayer.views.overlays.RepliesOverlay
+import com.futo.platformplayer.views.pills.PillRatingLikesDislikes
+import com.futo.platformplayer.views.platform.PlatformIndicator
+import com.futo.platformplayer.views.segments.CommentsList
+import com.futo.platformplayer.views.subscriptions.SubscribeButton
+import com.futo.polycentric.core.ApiMethods
+import com.futo.polycentric.core.ContentType
+import com.futo.polycentric.core.Models
+import com.futo.polycentric.core.Opinion
+import com.futo.polycentric.core.PolycentricProfile
+import com.futo.polycentric.core.fullyBackfillServersAnnounceExceptions
+import com.google.android.flexbox.FlexboxLayout
+import com.google.android.material.imageview.ShapeableImageView
+import com.google.android.material.shape.CornerFamily
+import com.google.android.material.shape.ShapeAppearanceModel
+import com.google.protobuf.ByteString
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import userpackage.Protocol
+import java.lang.Integer.min
+
+class WebDetailFragment : MainFragment {
+    override val isMainView: Boolean = true;
+    override val isTab: Boolean = true;
+    override val hasBottomBar: Boolean get() = true;
+
+    private var _viewDetail: WebDetailView? = null;
+
+    constructor() : super() { }
+
+    override fun onBackPressed(): Boolean {
+        return false;
+    }
+
+    override fun onCreateMainView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        val view = WebDetailView(inflater.context).applyFragment(this);
+        _viewDetail = view;
+        return view;
+    }
+
+    override fun onDestroyMainView() {
+        super.onDestroyMainView();
+        _viewDetail?.onDestroy();
+        _viewDetail = null;
+    }
+
+    override fun onShownWithView(parameter: Any?, isBack: Boolean) {
+        super.onShownWithView(parameter, isBack);
+
+        if (parameter is JSWeb) {
+            _viewDetail?.clear();
+            _viewDetail?.setWeb(parameter);
+        }
+        if (parameter is JSWebDetails) {
+            _viewDetail?.clear();
+            _viewDetail?.setWebDetails(parameter);
+        }
+    }
+
+    private class WebDetailView : ConstraintLayout {
+        private lateinit var _fragment: WebDetailFragment;
+        private var _url: String? = null;
+        private var _isLoading = false;
+        private var _web: JSWebDetails? = null;
+
+        private val _layoutLoadingOverlay: FrameLayout;
+        private val _imageLoader: ImageView;
+
+        private val _webview: WebView;
+
+        private val _taskLoadPost = if(!isInEditMode) TaskHandler<String, JSWebDetails>(
+            StateApp.instance.scopeGetter,
+            {
+                val result = StatePlatform.instance.getContentDetails(it).await();
+                if(result !is JSWebDetails)
+                    throw IllegalStateException(context.getString(R.string.expected_media_content_found) + " ${result.contentType}");
+                return@TaskHandler result;
+            })
+            .success { setWebDetails(it) }
+            .exception<Throwable> {
+                Logger.w(ChannelFragment.TAG, context.getString(R.string.failed_to_load_post), it);
+                UIDialogs.showGeneralRetryErrorDialog(context, context.getString(R.string.failed_to_load_post), it, ::fetchPost, null, _fragment);
+            } else TaskHandler(IPlatformPostDetails::class.java) { _fragment.lifecycleScope };
+
+
+        constructor(context: Context) : super(context) {
+            inflate(context, R.layout.fragview_web_detail, this);
+
+            val root = findViewById<FrameLayout>(R.id.root);
+
+            _layoutLoadingOverlay = findViewById(R.id.layout_loading_overlay);
+            _imageLoader = findViewById(R.id.image_loader);
+
+            _webview = findViewById(R.id.webview);
+            _webview.webViewClient = object: WebViewClient() {
+                override fun onPageFinished(view: WebView?, url: String?) {
+                    super.onPageFinished(view, url);
+                    if(url != "about:blank")
+                        setLoading(false);
+                }
+            }
+        }
+
+
+        fun applyFragment(frag: WebDetailFragment): WebDetailView {
+            _fragment = frag;
+            return this;
+        }
+
+        fun clear() {
+            _webview.loadUrl("about:blank");
+        }
+
+        fun setWeb(value: JSWeb) {
+            _url = value.url;
+            setLoading(true);
+            clear();
+            fetchPost();
+        }
+        fun setWebDetails(value: JSWebDetails) {
+            _web = value;
+            setLoading(true);
+            _webview.loadUrl("about:blank");
+            if(!value.html.isNullOrEmpty())
+                _webview.loadData(value.html, "text/html", null);
+            else
+                _webview.loadUrl(value.url ?: "about:blank");
+        }
+
+        private fun fetchPost() {
+            Logger.i(WebDetailView.TAG, "fetchWeb")
+            _web = null;
+
+            val url = _url;
+            if (!url.isNullOrBlank()) {
+                setLoading(true);
+                _taskLoadPost.run(url);
+            }
+        }
+
+        fun onDestroy() {
+            _webview.loadUrl("about:blank");
+        }
+
+        private fun setLoading(isLoading : Boolean) {
+            if (_isLoading == isLoading) {
+                return;
+            }
+
+            _isLoading = isLoading;
+
+            if(isLoading) {
+                (_imageLoader.drawable as Animatable?)?.start()
+                _layoutLoadingOverlay.visibility = View.VISIBLE;
+            }
+            else {
+                _layoutLoadingOverlay.visibility = View.GONE;
+                (_imageLoader.drawable as Animatable?)?.stop()
+            }
+        }
+
+        companion object {
+            const val TAG = "WebDetailFragment"
+        }
+    }
+
+    companion object {
+        fun newInstance() = WebDetailFragment().apply {}
+    }
+}
@@ -88,7 +88,6 @@ class SearchTopBarFragment : TopFragment() {
        } else if (parameter is SuggestionsFragmentData) {
            this.setText(parameter.query);
            _searchType = parameter.searchType;
-            _channelUrl = parameter.channelUrl;
        }

        if(currentMain is SuggestionsFragment)
@@ -114,7 +113,7 @@ class SearchTopBarFragment : TopFragment() {
    fun clear() {
        _editSearch?.text?.clear();
        if (currentMain !is SuggestionsFragment) {
-            navigate<SuggestionsFragment>(SuggestionsFragmentData("", _searchType, _channelUrl), false);
+            navigate<SuggestionsFragment>(SuggestionsFragmentData("", _searchType), false);
        } else {
            onSearch.emit("");
        }
@@ -29,7 +29,7 @@ data class ImageVariable(
            Glide.with(imageView)
                .load(bitmap)
                .into(imageView)
-        } else if(resId != null) {
+        } else if(resId != null && resId > 0) {
            Glide.with(imageView)
                .load(resId)
                .into(imageView)
@@ -35,6 +35,9 @@ class Playlist {
        this.videos = ArrayList(list);
    }

+    fun makeCopy(newName: String? = null): Playlist {
+        return Playlist(newName ?: name, videos)
+    }

    companion object {
        fun fromV8(config: SourcePluginConfig, obj: V8ValueObject?): Playlist? {
@@ -113,7 +113,7 @@ class LoginWebViewClient : WebViewClient {
            //val domainParts = domain!!.split(".");
            //val cookieDomain = "." + domainParts.drop(domainParts.size - 2).joinToString(".");
            val cookieDomain = domain!!.getSubdomainWildcardQuery();
-            if(_pluginConfig == null || _pluginConfig.allowUrls.any { it == "everywhere" || it.lowercase().matchesDomain(cookieDomain) })
+            if(_pluginConfig == null || _pluginConfig.allowUrls.any { it == "everywhere" || domain.matchesDomain(it) })
                _authConfig.cookiesToFind?.let { cookiesToFind ->
                    val cookies = cookieString.split(";");
                    for(cookieStr in cookies) {
@@ -8,11 +8,14 @@ import android.text.method.LinkMovementMethod
 import android.text.style.URLSpan
 import android.view.MotionEvent
 import android.widget.TextView
+import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.activities.MainActivity
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.receivers.MediaControlReceiver
 import com.futo.platformplayer.timestampRegex
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext

 class PlatformLinkMovementMethod(private val _context: Context) : LinkMovementMethod() {

@@ -60,31 +63,39 @@ class PlatformLinkMovementMethod(private val _context: Context) : LinkMovementMe
                    val dx = event.x - downX
                    val dy = event.y - downY
                    if (Math.abs(dx) <= touchSlop && Math.abs(dy) <= touchSlop && isTouchInside(widget, event)) {
-                        runBlocking {
-                            for (link in pressedLinks!!) {
-                                Logger.i(TAG) { "Link clicked '${link.url}'." }
+                    for (link in pressedLinks!!) {
+                        Logger.i(TAG) { "Link clicked '${link.url}'." }

-                                if (_context is MainActivity) {
-                                    if (_context.handleUrl(link.url)) continue
-                                    if (timestampRegex.matches(link.url)) {
-                                        val tokens = link.url.split(':')
-                                        var time_s = -1L
-                                        when (tokens.size) {
-                                            2 -> time_s = tokens[0].toLong() * 60 + tokens[1].toLong()
-                                            3 -> time_s = tokens[0].toLong() * 3600 +
-                                                    tokens[1].toLong() * 60 +
-                                                    tokens[2].toLong()
-                                        }
+                        val c = _context
+                        if (c is MainActivity) {
+                            c.lifecycleScope.launch(Dispatchers.IO) {
+                                if (c.handleUrl(link.url)) {
+                                    return@launch
+                                }
+                                if (timestampRegex.matches(link.url)) {
+                                    val tokens = link.url.split(':')
+                                    var time_s = -1L
+                                    when (tokens.size) {
+                                        2 -> time_s = tokens[0].toLong() * 60 + tokens[1].toLong()
+                                        3 -> time_s = tokens[0].toLong() * 3600 +
+                                                tokens[1].toLong() * 60 +
+                                                tokens[2].toLong()
+                                    }

-                                        if (time_s != -1L) {
+                                    if (time_s != -1L) {
+                                        withContext(Dispatchers.Main) {
                                            MediaControlReceiver.onSeekToReceived.emit(time_s * 1000)
-                                            continue
                                        }
+                                        return@launch
                                    }
                                }
-                                _context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(link.url)))
+
+                                withContext(Dispatchers.Main) {
+                                    c.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(link.url)))
+                                }
                            }
                        }
+                    }
                        pressedLinks = null
                        linkPressed = false
                        return true
@@ -67,7 +67,7 @@ class WebViewRequirementExtractor {
        if(cookieString != null) {
            //val domainParts = domain!!.split(".");
            val cookieDomain = domain!!.getSubdomainWildcardQuery()//"." + domainParts.drop(domainParts.size - 2).joinToString(".");
-            if(allowedUrls.any { it == "everywhere" || it.lowercase().matchesDomain(cookieDomain) })
+            if(allowedUrls.any { it == "everywhere" || domain.matchesDomain(it) })
                cookiesToFind?.let { cookiesToFind ->
                    val cookies = cookieString.split(";");
                    for(cookieStr in cookies) {
@@ -1,5 +1,11 @@
 package com.futo.platformplayer.parsers

+import android.net.Uri
+import androidx.annotation.OptIn
+import androidx.media3.common.util.UnstableApi
+import androidx.media3.exoplayer.hls.playlist.DefaultHlsPlaylistParserFactory
+import androidx.media3.exoplayer.hls.playlist.HlsMediaPlaylist
+import androidx.media3.exoplayer.hls.playlist.HlsMultivariantPlaylist
 import com.futo.platformplayer.api.media.models.streams.sources.HLSVariantAudioUrlSource
 import com.futo.platformplayer.api.media.models.streams.sources.HLSVariantSubtitleUrlSource
 import com.futo.platformplayer.api.media.models.streams.sources.HLSVariantVideoUrlSource
@@ -7,12 +13,15 @@ import com.futo.platformplayer.api.media.models.streams.sources.IHLSManifestAudi
 import com.futo.platformplayer.api.media.models.streams.sources.IHLSManifestSource
 import com.futo.platformplayer.toYesNo
 import com.futo.platformplayer.yesNoToBoolean
+import java.io.ByteArrayInputStream
 import java.net.URI
 import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter
+import kotlin.text.ifEmpty

 class HLS {
    companion object {
+        @OptIn(UnstableApi::class)
        fun parseMasterPlaylist(masterPlaylistContent: String, sourceUrl: String): MasterPlaylist {
            val baseUrl = URI(sourceUrl).resolve("./").toString()

@@ -49,6 +58,31 @@ class HLS {
            return MasterPlaylist(variantPlaylists, mediaRenditions, sessionDataList, independentSegments)
        }

+        fun mediaRenditionToVariant(rendition: MediaRendition): HLSVariantAudioUrlSource? {
+            if (rendition.uri == null) {
+                return null
+            }
+
+            val suffix = listOf(rendition.language, rendition.groupID).mapNotNull { x -> x?.ifEmpty { null } }.joinToString(", ")
+            return when (rendition.type) {
+                "AUDIO" -> HLSVariantAudioUrlSource(rendition.name?.ifEmpty { "Audio (${suffix})" } ?: "Audio (${suffix})", 0, "application/vnd.apple.mpegurl", "", rendition.language ?: "", null, false, false, rendition.uri)
+                else -> null
+            }
+        }
+
+        fun variantReferenceToVariant(reference: VariantPlaylistReference): HLSVariantVideoUrlSource {
+            var width: Int? = null
+            var height: Int? = null
+            val resolutionTokens = reference.streamInfo.resolution?.split('x')
+            if (resolutionTokens?.isNotEmpty() == true) {
+                width = resolutionTokens[0].toIntOrNull()
+                height = resolutionTokens[1].toIntOrNull()
+            }
+
+            val suffix = listOf(reference.streamInfo.video, reference.streamInfo.codecs).mapNotNull { x -> x?.ifEmpty { null } }.joinToString(", ")
+            return HLSVariantVideoUrlSource(suffix, width ?: 0, height ?: 0, "application/vnd.apple.mpegurl", reference.streamInfo.codecs ?: "", reference.streamInfo.bandwidth, 0, false, reference.url)
+        }
+
        fun parseVariantPlaylist(content: String, sourceUrl: String): VariantPlaylist {
            val lines = content.lines()
            val version = lines.find { it.startsWith("#EXT-X-VERSION:") }?.substringAfter(":")?.toIntOrNull()
@@ -61,7 +95,25 @@ class HLS {
            val playlistType = lines.find { it.startsWith("#EXT-X-PLAYLIST-TYPE:") }?.substringAfter(":")
            val streamInfo = lines.find { it.startsWith("#EXT-X-STREAM-INF:") }?.let { parseStreamInfo(it) }

+            val keyInfo =
+                lines.find { it.startsWith("#EXT-X-KEY:") }?.substringAfter(":")?.split(",")
+
+            val key = keyInfo?.find { it.startsWith("URI=") }?.substringAfter("=")?.trim('"')
+            val iv =
+                keyInfo?.find { it.startsWith("IV=") }?.substringAfter("=")?.substringAfter("x")
+
+            val decryptionInfo: DecryptionInfo? = key?.let { k ->
+                DecryptionInfo(k, iv)
+            }
+
+            val initSegment =
+                lines.find { it.startsWith("#EXT-X-MAP:") }?.substringAfter(":")?.split(",")?.get(0)
+                    ?.substringAfter("=")?.trim('"')
            val segments = mutableListOf<Segment>()
+            if (initSegment != null) {
+                segments.add(MediaSegment(0.0, resolveUrl(sourceUrl, initSegment)))
+            }
+
            var currentSegment: MediaSegment? = null
            lines.forEach { line ->
                when {
@@ -86,7 +138,7 @@ class HLS {
                }
            }

-            return VariantPlaylist(version, targetDuration, mediaSequence, discontinuitySequence, programDateTime, playlistType, streamInfo, segments)
+            return VariantPlaylist(version, targetDuration, mediaSequence, discontinuitySequence, programDateTime, playlistType, streamInfo, segments, decryptionInfo)
        }

        fun parseAndGetVideoSources(source: Any, content: String, url: String): List<HLSVariantVideoUrlSource> {
@@ -270,7 +322,7 @@ class HLS {
        val name: String?,
        val isDefault: Boolean?,
        val isAutoSelect: Boolean?,
-        val isForced: Boolean?
+        val isForced: Boolean?,
    ) {
        fun toM3U8Line(): String = buildString {
            append("#EXT-X-MEDIA:")
@@ -319,30 +371,13 @@ class HLS {

        fun getVideoSources(): List<HLSVariantVideoUrlSource> {
            return variantPlaylistsRefs.map {
-                var width: Int? = null
-                var height: Int? = null
-                val resolutionTokens = it.streamInfo.resolution?.split('x')
-                if (resolutionTokens?.isNotEmpty() == true) {
-                    width = resolutionTokens[0].toIntOrNull()
-                    height = resolutionTokens[1].toIntOrNull()
-                }
-
-                val suffix = listOf(it.streamInfo.video, it.streamInfo.codecs).mapNotNull { x -> x?.ifEmpty { null } }.joinToString(", ")
-                HLSVariantVideoUrlSource(suffix, width ?: 0, height ?: 0, "application/vnd.apple.mpegurl", it.streamInfo.codecs ?: "", it.streamInfo.bandwidth, 0, false, it.url)
+                variantReferenceToVariant(it)
            }
        }

        fun getAudioSources(): List<HLSVariantAudioUrlSource> {
            return mediaRenditions.mapNotNull {
-                if (it.uri == null) {
-                    return@mapNotNull null
-                }
-
-                val suffix = listOf(it.language, it.groupID).mapNotNull { x -> x?.ifEmpty { null } }.joinToString(", ")
-                return@mapNotNull when (it.type) {
-                    "AUDIO" -> HLSVariantAudioUrlSource(it.name?.ifEmpty { "Audio (${suffix})" } ?: "Audio (${suffix})", 0, "application/vnd.apple.mpegurl", "", it.language ?: "", null, false, false, it.uri)
-                    else -> null
-                }
+                return@mapNotNull mediaRenditionToVariant(it)
            }
        }

@@ -368,6 +403,11 @@ class HLS {
        }
    }

+    data class DecryptionInfo(
+        val keyUrl: String,
+        val iv: String?
+    )
+
    data class VariantPlaylist(
        val version: Int?,
        val targetDuration: Int?,
@@ -376,7 +416,8 @@ class HLS {
        val programDateTime: ZonedDateTime?,
        val playlistType: String?,
        val streamInfo: StreamInfo?,
-        val segments: List<Segment>
+        val segments: List<Segment>,
+        val decryptionInfo: DecryptionInfo? = null
    ) {
        fun buildM3U8(): String = buildString {
            append("#EXTM3U\n")
@@ -21,6 +21,7 @@ class MediaControlReceiver : BroadcastReceiver() {
                EVENT_NEXT -> onNextReceived.emit();
                EVENT_PREV -> onPreviousReceived.emit();
                EVENT_CLOSE -> onCloseReceived.emit();
+                EVENT_BACKGROUND -> onBackgroundReceived.emit();
            }
        }
        catch(ex: Throwable) {
@@ -38,6 +39,7 @@ class MediaControlReceiver : BroadcastReceiver() {
        const val EVENT_NEXT = "Next";
        const val EVENT_PREV = "Prev";
        const val EVENT_CLOSE = "Close";
+        const val EVENT_BACKGROUND = "Background";

        val onPlayReceived = Event0();
        val onPauseReceived = Event0();
@@ -48,6 +50,7 @@ class MediaControlReceiver : BroadcastReceiver() {
        val onLowerVolumeReceived = Event0();

        val onCloseReceived = Event0()
+        val onBackgroundReceived = Event0()

        fun getPlayIntent(context: Context, code: Int = 0) : PendingIntent = PendingIntent.getBroadcast(context, code, Intent(context, MediaControlReceiver::class.java).apply {
            this.putExtra(EXTRA_MEDIA_ACTION, EVENT_PLAY);
@@ -64,5 +67,8 @@ class MediaControlReceiver : BroadcastReceiver() {
        fun getCloseIntent(context: Context, code: Int = 0) : PendingIntent = PendingIntent.getBroadcast(context, code, Intent(context, MediaControlReceiver::class.java).apply {
            this.putExtra(EXTRA_MEDIA_ACTION, EVENT_CLOSE);
        },PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT);
+        fun getToBackgroundIntent(context: Context, code: Int = 0) : PendingIntent = PendingIntent.getBroadcast(context, code, Intent(context, MediaControlReceiver::class.java).apply {
+            this.putExtra(EXTRA_MEDIA_ACTION, EVENT_BACKGROUND);
+        },PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT);
    }
 }
@@ -1,5 +1,6 @@
 package com.futo.platformplayer.serializers

+import com.futo.platformplayer.sToOffsetDateTimeUTC
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.descriptors.PrimitiveKind
 import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
@@ -37,7 +38,7 @@ class OffsetDateTimeSerializer : KSerializer<OffsetDateTime> {
            return OffsetDateTime.MAX;
        else if(epochSecond < -9999999999)
            return OffsetDateTime.MIN;
-        return OffsetDateTime.of(LocalDateTime.ofEpochSecond(epochSecond, 0, ZoneOffset.UTC), ZoneOffset.UTC);
+        return epochSecond.sToOffsetDateTimeUTC()
    }
 }
 class OffsetDateTimeStringSerializer : KSerializer<OffsetDateTime> {
@@ -29,6 +29,7 @@ import com.futo.platformplayer.activities.CaptchaActivity
 import com.futo.platformplayer.activities.IWithResultLauncher
 import com.futo.platformplayer.activities.MainActivity
 import com.futo.platformplayer.activities.SettingsActivity
+import com.futo.platformplayer.activities.SettingsActivity.Companion.settingsActivityClosed
 import com.futo.platformplayer.api.media.platforms.js.DevJSClient
 import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.background.BackgroundWorker
@@ -155,6 +156,8 @@ class StateApp {
        return thisContext;
    }

+    private var _mainId: String? = null;
+
    //Files
    private var _tempDirectory: File? = null;
    private var _cacheDirectory: File? = null;
@@ -294,9 +297,12 @@ class StateApp {
    }

    //Lifecycle
-    fun setGlobalContext(context: Context, coroutineScope: CoroutineScope? = null) {
+    fun setGlobalContext(context: Context, coroutineScope: CoroutineScope? = null, mainId: String? = null) {
+        _mainId = mainId;
        _context = context;
        _scope = coroutineScope
+        Logger.w(TAG, "Scope initialized ${(coroutineScope != null)}\n ${Log.getStackTraceString(Throwable())}")
+
    }

    fun initializeFiles(force: Boolean = false) {
@@ -414,6 +420,14 @@ class StateApp {
            StateSync.instance.start(context)
        }

+        settingsActivityClosed.subscribe {
+            if (Settings.instance.synchronization.enabled) {
+                StateSync.instance.start(context)
+            } else {
+                StateSync.instance.stop()
+            }
+        }
+
        Logger.onLogSubmitted.subscribe {
            scopeOrNull?.launch(Dispatchers.Main) {
                try {
@@ -509,10 +523,17 @@ class StateApp {

        //Migration
        Logger.i(TAG, "MainApp Started: Check [Migrations]");
-        migrateStores(context, listOf(
-            StateSubscriptions.instance.toMigrateCheck(),
-            StatePlaylists.instance.toMigrateCheck()
-        ).flatten(), 0);
+
+        scopeOrNull?.launch(Dispatchers.IO) {
+            try {
+                migrateStores(context, listOf(
+                    StateSubscriptions.instance.toMigrateCheck(),
+                    StatePlaylists.instance.toMigrateCheck()
+                ).flatten(), 0)
+            } catch (e: Throwable) {
+                Logger.e(TAG, "Failed to migrate stores")
+            }
+        }

        if(Settings.instance.subscriptions.fetchOnAppBoot) {
            scope.launch(Dispatchers.IO) {
@@ -679,19 +700,33 @@ class StateApp {
    }


-    private fun migrateStores(context: Context, managedStores: List<ManagedStore<*>>, index: Int) {
+    private suspend fun migrateStores(context: Context, managedStores: List<ManagedStore<*>>, index: Int) {
        if(managedStores.size <= index)
            return;
        val store = managedStores[index];
-        if(store.hasMissingReconstructions())
-            UIDialogs.showMigrateDialog(context, store) {
-                migrateStores(context, managedStores, index + 1);
-            };
-        else
+        if(store.hasMissingReconstructions()) {
+            withContext(Dispatchers.Main) {
+                try {
+                    UIDialogs.showMigrateDialog(context, store) {
+                        scopeOrNull?.launch(Dispatchers.IO) {
+                            try {
+                                migrateStores(context, managedStores, index + 1);
+                            } catch (e: Throwable) {
+                                Logger.e(TAG, "Failed to migrate store", e)
+                            }
+                        }
+                    }
+                } catch (e: Throwable) {
+                    Logger.e(TAG, "Failed to migrate stores", e)
+                }
+            }
+        } else
            migrateStores(context, managedStores, index + 1);
    }

-    fun mainAppDestroyed(context: Context) {
+    fun mainAppDestroyed(context: Context, mainId: String? = null) {
+        if (mainId != null && (_mainId != mainId || _mainId == null))
+            return
        Logger.i(TAG, "App ended");
        _receiverBecomingNoisy?.let {
            _receiverBecomingNoisy = null;
@@ -707,6 +742,7 @@ class StateApp {

        StatePlayer.instance.closeMediaSession();
        StateCasting.instance.stop();
+        StateSync.instance.stop();
        StatePlayer.dispose();
        Companion.dispose();
        _fileLogConsumer?.close();
@@ -714,7 +750,8 @@ class StateApp {

    fun dispose(){
        _context = null;
-        _scope = null;
+        // _scope = null;
+        Logger.w(TAG, "StateApp disposed: ${Log.getStackTraceString(Throwable())}")
    }

    private val _connectivityEvents = object : ConnectivityManager.NetworkCallback() {
@@ -383,7 +383,7 @@ class StateDownloads {
    }
    private fun validateDownload(videoState: VideoDownload) {
        if(_downloading.hasItem { it.videoEither.url == videoState.videoEither.url })
-            throw IllegalStateException("Video [${videoState.name}] is already queued for dowload");
+            throw IllegalStateException("Video [${videoState.name}] is already queued for download");

        val existing = getCachedVideo(videoState.id);
        if(existing != null) {
@@ -131,8 +131,13 @@ class StateHistory {
    fun getHistoryPager(): IPager<HistoryVideo> {
        return _historyDBStore.getObjectPager();
    }
-    fun getHistorySearchPager(query: String): IPager<HistoryVideo> {
-        return _historyDBStore.queryLikeObjectPager(DBHistory.Index::name, "%${query}%", 10);
+    fun getHistorySearchPager(query: String, withAuthor: Boolean = false): IPager<HistoryVideo> {
+        return if(!withAuthor)
+            _historyDBStore.queryLikeObjectPager(DBHistory.Index::name, "%${query}%", 10)
+        else
+            _historyDBStore.queryLikeObjectPager(DBHistory.Index::name, "%${query}%", 10)
+            //_historyDBStore.queryLike2ObjectPager(DBHistory.Index::name, DBHistory.Index::auth,"%${query}%", 10)
+        //TODO: See if we can include author name?
    }
    fun getHistoryIndexByUrl(url: String): DBHistory.Index? {
        return historyIndex[url];
@@ -2,10 +2,10 @@ package com.futo.platformplayer.states

 import android.content.Context
 import androidx.collection.LruCache
+import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.R
 import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
-import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.media.IPlatformClient
 import com.futo.platformplayer.api.media.IPluginSourced
 import com.futo.platformplayer.api.media.PlatformMultiClientPool
@@ -39,6 +39,7 @@ import com.futo.platformplayer.awaitFirstNotNullDeferred
 import com.futo.platformplayer.constructs.BatchedTaskHandler
 import com.futo.platformplayer.constructs.Event0
 import com.futo.platformplayer.constructs.Event1
+import com.futo.platformplayer.engine.exceptions.ScriptReloadRequiredException
 import com.futo.platformplayer.fromPool
 import com.futo.platformplayer.getNowDiffDays
 import com.futo.platformplayer.getNowDiffSeconds
@@ -46,7 +47,6 @@ import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.ImageVariable
 import com.futo.platformplayer.stores.FragmentedStorage
 import com.futo.platformplayer.stores.StringArrayStorage
-import com.futo.platformplayer.stores.StringStorage
 import com.futo.platformplayer.views.ToastView
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Deferred
@@ -56,7 +56,6 @@ import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import okhttp3.internal.concat
 import java.lang.Thread.sleep
 import java.time.OffsetDateTime
 import kotlin.streams.asSequence
@@ -94,9 +93,11 @@ class StatePlatform {
    private val _trackerClientPool = PlatformMultiClientPool("Trackers", 1); //Used exclusively for playback trackers
    private val _liveEventClientPool = PlatformMultiClientPool("LiveEvents", 1); //Used exclusively for live events
    private val _privateClientPool = PlatformMultiClientPool("Private", 2, true); //Used primarily for calls if in incognito mode
+    private val _instantClientPool = PlatformMultiClientPool("Instant", 1, false, true); //Used for all instant calls


    private val _icons : HashMap<String, ImageVariable> = HashMap();
+    private val _iconsByName : HashMap<String, ImageVariable> = HashMap();

    val hasClients: Boolean get() = _availableClients.size > 0;

@@ -113,14 +114,14 @@ class StatePlatform {

            Logger.i(StatePlatform::class.java.name, "Fetching video details [${url}]");
            if(!StateApp.instance.privateMode) {
-                _enabledClients.find { it.isContentDetailsUrl(url) }?.let {
+                _enabledClients.find { _instantClientPool.getClientPooled(it).isContentDetailsUrl(url) }?.let {
                    _mainClientPool.getClientPooled(it).getContentDetails(url)
                }
                    ?: throw NoPlatformClientException("No client enabled that supports this url ($url)");
            }
            else {
                Logger.i(TAG, "Fetching details with private client");
-                _enabledClients.find { it.isContentDetailsUrl(url) }?.let {
+                _enabledClients.find { _instantClientPool.getClientPooled(it).isContentDetailsUrl(url) }?.let {
                    _privateClientPool.getClientPooled(it).getContentDetails(url)
                }
                    ?: throw NoPlatformClientException("No client enabled that supports this url ($url)");
@@ -192,6 +193,7 @@ class StatePlatform {
                _availableClients.clear();

                _icons.clear();
+                _iconsByName.clear()
                _icons[StateDeveloper.DEV_ID] = ImageVariable(null, R.drawable.ic_security_red);

                StatePlugins.instance.updateEmbeddedPlugins(context);
@@ -200,6 +202,8 @@ class StatePlatform {
                for (plugin in StatePlugins.instance.getPlugins()) {
                    _icons[plugin.config.id] = StatePlugins.instance.getPluginIconOrNull(plugin.config.id) ?:
                            ImageVariable(plugin.config.absoluteIconUrl, null);
+                    _iconsByName[plugin.config.name.lowercase()] = StatePlugins.instance.getPluginIconOrNull(plugin.config.id) ?:
+                            ImageVariable(plugin.config.absoluteIconUrl, null);

                    val client = JSClient(context, plugin);
                    client.onCaptchaException.subscribe { c, ex ->
@@ -299,13 +303,33 @@ class StatePlatform {
        return null;
    }

+    fun getPlatformIconByName(name: String?) : ImageVariable? {
+        if(name == null)
+            return null;
+        val nameLower = name.lowercase()
+        if(_iconsByName.containsKey(nameLower))
+            return _iconsByName[nameLower];
+        return null;
+    }
+
    fun setPlatformOrder(platformOrder: List<String>) {
        _platformOrderPersistent.values.clear();
        _platformOrderPersistent.values.addAll(platformOrder);
        _platformOrderPersistent.save();
    }

-    suspend fun reloadClient(context: Context, id: String) : JSClient? {
+    fun handleReloadRequired(reloadRequiredException: ScriptReloadRequiredException, afterReload: (() -> Unit)? = null) {
+        val id = if(reloadRequiredException.config is SourcePluginConfig) reloadRequiredException.config.id else "";
+        UIDialogs.appToast("Reloading [${reloadRequiredException.config.name}] by plugin request");
+        StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
+            if(!reloadRequiredException.reloadData.isNullOrEmpty())
+                reEnableClientWithData(id, reloadRequiredException.reloadData, afterReload);
+            else
+                reEnableClient(id, afterReload);
+        }
+    }
+
+    suspend fun reloadClient(context: Context, id: String, afterReload: (()->Unit)? = null) : JSClient? {
        return withContext(Dispatchers.IO) {
            val client = getClient(id);
            if (client !is JSClient)
@@ -336,10 +360,27 @@ class StatePlatform {
                _availableClients.removeIf { it.id == id };
                _availableClients.add(newClient);
            }
+            afterReload?.invoke();
            return@withContext newClient;
        };
    }

+    suspend fun reEnableClientWithData(id: String, data: String? = null, afterReload: (()->Unit)? = null) {
+        val enabledBefore = getEnabledClients().map { it.id };
+        if(data != null) {
+            val client = getClientOrNull(id);
+            if(client != null && client is JSClient)
+                client.setReloadData(data);
+        }
+        selectClients({
+            _scope.launch(Dispatchers.IO) {
+                selectClients({
+                    afterReload?.invoke();
+                }, *(enabledBefore).distinct().toTypedArray());
+            }
+        }, *(enabledBefore.filter { it != id }).distinct().toTypedArray())
+    }
+    suspend fun reEnableClient(id: String, afterReload: (()->Unit)? = null) = reEnableClientWithData(id, null, afterReload);

    suspend fun enableClient(ids: List<String>) {
        val currentClients = getEnabledClients().map { it.id };
@@ -350,6 +391,9 @@ class StatePlatform {
     * If a client is disabled, NO requests are made to said client
     */
    suspend fun selectClients(vararg ids: String) {
+        selectClients(null, *ids);
+    }
+    suspend fun selectClients(afterLoad: (() -> Unit)?, vararg ids: String) {
        withContext(Dispatchers.IO) {
            synchronized(_clientsLock) {
                val removed = _enabledClients.toMutableList();
@@ -374,6 +418,7 @@ class StatePlatform {
                    onSourceDisabled.emit(oldClient);
                }
            }
+            afterLoad?.invoke();
        };
    }

@@ -655,10 +700,10 @@ class StatePlatform {


    //Video
-    fun hasEnabledVideoClient(url: String) : Boolean = getEnabledClients().any { it.isContentDetailsUrl(url) };
+    fun hasEnabledContentClient(url: String) : Boolean = getEnabledClients().any { _instantClientPool.getClientPooled(it).isContentDetailsUrl(url) };
    fun getContentClient(url: String) : IPlatformClient = getContentClientOrNull(url)
        ?: throw NoPlatformClientException("No client enabled that supports this content url (${url})");
-    fun getContentClientOrNull(url: String) : IPlatformClient? = getEnabledClients().find { it.isContentDetailsUrl(url) };
+    fun getContentClientOrNull(url: String) : IPlatformClient? = getEnabledClients().find { _instantClientPool.getClientPooled(it).isContentDetailsUrl(url) };
    fun getContentDetails(url: String, forceRefetch: Boolean = false): Deferred<IPlatformContentDetails> {
        Logger.i(TAG, "Platform - getContentDetails (${url})");
        if(forceRefetch)
@@ -699,14 +744,14 @@ class StatePlatform {
        return client.getContentRecommendations(url);
    }

-    fun hasEnabledChannelClient(url : String) : Boolean = getEnabledClients().any { it.isChannelUrl(url) };
+    fun hasEnabledChannelClient(url : String) : Boolean = getEnabledClients().any { _instantClientPool.getClientPooled(it).isChannelUrl(url) };
    fun getChannelClient(url : String, exclude: List<String>? = null) : IPlatformClient = getChannelClientOrNull(url, exclude)
        ?: throw NoPlatformClientException("No client enabled that supports this channel url (${url})");
    fun getChannelClientOrNull(url : String, exclude: List<String>? = null) : IPlatformClient? =
        if(exclude == null)
-            getEnabledClients().find { it.isChannelUrl(url) }
+            getEnabledClients().find { _instantClientPool.getClientPooled(it).isChannelUrl(url) }
        else
-            getEnabledClients().find { !exclude.contains(it.id) && it.isChannelUrl(url) };
+            getEnabledClients().find { !exclude.contains(it.id) && _instantClientPool.getClientPooled(it).isChannelUrl(url) };

    fun getChannel(url: String, updateSubscriptions: Boolean = true): Deferred<IPlatformChannel>  {
        Logger.i(TAG, "Platform - getChannel");
@@ -718,7 +763,7 @@ class StatePlatform {
        }
    }

-    fun getChannelContent(baseClient: IPlatformClient, channelUrl: String, isSubscriptionOptimized: Boolean = false, usePooledClients: Int = 0): IPager<IPlatformContent> {
+    fun getChannelContent(baseClient: IPlatformClient, channelUrl: String, isSubscriptionOptimized: Boolean = false, usePooledClients: Int = 0, type: String? = null): IPager<IPlatformContent> {
        val clientCapabilities = baseClient.getChannelCapabilities();
        val client = if(usePooledClients > 1)
            _channelClientPool.getClientPooled(baseClient, usePooledClients);
@@ -727,66 +772,75 @@ class StatePlatform {
        var lastStream: OffsetDateTime? = null;

        val pagerResult: IPager<IPlatformContent>;
-        if(!clientCapabilities.hasType(ResultCapabilities.TYPE_MIXED) &&
-                (   clientCapabilities.hasType(ResultCapabilities.TYPE_VIDEOS) ||
-                    clientCapabilities.hasType(ResultCapabilities.TYPE_STREAMS) ||
-                    clientCapabilities.hasType(ResultCapabilities.TYPE_LIVE) ||
-                    clientCapabilities.hasType(ResultCapabilities.TYPE_POSTS)
-                )) {
-            val toQuery = mutableListOf<String>();
-            if(clientCapabilities.hasType(ResultCapabilities.TYPE_VIDEOS))
-                toQuery.add(ResultCapabilities.TYPE_VIDEOS);
-            if(clientCapabilities.hasType(ResultCapabilities.TYPE_STREAMS))
-                toQuery.add(ResultCapabilities.TYPE_STREAMS);
-            if(clientCapabilities.hasType(ResultCapabilities.TYPE_LIVE))
-                toQuery.add(ResultCapabilities.TYPE_LIVE);
-            if(clientCapabilities.hasType(ResultCapabilities.TYPE_POSTS))
-                toQuery.add(ResultCapabilities.TYPE_POSTS);
+        if (type == null) {
+            if(!clientCapabilities.hasType(ResultCapabilities.TYPE_MIXED) &&
+                    (   clientCapabilities.hasType(ResultCapabilities.TYPE_VIDEOS) ||
+                        clientCapabilities.hasType(ResultCapabilities.TYPE_STREAMS) ||
+                        clientCapabilities.hasType(ResultCapabilities.TYPE_LIVE) ||
+                        clientCapabilities.hasType(ResultCapabilities.TYPE_POSTS)
+                    )) {
+                val toQuery = mutableListOf<String>();
+                if(clientCapabilities.hasType(ResultCapabilities.TYPE_VIDEOS))
+                    toQuery.add(ResultCapabilities.TYPE_VIDEOS);
+                if(clientCapabilities.hasType(ResultCapabilities.TYPE_STREAMS))
+                    toQuery.add(ResultCapabilities.TYPE_STREAMS);
+                if(clientCapabilities.hasType(ResultCapabilities.TYPE_LIVE))
+                    toQuery.add(ResultCapabilities.TYPE_LIVE);
+                if(clientCapabilities.hasType(ResultCapabilities.TYPE_POSTS))
+                    toQuery.add(ResultCapabilities.TYPE_POSTS);

-            if(isSubscriptionOptimized) {
-                val sub = StateSubscriptions.instance.getSubscription(channelUrl);
-                if(sub != null) {
-                    if(!sub.shouldFetchStreams()) {
-                        Logger.i(TAG, "Subscription [${sub.channel.name}:${channelUrl}] Last livestream > 7 days, skipping live streams [${sub.lastLiveStream.getNowDiffDays()} days ago]");
-                        toQuery.remove(ResultCapabilities.TYPE_LIVE);
-                    }
-                    if(!sub.shouldFetchLiveStreams()) {
-                        Logger.i(TAG, "Subscription [${sub.channel.name}:${channelUrl}] Last livestream > 15 days, skipping streams [${sub.lastLiveStream.getNowDiffDays()} days ago]");
-                        toQuery.remove(ResultCapabilities.TYPE_STREAMS);
-                    }
-                    if(!sub.shouldFetchPosts()) {
-                        Logger.i(TAG, "Subscription [${sub.channel.name}:${channelUrl}] Last livestream > 5 days, skipping posts [${sub.lastPost.getNowDiffDays()} days ago]");
-                        toQuery.remove(ResultCapabilities.TYPE_POSTS);
-                    }
-                }
-            }
-
-            //Merged pager
-            val pagers = toQuery
-                .parallelStream()
-                .map {
-                    val results = client.getChannelContents(channelUrl, it, ResultCapabilities.ORDER_CHONOLOGICAL) ;
-
-                    when(it) {
-                        ResultCapabilities.TYPE_STREAMS -> {
-                            val streamResults = results.getResults();
-                            if(streamResults.size == 0)
-                                lastStream = OffsetDateTime.MIN;
-                            else
-                                lastStream = results.getResults().firstOrNull()?.datetime;
+                if(isSubscriptionOptimized) {
+                    val sub = StateSubscriptions.instance.getSubscription(channelUrl);
+                    if(sub != null) {
+                        if(!sub.shouldFetchStreams()) {
+                            Logger.i(TAG, "Subscription [${sub.channel.name}:${channelUrl}] Last livestream > 7 days, skipping live streams [${sub.lastLiveStream.getNowDiffDays()} days ago]");
+                            toQuery.remove(ResultCapabilities.TYPE_LIVE);
+                        }
+                        if(!sub.shouldFetchLiveStreams()) {
+                            Logger.i(TAG, "Subscription [${sub.channel.name}:${channelUrl}] Last livestream > 15 days, skipping streams [${sub.lastLiveStream.getNowDiffDays()} days ago]");
+                            toQuery.remove(ResultCapabilities.TYPE_STREAMS);
+                        }
+                        if(!sub.shouldFetchPosts()) {
+                            Logger.i(TAG, "Subscription [${sub.channel.name}:${channelUrl}] Last livestream > 5 days, skipping posts [${sub.lastPost.getNowDiffDays()} days ago]");
+                            toQuery.remove(ResultCapabilities.TYPE_POSTS);
                        }
                    }
-                    return@map results;
                }
-                .asSequence()
-                .toList();

-            val pager = MultiChronoContentPager(pagers.toTypedArray());
-            pager.initialize();
-            pagerResult = pager;
+                //Merged pager
+                val pagers = toQuery
+                    .parallelStream()
+                    .map {
+                        val results = client.getChannelContents(channelUrl, it, ResultCapabilities.ORDER_CHONOLOGICAL) ;
+
+                        when(it) {
+                            ResultCapabilities.TYPE_STREAMS -> {
+                                val streamResults = results.getResults();
+                                if(streamResults.size == 0)
+                                    lastStream = OffsetDateTime.MIN;
+                                else
+                                    lastStream = results.getResults().firstOrNull()?.datetime;
+                            }
+                        }
+                        return@map results;
+                    }
+                    .asSequence()
+                    .toList();
+
+                val pager = MultiChronoContentPager(pagers.toTypedArray());
+                pager.initialize();
+                pagerResult = pager;
+            }
+            else {
+                pagerResult = client.getChannelContents(channelUrl, ResultCapabilities.TYPE_MIXED, ResultCapabilities.ORDER_CHONOLOGICAL);
+            }
+        } else {
+            pagerResult = if (type == ResultCapabilities.TYPE_SHORTS && clientCapabilities.hasType(ResultCapabilities.TYPE_SHORTS)) {
+                client.getChannelContents(channelUrl, ResultCapabilities.TYPE_SHORTS, ResultCapabilities.ORDER_CHONOLOGICAL);
+            } else {
+                EmptyPager()
+            }
        }
-        else
-            pagerResult = client.getChannelContents(channelUrl, ResultCapabilities.TYPE_MIXED, ResultCapabilities.ORDER_CHONOLOGICAL);

        //Subscription optimization
        val sub = StateSubscriptions.instance.getSubscription(channelUrl);
@@ -838,10 +892,10 @@ class StatePlatform {

        return pagerResult;
    }
-    fun getChannelContent(channelUrl: String, isSubscriptionOptimized: Boolean = false, usePooledClients: Int = 0, ignorePlugins: List<String>? = null): IPager<IPlatformContent> {
+    fun getChannelContent(channelUrl: String, isSubscriptionOptimized: Boolean = false, usePooledClients: Int = 0, ignorePlugins: List<String>? = null, type: String? = null): IPager<IPlatformContent> {
        Logger.i(TAG, "Platform - getChannelVideos");
        val baseClient = getChannelClient(channelUrl, ignorePlugins);
-        return getChannelContent(baseClient, channelUrl, isSubscriptionOptimized, usePooledClients);
+        return getChannelContent(baseClient, channelUrl, isSubscriptionOptimized, usePooledClients, type);
    }
    fun getChannelContent(channelUrl: String, type: String?, ordering: String = ResultCapabilities.ORDER_CHONOLOGICAL): IPager<IPlatformContent> {
        val client = getChannelClient(channelUrl);
@@ -893,9 +947,9 @@ class StatePlatform {
        return urls;
    }

-    fun hasEnabledPlaylistClient(url: String) : Boolean = getEnabledClients().any { it.isPlaylistUrl(url) };
-    fun getPlaylistClientOrNull(url: String): IPlatformClient? = getEnabledClients().find { it.isPlaylistUrl(url) }
-    fun getPlaylistClient(url: String): IPlatformClient = getEnabledClients().find { it.isPlaylistUrl(url) }
+    fun hasEnabledPlaylistClient(url: String) : Boolean = getEnabledClients().any { _instantClientPool.getClientPooled(it).isPlaylistUrl(url) };
+    fun getPlaylistClientOrNull(url: String): IPlatformClient? = getEnabledClients().find { _instantClientPool.getClientPooled(it).isPlaylistUrl(url) }
+    fun getPlaylistClient(url: String): IPlatformClient = getEnabledClients().find { _instantClientPool.getClientPooled(it).isPlaylistUrl(url) }
        ?: throw NoPlatformClientException("No client enabled that supports this playlist url (${url})");
    fun getPlaylist(url: String): IPlatformPlaylistDetails {
        return getPlaylistClient(url).getPlaylist(url);
@@ -904,7 +958,7 @@ class StatePlatform {
    //Comments
    fun getComments(content: IPlatformContentDetails): IPager<IPlatformComment> {
        val client = getContentClient(content.url);
-        val pager = content.getComments(client);
+        val pager = null;//content.getComments(client);

        return pager ?: getComments(content.url);
    }
@@ -915,7 +969,7 @@ class StatePlatform {
            return EmptyPager();

        if(!StateApp.instance.privateMode)
-            return client.fromPool(_mainClientPool).getComments(url);
+            return client.fromPool(_pagerClientPool).getComments(url);
        else
            return client.fromPool(_privateClientPool).getComments(url);
    }
@@ -598,7 +598,7 @@ class StatePlayer {
            }

            if(_queuePosition < _queue.size) {
-                return _queue[_queuePosition];
+                return getCurrentQueueItem();
            }
        }
        return null;
@@ -3,7 +3,6 @@ package com.futo.platformplayer.states
 import android.content.Context
 import android.net.Uri
 import androidx.core.content.FileProvider
-import androidx.fragment.app.Fragment
 import com.futo.platformplayer.R
 import com.futo.platformplayer.Settings
 import com.futo.platformplayer.api.media.exceptions.NoPlatformClientException
@@ -19,8 +18,8 @@ import com.futo.platformplayer.exceptions.ReconstructionException
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.ImportCache
 import com.futo.platformplayer.models.Playlist
+import com.futo.platformplayer.sToOffsetDateTimeUTC
 import com.futo.platformplayer.smartMerge
-import com.futo.platformplayer.states.StateSubscriptionGroups.Companion
 import com.futo.platformplayer.stores.FragmentedStorage
 import com.futo.platformplayer.stores.StringArrayStorage
 import com.futo.platformplayer.stores.StringDateMapStorage
@@ -29,15 +28,12 @@ import com.futo.platformplayer.stores.v2.ManagedStore
 import com.futo.platformplayer.stores.v2.ReconstructStore
 import com.futo.platformplayer.sync.internal.GJSyncOpcodes
 import com.futo.platformplayer.sync.models.SyncPlaylistsPackage
-import com.futo.platformplayer.sync.models.SyncSubscriptionGroupsPackage
-import com.futo.platformplayer.sync.models.SyncSubscriptionsPackage
 import com.futo.platformplayer.sync.models.SyncWatchLaterPackage
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import java.io.File
-import java.time.Instant
 import java.time.OffsetDateTime
 import java.time.ZoneOffset

@@ -85,7 +81,7 @@ class StatePlaylists {
        if(value.isEmpty())
            return OffsetDateTime.MIN;
        val tryParse = value.toLongOrNull() ?: 0;
-        return OffsetDateTime.ofInstant(Instant.ofEpochSecond(tryParse), ZoneOffset.UTC);
+        return tryParse.sToOffsetDateTimeUTC();
    }
    private fun setWatchLaterReorderTime() {
        val now = OffsetDateTime.now(ZoneOffset.UTC);
@@ -177,31 +173,30 @@ class StatePlaylists {
            StateDownloads.instance.checkForOutdatedPlaylistVideos(VideoDownload.GROUP_WATCHLATER);
        }
    }
-    fun addToWatchLater(video: SerializedPlatformVideo, isUserInteraction: Boolean = false, orderPosition: Int = -1): Boolean {
-        var wasNew = false;
+    fun addToWatchLater(video: SerializedPlatformVideo, isUserInteraction: Boolean = false): Boolean {
        synchronized(_watchlistStore) {
-            if(!_watchlistStore.hasItem { it.url == video.url })
-                wasNew = true;
-            _watchlistStore.saveAsync(video);
-            if(orderPosition == -1)
-                _watchlistOrderStore.set(*(listOf(video.url) + _watchlistOrderStore.values).toTypedArray());
-            else {
-                val existing = _watchlistOrderStore.getAllValues().toMutableList();
-                existing.add(orderPosition, video.url);
-                _watchlistOrderStore.set(*existing.toTypedArray());
+            if (_watchlistStore.hasItem { it.url == video.url }) {
+                return false
            }
-            _watchlistOrderStore.save();
+
+            _watchlistStore.saveAsync(video)
+            if (Settings.instance.other.watchLaterAddStart) {
+                _watchlistOrderStore.set(*(listOf(video.url) + _watchlistOrderStore.values).toTypedArray())
+            } else {
+                _watchlistOrderStore.set(*(_watchlistOrderStore.values + listOf(video.url)).toTypedArray())
+            }
+            _watchlistOrderStore.save()
        }
        onWatchLaterChanged.emit();

-        if(isUserInteraction) {
+        if (isUserInteraction) {
            val now = OffsetDateTime.now();
            _watchLaterAdds.setAndSave(video.url, now);
            broadcastWatchLaterAddition(video, now);
        }

        StateDownloads.instance.checkForOutdatedPlaylists();
-        return wasNew;
+        return true;
    }

    fun getLastPlayedPlaylist() : Playlist? {
@@ -400,12 +395,15 @@ class StatePlaylists {
    companion object {
        val TAG = "StatePlaylists";
        private var _instance : StatePlaylists? = null;
+        private var _lockObject = Object()
        val instance : StatePlaylists
-            get(){
-            if(_instance == null)
-                _instance = StatePlaylists();
-            return _instance!!;
-        };
+            get() {
+                synchronized(_lockObject) {
+                    if (_instance == null)
+                        _instance = StatePlaylists();
+                    return _instance!!;
+                }
+            }

        fun finish() {
            _instance?.let {
@@ -419,17 +417,25 @@ class StatePlaylists {
    class PlaylistBackup: ReconstructStore<Playlist>() {
        override fun toReconstruction(obj: Playlist): String {
            val items = ArrayList<String>();
-            items.add(obj.name);
+            items.add(obj.name + ":::" + obj.id);
            items.addAll(obj.videos.map { it.url });
            return items.map { it.replace("\n","") }.joinToString("\n");
        }
        override suspend fun toObject(id: String, backup: String, reconstructionBuilder: Builder, importCache: ImportCache?): Playlist {
+            var idToUse = id;
            val items = backup.split("\n");
            if(items.size <= 0) {
                throw IllegalStateException("Cannot reconstructor playlist ${id}");
            }

-            val name = items[0];
+            var name = items[0];
+            if(name.contains(":::")){
+                val splitIndex = name.indexOf(":::");
+                val foundId = name.substring(splitIndex + 3);
+                if(!foundId.isNullOrEmpty())
+                    idToUse = foundId;
+                name = name.substring(0, splitIndex);
+            }
            val videos = items.drop(1).filter { it.isNotEmpty() }.map {
                try {
                    val videoUrl = it;
@@ -461,7 +467,7 @@ class StatePlaylists {
                    throw ReconstructionException(name, "${name}:[${it}] ${ex.message}", ex);
                }
            }.filter { it != null }.map { it!! }
-            return Playlist(id, name, videos);
+            return Playlist(idToUse, name, videos);
        }
    }
 }
@@ -236,7 +236,7 @@ class StatePolycentric {
        return Pair(didUpdate, listOf(url));
    }

-    fun getChannelContent(scope: CoroutineScope, profile: PolycentricProfile, isSubscriptionOptimized: Boolean = false, channelConcurrency: Int = -1): IPager<IPlatformContent>? {
+    fun getChannelContent(scope: CoroutineScope, profile: PolycentricProfile, isSubscriptionOptimized: Boolean = false, channelConcurrency: Int = -1, type: String? = null): IPager<IPlatformContent>? {
        ensureEnabled()

        //TODO: Currently abusing subscription concurrency for parallelism
@@ -248,7 +248,11 @@ class StatePolycentric {

                return@mapNotNull Pair(client, scope.async(Dispatchers.IO) {
                    try {
-                        return@async StatePlatform.instance.getChannelContent(url, isSubscriptionOptimized, concurrency);
+                        if (type == null) {
+                            return@async StatePlatform.instance.getChannelContent(url, isSubscriptionOptimized, concurrency);
+                        } else {
+                            return@async StatePlatform.instance.getChannelContent(url, isSubscriptionOptimized, concurrency, type = type);
+                        }
                    } catch (ex: Throwable) {
                        Logger.e(TAG, "getChannelContent", ex);
                        return@async null;
@@ -329,8 +329,19 @@ class StateSubscriptions {
                }
            }

-            if(StateSubscriptionGroups.instance.hasSubscriptionGroup(sub.channel.url))
-                getSubscriptionOtherOrCreate(sub.channel.url, sub.channel.name, sub.channel.thumbnail);
+            if(StateSubscriptionGroups.instance.hasSubscriptionGroup(sub.channel.url)) {
+                val subGroups = StateSubscriptionGroups.instance.getSubscriptionGroups().filter { it.urls.contains(sub.channel.url) };
+                for(group in subGroups) {
+                    group.urls.remove(sub.channel.url);
+                    StateSubscriptionGroups.instance.updateSubscriptionGroup(group);
+                }
+                /*
+                getSubscriptionOtherOrCreate(
+                    sub.channel.url,
+                    sub.channel.name,
+                    sub.channel.thumbnail
+                ); */
+            }
        }
        return sub;
    }
--- a/Show More
+++ b/Show More