Rename to direct and relayed.

.gitattributes

@@ -1,2 +0,0 @@
-aar/* filter=lfs diff=lfs merge=lfs -text
-app/aar/* filter=lfs diff=lfs merge=lfs -text

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,9 +1,6 @@
 name: Bug Report
 description: Let us know about an unexpected error, a crash, or an incorrect behavior.
-labels: ["Bug", "Android"]
+labels: ["Bug"]
-title: "Bug: "
-type: bug
-projects: ["futo-org/19"]
 body:
   - type: markdown
     attributes:
@@ -21,33 +18,11 @@ 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: reproduction-steps
+    id: what-happened
     attributes:
-      label: Reproduction steps
+      label: What happened?
-      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.
+      description: What did you expect to happen?
-      placeholder: |
+      placeholder: Tell us what you see!
-        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
 
@@ -56,7 +31,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: "311"
+      placeholder: "242"
     validations:
       required: true
 
@@ -67,23 +42,19 @@ body:
       multiple: true
       options:
         - "All"
-        - "Apple Podcasts"
+        - "Youtube"
+        - "Odysee"
+        - "Rumble"
+        - "Kick"
+        - "Twitch"
+        - "PeerTube"
+        - "Patreon"
+        - "Nebula"
         - "BiliBili (CN)"
         - "Bitchute"
-        - "Crunchyroll"
-        - "CuriosityStream"
-        - "Dailymotion"
-        - "Kick"
-        - "Nebula"
-        - "Odysee"
-        - "Patreon"
-        - "PeerTube"
-        - "Rumble"
         - "SoundCloud"
-        - "Spotify"
+        - "Dailymotion"
-        - "TedTalks"
+        - "Apple Podcasts"
-        - "Twitch"
-        - "Youtube"
         - "Other"
     validations:
       required: true
@@ -95,30 +66,6 @@ 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:
@@ -139,28 +86,9 @@ 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.

.github/ISSUE_TEMPLATE/documentation_issue.yml

@@ -1,16 +1,13 @@
 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)

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,16 +1,13 @@
 name: Feature Request
 description: Suggest a new feature or other enhancement.
-labels: ["Enhancement", "Android"]
+labels: ["Enhancement"]
-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 and feature requests relating to the Grayjay android application
+        The [grayjay-android](https://github.com/futo-org/grayjay-android) issue tracker is reserved for issues 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)
 

.gitmodules

@@ -94,15 +94,3 @@
 [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

app/aar/ffmpeg-kit-full-6.0-2.LTS.aar

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ea10d3c5562c9f449a4e89e9c3dfcf881ed79a952f3409bc005bcc62c2cf4b81
-size 65512557

app/build.gradle

@@ -197,8 +197,7 @@ 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 fileTree(dir: 'aar', include: ['*.aar'])
+    implementation 'com.arthenica:ffmpeg-kit-full:6.0-2.LTS'
-    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'

app/src/androidTest/java/com/futo/platformplayer/SyncServerTests.kt

@@ -3,21 +3,19 @@ package com.futo.platformplayer
 import com.futo.platformplayer.noise.protocol.Noise
 import com.futo.platformplayer.sync.internal.*
 import kotlinx.coroutines.*
-import kotlinx.coroutines.selects.select
 import org.junit.Assert.*
 import org.junit.Test
 import java.net.Socket
 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"
     //private val relayKey = "xGbHRzDOvE6plRbQaFgSen82eijF+gxS0yeUaeEErkw="
     private val relayKey = "XlUaSpIlRaCg0TGzZ7JYmPupgUHDqTZXUUBco2K7ejw="
-    private val relayHost = "192.168.1.138"
+    private val relayHost = "192.168.1.175"
     private val relayPort = 9000
 
     /** Creates a client connected to the live relay server. */
@@ -25,8 +23,7 @@ class SyncServerTests {
         onHandshakeComplete: ((SyncSocketSession) -> Unit)? = null,
         onData: ((SyncSocketSession, UByte, UByte, ByteBuffer) -> Unit)? = null,
         onNewChannel: ((SyncSocketSession, ChannelRelayed) -> Unit)? = null,
-        isHandshakeAllowed: ((LinkType, SyncSocketSession, String, String?, UInt) -> Boolean)? = null,
+        isHandshakeAllowed: ((SyncSocketSession, String, String?) -> Boolean)? = null
-        onException: ((Throwable) -> Unit)? = null
     ): SyncSocketSession = withContext(Dispatchers.IO) {
         val p = Noise.createDH("25519")
         p.generateKeyPair()
@@ -46,14 +43,10 @@ class SyncServerTests {
             },
             onData = onData ?: { _, _, _, _ -> },
             onNewChannel = onNewChannel ?: { _, _ -> },
-            isHandshakeAllowed = isHandshakeAllowed ?: { _, _, _, _, _ -> true }
+            isHandshakeAllowed = isHandshakeAllowed ?: { _, _, _ -> true }
         )
         socketSession.authorizable = AlwaysAuthorized()
-        try {
+        socketSession.startAsInitiator(relayKey)
-            socketSession.startAsInitiator(relayKey)
-        } catch (e: Throwable) {
-            onException?.invoke(e)
-        }
         withTimeout(5000.milliseconds) { tcs.await() }
         return@withContext socketSession
     }
@@ -266,71 +259,6 @@ class SyncServerTests {
         clientA.stop()
         clientB.stop()
     }
-
-    @Test
-    fun relayedTransport_WithValidAppId_Success() = runBlocking {
-        // Arrange: Set up clients
-        val allowedAppId = 1234u
-        val tcsB = CompletableDeferred<ChannelRelayed>()
-
-        // Client B requires appId 1234
-        val clientB = createClient(
-            onNewChannel = { _, c -> tcsB.complete(c) },
-            isHandshakeAllowed = { linkType, _, _, _, appId -> linkType == LinkType.Relayed && appId == allowedAppId }
-        )
-
-        val clientA = createClient()
-
-        // Act: Start relayed channel with valid appId
-        val channelTask = async { clientA.startRelayedChannel(clientB.localPublicKey, appId = allowedAppId) }
-        val channelB = withTimeout(5.seconds) { tcsB.await() }
-        withTimeout(5.seconds) { channelTask.await() }
-
-        // Assert: Channel is established
-        assertNotNull("Channel should be created on target with valid appId", channelB)
-
-        // Clean up
-        clientA.stop()
-        clientB.stop()
-    }
-
-    @Test
-    fun relayedTransport_WithInvalidAppId_Fails() = runBlocking {
-        // Arrange: Set up clients
-        val allowedAppId = 1234u
-        val invalidAppId = 5678u
-        val tcsB = CompletableDeferred<ChannelRelayed>()
-
-        // Client B requires appId 1234
-        val clientB = createClient(
-            onNewChannel = { _, c -> tcsB.complete(c) },
-            isHandshakeAllowed = { linkType, _, _, _, appId -> linkType == LinkType.Relayed && appId == allowedAppId },
-            onException = { }
-        )
-
-        val clientA = createClient()
-
-        // Act & Assert: Attempt with invalid appId should fail
-        try {
-            withTimeout(5.seconds) {
-                clientA.startRelayedChannel(clientB.localPublicKey, appId = invalidAppId)
-            }
-            fail("Starting relayed channel with invalid appId should fail")
-        } catch (e: Throwable) {
-            // Expected: The channel creation should time out or fail
-        }
-
-        // Ensure no channel was created on client B
-        val completedTask = select {
-            tcsB.onAwait { "channel" }
-            async { delay(1.seconds); "timeout" }.onAwait { "timeout" }
-        }
-        assertEquals("No channel should be created with invalid appId", "timeout", completedTask)
-
-        // Clean up
-        clientA.stop()
-        clientB.stop()
-    }
 }
 
 class AlwaysAuthorized : IAuthorizable {

app/src/androidTest/java/com/futo/platformplayer/SyncTests.kt

@@ -1,512 +0,0 @@
-package com.futo.platformplayer
-
-import com.futo.platformplayer.noise.protocol.DHState
-import com.futo.platformplayer.noise.protocol.Noise
-import com.futo.platformplayer.sync.internal.*
-import kotlinx.coroutines.*
-import org.junit.Assert.*
-import org.junit.Test
-import java.io.PipedInputStream
-import java.io.PipedOutputStream
-import java.nio.ByteBuffer
-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,
-    val responderInput: LittleEndianDataInputStream,
-    val responderOutput: LittleEndianDataOutputStream
-)
-
-typealias OnHandshakeComplete = (SyncSocketSession) -> Unit
-typealias IsHandshakeAllowed = (LinkType, SyncSocketSession, String, String?, UInt) -> Boolean
-typealias OnClose = (SyncSocketSession) -> Unit
-typealias OnData = (SyncSocketSession, UByte, UByte, ByteBuffer) -> Unit
-
-class SyncSocketTests {
-    private fun createPipeStreams(): PipeStreams {
-        val initiatorOutput = PipedOutputStream()
-        val responderOutput = PipedOutputStream()
-        val responderInput = PipedInputStream(initiatorOutput)
-        val initiatorInput = PipedInputStream(responderOutput)
-        return PipeStreams(
-            LittleEndianDataInputStream(initiatorInput), LittleEndianDataOutputStream(initiatorOutput),
-            LittleEndianDataInputStream(responderInput), LittleEndianDataOutputStream(responderOutput)
-        )
-    }
-    
-    fun generateKeyPair(): DHState {
-        val p = Noise.createDH("25519")
-        p.generateKeyPair()
-        return p
-    }
-
-    private fun createSessions(
-        initiatorInput: LittleEndianDataInputStream,
-        initiatorOutput: LittleEndianDataOutputStream,
-        responderInput: LittleEndianDataInputStream,
-        responderOutput: LittleEndianDataOutputStream,
-        initiatorKeyPair: DHState,
-        responderKeyPair: DHState,
-        onInitiatorHandshakeComplete: OnHandshakeComplete,
-        onResponderHandshakeComplete: OnHandshakeComplete,
-        onInitiatorClose: OnClose? = null,
-        onResponderClose: OnClose? = null,
-        onClose: OnClose? = null,
-        isHandshakeAllowed: IsHandshakeAllowed? = null,
-        onDataA: OnData? = null,
-        onDataB: OnData? = null
-    ): Pair<SyncSocketSession, SyncSocketSession> {
-        val initiatorSession = SyncSocketSession(
-            "", initiatorKeyPair, initiatorInput, initiatorOutput,
-            onClose = {
-                onClose?.invoke(it)
-                onInitiatorClose?.invoke(it)
-            },
-            onHandshakeComplete = onInitiatorHandshakeComplete,
-            onData = onDataA,
-            isHandshakeAllowed = isHandshakeAllowed
-        )
-
-        val responderSession = SyncSocketSession(
-            "", responderKeyPair, responderInput, responderOutput,
-            onClose = {
-                onClose?.invoke(it)
-                onResponderClose?.invoke(it)
-            },
-            onHandshakeComplete = onResponderHandshakeComplete,
-            onData = onDataB,
-            isHandshakeAllowed = isHandshakeAllowed
-        )
-
-        return Pair(initiatorSession, responderSession)
-    }
-
-    @Test
-    fun handshake_WithValidPairingCode_Succeeds(): Unit = runBlocking {
-        val (initiatorInput, initiatorOutput, responderInput, responderOutput) = createPipeStreams()
-        val initiatorKeyPair = generateKeyPair()
-        val responderKeyPair = generateKeyPair()
-        val validPairingCode = "secret"
-
-        val handshakeInitiatorCompleted = CompletableDeferred<Boolean>()
-        val handshakeResponderCompleted = CompletableDeferred<Boolean>()
-
-        val (initiatorSession, responderSession) = createSessions(
-            initiatorInput, initiatorOutput, responderInput, responderOutput,
-            initiatorKeyPair, responderKeyPair,
-            { handshakeInitiatorCompleted.complete(true) },
-            { handshakeResponderCompleted.complete(true) },
-            isHandshakeAllowed = { _, _, _, pairingCode, _ -> pairingCode == validPairingCode }
-        )
-
-        initiatorSession.startAsInitiator(responderSession.localPublicKey, pairingCode = validPairingCode)
-        responderSession.startAsResponder()
-
-        withTimeout(5.seconds) {
-            handshakeInitiatorCompleted.await()
-            handshakeResponderCompleted.await()
-        }
-    }
-
-    @Test
-    fun handshake_WithInvalidPairingCode_Fails() = runBlocking {
-        val (initiatorInput, initiatorOutput, responderInput, responderOutput) = createPipeStreams()
-        val initiatorKeyPair = generateKeyPair()
-        val responderKeyPair = generateKeyPair()
-        val validPairingCode = "secret"
-        val invalidPairingCode = "wrong"
-
-        val handshakeInitiatorCompleted = CompletableDeferred<Boolean>()
-        val handshakeResponderCompleted = CompletableDeferred<Boolean>()
-        val initiatorClosed = CompletableDeferred<Boolean>()
-        val responderClosed = CompletableDeferred<Boolean>()
-
-        val (initiatorSession, responderSession) = createSessions(
-            initiatorInput, initiatorOutput, responderInput, responderOutput,
-            initiatorKeyPair, responderKeyPair,
-            { handshakeInitiatorCompleted.complete(true) },
-            { handshakeResponderCompleted.complete(true) },
-            onInitiatorClose = {
-                initiatorClosed.complete(true)
-            },
-            onResponderClose = {
-                responderClosed.complete(true)
-            },
-            isHandshakeAllowed = { _, _, _, pairingCode, _ -> pairingCode == validPairingCode }
-        )
-
-        initiatorSession.startAsInitiator(responderSession.localPublicKey, pairingCode = invalidPairingCode)
-        responderSession.startAsResponder()
-
-        withTimeout(100.seconds) {
-            initiatorClosed.await()
-            responderClosed.await()
-        }
-
-        assertFalse(handshakeInitiatorCompleted.isCompleted)
-        assertFalse(handshakeResponderCompleted.isCompleted)
-    }
-
-    @Test
-    fun handshake_WithoutPairingCodeWhenRequired_Fails() = runBlocking {
-        val (initiatorInput, initiatorOutput, responderInput, responderOutput) = createPipeStreams()
-        val initiatorKeyPair = generateKeyPair()
-        val responderKeyPair = generateKeyPair()
-        val validPairingCode = "secret"
-
-        val handshakeInitiatorCompleted = CompletableDeferred<Boolean>()
-        val handshakeResponderCompleted = CompletableDeferred<Boolean>()
-        val initiatorClosed = CompletableDeferred<Boolean>()
-        val responderClosed = CompletableDeferred<Boolean>()
-
-        val (initiatorSession, responderSession) = createSessions(
-            initiatorInput, initiatorOutput, responderInput, responderOutput,
-            initiatorKeyPair, responderKeyPair,
-            { handshakeInitiatorCompleted.complete(true) },
-            { handshakeResponderCompleted.complete(true) },
-            onInitiatorClose = {
-                initiatorClosed.complete(true)
-            },
-            onResponderClose = {
-                responderClosed.complete(true)
-            },
-            isHandshakeAllowed = { _, _, _, pairingCode, _ -> pairingCode == validPairingCode }
-        )
-
-        initiatorSession.startAsInitiator(responderSession.localPublicKey) // No pairing code
-        responderSession.startAsResponder()
-
-        withTimeout(5.seconds) {
-            initiatorClosed.await()
-            responderClosed.await()
-        }
-
-        assertFalse(handshakeInitiatorCompleted.isCompleted)
-        assertFalse(handshakeResponderCompleted.isCompleted)
-    }
-
-    @Test
-    fun handshake_WithPairingCodeWhenNotRequired_Succeeds(): Unit = runBlocking {
-        val (initiatorInput, initiatorOutput, responderInput, responderOutput) = createPipeStreams()
-        val initiatorKeyPair = generateKeyPair()
-        val responderKeyPair = generateKeyPair()
-        val pairingCode = "unnecessary"
-
-        val handshakeInitiatorCompleted = CompletableDeferred<Boolean>()
-        val handshakeResponderCompleted = CompletableDeferred<Boolean>()
-
-        val (initiatorSession, responderSession) = createSessions(
-            initiatorInput, initiatorOutput, responderInput, responderOutput,
-            initiatorKeyPair, responderKeyPair,
-            { handshakeInitiatorCompleted.complete(true) },
-            { handshakeResponderCompleted.complete(true) },
-            isHandshakeAllowed = { _, _, _, _, _ -> true } // Always allow
-        )
-
-        initiatorSession.startAsInitiator(responderSession.localPublicKey, pairingCode = pairingCode)
-        responderSession.startAsResponder()
-
-        withTimeout(10.seconds) {
-            handshakeInitiatorCompleted.await()
-            handshakeResponderCompleted.await()
-        }
-    }
-
-    @Test
-    fun sendAndReceive_SmallDataPacket_Succeeds() = runBlocking {
-        val (initiatorInput, initiatorOutput, responderInput, responderOutput) = createPipeStreams()
-        val initiatorKeyPair = generateKeyPair()
-        val responderKeyPair = generateKeyPair()
-
-        val handshakeInitiatorCompleted = CompletableDeferred<Boolean>()
-        val handshakeResponderCompleted = CompletableDeferred<Boolean>()
-        val tcsDataReceived = CompletableDeferred<ByteArray>()
-
-        val (initiatorSession, responderSession) = createSessions(
-            initiatorInput, initiatorOutput, responderInput, responderOutput,
-            initiatorKeyPair, responderKeyPair,
-            { handshakeInitiatorCompleted.complete(true) },
-            { handshakeResponderCompleted.complete(true) },
-            onDataB = { _, opcode, subOpcode, data ->
-                if (opcode == Opcode.DATA.value && subOpcode == 0u.toUByte()) {
-                    val b = ByteArray(data.remaining())
-                    data.get(b)
-                    tcsDataReceived.complete(b)
-                }
-            }
-        )
-
-        initiatorSession.startAsInitiator(responderSession.localPublicKey)
-        responderSession.startAsResponder()
-
-        withTimeout(10.seconds) {
-            handshakeInitiatorCompleted.await()
-            handshakeResponderCompleted.await()
-        }
-
-        // Ensure both sessions are authorized
-        initiatorSession.authorizable = Authorized()
-        responderSession.authorizable = Authorized()
-
-        val smallData = byteArrayOf(1, 2, 3)
-        initiatorSession.send(Opcode.DATA.value, 0u, ByteBuffer.wrap(smallData))
-
-        val receivedData = withTimeout(10.seconds) { tcsDataReceived.await() }
-        assertArrayEquals(smallData, receivedData)
-    }
-
-    @Test
-    fun sendAndReceive_ExactlyMaximumPacketSize_Succeeds() = runBlocking {
-        val (initiatorInput, initiatorOutput, responderInput, responderOutput) = createPipeStreams()
-        val initiatorKeyPair = generateKeyPair()
-        val responderKeyPair = generateKeyPair()
-
-        val handshakeInitiatorCompleted = CompletableDeferred<Boolean>()
-        val handshakeResponderCompleted = CompletableDeferred<Boolean>()
-        val tcsDataReceived = CompletableDeferred<ByteArray>()
-
-        val (initiatorSession, responderSession) = createSessions(
-            initiatorInput, initiatorOutput, responderInput, responderOutput,
-            initiatorKeyPair, responderKeyPair,
-            { handshakeInitiatorCompleted.complete(true) },
-            { handshakeResponderCompleted.complete(true) },
-            onDataB = { _, opcode, subOpcode, data ->
-                if (opcode == Opcode.DATA.value && subOpcode == 0u.toUByte()) {
-                    val b = ByteArray(data.remaining())
-                    data.get(b)
-                    tcsDataReceived.complete(b)
-                }
-            }
-        )
-
-        initiatorSession.startAsInitiator(responderSession.localPublicKey)
-        responderSession.startAsResponder()
-
-        withTimeout(10.seconds) {
-            handshakeInitiatorCompleted.await()
-            handshakeResponderCompleted.await()
-        }
-
-        // Ensure both sessions are authorized
-        initiatorSession.authorizable = Authorized()
-        responderSession.authorizable = Authorized()
-
-        val maxData = ByteArray(SyncSocketSession.MAXIMUM_PACKET_SIZE - SyncSocketSession.HEADER_SIZE).apply { Random.nextBytes(this) }
-        initiatorSession.send(Opcode.DATA.value, 0u, ByteBuffer.wrap(maxData))
-
-        val receivedData = withTimeout(10.seconds) { tcsDataReceived.await() }
-        assertArrayEquals(maxData, receivedData)
-    }
-
-    @Test
-    fun stream_LargeData_Succeeds() = runBlocking {
-        val (initiatorInput, initiatorOutput, responderInput, responderOutput) = createPipeStreams()
-        val initiatorKeyPair = generateKeyPair()
-        val responderKeyPair = generateKeyPair()
-
-        val handshakeInitiatorCompleted = CompletableDeferred<Boolean>()
-        val handshakeResponderCompleted = CompletableDeferred<Boolean>()
-        val tcsDataReceived = CompletableDeferred<ByteArray>()
-
-        val (initiatorSession, responderSession) = createSessions(
-            initiatorInput, initiatorOutput, responderInput, responderOutput,
-            initiatorKeyPair, responderKeyPair,
-            { handshakeInitiatorCompleted.complete(true) },
-            { handshakeResponderCompleted.complete(true) },
-            onDataB = { _, opcode, subOpcode, data ->
-                if (opcode == Opcode.DATA.value && subOpcode == 0u.toUByte()) {
-                    val b = ByteArray(data.remaining())
-                    data.get(b)
-                    tcsDataReceived.complete(b)
-                }
-            }
-        )
-
-        initiatorSession.startAsInitiator(responderSession.localPublicKey)
-        responderSession.startAsResponder()
-
-        withTimeout(10.seconds) {
-            handshakeInitiatorCompleted.await()
-            handshakeResponderCompleted.await()
-        }
-
-        // Ensure both sessions are authorized
-        initiatorSession.authorizable = Authorized()
-        responderSession.authorizable = Authorized()
-
-        val largeData = ByteArray(2 * (SyncSocketSession.MAXIMUM_PACKET_SIZE - SyncSocketSession.HEADER_SIZE)).apply { Random.nextBytes(this) }
-        initiatorSession.send(Opcode.DATA.value, 0u, ByteBuffer.wrap(largeData))
-
-        val receivedData = withTimeout(10.seconds) { tcsDataReceived.await() }
-        assertArrayEquals(largeData, receivedData)
-    }
-
-    @Test
-    fun authorizedSession_CanSendData() = runBlocking {
-        val (initiatorInput, initiatorOutput, responderInput, responderOutput) = createPipeStreams()
-        val initiatorKeyPair = generateKeyPair()
-        val responderKeyPair = generateKeyPair()
-
-        val handshakeInitiatorCompleted = CompletableDeferred<Boolean>()
-        val handshakeResponderCompleted = CompletableDeferred<Boolean>()
-        val tcsDataReceived = CompletableDeferred<ByteArray>()
-
-        val (initiatorSession, responderSession) = createSessions(
-            initiatorInput, initiatorOutput, responderInput, responderOutput,
-            initiatorKeyPair, responderKeyPair,
-            { handshakeInitiatorCompleted.complete(true) },
-            { handshakeResponderCompleted.complete(true) },
-            onDataB = { _, opcode, subOpcode, data ->
-                if (opcode == Opcode.DATA.value && subOpcode == 0u.toUByte()) {
-                    val b = ByteArray(data.remaining())
-                    data.get(b)
-                    tcsDataReceived.complete(b)
-                }
-            }
-        )
-
-        initiatorSession.startAsInitiator(responderSession.localPublicKey)
-        responderSession.startAsResponder()
-
-        withTimeout(10.seconds) {
-            handshakeInitiatorCompleted.await()
-            handshakeResponderCompleted.await()
-        }
-
-        // Authorize both sessions
-        initiatorSession.authorizable = Authorized()
-        responderSession.authorizable = Authorized()
-
-        val data = byteArrayOf(1, 2, 3)
-        initiatorSession.send(Opcode.DATA.value, 0u, ByteBuffer.wrap(data))
-
-        val receivedData = withTimeout(10.seconds) { tcsDataReceived.await() }
-        assertArrayEquals(data, receivedData)
-    }
-
-    @Test
-    fun unauthorizedSession_CannotSendData() = runBlocking {
-        val (initiatorInput, initiatorOutput, responderInput, responderOutput) = createPipeStreams()
-        val initiatorKeyPair = generateKeyPair()
-        val responderKeyPair = generateKeyPair()
-
-        val handshakeInitiatorCompleted = CompletableDeferred<Boolean>()
-        val handshakeResponderCompleted = CompletableDeferred<Boolean>()
-        val tcsDataReceived = CompletableDeferred<ByteArray>()
-
-        val (initiatorSession, responderSession) = createSessions(
-            initiatorInput, initiatorOutput, responderInput, responderOutput,
-            initiatorKeyPair, responderKeyPair,
-            { handshakeInitiatorCompleted.complete(true) },
-            { handshakeResponderCompleted.complete(true) },
-            onDataB = { _, _, _, _ -> }
-        )
-
-        initiatorSession.startAsInitiator(responderSession.localPublicKey)
-        responderSession.startAsResponder()
-
-        withTimeout(10.seconds) {
-            handshakeInitiatorCompleted.await()
-            handshakeResponderCompleted.await()
-        }
-
-        // Authorize initiator but not responder
-        initiatorSession.authorizable = Authorized()
-        responderSession.authorizable = Unauthorized()
-
-        val data = byteArrayOf(1, 2, 3)
-        initiatorSession.send(Opcode.DATA.value, 0u, ByteBuffer.wrap(data))
-
-        delay(1.seconds)
-        assertFalse(tcsDataReceived.isCompleted)
-    }
-
-    @Test
-    fun directHandshake_WithValidAppId_Succeeds() = runBlocking {
-        val (initiatorInput, initiatorOutput, responderInput, responderOutput) = createPipeStreams()
-        val initiatorKeyPair = generateKeyPair()
-        val responderKeyPair = generateKeyPair()
-        val allowedAppId = 1234u
-
-        val handshakeInitiatorCompleted = CompletableDeferred<Boolean>()
-        val handshakeResponderCompleted = CompletableDeferred<Boolean>()
-
-        val responderIsHandshakeAllowed = { linkType: LinkType, _: SyncSocketSession, _: String, _: String?, appId: UInt ->
-            linkType == LinkType.Direct && appId == allowedAppId
-        }
-
-        val (initiatorSession, responderSession) = createSessions(
-            initiatorInput, initiatorOutput, responderInput, responderOutput,
-            initiatorKeyPair, responderKeyPair,
-            { handshakeInitiatorCompleted.complete(true) },
-            { handshakeResponderCompleted.complete(true) },
-            isHandshakeAllowed = responderIsHandshakeAllowed
-        )
-
-        initiatorSession.startAsInitiator(responderSession.localPublicKey, appId = allowedAppId)
-        responderSession.startAsResponder()
-
-        withTimeout(5.seconds) {
-            handshakeInitiatorCompleted.await()
-            handshakeResponderCompleted.await()
-        }
-
-        assertNotNull(initiatorSession.remotePublicKey)
-        assertNotNull(responderSession.remotePublicKey)
-    }
-
-    @Test
-    fun directHandshake_WithInvalidAppId_Fails() = runBlocking {
-        val (initiatorInput, initiatorOutput, responderInput, responderOutput) = createPipeStreams()
-        val initiatorKeyPair = generateKeyPair()
-        val responderKeyPair = generateKeyPair()
-        val allowedAppId = 1234u
-        val invalidAppId = 5678u
-
-        val handshakeInitiatorCompleted = CompletableDeferred<Boolean>()
-        val handshakeResponderCompleted = CompletableDeferred<Boolean>()
-        val initiatorClosed = CompletableDeferred<Boolean>()
-        val responderClosed = CompletableDeferred<Boolean>()
-
-        val responderIsHandshakeAllowed = { linkType: LinkType, _: SyncSocketSession, _: String, _: String?, appId: UInt ->
-            linkType == LinkType.Direct && appId == allowedAppId
-        }
-
-        val (initiatorSession, responderSession) = createSessions(
-            initiatorInput, initiatorOutput, responderInput, responderOutput,
-            initiatorKeyPair, responderKeyPair,
-            { handshakeInitiatorCompleted.complete(true) },
-            { handshakeResponderCompleted.complete(true) },
-            onInitiatorClose = {
-                initiatorClosed.complete(true)
-            },
-            onResponderClose = {
-                responderClosed.complete(true)
-            },
-            isHandshakeAllowed = responderIsHandshakeAllowed
-        )
-
-        initiatorSession.startAsInitiator(responderSession.localPublicKey, appId = invalidAppId)
-        responderSession.startAsResponder()
-
-        withTimeout(5.seconds) {
-            initiatorClosed.await()
-            responderClosed.await()
-        }
-
-        assertFalse(handshakeInitiatorCompleted.isCompleted)
-        assertFalse(handshakeResponderCompleted.isCompleted)
-    }
-}
-
-class Authorized : IAuthorizable {
-    override val isAuthorized: Boolean = true
-}
-
-class Unauthorized : IAuthorizable {
-    override val isAuthorized: Boolean = false
-}

app/src/main/AndroidManifest.xml

@@ -55,7 +55,7 @@
 
         <activity
             android:name=".activities.MainActivity"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout|uiMode"
+            android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
             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>

app/src/main/assets/scripts/source.js

@@ -32,8 +32,7 @@ let Type = {
     Text: {
         RAW: 0,
         HTML: 1,
-        MARKUP: 2,
+        MARKUP: 2
-        CODE: 3
     },
     Chapter: {
         NORMAL: 0,
@@ -292,39 +291,15 @@ class PlatformPostDetails extends PlatformPost {
     }
 }
 
-class PlatformWeb extends PlatformContent {
+class PlatformArticleDetails 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 {
@@ -340,17 +315,9 @@ class ArticleTextSegment extends ArticleSegment {
     }
 }
 class ArticleImagesSegment extends ArticleSegment {
-    constructor(images, caption) {
+    constructor(images) {
         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 {
@@ -628,8 +595,6 @@ class PlatformComment {
         this.date = obj.date ?? 0;
         this.replyCount = obj.replyCount ?? 0;
         this.context = obj.context ?? {};
-        if(obj.getReplies)
-            this.getReplies = obj.getReplies;
     }
 }
 

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

@@ -14,6 +14,7 @@ import java.text.DecimalFormat
 import java.time.OffsetDateTime
 import java.time.temporal.ChronoUnit
 import kotlin.math.abs
+import kotlin.math.roundToInt
 import kotlin.math.roundToLong
 
 
@@ -375,19 +376,14 @@ private val slds = hashSetOf(".com.ac", ".net.ac", ".gov.ac", ".org.ac", ".mil.a
 fun String.matchesDomain(queryDomain: String): Boolean {
 
     if(queryDomain.startsWith(".")) {
-        val parts = this.lowercase().split(".");
+
-        val queryParts = queryDomain.lowercase().trimStart("."[0]).split(".");
+        val parts = queryDomain.lowercase().split(".");
-        if(queryParts.size < 2)
+        if(parts.size < 3)
             throw IllegalStateException("Illegal use of wildcards on First-Level-Domain (" + queryDomain + ")");
-        else {
+        if(parts.size >= 3){
-            val possibleDomain = "." + queryParts.joinToString(".");
+            val isSLD = slds.contains("." + parts[parts.size - 2] + "." + parts[parts.size - 1]);
-            if(slds.contains(possibleDomain))
+            if(isSLD && parts.size <= 3)
                 throw IllegalStateException("Illegal use of wildcards on Second-Level-Domain (" + queryDomain + ")");
-            /*
-            val isSLD = slds.contains("." + queryParts[queryParts.size - 2] + "." + queryParts[queryParts.size - 1]);
-            if(isSLD && queryParts.size <= 3)
-                throw IllegalStateException("Illegal use of wildcards on Second-Level-Domain (" + queryDomain + ")");
-            */
         }
 
         //TODO: Should be safe, but double verify if can't be exploited
@@ -399,11 +395,9 @@ fun String.matchesDomain(queryDomain: String): Boolean {
 
 fun String.getSubdomainWildcardQuery(): String {
     val domainParts = this.split(".");
-    var wildcardDomain = if(domainParts.size > 2)
+    val sldParts = "." + domainParts[domainParts.size - 2].lowercase() + "." + domainParts[domainParts.size - 1].lowercase();
-        "." + domainParts.drop(1).joinToString(".")
+    if(slds.contains(sldParts))
+        return "." + domainParts.drop(domainParts.size - 3).joinToString(".");
     else
-        "." + domainParts.joinToString(".");
+        return "." + domainParts.drop(domainParts.size - 2).joinToString(".");
-    if(slds.contains(wildcardDomain.lowercase()))
-        "." + domainParts.joinToString(".");
-    return wildcardDomain;
 }

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

@@ -217,9 +217,9 @@ private fun ByteArray.toInetAddress(): InetAddress {
 }
 
 fun getConnectedSocket(attemptAddresses: List<InetAddress>, port: Int): Socket? {
-    ensureNotMainThread()
+    val timeout = 2000
+
 
-    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")})");

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

@@ -7,9 +7,6 @@ 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?{
@@ -36,37 +33,13 @@ fun Boolean?.toYesNo(): String {
 fun InetAddress?.toUrlAddress(): String {
     return when (this) {
         is Inet6Address -> {
-            val hostAddr = this.hostAddress ?: throw Exception("Invalid address: hostAddress is null")
+            "[${hostAddress}]"
-            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 -> {
-            this.hostAddress ?: throw Exception("Invalid address: hostAddress is null")
+            hostAddress
         }
         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)
 }

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

@@ -29,7 +29,6 @@ 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
@@ -176,10 +175,6 @@ 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
@@ -226,11 +221,10 @@ 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;
 
@@ -259,11 +253,9 @@ 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;
 
@@ -285,7 +277,6 @@ class Settings : FragmentedStorageFileJson() {
     @Serializable
     class ChannelSettings {
 
-        @AdvancedField
         @FormField(R.string.progress_bar, FieldForm.TOGGLE, R.string.progress_bar_description, 6)
         var progressBar: Boolean = true;
     }
@@ -311,20 +302,16 @@ 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;
 
@@ -355,16 +342,13 @@ 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;
 
@@ -441,11 +425,9 @@ 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
 
@@ -456,7 +438,6 @@ 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;
@@ -483,10 +464,14 @@ 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;
@@ -512,78 +497,8 @@ 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.comments, "group", R.string.comments_description, 6)
@@ -599,7 +514,6 @@ 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;
 
@@ -636,12 +550,10 @@ 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;
@@ -671,20 +583,14 @@ 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;
+        var allowIpv6: Boolean = false;
-
-        @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)
@@ -753,11 +659,9 @@ 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;
 
@@ -958,23 +862,7 @@ 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.license_status, FieldForm.BUTTON, R.string.view_license_status, 2)
+        @FormField(R.string.clear_payment, FieldForm.BUTTON, R.string.deletes_license_keys_from_app, 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?", {
@@ -992,10 +880,8 @@ 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;
 
@@ -1040,7 +926,7 @@ class Settings : FragmentedStorageFileJson() {
     @Serializable
     class Synchronization {
         @FormField(R.string.enabled, FieldForm.TOGGLE, R.string.enabled_description, 1)
-        var enabled: Boolean = false;
+        var enabled: Boolean = true;
 
         @FormField(R.string.broadcast, FieldForm.TOGGLE, R.string.broadcast_description, 1)
         var broadcast: Boolean = false;
@@ -1050,21 +936,6 @@ class Settings : FragmentedStorageFileJson() {
 
         @FormField(R.string.connect_last, FieldForm.TOGGLE, R.string.connect_last_description, 3)
         var connectLast: Boolean = true;
-
-        @FormField(R.string.discover_through_relay, FieldForm.TOGGLE, R.string.discover_through_relay_description, 3)
-        var discoverThroughRelay: Boolean = true;
-
-        @FormField(R.string.pair_through_relay, FieldForm.TOGGLE, R.string.pair_through_relay_description, 3)
-        var pairThroughRelay: Boolean = true;
-
-        @FormField(R.string.connect_through_relay, FieldForm.TOGGLE, R.string.connect_through_relay_description, 3)
-        var connectThroughRelay: Boolean = true;
-
-        @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)
@@ -1133,4 +1004,4 @@ class Settings : FragmentedStorageFileJson() {
         }
     }
     //endregion
-}
+}

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

@@ -319,11 +319,7 @@ class UIDialogs {
                         closeAction?.invoke()
                     }, UIDialogs.ActionStyle.NONE),
                     UIDialogs.Action(context.getString(R.string.retry), {
-                        try {
+                        retryAction?.invoke();
-                            retryAction?.invoke();
-                        } catch (e: Throwable) {
-                            Logger.e(TAG, "Unhandled exception retrying", e)
-                        }
                     }, UIDialogs.ActionStyle.PRIMARY)
                 );
             else
@@ -337,11 +333,7 @@ class UIDialogs {
                         closeAction?.invoke()
                     }, UIDialogs.ActionStyle.NONE),
                     UIDialogs.Action(context.getString(R.string.retry), {
-                        try {
+                        retryAction?.invoke();
-                            retryAction?.invoke();
-                        } catch (e: Throwable) {
-                            Logger.e(TAG, "Unhandled exception retrying", e)
-                        }
                     }, UIDialogs.ActionStyle.PRIMARY)
                 );
         }

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

@@ -4,14 +4,8 @@ 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
@@ -43,9 +37,6 @@ 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
@@ -72,8 +63,6 @@ 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 {
@@ -310,7 +299,6 @@ 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)
@@ -322,8 +310,6 @@ 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
@@ -336,103 +322,55 @@ class UISlideOverlays {
 
                 val masterPlaylist: HLS.MasterPlaylist
                 try {
-                    val inputStream = ByteArrayInputStream(masterPlaylistContent.toByteArray())
+                    masterPlaylist = HLS.parseMasterPlaylist(masterPlaylistContent, sourceUrl)
-                    val playlist = DefaultHlsPlaylistParserFactory().createPlaylistParser()
-                        .parse(sourceUrl.toUri(), inputStream)
 
-                    if (playlist is HlsMediaPlaylist) {
+                    masterPlaylist.getAudioSources().forEach { it ->
-                        if (source is IHLSManifestAudioSource) {
-                            val variant = HLS.mediaRenditionToVariant(MediaRendition("AUDIO", playlist.baseUri, "Single Playlist", null, null, null, null, null))!!
 
-                            val estSize = VideoHelper.estimateSourceSize(variant);
+                        val estSize = VideoHelper.estimateSourceSize(it);
-                            val prefix = if(estSize > 0) "±" + estSize.toHumanBytesSize() + " " else "";
+                        val prefix = if(estSize > 0) "±" + estSize.toHumanBytesSize() + " " else "";
-                            audioButtons.add(SlideUpMenuItem(
+                        audioButtons.add(SlideUpMenuItem(
-                                container.context,
+                            container.context,
-                                R.drawable.ic_music,
+                            R.drawable.ic_music,
-                                variant.name,
+                            it.name,
-                                listOf(variant.language, variant.codec).mapNotNull { x -> x.ifEmpty { null } }.joinToString(", "),
+                            listOf(it.language, it.codec).mapNotNull { x -> x.ifEmpty { null } }.joinToString(", "),
-                                (prefix + variant.codec).trim(),
+                            (prefix + it.codec).trim(),
-                                tag = variant,
+                            tag = it,
-                                call = {
+                            call = {
-                                    selectedAudioVariant = variant
+                                selectedAudioVariant = it
-                                    slideUpMenuOverlay.selectOption(audioButtons, variant)
+                                slideUpMenuOverlay.selectOption(audioButtons, it)
-                                    slideUpMenuOverlay.setOk(container.context.getString(R.string.download))
-                                },
-                                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))
+                            },
-                        }*/
+                            invokeParent = false
+                        ))
+                    }
 
-                        masterPlaylist.getVideoSources().forEach {
+                    /*masterPlaylist.getSubtitleSources().forEach { it ->
-                            val estSize = VideoHelper.estimateSourceSize(it);
+                        subtitleButtons.add(SlideUpMenuItem(container.context, R.drawable.ic_music, it.name, listOf(it.format).mapNotNull { x -> x.ifEmpty { null } }.joinToString(", "), it, {
-                            val prefix = if(estSize > 0) "±" + estSize.toHumanBytesSize() + " " else "";
+                            selectedSubtitleVariant = it
-                            videoButtons.add(SlideUpMenuItem(
+                            slideUpMenuOverlay.selectOption(subtitleButtons, it)
-                                container.context,
+                            slideUpMenuOverlay.setOk(container.context.getString(R.string.download))
-                                R.drawable.ic_movie,
+                        }, false))
-                                it.name,
+                    }*/
-                                "${it.width}x${it.height}",
+
-                                (prefix + it.codec).trim(),
+                    masterPlaylist.getVideoSources().forEach {
-                                tag = it,
+                        val estSize = VideoHelper.estimateSourceSize(it);
-                                call = {
+                        val prefix = if(estSize > 0) "±" + estSize.toHumanBytesSize() + " " else "";
-                                    selectedVideoVariant = it
+                        videoButtons.add(SlideUpMenuItem(
-                                    slideUpMenuOverlay.selectOption(videoButtons, it)
+                            container.context,
-                                    if (audioButtons.isEmpty()){
+                            R.drawable.ic_movie,
-                                        slideUpMenuOverlay.setOk(container.context.getString(R.string.download))
+                            it.name,
-                                    }
+                            "${it.width}x${it.height}",
-                                },
+                            (prefix + it.codec).trim(),
-                                invokeParent = false
+                            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>()
@@ -460,11 +398,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, resolvedPlaylistUrl), null, null)
+                                StateDownloads.instance.download(video, HLSVariantVideoUrlSource("variant", 0, 0, "application/vnd.apple.mpegurl", "", null, 0, false, sourceUrl), 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, resolvedPlaylistUrl), null)
+                                StateDownloads.instance.download(video, null, HLSVariantAudioUrlSource("variant", 0, "application/vnd.apple.mpegurl", "", "", null, false, false, sourceUrl), null)
                                 UIDialogs.toast(container.context, "Variant audio HLS playlist download started")
                                 slideUpMenuOverlay.hide()
                             } else {
@@ -746,10 +684,6 @@ class UISlideOverlays {
                             }
                         }
                     }
-                    if(!Settings.instance.downloads.shouldDownload()) {
-                        UIDialogs.appToast("Download will start when you're back on wifi.\n" +
-                                "(You can change this in settings)", true);
-                    }
                 }
             };
             return menu.apply { show() };
@@ -1046,30 +980,26 @@ class UISlideOverlays {
                         + actions).filterNotNull()
             ));
             items.add(
-                SlideUpMenuGroup(
+                SlideUpMenuGroup(container.context, container.context.getString(R.string.add_to), "addto",
-                    container.context, container.context.getString(R.string.add_to), "addto",
+                    SlideUpMenuItem(container.context,
-                    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(
+                    SlideUpMenuItem(container.context,
-                        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(
+                    SlideUpMenuItem(container.context,
-                        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(
@@ -1133,17 +1063,14 @@ class UISlideOverlays {
             val queue = StatePlayer.instance.getQueue();
             val watchLater = StatePlaylists.instance.getWatchLater();
             items.add(
-                SlideUpMenuGroup(
+                SlideUpMenuGroup(container.context, container.context.getString(R.string.other), "other",
-                    container.context, container.context.getString(R.string.other), "other",
+                    SlideUpMenuItem(container.context,
-                    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(
+                    SlideUpMenuItem(container.context,
-                        container.context,
                         R.drawable.ic_watchlist_add,
                         StatePlayer.TYPE_WATCHLATER,
                         "${watchLater.size} " + container.context.getString(R.string.videos),
@@ -1152,7 +1079,7 @@ class UISlideOverlays {
                             if(StatePlaylists.instance.addToWatchLater(SerializedPlatformVideo.fromVideo(video), true))
                                 UIDialogs.appToast("Added to watch later", false);
                         }),
-                )
+                    )
             );
 
             val playlistItems = arrayListOf<SlideUpMenuItem>();
@@ -1190,8 +1117,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>>): SlideUpMenuFilters {
+        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);
+            val overlay = SlideUpMenuFilters(lifecycleScope, container, enabledClientsIds, filterValues, isChannelSearch);
             overlay.show();
             return overlay;
         }

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

@@ -31,12 +31,6 @@ 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
@@ -75,14 +69,7 @@ fun warnIfMainThread(context: String) {
 }
 
 fun ensureNotMainThread() {
-    val isMainLooper = try {
+    if (Looper.myLooper() == Looper.getMainLooper()) {
-        Looper.myLooper() == Looper.getMainLooper()
-    } catch (e: Throwable) {
-        //Ignore, for unit tests where its not mocked
-        false
-    }
-
-    if (isMainLooper) {
         Logger.e("Utility", "Throwing exception because a function that should not be called on main thread, is called on main thread")
         throw IllegalStateException("Cannot run on main thread")
     }
@@ -285,7 +272,7 @@ fun <T> findNewIndex(originalArr: List<T>, newArr: List<T>, item: T): Int{
         }
     }
     if(newIndex < 0)
-        return newArr.size;
+        return originalArr.size;
     else
         return newIndex;
 }
@@ -337,125 +324,4 @@ 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
-    }
-}
-
-private 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)

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

@@ -1,15 +1,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,7 +21,6 @@ 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
@@ -32,8 +30,6 @@ 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
@@ -42,9 +38,7 @@ 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
@@ -71,9 +65,7 @@ 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
@@ -82,6 +74,7 @@ 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
@@ -153,8 +146,6 @@ 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;
@@ -184,7 +175,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
     lateinit var _fragVideoDetail: VideoDetailFragment;
 
     //State
-    private val _queue: LinkedList<Pair<MainFragment, Any?>> = LinkedList();
+    private val _queue: Queue<Pair<MainFragment, Any?>> = LinkedList();
     lateinit var fragCurrent: MainFragment private set;
     private var _parameterCurrent: Any? = null;
 
@@ -194,9 +185,6 @@ 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)
@@ -208,7 +196,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             }
 
             try {
-                lifecycleScope.launch {
+                runBlocking {
                     handleUrlAll(content)
                 }
             } catch (e: Throwable) {
@@ -274,10 +262,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         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)
@@ -285,11 +269,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
                 WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
 
         runBlocking {
-            try {
+            StatePlatform.instance.updateAvailableClients(this@MainActivity);
-                StatePlatform.instance.updateAvailableClients(this@MainActivity);
-            } catch (e: Throwable) {
-                Logger.e(TAG, "Unhandled exception in updateAvailableClients", e)
-            }
         }
 
         //Preload common files to memory
@@ -333,8 +313,6 @@ 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();
@@ -376,18 +354,22 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             _fragMainSubscriptionsFeed.setPreviewsEnabled(true);
             _fragContainerVideoDetail.visibility = View.INVISIBLE;
             updateSegmentPaddings();
-            updatePrivateModeVisibility()
         };
 
 
         _buttonIncognito = findViewById(R.id.incognito_button);
-        updatePrivateModeVisibility()
+        _buttonIncognito.elevation = -99f;
+        _buttonIncognito.alpha = 0f;
         StateApp.instance.privateModeChanged.subscribe {
             //Messing with visibility causes some issues with layout ordering?
-            _privateModeEnabled = it
+            if (it) {
-            updatePrivateModeVisibility()
+                _buttonIncognito.elevation = 99f;
+                _buttonIncognito.alpha = 1f;
+            } else {
+                _buttonIncognito.elevation = -99f;
+                _buttonIncognito.alpha = 0f;
+            }
         }
-
         _buttonIncognito.setOnClickListener {
             if (!StateApp.instance.privateMode)
                 return@setOnClickListener;
@@ -404,16 +386,19 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         };
         _fragVideoDetail.onFullscreenChanged.subscribe {
             Logger.i(TAG, "onFullscreenChanged ${it}");
-            _isFullscreen = it
-            updatePrivateModeVisibility()
-        }
 
-        _fragVideoDetail.onMinimize.subscribe {
+            if (it) {
-            updatePrivateModeVisibility()
+                _buttonIncognito.elevation = -99f;
-        }
+                _buttonIncognito.alpha = 0f;
-
+            } else {
-        _fragVideoDetail.onMaximized.subscribe {
+                if (StateApp.instance.privateMode) {
-            updatePrivateModeVisibility()
+                    _buttonIncognito.elevation = 99f;
+                    _buttonIncognito.alpha = 1f;
+                } else {
+                    _buttonIncognito.elevation = -99f;
+                    _buttonIncognito.alpha = 0f;
+                }
+            }
         }
 
         StatePlayer.instance.also {
@@ -461,8 +446,6 @@ 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;
@@ -630,18 +613,8 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             UIDialogs.toast(this, "No external file permissions\nExporting and auto backups will not work");
     }*/
 
-    private var _qrCodeLoadingDialog: AlertDialog? = null
-
     fun showUrlQrCodeScanner() {
         try {
-            _qrCodeLoadingDialog = UIDialogs.showDialog(this, R.drawable.ic_loader_animated, true,
-                "Launching QR scanner",
-                "Make sure your camera is enabled", null, -2,
-                UIDialogs.Action("Close", {
-                    _qrCodeLoadingDialog?.dismiss()
-                    _qrCodeLoadingDialog = null
-                }));
-
             val integrator = IntentIntegrator(this)
             integrator.setDesiredBarcodeFormats(IntentIntegrator.QR_CODE)
             integrator.setPrompt(getString(R.string.scan_a_qr_code))
@@ -657,18 +630,6 @@ 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")
@@ -679,9 +640,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         super.onPause();
         Logger.v(TAG, "onPause")
         _isVisible = false;
-
-        _qrCodeLoadingDialog?.dismiss()
-        _qrCodeLoadingDialog = null
     }
 
     override fun onStop() {
@@ -720,7 +678,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
 
             "VIDEO" -> {
                 val url = intent.getStringExtra("VIDEO");
-                navigateWhenReady(_fragVideoDetail, url);
+                navigate(_fragVideoDetail, url);
             }
 
             "IMPORT_OPTIONS" -> {
@@ -738,11 +696,11 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
                     "Sources" -> {
                         runBlocking {
                             StatePlatform.instance.updateAvailableClients(this@MainActivity, true) //Ideally this is not needed..
-                            navigateWhenReady(_fragMainSources);
+                            navigate(_fragMainSources);
                         }
                     };
                     "BROWSE_PLUGINS" -> {
-                        navigateWhenReady(_fragBrowser, BrowserFragment.NavigateOptions("https://plugins.grayjay.app/phone.html", mapOf(
+                        navigate(_fragBrowser, BrowserFragment.NavigateOptions("https://plugins.grayjay.app/phone.html", mapOf(
                             Pair("grayjay") { req ->
                                 StateApp.instance.contextOrNull?.let {
                                     if (it is MainActivity) {
@@ -760,12 +718,8 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
 
         try {
             if (targetData != null) {
-                lifecycleScope.launch(Dispatchers.Main) {
+                runBlocking {
-                    try {
+                    handleUrlAll(targetData)
-                        handleUrlAll(targetData)
-                    } catch (e: Throwable) {
-                        Logger.e(TAG, "Unhandled exception in handleUrlAll", e)
-                    }
                 }
             }
         } catch (ex: Throwable) {
@@ -793,10 +747,10 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
                     startActivity(intent);
                 } else if (url.startsWith("grayjay://video/")) {
                     val videoUrl = url.substring("grayjay://video/".length);
-                    navigateWhenReady(_fragVideoDetail, videoUrl);
+                    navigate(_fragVideoDetail, videoUrl);
                 } else if (url.startsWith("grayjay://channel/")) {
                     val channelUrl = url.substring("grayjay://channel/".length);
-                    navigateWhenReady(_fragMainChannel, channelUrl);
+                    navigate(_fragMainChannel, channelUrl);
                 }
             }
 
@@ -862,29 +816,29 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
 
         return withContext(Dispatchers.IO) {
             Logger.i(TAG, "handleUrl(url=$url) on IO");
-            if (StatePlatform.instance.hasEnabledContentClient(url)) {
+            if (StatePlatform.instance.hasEnabledVideoClient(url)) {
                 Logger.i(TAG, "handleUrl(url=$url) found video client");
-                withContext(Dispatchers.Main) {
+                lifecycleScope.launch(Dispatchers.Main) {
                     if (position > 0)
-                        navigateWhenReady(_fragVideoDetail, UrlVideoWithTime(url, position.toLong(), true));
+                        navigate(_fragVideoDetail, UrlVideoWithTime(url, position.toLong(), true));
                     else
-                        navigateWhenReady(_fragVideoDetail, url);
+                        navigate(_fragVideoDetail, url);
 
                     _fragVideoDetail.maximizeVideoDetail(true);
                 }
                 return@withContext true;
             } else if (StatePlatform.instance.hasEnabledChannelClient(url)) {
                 Logger.i(TAG, "handleUrl(url=$url) found channel client");
-                withContext(Dispatchers.Main) {
+                lifecycleScope.launch(Dispatchers.Main) {
-                    navigateWhenReady(_fragMainChannel, url);
+                    navigate(_fragMainChannel, url);
                     delay(100);
                     _fragVideoDetail.minimizeVideoDetail();
                 };
                 return@withContext true;
             } else if (StatePlatform.instance.hasEnabledPlaylistClient(url)) {
                 Logger.i(TAG, "handleUrl(url=$url) found playlist client");
-                withContext(Dispatchers.Main) {
+                lifecycleScope.launch(Dispatchers.Main) {
-                    navigateWhenReady(_fragMainRemotePlaylist, url);
+                    navigate(_fragMainRemotePlaylist, url);
                     delay(100);
                     _fragVideoDetail.minimizeVideoDetail();
                 };
@@ -1096,9 +1050,6 @@ 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() {
@@ -1111,18 +1062,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         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
@@ -1184,6 +1123,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             if (segment.isOverlay && !fragCurrent.isOverlay && withHistory)// && fragCurrent.isHistory)
                 fragBeforeOverlay = fragCurrent;
 
+
             fragCurrent = segment;
             _parameterCurrent = parameter;
         }
@@ -1246,8 +1186,6 @@ 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;

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

@@ -9,8 +9,6 @@ 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
@@ -31,16 +29,6 @@ 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()
 
@@ -66,6 +54,7 @@ class SyncHomeActivity : AppCompatActivity() {
                 val view = _viewMap[publicKey]
                 if (!session.isAuthorized) {
                     if (view != null) {
+                        _layoutDevices.removeView(view)
                         _viewMap.remove(publicKey)
                     }
                     return@launch
@@ -100,20 +89,6 @@ 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() {
@@ -125,12 +100,11 @@ 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 && authorized) "Connected" else "Disconnected or unauthorized")
+            .setStatus(if (connected) "Connected" else "Disconnected")
         return syncDeviceView
     }
 

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

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

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

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

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

@@ -90,7 +90,6 @@ open class ManagedHttpClient {
     }
 
     fun tryHead(url: String): Map<String, String>? {
-        ensureNotMainThread()
         try {
             val result = head(url);
             if(result.isOk)
@@ -105,7 +104,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" })
@@ -301,7 +300,6 @@ open class ManagedHttpClient {
         }
 
         fun send(msg: String) {
-            ensureNotMainThread()
             socket.send(msg);
         }
 

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

@@ -1,6 +1,5 @@
 package com.futo.platformplayer.api.media
 
-import com.futo.platformplayer.api.media.models.IPlatformChannelContent
 import com.futo.platformplayer.api.media.models.PlatformAuthorLink
 import com.futo.platformplayer.api.media.models.ResultCapabilities
 import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
@@ -67,11 +66,6 @@ interface IPlatformClient {
      */
     fun searchChannels(query: String): IPager<PlatformAuthorLink>;
 
-    /**
-     * Searches for channels and returns a content pager
-     */
-    fun searchChannelsAsContent(query: String): IPager<IPlatformContent>;
-
 
     //Video Pages
     /**

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

@@ -14,16 +14,14 @@ 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, isolatedInitialization: Boolean = false) {
+    constructor(parentClient: IPlatformClient, name: String? = null, privatePool: 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");
@@ -55,7 +53,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, _isolatedInitialization);
+                reserved = _parent.getCopy(_privatePool);
 
                 reserved?.onCaptchaException?.subscribe { client, ex ->
                     StateApp.instance.handleCaptchaException(client, ex);

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

@@ -7,15 +7,13 @@ class PlatformMultiClientPool {
 
     private var _isFake = false;
     private var _privatePool = false;
-    private val _isolatedInitialization: Boolean
 
-    constructor(name: String, maxCap: Int = -1, isPrivatePool: Boolean = false, isolatedInitialization: Boolean = false) {
+    constructor(name: String, maxCap: Int = -1, isPrivatePool: Boolean = false) {
         _name = name;
         _maxCap = if(maxCap > 0)
             maxCap
         else 99;
         _privatePool = isPrivatePool;
-        _isolatedInitialization = isolatedInitialization
     }
 
     fun getClientPooled(parentClient: IPlatformClient, capacity: Int = _maxCap): IPlatformClient {
@@ -23,7 +21,7 @@ class PlatformMultiClientPool {
             return parentClient;
         val pool = synchronized(_clientPools) {
             if(!_clientPools.containsKey(parentClient))
-                _clientPools[parentClient] = PlatformClientPool(parentClient, _name, _privatePool, _isolatedInitialization).apply {
+                _clientPools[parentClient] = PlatformClientPool(parentClient, _name, _privatePool).apply {
                     this.onDead.subscribe { _, pool ->
                         synchronized(_clientPools) {
                             if(_clientPools[parentClient] == pool)

app/src/main/java/com/futo/platformplayer/api/media/models/PlatformAuthorLink.kt

@@ -2,10 +2,7 @@ package com.futo.platformplayer.api.media.models
 
 import com.caoccao.javet.values.reference.V8ValueObject
 import com.futo.platformplayer.api.media.PlatformID
-import com.futo.platformplayer.api.media.models.contents.ContentType
-import com.futo.platformplayer.api.media.models.contents.IPlatformContent
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
-import com.futo.platformplayer.api.media.platforms.js.models.JSContent
 import com.futo.platformplayer.getOrDefault
 import com.futo.platformplayer.getOrThrow
 
@@ -45,21 +42,4 @@ open class PlatformAuthorLink {
             );
         }
     }
-}
-
-interface IPlatformChannelContent : IPlatformContent {
-    val thumbnail: String?
-    val subscribers: Long?
-}
-
-open class JSChannelContent : JSContent, IPlatformChannelContent {
-    override val contentType: ContentType get() = ContentType.CHANNEL
-    override val thumbnail: String?
-    override val subscribers: Long?
-
-    constructor(config: SourcePluginConfig, obj: V8ValueObject) : super(config, obj) {
-        val contextName = "Channel";
-        thumbnail = obj.getOrDefault<String>(config, "thumbnail", contextName, null)
-        subscribers = if(obj.has("subscribers")) obj.getOrThrow(config,"subscribers", contextName) else null
-    }
 }

app/src/main/java/com/futo/platformplayer/api/media/models/article/IPlatformArticle.kt

@@ -1,9 +0,0 @@
-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?;
-}

app/src/main/java/com/futo/platformplayer/api/media/models/article/IPlatformArticleDetails.kt

@@ -1,12 +0,0 @@
-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;
-}

app/src/main/java/com/futo/platformplayer/api/media/models/contents/ContentType.kt

@@ -8,12 +8,10 @@ enum class ContentType(val value: Int) {
     POST(2),
     ARTICLE(3),
     PLAYLIST(4),
-    WEB(7),
 
     URL(9),
 
     NESTED_VIDEO(11),
-    CHANNEL(60),
 
     LOCKED(70),
 

app/src/main/java/com/futo/platformplayer/api/media/models/post/TextType.kt

@@ -5,8 +5,7 @@ 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

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

@@ -54,11 +54,8 @@ class DevJSClient : JSClient {
         return DevJSClient(context, config, _devScript, _auth, _captcha, devID, descriptor.settings);
     }
 
-    override fun getCopy(privateCopy: Boolean, noSaveState: Boolean): JSClient {
+    override fun getCopy(privateCopy: Boolean): JSClient {
-        val client = DevJSClient(_context, descriptor, _script, if(!privateCopy) _auth else null, _captcha, if (noSaveState) null else saveState(), devID);
+        return DevJSClient(_context, descriptor, _script, if(!privateCopy) _auth else null, _captcha, saveState(), devID);
-        if (noSaveState)
-            client.initialize()
-        return client
     }
 
     override fun initialize() {

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

@@ -10,7 +10,6 @@ import com.caoccao.javet.values.reference.V8ValueObject
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.media.IPlatformClient
 import com.futo.platformplayer.api.media.PlatformClientCapabilities
-import com.futo.platformplayer.api.media.models.IPlatformChannelContent
 import com.futo.platformplayer.api.media.models.PlatformAuthorLink
 import com.futo.platformplayer.api.media.models.ResultCapabilities
 import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
@@ -32,7 +31,6 @@ import com.futo.platformplayer.api.media.platforms.js.internal.JSParameterDocs
 import com.futo.platformplayer.api.media.platforms.js.models.IJSContent
 import com.futo.platformplayer.api.media.platforms.js.models.IJSContentDetails
 import com.futo.platformplayer.api.media.platforms.js.models.JSChannel
-import com.futo.platformplayer.api.media.platforms.js.models.JSChannelContentPager
 import com.futo.platformplayer.api.media.platforms.js.models.JSChannelPager
 import com.futo.platformplayer.api.media.platforms.js.models.JSChapter
 import com.futo.platformplayer.api.media.platforms.js.models.JSComment
@@ -195,11 +193,8 @@ open class JSClient : IPlatformClient {
         _plugin.changeAllowDevSubmit(descriptor.appSettings.allowDeveloperSubmit);
     }
 
-    open fun getCopy(withoutCredentials: Boolean = false, noSaveState: Boolean = false): JSClient {
+    open fun getCopy(withoutCredentials: Boolean = false): JSClient {
-        val client = JSClient(_context, descriptor, if (noSaveState) null else saveState(), _script, withoutCredentials);
+        return JSClient(_context, descriptor, saveState(), _script, withoutCredentials);
-        if (noSaveState)
-            client.initialize()
-        return client
     }
 
     fun getUnderlyingPlugin(): V8Plugin {
@@ -214,8 +209,6 @@ open class JSClient : IPlatformClient {
     }
 
     override fun initialize() {
-        if (_initialized) return
-
         Logger.i(TAG, "Plugin [${config.name}] initializing");
         plugin.start();
         plugin.execute("plugin.config = ${Json.encodeToString(config)}");
@@ -368,10 +361,6 @@ open class JSClient : IPlatformClient {
         return@isBusyWith JSChannelPager(config, this,
             plugin.executeTyped("source.searchChannels(${Json.encodeToString(query)})"));
     }
-    override fun searchChannelsAsContent(query: String): IPager<IPlatformContent> = isBusyWith("searchChannels") {
-        ensureEnabled();
-        return@isBusyWith JSChannelContentPager(config, this, plugin.executeTyped("source.searchChannels(${Json.encodeToString(query)})"), );
-    }
 
     @JSDocs(6, "source.isChannelUrl(url)", "Validates if an channel url is for this platform")
     @JSDocsParameter("url", "A channel url (May not be your platform)")

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

@@ -127,7 +127,7 @@ class JSHttpClient : ManagedHttpClient {
         }
 
         if(doApplyCookies) {
-            if (_currentCookieMap.isNotEmpty() || _otherCookieMap.isNotEmpty()) {
+            if (_currentCookieMap.isNotEmpty()) {
                 val cookiesToApply = hashMapOf<String, String>();
                 synchronized(_currentCookieMap) {
                     for(cookie in _currentCookieMap
@@ -135,12 +135,6 @@ 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("; ");

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/IJSContent.kt

@@ -1,7 +1,6 @@
 package com.futo.platformplayer.api.media.platforms.js.models
 
 import com.caoccao.javet.values.reference.V8ValueObject
-import com.futo.platformplayer.api.media.models.JSChannelContent
 import com.futo.platformplayer.api.media.models.contents.ContentType
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
 import com.futo.platformplayer.api.media.platforms.js.JSClient
@@ -27,9 +26,6 @@ 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.ARTICLE -> JSArticle(config, obj);
-                ContentType.WEB -> JSWeb(config, obj);
                 else -> throw NotImplementedError("Unknown content type ${type}");
             }
         }

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/IJSContentDetails.kt

@@ -17,7 +17,6 @@ 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}");
             }
         }

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSArticle.kt

@@ -1,39 +0,0 @@
-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));
-
-    }
-}

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSArticleDetails.kt

@@ -4,8 +4,6 @@ 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
@@ -23,20 +21,20 @@ import com.futo.platformplayer.getOrThrow
 import com.futo.platformplayer.getOrThrowNullableList
 import com.futo.platformplayer.states.StateDeveloper
 
-open class JSArticleDetails : JSContent, IPlatformArticleDetails, IPluginSourced, IPlatformContentDetails {
+open class JSArticleDetails : JSContent, IPluginSourced, IPlatformContentDetails {
     final override val contentType: ContentType get() = ContentType.ARTICLE;
 
     private val _hasGetComments: Boolean;
     private val _hasGetContentRecommendations: Boolean;
 
-    override val rating: IRating;
+    val rating: IRating;
 
-    override val summary: String;
+    val summary: String;
-    override val thumbnails: Thumbnails?;
+    val thumbnails: Thumbnails?;
-    override val segments: List<IJSArticleSegment>;
+    val segments: List<IJSArticleSegment>;
 
     constructor(client: JSClient, obj: V8ValueObject): super(client.config, obj) {
-        val contextName = "PlatformArticle";
+        val contextName = "PlatformPost";
 
         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);
@@ -101,7 +99,6 @@ open class JSArticleDetails : JSContent, IPlatformArticleDetails, IPluginSourced
             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;
             }
@@ -113,7 +110,6 @@ enum class SegmentType(val value: Int) {
     UNKNOWN(0),
     TEXT(1),
     IMAGES(2),
-    HEADER(3),
 
     NESTED(9);
 
@@ -154,17 +150,6 @@ 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;

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSChannelPager.kt

@@ -5,6 +5,7 @@ import com.futo.platformplayer.api.media.models.PlatformAuthorLink
 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.engine.V8Plugin
 
 class JSChannelPager : JSPager<PlatformAuthorLink>, IPager<PlatformAuthorLink> {
 

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSContent.kt

@@ -49,8 +49,8 @@ open class JSContent : IPlatformContent, IPluginSourced {
         else
             author = PlatformAuthorLink.UNKNOWN;
 
-        val datetimeInt = _content.getOrDefault<Int>(config, "datetime", contextName, null)?.toLong();
+        val datetimeInt = _content.getOrThrow<Int>(config, "datetime", contextName).toLong();
-        if(datetimeInt == null || datetimeInt == 0.toLong())
+        if(datetimeInt == 0.toLong())
             datetime = null;
         else
             datetime = OffsetDateTime.of(LocalDateTime.ofEpochSecond(datetimeInt, 0, ZoneOffset.UTC), ZoneOffset.UTC);

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSContentPager.kt

@@ -2,7 +2,6 @@ package com.futo.platformplayer.api.media.platforms.js.models
 
 import com.caoccao.javet.values.reference.V8ValueObject
 import com.futo.platformplayer.api.media.IPluginSourced
-import com.futo.platformplayer.api.media.models.JSChannelContent
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
 import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
@@ -16,14 +15,4 @@ class JSContentPager : JSPager<IPlatformContent>, IPluginSourced {
     override fun convertResult(obj: V8ValueObject): IPlatformContent {
         return IJSContent.fromV8(plugin, obj);
     }
-}
-
-class JSChannelContentPager : JSPager<IPlatformContent>, IPluginSourced {
-    override val sourceConfig: SourcePluginConfig get() = config;
-
-    constructor(config: SourcePluginConfig, plugin: JSClient, pager: V8ValueObject) : super(config, plugin, pager) {}
-
-    override fun convertResult(obj: V8ValueObject): IPlatformContent {
-        return JSChannelContent(config, obj);
-    }
 }

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSWeb.kt

@@ -1,31 +0,0 @@
-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";
-    }
-}

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSWebDetails.kt

@@ -1,41 +0,0 @@
-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;
-
-}

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

@@ -149,7 +149,6 @@ class AirPlayCastingDevice : CastingDevice {
                         break;
                     } catch (e: Throwable) {
                         Logger.w(TAG, "Failed to get setup initial connection to AirPlay device.", e)
-                        delay(1000);
                     }
                 }
 

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

@@ -108,7 +108,7 @@ abstract class CastingDevice {
 
     val expectedCurrentTime: Double
         get() {
-            val diff = if (isPlaying) ((System.currentTimeMillis() - lastTimeChangeTime_ms).toDouble() / 1000.0) else 0.0;
+            val diff = (System.currentTimeMillis() - lastTimeChangeTime_ms).toDouble() / 1000.0;
             return time + diff;
         };
     var connectionState: CastConnectionState = CastConnectionState.DISCONNECTED

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

@@ -10,9 +10,7 @@ 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
@@ -58,10 +56,6 @@ 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;
@@ -235,7 +229,6 @@ 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() {
@@ -275,7 +268,6 @@ class ChromecastCastingDevice : CastingDevice {
             _contentType = null;
             _streamType = null;
             _sessionId = null;
-            _launchRetries = 0
             _transportId = null;
         }
 
@@ -290,7 +282,6 @@ class ChromecastCastingDevice : CastingDevice {
 
         _started = true;
         _sessionId = null;
-        _launchRetries = 0
         _mediaSessionId = null;
 
         Logger.i(TAG, "Starting...");
@@ -331,7 +322,6 @@ class ChromecastCastingDevice : CastingDevice {
                         break;
                     } catch (e: Throwable) {
                         Logger.w(TAG, "Failed to get setup initial connection to ChromeCast device.", e)
-                        Thread.sleep(1000);
                     }
                 }
 
@@ -344,10 +334,6 @@ class ChromecastCastingDevice : CastingDevice {
 
                 //Connection loop
                 while (_scopeIO?.isActive == true) {
-                    _sessionId = null;
-                    _launchRetries = 0
-                    _mediaSessionId = null;
-
                     Logger.i(TAG, "Connecting to Chromecast.");
                     connectionState = CastConnectionState.CONNECTING;
 
@@ -406,7 +392,7 @@ class ChromecastCastingDevice : CastingDevice {
                         try {
                             val inputStream = _inputStream ?: break;
 
-                            val message = synchronized(_inputStreamLock)
+                            synchronized(_inputStreamLock)
                             {
                                 Log.d(TAG, "Receiving next packet...");
                                 val b1 = inputStream.readUnsignedByte();
@@ -418,7 +404,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 null
+                                    return@synchronized
                                 }
 
                                 Log.d(TAG, "Received header indicating $size bytes. Waiting for message.");
@@ -427,19 +413,15 @@ 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 msg = ChromeCast.CastMessage.parseFrom(messageBytes);
+                                val message = ChromeCast.CastMessage.parseFrom(messageBytes);
-                                if (msg.namespace != "urn:x-cast:com.google.cast.tp.heartbeat") {
+                                if (message.namespace != "urn:x-cast:com.google.cast.tp.heartbeat") {
-                                    Logger.i(TAG, "Received message: $msg");
+                                    Logger.i(TAG, "Received message: $message");
                                 }
-                                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) {
@@ -503,10 +485,6 @@ 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;
         }
     }
 
@@ -533,7 +511,6 @@ class ChromecastCastingDevice : CastingDevice {
                             if (_sessionId == null) {
                                 connectionState = CastConnectionState.CONNECTED;
                                 _sessionId = applicationUpdate.getString("sessionId");
-                                _launchRetries = 0
 
                                 val transportId = applicationUpdate.getString("transportId");
                                 connectMediaChannel(transportId);
@@ -548,40 +525,21 @@ class ChromecastCastingDevice : CastingDevice {
                 }
 
                 if (!sessionIsRunning) {
-                    if (System.currentTimeMillis() - _lastLaunchTime_ms > 5000) {
+                    _sessionId = null;
-                        _sessionId = null
+                    _mediaSessionId = null;
-                        _mediaSessionId = null
+                    setTime(0.0);
-                        setTime(0.0)
+                    _transportId = null;
-                        _transportId = null
+                    Logger.w(TAG, "Session not found.");
 
-                        if (_launching && _launchRetries < MAX_LAUNCH_RETRIES) {
+                    if (_launching) {
-                            Logger.i(TAG, "No player yet; attempting launch #${_launchRetries + 1}")
+                        Logger.i(TAG, "Player not found, launching.");
-                            _launchRetries++
+                        launchPlayer();
-                            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 {
-                        if (_retryJob == null) {
+                        Logger.i(TAG, "Player not found, disconnecting.");
-                            Logger.i(TAG, "Scheduled retry job over 5 seconds")
+                        stop();
-                            _retryJob = _scopeIO?.launch(Dispatchers.IO) {
-                                delay(5000)
-                                getStatus()
-                                _retryJob = null
-                            }
-                        }
                     }
                 } else {
-                    _launching = false
+                    _launching = false;
-                    _launchRetries = 0
                 }
 
                 val volume = status.getJSONObject("volume");
@@ -608,7 +566,7 @@ class ChromecastCastingDevice : CastingDevice {
                     }
 
                     isPlaying = playerState == "PLAYING";
-                    if (isPlaying ||  playerState == "PAUSED") {
+                    if (isPlaying) {
                         setTime(currentTime);
                     }
 
@@ -623,8 +581,6 @@ 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 {
@@ -659,9 +615,6 @@ class ChromecastCastingDevice : CastingDevice {
         localAddress = null;
         _started = false;
 
-        _retryJob?.cancel()
-        _retryJob = null
-
         val socket = _socket;
         val scopeIO = _scopeIO;
 

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

@@ -25,7 +25,6 @@ import com.futo.platformplayer.toInetAddress
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import kotlinx.serialization.encodeToString
@@ -93,7 +92,7 @@ class FCastCastingDevice : CastingDevice {
     private var _version: Long = 1;
     private var _thread: Thread? = null
     private var _pingThread: Thread? = null
-    @Volatile private var _lastPongTime = System.currentTimeMillis()
+    private var _lastPongTime = -1L
     private var _outputStreamLock = Object()
 
     constructor(name: String, addresses: Array<InetAddress>, port: Int) : super() {
@@ -290,7 +289,6 @@ class FCastCastingDevice : CastingDevice {
                         break;
                     } catch (e: Throwable) {
                         Logger.w(TAG, "Failed to get setup initial connection to FastCast device.", e)
-                        Thread.sleep(1000);
                     }
                 }
 
@@ -328,9 +326,9 @@ class FCastCastingDevice : CastingDevice {
                         continue;
                     }
 
-                    localAddress = _socket?.localAddress
+                    localAddress = _socket?.localAddress;
-                    _lastPongTime = System.currentTimeMillis()
+                    connectionState = CastConnectionState.CONNECTED;
-                    connectionState = CastConnectionState.CONNECTED
+                    _lastPongTime = -1L
 
                     val buffer = ByteArray(4096);
 
@@ -406,32 +404,36 @@ class FCastCastingDevice : CastingDevice {
 
             _pingThread = Thread {
                 Logger.i(TAG, "Started ping loop.")
+
                 while (_scopeIO?.isActive == true) {
-                    if (connectionState == CastConnectionState.CONNECTED) {
+                    try {
+                        send(Opcode.Ping)
+                    } catch (e: Throwable) {
+                        Log.w(TAG, "Failed to send ping.")
+
                         try {
-                            send(Opcode.Ping)
+                            _socket?.close()
-                            if (System.currentTimeMillis() - _lastPongTime > 15000) {
+                            _inputStream?.close()
-                                Logger.w(TAG, "Closing socket due to last pong time being larger than 15 seconds.")
+                            _outputStream?.close()
-                                try {
-                                    _socket?.close()
-                                } catch (e: Throwable) {
-                                    Log.w(TAG, "Failed to close socket.", e)
-                                }
-                            }
                         } catch (e: Throwable) {
-                            Log.w(TAG, "Failed to send ping.")
+                            Log.w(TAG, "Failed to close socket.", e)
-                            try {
-                                _socket?.close()
-                                _inputStream?.close()
-                                _outputStream?.close()
-                            } catch (e: Throwable) {
-                                Log.w(TAG, "Failed to close socket.", e)
-                            }
                         }
                     }
-                    Thread.sleep(5000)
+
+                    /*if (_lastPongTime != -1L && System.currentTimeMillis() - _lastPongTime > 6000) {
+                        Logger.w(TAG, "Closing socket due to last pong time being larger than 6 seconds.")
+
+                        try {
+                            _socket?.close()
+                        } catch (e: Throwable) {
+                            Log.w(TAG, "Failed to close socket.", e)
+                        }
+                    }*/
+
+                    Thread.sleep(2000)
                 }
-                Logger.i(TAG, "Stopped ping loop.")
+
+                Logger.i(TAG, "Stopped ping loop.");
             }.apply { start() }
         } else {
             Log.i(TAG, "Thread was still alive, not restarted")

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

@@ -4,14 +4,10 @@ import android.app.AlertDialog
 import android.content.ContentResolver
 import android.content.Context
 import android.net.Uri
-import android.net.nsd.NsdManager
-import android.net.nsd.NsdServiceInfo
-import android.os.Build
 import android.os.Looper
 import android.util.Base64
 import android.util.Log
-import java.net.NetworkInterface
+import android.util.Xml
-import java.net.Inet4Address
 import androidx.annotation.OptIn
 import androidx.media3.common.util.UnstableApi
 import com.futo.platformplayer.R
@@ -43,8 +39,9 @@ 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.mdns.DnsService
+import com.futo.platformplayer.mdns.ServiceDiscoverer
 import com.futo.platformplayer.models.CastingDeviceInfo
 import com.futo.platformplayer.parsers.HLS
 import com.futo.platformplayer.states.StateApp
@@ -58,11 +55,10 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
-import java.net.Inet6Address
+import java.io.ByteArrayInputStream
 import java.net.InetAddress
 import java.net.URLDecoder
 import java.net.URLEncoder
-import java.util.Collections
 import java.util.UUID
 
 class StateCasting {
@@ -74,6 +70,7 @@ class StateCasting {
     private var _started = false;
 
     var devices: HashMap<String, CastingDevice> = hashMapOf();
+    var rememberedDevices: ArrayList<CastingDevice> = arrayListOf();
     val onDeviceAdded = Event1<CastingDevice>();
     val onDeviceChanged = Event1<CastingDevice>();
     val onDeviceRemoved = Event1<CastingDevice>();
@@ -87,15 +84,48 @@ class StateCasting {
     private var _audioExecutor: JSRequestExecutor? = null
     private val _client = ManagedHttpClient();
     var _resumeCastingDevice: CastingDeviceInfo? = null;
-    private var _nsdManager: NsdManager? = null
+    val _serviceDiscoverer = ServiceDiscoverer(arrayOf(
+        "_googlecast._tcp.local",
+        "_airplay._tcp.local",
+        "_fastcast._tcp.local",
+        "_fcast._tcp.local"
+    )) { handleServiceUpdated(it) }
+
     val isCasting: Boolean get() = activeDevice != null;
 
-    private val _discoveryListeners = mapOf(
+    private fun handleServiceUpdated(services: List<DnsService>) {
-        "_googlecast._tcp" to createDiscoveryListener(::addOrUpdateChromeCastDevice),
+        for (s in services) {
-        "_airplay._tcp" to createDiscoveryListener(::addOrUpdateAirPlayDevice),
+            //TODO: Addresses IPv4 only?
-        "_fastcast._tcp" to createDiscoveryListener(::addOrUpdateFastCastDevice),
+            val addresses = s.addresses.toTypedArray()
-        "_fcast._tcp" to createDiscoveryListener(::addOrUpdateFastCastDevice)
+            val port = s.port.toInt()
-    )
+            var name = s.texts.firstOrNull { it.startsWith("md=") }?.substring("md=".length)
+            if (s.name.endsWith("._googlecast._tcp.local")) {
+                if (name == null) {
+                    name = s.name.substring(0, s.name.length - "._googlecast._tcp.local".length)
+                }
+
+                addOrUpdateChromeCastDevice(name, addresses, port)
+            } else if (s.name.endsWith("._airplay._tcp.local")) {
+                if (name == null) {
+                    name = s.name.substring(0, s.name.length - "._airplay._tcp.local".length)
+                }
+
+                addOrUpdateAirPlayDevice(name, addresses, port)
+            } else if (s.name.endsWith("._fastcast._tcp.local")) {
+                if (name == null) {
+                    name = s.name.substring(0, s.name.length - "._fastcast._tcp.local".length)
+                }
+
+                addOrUpdateFastCastDevice(name, addresses, port)
+            } else if (s.name.endsWith("._fcast._tcp.local")) {
+                if (name == null) {
+                    name = s.name.substring(0, s.name.length - "._fcast._tcp.local".length)
+                }
+
+                addOrUpdateFastCastDevice(name, addresses, port)
+            }
+        }
+    }
 
     fun handleUrl(context: Context, url: String) {
         val uri = Uri.parse(url)
@@ -160,34 +190,30 @@ class StateCasting {
 
         Logger.i(TAG, "CastingService starting...");
 
+        rememberedDevices.clear();
+        rememberedDevices.addAll(_storage.deviceInfos.map { deviceFromCastingDeviceInfo(it) });
+
         _castServer.start();
         enableDeveloper(true);
 
         Logger.i(TAG, "CastingService started.");
-
-        _nsdManager = context.getSystemService(Context.NSD_SERVICE) as NsdManager
-        startDiscovering()
     }
 
     @Synchronized
-    private fun startDiscovering() {
+    fun startDiscovering() {
-        _nsdManager?.apply {
+        try {
-            _discoveryListeners.forEach {
+            _serviceDiscoverer.start()
-                discoverServices(it.key, NsdManager.PROTOCOL_DNS_SD, it.value)
+        } catch (e: Throwable) {
-            }
+            Logger.i(TAG, "Failed to start ServiceDiscoverer", e)
         }
     }
 
     @Synchronized
-    private fun stopDiscovering() {
+    fun stopDiscovering() {
-        _nsdManager?.apply {
+        try {
-            _discoveryListeners.forEach {
+            _serviceDiscoverer.stop()
-                try {
+        } catch (e: Throwable) {
-                    stopServiceDiscovery(it.value)
+            Logger.i(TAG, "Failed to stop ServiceDiscoverer", e)
-                } catch (e: Throwable) {
-                    Logger.w(TAG, "Failed to stop service discovery", e)
-                }
-            }
         }
     }
 
@@ -213,85 +239,6 @@ class StateCasting {
         _castServer.removeAllHandlers();
 
         Logger.i(TAG, "CastingService stopped.")
-
-        _nsdManager = null
-    }
-
-    private fun createDiscoveryListener(addOrUpdate: (String, Array<InetAddress>, Int) -> Unit): NsdManager.DiscoveryListener {
-        return object : NsdManager.DiscoveryListener {
-            override fun onDiscoveryStarted(regType: String) {
-                Log.d(TAG, "Service discovery started for $regType")
-            }
-
-            override fun onDiscoveryStopped(serviceType: String) {
-                Log.i(TAG, "Discovery stopped: $serviceType")
-            }
-
-            override fun onServiceLost(service: NsdServiceInfo) {
-                Log.e(TAG, "service lost: $service")
-                // TODO: Handle service lost, e.g., remove device
-            }
-
-            override fun onStartDiscoveryFailed(serviceType: String, errorCode: Int) {
-                Log.e(TAG, "Discovery failed for $serviceType: Error code:$errorCode")
-                try {
-                    _nsdManager?.stopServiceDiscovery(this)
-                } catch (e: Throwable) {
-                    Logger.w(TAG, "Failed to stop service discovery", e)
-                }
-            }
-
-            override fun onStopDiscoveryFailed(serviceType: String, errorCode: Int) {
-                Log.e(TAG, "Stop discovery failed for $serviceType: Error code:$errorCode")
-                try {
-                    _nsdManager?.stopServiceDiscovery(this)
-                } catch (e: Throwable) {
-                    Logger.w(TAG, "Failed to stop service discovery", e)
-                }
-            }
-
-            override fun onServiceFound(service: NsdServiceInfo) {
-                Log.v(TAG, "Service discovery success for ${service.serviceType}: $service")
-                val addresses = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-                    service.hostAddresses.toTypedArray()
-                } else {
-                    arrayOf(service.host)
-                }
-                addOrUpdate(service.serviceName, addresses, service.port)
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-                    _nsdManager?.registerServiceInfoCallback(service, { it.run() }, object : NsdManager.ServiceInfoCallback {
-                        override fun onServiceUpdated(serviceInfo: NsdServiceInfo) {
-                            Log.v(TAG, "onServiceUpdated: $serviceInfo")
-                            addOrUpdate(serviceInfo.serviceName, serviceInfo.hostAddresses.toTypedArray(), serviceInfo.port)
-                        }
-
-                        override fun onServiceLost() {
-                            Log.v(TAG, "onServiceLost: $service")
-                            // TODO: Handle service lost
-                        }
-
-                        override fun onServiceInfoCallbackRegistrationFailed(errorCode: Int) {
-                            Log.v(TAG, "onServiceInfoCallbackRegistrationFailed: $errorCode")
-                        }
-
-                        override fun onServiceInfoCallbackUnregistered() {
-                            Log.v(TAG, "onServiceInfoCallbackUnregistered")
-                        }
-                    })
-                } else {
-                    _nsdManager?.resolveService(service, object : NsdManager.ResolveListener {
-                        override fun onResolveFailed(serviceInfo: NsdServiceInfo, errorCode: Int) {
-                            Log.v(TAG, "Resolve failed: $errorCode")
-                        }
-
-                        override fun onServiceResolved(serviceInfo: NsdServiceInfo) {
-                            Log.v(TAG, "Resolve Succeeded: $serviceInfo")
-                            addOrUpdate(serviceInfo.serviceName, arrayOf(serviceInfo.host), serviceInfo.port)
-                        }
-                    })
-                }
-            }
-        }
     }
 
     private val _castingDialogLock = Any();
@@ -347,9 +294,7 @@ class StateCasting {
                                 UIDialogs.toast(it, "Connecting to device...")
                                 synchronized(_castingDialogLock) {
                                     if(_currentDialog == null) {
-                                        _currentDialog = UIDialogs.showDialog(context, R.drawable.ic_loader_animated, true,
+                                        _currentDialog = UIDialogs.showDialog(context, R.drawable.ic_loader_animated, true, "Connecting to [${device.name}]", "Make sure you are on the same network", null, -2,
-                                                "Connecting to [${device.name}]",
-                                                "Make sure you are on the same network\n\nVPNs and guest networks can cause issues", null, -2,
                                             UIDialogs.Action("Disconnect", {
                                                 device.stop();
                                             }));
@@ -384,6 +329,9 @@ class StateCasting {
             invokeInMainScopeIfRequired { onActiveDeviceTimeChanged.emit(it) };
         };
 
+        addRememberedDevice(device);
+        Logger.i(TAG, "Device added to active discovery. Active discovery now contains ${_storage.getDevicesCount()} devices.")
+
         try {
             device.start();
         } catch (e: Throwable) {
@@ -405,22 +353,21 @@ class StateCasting {
         return addRememberedDevice(device);
     }
 
-    fun getRememberedCastingDevices(): List<CastingDevice> {
-        return _storage.getDevices().map { deviceFromCastingDeviceInfo(it) }
-    }
-
-    fun getRememberedCastingDeviceNames(): List<String> {
-        return _storage.getDeviceNames()
-    }
-
     fun addRememberedDevice(device: CastingDevice): CastingDeviceInfo {
         val deviceInfo = device.getDeviceInfo()
-        return _storage.addDevice(deviceInfo)
+        val foundInfo = _storage.addDevice(deviceInfo)
+        if (foundInfo == deviceInfo) {
+            rememberedDevices.add(device);
+            return foundInfo;
+        }
+
+        return foundInfo;
     }
 
     fun removeRememberedDevice(device: CastingDevice) {
-        val name = device.name ?: return
+        val name = device.name ?: return;
-        _storage.removeDevice(name)
+        _storage.removeDevice(name);
+        rememberedDevices.remove(device);
     }
 
     private fun invokeInMainScopeIfRequired(action: () -> Unit){
@@ -489,7 +436,7 @@ class StateCasting {
             }
         } else {
             val proxyStreams = Settings.instance.casting.alwaysProxyRequests;
-            val url = getLocalUrl(ad);
+            val url = "http://${ad.localAddress.toUrlAddress().trim('/')}:${_castServer.port}";
             val id = UUID.randomUUID();
 
             if (videoSource is IVideoUrlSource) {
@@ -584,7 +531,7 @@ class StateCasting {
     private fun castLocalVideo(video: IPlatformVideoDetails, videoSource: LocalVideoSource, resumePosition: Double, speed: Double?) : List<String> {
         val ad = activeDevice ?: return listOf();
 
-        val url = getLocalUrl(ad);
+        val url = "http://${ad.localAddress.toUrlAddress().trim('/')}:${_castServer.port}";
         val id = UUID.randomUUID();
         val videoPath = "/video-${id}"
         val videoUrl = url + videoPath;
@@ -603,7 +550,7 @@ class StateCasting {
     private fun castLocalAudio(video: IPlatformVideoDetails, audioSource: LocalAudioSource, resumePosition: Double, speed: Double?) : List<String> {
         val ad = activeDevice ?: return listOf();
 
-        val url = getLocalUrl(ad);
+        val url = "http://${ad.localAddress.toUrlAddress().trim('/')}:${_castServer.port}";
         val id = UUID.randomUUID();
         val audioPath = "/audio-${id}"
         val audioUrl = url + audioPath;
@@ -622,7 +569,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 = getLocalUrl(ad)
+        val url = "http://${ad.localAddress.toUrlAddress().trim('/')}:${_castServer.port}"
         val id = UUID.randomUUID()
 
         val hlsPath = "/hls-${id}"
@@ -718,7 +665,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 = getLocalUrl(ad);
+        val url = "http://${ad.localAddress.toUrlAddress().trim('/')}:${_castServer.port}";
         val id = UUID.randomUUID();
 
         val dashPath = "/dash-${id}"
@@ -768,7 +715,7 @@ class StateCasting {
         val ad = activeDevice ?: return listOf();
         val proxyStreams = Settings.instance.casting.alwaysProxyRequests || ad !is FCastCastingDevice;
 
-        val url = getLocalUrl(ad);
+        val url = "http://${ad.localAddress.toUrlAddress().trim('/')}:${_castServer.port}";
         val id = UUID.randomUUID();
 
         val videoPath = "/video-${id}"
@@ -833,7 +780,7 @@ class StateCasting {
         _castServer.removeAllHandlers("castProxiedHlsMaster")
 
         val ad = activeDevice ?: return listOf();
-        val url = getLocalUrl(ad);
+        val url = "http://${ad.localAddress.toUrlAddress().trim('/')}:${_castServer.port}";
 
         val id = UUID.randomUUID();
         val hlsPath = "/hls-${id}"
@@ -1003,7 +950,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 = getLocalUrl(ad);
+        val url = "http://${ad.localAddress.toUrlAddress().trim('/')}:${_castServer.port}";
         val id = UUID.randomUUID();
 
         val hlsPath = "/hls-${id}"
@@ -1133,7 +1080,7 @@ class StateCasting {
         val ad = activeDevice ?: return listOf();
         val proxyStreams = Settings.instance.casting.alwaysProxyRequests || ad !is FCastCastingDevice;
 
-        val url = getLocalUrl(ad);
+        val url = "http://${ad.localAddress.toUrlAddress().trim('/')}:${_castServer.port}";
         val id = UUID.randomUUID();
 
         val dashPath = "/dash-${id}"
@@ -1219,22 +1166,6 @@ 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();
@@ -1242,7 +1173,7 @@ class StateCasting {
         cleanExecutors()
         _castServer.removeAllHandlers("castDashRaw")
 
-        val url = getLocalUrl(ad);
+        val url = "http://${ad.localAddress.toUrlAddress().trim('/')}:${_castServer.port}";
         val id = UUID.randomUUID();
 
         val dashPath = "/dash-${id}"

app/src/main/java/com/futo/platformplayer/constructs/TaskHandler.kt

@@ -82,11 +82,7 @@ class TaskHandler<TParameter, TResult> {
                         handled = true;
                     } catch (e: Throwable) {
                         Logger.w(TAG, "Handled exception in TaskHandler onSuccess.", e);
-                        try {
+                        onError.emit(e, parameter);
-                            onError.emit(e, parameter);
-                        } catch (e: Throwable) {
-                            Logger.e(TAG, "Unhandled exception in .exception handler 1", e)
-                        }
                         handled = true;
                     }
                 }
@@ -103,14 +99,10 @@ class TaskHandler<TParameter, TResult> {
                     if (id != _idGenerator)
                         return@withContext;
 
-                    try {
+                    if (!onError.emit(e, parameter)) {
-                        if (!onError.emit(e, parameter)) {
+                        Logger.e(TAG, "Uncaught exception handled by TaskHandler.", e);
-                            Logger.e(TAG, "Uncaught exception handled by TaskHandler.", e);
+                    } else {
-                        } else {
+                        //Logger.w(TAG, "Handled exception in TaskHandler invoke.", e); (Prevents duplicate logs)
-                            //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)
                     }
                 }
             }

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

@@ -9,9 +9,7 @@ import android.view.View
 import android.widget.Button
 import android.widget.ImageButton
 import android.widget.ImageView
-import android.widget.LinearLayout
 import android.widget.TextView
-import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.futo.platformplayer.R
@@ -23,21 +21,22 @@ import com.futo.platformplayer.casting.StateCasting
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.views.adapters.DeviceAdapter
-import com.futo.platformplayer.views.adapters.DeviceAdapterEntry
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
 class ConnectCastingDialog(context: Context?) : AlertDialog(context) {
     private lateinit var _imageLoader: ImageView;
     private lateinit var _buttonClose: Button;
-    private lateinit var _buttonAdd: LinearLayout;
+    private lateinit var _buttonAdd: ImageButton;
-    private lateinit var _buttonScanQR: LinearLayout;
+    private lateinit var _buttonScanQR: ImageButton;
     private lateinit var _textNoDevicesFound: TextView;
+    private lateinit var _textNoDevicesRemembered: TextView;
     private lateinit var _recyclerDevices: RecyclerView;
+    private lateinit var _recyclerRememberedDevices: RecyclerView;
     private lateinit var _adapter: DeviceAdapter;
-    private val _devices: MutableSet<String> = mutableSetOf()
+    private lateinit var _rememberedAdapter: DeviceAdapter;
-    private val _rememberedDevices: MutableSet<String> = mutableSetOf()
+    private val _devices: ArrayList<CastingDevice> = arrayListOf();
-    private val _unifiedDevices: MutableList<DeviceAdapterEntry> = mutableListOf()
+    private val _rememberedDevices: ArrayList<CastingDevice> = arrayListOf();
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState);
@@ -46,40 +45,42 @@ class ConnectCastingDialog(context: Context?) : AlertDialog(context) {
         _imageLoader = findViewById(R.id.image_loader);
         _buttonClose = findViewById(R.id.button_close);
         _buttonAdd = findViewById(R.id.button_add);
-        _buttonScanQR = findViewById(R.id.button_qr);
+        _buttonScanQR = findViewById(R.id.button_scan_qr);
         _recyclerDevices = findViewById(R.id.recycler_devices);
+        _recyclerRememberedDevices = findViewById(R.id.recycler_remembered_devices);
         _textNoDevicesFound = findViewById(R.id.text_no_devices_found);
+        _textNoDevicesRemembered = findViewById(R.id.text_no_devices_remembered);
 
-        _adapter = DeviceAdapter(_unifiedDevices)
+        _adapter = DeviceAdapter(_devices, false);
         _recyclerDevices.adapter = _adapter;
         _recyclerDevices.layoutManager = LinearLayoutManager(context);
 
-        _adapter.onPin.subscribe { d ->
+        _rememberedAdapter = DeviceAdapter(_rememberedDevices, true);
-            val isRemembered = _rememberedDevices.contains(d.name)
+        _rememberedAdapter.onRemove.subscribe { d ->
-            val newIsRemembered = !isRemembered
+            if (StateCasting.instance.activeDevice == d) {
-            if (newIsRemembered) {
+                d.stopCasting();
-                StateCasting.instance.addRememberedDevice(d)
-                val name = d.name
-                if (name != null) {
-                    _rememberedDevices.add(name)
-                }
-            } else {
-                StateCasting.instance.removeRememberedDevice(d)
-                _rememberedDevices.remove(d.name)
             }
-            updateUnifiedList()
+
+            StateCasting.instance.removeRememberedDevice(d);
+            val index = _rememberedDevices.indexOf(d);
+            if (index != -1) {
+                _rememberedDevices.removeAt(index);
+                _rememberedAdapter.notifyItemRemoved(index);
+            }
+
+            _textNoDevicesRemembered.visibility = if (_rememberedDevices.isEmpty()) View.VISIBLE else View.GONE;
+            _recyclerRememberedDevices.visibility = if (_rememberedDevices.isNotEmpty()) View.VISIBLE else View.GONE;
+        };
+        _rememberedAdapter.onConnect.subscribe { _ ->
+            dismiss()
+            //UIDialogs.showCastingDialog(context)
         }
-
-        //TODO: Integrate remembered into the main list
-        //TODO: Add green indicator to indicate a device is oneline
-        //TODO: Add pinning
-        //TODO: Implement QR code as an option in add manually
-        //TODO: Remove start button
-
         _adapter.onConnect.subscribe { _ ->
             dismiss()
             //UIDialogs.showCastingDialog(context)
         }
+        _recyclerRememberedDevices.adapter = _rememberedAdapter;
+        _recyclerRememberedDevices.layoutManager = LinearLayoutManager(context);
 
         _buttonClose.setOnClickListener { dismiss(); };
         _buttonAdd.setOnClickListener {
@@ -103,111 +104,78 @@ 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) {
+        _devices.clear();
-            _devices.addAll(StateCasting.instance.devices.values.mapNotNull { it.name })
+        synchronized (StateCasting.instance.devices) {
+            _devices.addAll(StateCasting.instance.devices.values);
         }
 
-        _rememberedDevices.addAll(StateCasting.instance.getRememberedCastingDeviceNames())
+        _rememberedDevices.clear();
-        updateUnifiedList()
+        synchronized (StateCasting.instance.rememberedDevices) {
-
+            _rememberedDevices.addAll(StateCasting.instance.rememberedDevices);
-        StateCasting.instance.onDeviceAdded.subscribe(this) { d ->
-            val name = d.name
-            if (name != null)
-                _devices.add(name)
-            updateUnifiedList()
-        }
-
-        StateCasting.instance.onDeviceChanged.subscribe(this) { d ->
-            val index = _unifiedDevices.indexOfFirst { it.castingDevice.name == d.name }
-            if (index != -1) {
-                _unifiedDevices[index] = DeviceAdapterEntry(d, _unifiedDevices[index].isPinnedDevice, _unifiedDevices[index].isOnlineDevice)
-                _adapter.notifyItemChanged(index)
-            }
-        }
-
-        StateCasting.instance.onDeviceRemoved.subscribe(this) { d ->
-            _devices.remove(d.name)
-            updateUnifiedList()
-        }
-
-        StateCasting.instance.onActiveDeviceConnectionStateChanged.subscribe(this) { _, connectionState ->
-            if (connectionState == CastConnectionState.CONNECTED) {
-                StateApp.instance.scopeOrNull?.launch(Dispatchers.Main) {
-                    dismiss()
-                }
-            }
         }
 
         _textNoDevicesFound.visibility = if (_devices.isEmpty()) View.VISIBLE else View.GONE;
         _recyclerDevices.visibility = if (_devices.isNotEmpty()) View.VISIBLE else View.GONE;
+        _textNoDevicesRemembered.visibility = if (_rememberedDevices.isEmpty()) View.VISIBLE else View.GONE;
+        _recyclerRememberedDevices.visibility = if (_rememberedDevices.isNotEmpty()) View.VISIBLE else View.GONE;
+
+        StateCasting.instance.onDeviceAdded.subscribe(this) { d ->
+            _devices.add(d);
+            _adapter.notifyItemInserted(_devices.size - 1);
+            _textNoDevicesFound.visibility = View.GONE;
+            _recyclerDevices.visibility = View.VISIBLE;
+        };
+
+        StateCasting.instance.onDeviceChanged.subscribe(this) { d ->
+            val index = _devices.indexOf(d);
+            if (index == -1) {
+                return@subscribe;
+            }
+
+            _devices[index] = d;
+            _adapter.notifyItemChanged(index);
+        };
+
+        StateCasting.instance.onDeviceRemoved.subscribe(this) { d ->
+            val index = _devices.indexOf(d);
+            if (index == -1) {
+                return@subscribe;
+            }
+
+            _devices.removeAt(index);
+            _adapter.notifyItemRemoved(index);
+            _textNoDevicesFound.visibility = if (_devices.isEmpty()) View.VISIBLE else View.GONE;
+            _recyclerDevices.visibility = if (_devices.isNotEmpty()) View.VISIBLE else View.GONE;
+        };
+
+        StateCasting.instance.onActiveDeviceConnectionStateChanged.subscribe(this) { _, connectionState ->
+            if (connectionState != CastConnectionState.CONNECTED) {
+                return@subscribe;
+            }
+
+            StateApp.instance.scopeOrNull?.launch(Dispatchers.Main) {
+                dismiss();
+            };
+        };
+
+        _adapter.notifyDataSetChanged();
+        _rememberedAdapter.notifyDataSetChanged();
     }
 
     override fun dismiss() {
-        super.dismiss()
+        super.dismiss();
-        (_imageLoader.drawable as Animatable?)?.stop()
-        StateCasting.instance.onDeviceAdded.remove(this)
-        StateCasting.instance.onDeviceChanged.remove(this)
-        StateCasting.instance.onDeviceRemoved.remove(this)
-        StateCasting.instance.onActiveDeviceConnectionStateChanged.remove(this)
-    }
 
-    private fun updateUnifiedList() {
+        (_imageLoader.drawable as Animatable?)?.stop();
-        val oldList = ArrayList(_unifiedDevices)
-        val newList = buildUnifiedList()
 
-        val diffResult = DiffUtil.calculateDiff(object : DiffUtil.Callback() {
+        StateCasting.instance.stopDiscovering()
-            override fun getOldListSize() = oldList.size
+        StateCasting.instance.onDeviceAdded.remove(this);
-            override fun getNewListSize() = newList.size
+        StateCasting.instance.onDeviceChanged.remove(this);
-            override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+        StateCasting.instance.onDeviceRemoved.remove(this);
-                val oldItem = oldList[oldItemPosition]
+        StateCasting.instance.onActiveDeviceConnectionStateChanged.remove(this);
-                val newItem = newList[newItemPosition]
-                return oldItem.castingDevice.name == newItem.castingDevice.name
-                        && oldItem.castingDevice.isReady == newItem.castingDevice.isReady
-                        && oldItem.isOnlineDevice == newItem.isOnlineDevice
-                        && oldItem.isPinnedDevice == newItem.isPinnedDevice
-            }
-            override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
-                val oldItem = oldList[oldItemPosition]
-                val newItem = newList[newItemPosition]
-                return oldItem.castingDevice.name == newItem.castingDevice.name
-                        && oldItem.castingDevice.isReady == newItem.castingDevice.isReady
-                        && oldItem.isOnlineDevice == newItem.isOnlineDevice
-                        && oldItem.isPinnedDevice == newItem.isPinnedDevice
-            }
-        })
-
-        _unifiedDevices.clear()
-        _unifiedDevices.addAll(newList)
-        diffResult.dispatchUpdatesTo(_adapter)
-
-        _textNoDevicesFound.visibility = if (_unifiedDevices.isEmpty()) View.VISIBLE else View.GONE
-        _recyclerDevices.visibility = if (_unifiedDevices.isNotEmpty()) View.VISIBLE else View.GONE
-    }
-
-    private fun buildUnifiedList(): List<DeviceAdapterEntry> {
-        val onlineDevices = StateCasting.instance.devices.values.associateBy { it.name }
-        val rememberedDevices = StateCasting.instance.getRememberedCastingDevices().associateBy { it.name }
-
-        val unifiedList = mutableListOf<DeviceAdapterEntry>()
-
-        val intersectionNames = _devices.intersect(_rememberedDevices)
-        for (name in intersectionNames) {
-            onlineDevices[name]?.let { unifiedList.add(DeviceAdapterEntry(it, true, true)) }
-        }
-
-        val onlineOnlyNames = _devices - _rememberedDevices
-        for (name in onlineOnlyNames) {
-            onlineDevices[name]?.let { unifiedList.add(DeviceAdapterEntry(it, false, true)) }
-        }
-
-        val rememberedOnlyNames = _rememberedDevices - _devices
-        for (name in rememberedOnlyNames) {
-            rememberedDevices[name]?.let { unifiedList.add(DeviceAdapterEntry(it, true, false)) }
-        }
-
-        return unifiedList
     }
 
     companion object {

app/src/main/java/com/futo/platformplayer/downloads/VideoDownload.kt

@@ -47,7 +47,6 @@ 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
@@ -60,21 +59,16 @@ 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
 
@@ -570,14 +564,6 @@ 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();
@@ -593,14 +579,6 @@ 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
@@ -612,7 +590,7 @@ class VideoDownload {
                 try {
                     segmentFiles.add(segmentFile)
 
-                    val segmentLength = downloadSource_Sequential(client, outputStream, segment.uri, if (index == 0) null else decryptionInfo, index) { segmentLength, totalRead, lastSpeed ->
+                    val segmentLength = downloadSource_Sequential(client, outputStream, segment.uri) { 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)
@@ -652,8 +630,10 @@ class VideoDownload {
 
     private suspend fun combineSegments(context: Context, segmentFiles: List<File>, targetFile: File) = withContext(Dispatchers.IO) {
         suspendCancellableCoroutine { continuation ->
-            val cmd =
+            val fileList = File(context.cacheDir, "fileList-${UUID.randomUUID()}.txt")
-                "-i \"concat:${segmentFiles.joinToString("|")}\" -c copy \"${targetFile.absolutePath}\""
+            fileList.writeText(segmentFiles.joinToString("\n") { "file '${it.absolutePath}'" })
+
+            val cmd = "-f concat -safe 0 -i \"${fileList.absolutePath}\" -c copy \"${targetFile.absolutePath}\""
 
             val statisticsCallback = StatisticsCallback { _ ->
                 //TODO: Show progress?
@@ -663,6 +643,7 @@ 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)) {
@@ -670,6 +651,7 @@ class VideoDownload {
                         } else {
                             "Command failed with state '${session.state}' and return code ${session.returnCode}, stack trace ${session.failStackTrace}"
                         }
+                        fileList.delete()
                         continuation.resumeWithException(RuntimeException(errorMessage))
                     }
                 },
@@ -789,7 +771,7 @@ class VideoDownload {
             else {
                 Logger.i(TAG, "Download $name Sequential");
                 try {
-                    sourceLength = downloadSource_Sequential(client, fileStream, videoUrl, null, 0, onProgress);
+                    sourceLength = downloadSource_Sequential(client, fileStream, videoUrl, onProgress);
                 } catch (e: Throwable) {
                     Logger.w(TAG, "Failed to download sequentially (url = $videoUrl)")
                     throw e
@@ -816,31 +798,7 @@ 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;
@@ -860,8 +818,6 @@ class VideoDownload {
         val sourceLength = result.body.contentLength();
         val sourceStream = result.body.byteStream();
 
-        val segmentBuffer = ByteArrayOutputStream()
-
         var totalRead: Long = 0;
         try {
             var read: Int;
@@ -872,7 +828,7 @@ class VideoDownload {
                 if (read < 0)
                     break;
 
-                segmentBuffer.write(buffer, 0, read);
+                fileStream.write(buffer, 0, read);
 
                 totalRead += read;
 
@@ -898,21 +854,6 @@ 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;
     }
@@ -1219,8 +1160,6 @@ 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"))
@@ -1228,7 +1167,7 @@ class VideoDownload {
             else if (container.contains("audio/webm"))
                 return "webm";
             else if (container == "application/vnd.apple.mpegurl")
-                return "m4a";
+                return "mp4a";
             else
                 return "audio";// throw IllegalStateException("Unknown container: " + container)
         }

app/src/main/java/com/futo/platformplayer/downloads/VideoExport.kt

@@ -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(if (v.container == "application/vnd.apple.mpegurl") "video/mp4" else v.container, outputFileName)
+            val f = downloadRoot.createFile(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(if (a.container == "application/vnd.apple.mpegurl") "video/mp4" else a.container, outputFileName)
+            val f = downloadRoot.createFile(a.container, outputFileName)
-                    ?: throw Exception("Failed to create file in external directory.");
+                ?: throw Exception("Failed to create file in external directory.");
 
             Logger.i(TAG, "Copying audio.");
 

app/src/main/java/com/futo/platformplayer/engine/V8Plugin.kt

@@ -188,14 +188,6 @@ class V8Plugin {
         whenNotBusy {
             synchronized(_runtimeLock) {
                 isStopped = true;
-
-                //Cleanup http
-                for(pack in _depsPackages) {
-                    if(pack is PackageHttp) {
-                        pack.cleanup();
-                    }
-                }
-
                 _runtime?.let {
                     _runtime = null;
                     if(!it.isClosed && !it.isDead) {

app/src/main/java/com/futo/platformplayer/engine/packages/PackageBridge.kt

@@ -12,7 +12,6 @@ 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
@@ -73,26 +72,6 @@ class PackageBridge : V8Package {
     fun buildSpecVersion(): Int {
         return JSClientConstants.PLUGIN_SPEC_VERSION;
     }
-    @V8Property
-    fun buildPlatform(): String {
-        return "android";
-    }
-
-    @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) {

app/src/main/java/com/futo/platformplayer/engine/packages/PackageHttp.kt

@@ -8,7 +8,9 @@ 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
@@ -18,9 +20,15 @@ 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
@@ -41,9 +49,6 @@ class PackageHttp: V8Package {
     private var _batchPoolLock: Any = Any();
     private var _batchPool: ForkJoinPool? = null;
 
-    private val aliveSockets = mutableListOf<SocketResult>();
-    private var _cleanedUp = false;
-
 
     constructor(plugin: V8Plugin, config: IV8PluginConfig): super(plugin) {
         _config = config;
@@ -53,27 +58,6 @@ 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.
@@ -127,24 +111,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.requestInternal(method, url, headers, if(bytesResult) ReturnType.BYTES else ReturnType.STRING)
+            _packageClientAuth.request(method, url, headers, if(bytesResult) ReturnType.BYTES else ReturnType.STRING)
         else
-            _packageClient.requestInternal(method, url, headers, if(bytesResult) ReturnType.BYTES else ReturnType.STRING);
+            _packageClient.request(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.requestWithBodyInternal(method, url, body, headers, if(bytesResult) ReturnType.BYTES else ReturnType.STRING)
+            _packageClientAuth.requestWithBody(method, url, body, headers, if(bytesResult) ReturnType.BYTES else ReturnType.STRING)
         else
-            _packageClient.requestWithBodyInternal(method, url, body, headers, if(bytesResult) ReturnType.BYTES else ReturnType.STRING);
+            _packageClient.requestWithBody(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.GETInternal(url, headers, if(useByteResponse) ReturnType.BYTES else ReturnType.STRING)
+            _packageClientAuth.GET(url, headers, if(useByteResponse) ReturnType.BYTES else ReturnType.STRING)
         else
-            _packageClient.GETInternal(url, headers, if(useByteResponse) ReturnType.BYTES else ReturnType.STRING);
+            _packageClient.GET(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 {
@@ -152,15 +136,15 @@ class PackageHttp: V8Package {
         val client = if(useAuth) _packageClientAuth else _packageClient;
 
         if(body is V8ValueString)
-            return client.POSTInternal(url, body.value, headers, if(useByteResponse) ReturnType.BYTES else ReturnType.STRING);
+            return client.POST(url, body.value, headers, if(useByteResponse) ReturnType.BYTES else ReturnType.STRING);
         else if(body is String)
-            return client.POSTInternal(url, body, headers, if(useByteResponse) ReturnType.BYTES else ReturnType.STRING);
+            return client.POST(url, body, headers, if(useByteResponse) ReturnType.BYTES else ReturnType.STRING);
         else if(body is V8ValueTypedArray)
-            return client.POSTInternal(url, body.toBytes(), headers, if(useByteResponse) ReturnType.BYTES else ReturnType.STRING);
+            return client.POST(url, body.toBytes(), headers, if(useByteResponse) ReturnType.BYTES else ReturnType.STRING);
         else if(body is ByteArray)
-            return client.POSTInternal(url, body, headers, if(useByteResponse) ReturnType.BYTES else ReturnType.STRING);
+            return client.POST(url, body, headers, if(useByteResponse) ReturnType.BYTES else ReturnType.STRING);
         else if(body is ArrayList<*>) //Avoid this case, used purely for testing
-            return client.POSTInternal(url, body.map { (it as Double).toInt().toByte() }.toByteArray(), headers, if(useByteResponse) ReturnType.BYTES else ReturnType.STRING);
+            return client.POST(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");
     }
@@ -292,9 +276,9 @@ class PackageHttp: V8Package {
                 if(it.second.method == "DUMMY")
                     return@autoParallelPool null;
                 if(it.second.body != null)
-                    return@autoParallelPool it.first.requestWithBodyInternal(it.second.method, it.second.url, it.second.body!!, it.second.headers, it.second.respType);
+                    return@autoParallelPool it.first.requestWithBody(it.second.method, it.second.url, it.second.body!!, it.second.headers, it.second.respType);
                 else
-                    return@autoParallelPool it.first.requestInternal(it.second.method, it.second.url, it.second.headers, it.second.respType);
+                    return@autoParallelPool it.first.request(it.second.method, it.second.url, it.second.headers, it.second.respType);
             }.map {
                 if(it.second != null)
                     throw it.second!!;
@@ -361,9 +345,7 @@ class PackageHttp: V8Package {
         }
 
         @V8Function
-        fun request(method: String, url: String, headers: MutableMap<String, String> = HashMap(), useBytes: Boolean = false) : IBridgeHttpResponse
+        fun request(method: String, url: String, headers: MutableMap<String, String> = HashMap(), returnType: ReturnType) : 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 {
@@ -382,9 +364,7 @@ class PackageHttp: V8Package {
             };
         }
         @V8Function
-        fun requestWithBody(method: String, url: String, body:String, headers: MutableMap<String, String> = HashMap(), useBytes: Boolean = false) : IBridgeHttpResponse
+        fun requestWithBody(method: String, url: String, body:String, headers: MutableMap<String, String> = HashMap(), returnType: ReturnType) : 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 {
@@ -405,9 +385,7 @@ class PackageHttp: V8Package {
         }
 
         @V8Function
-        fun GET(url: String, headers: MutableMap<String, String> = HashMap(), useBytes: Boolean = false) : IBridgeHttpResponse
+        fun GET(url: String, headers: MutableMap<String, String> = HashMap(), returnType: ReturnType = ReturnType.STRING) : 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 {
@@ -429,9 +407,7 @@ class PackageHttp: V8Package {
             };
         }
         @V8Function
-        fun POST(url: String, body: String, headers: MutableMap<String, String> = HashMap(), useBytes: Boolean = false) : IBridgeHttpResponse
+        fun POST(url: String, body: String, headers: MutableMap<String, String> = HashMap(), returnType: ReturnType = ReturnType.STRING) : IBridgeHttpResponse {
-            = 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 {
@@ -453,9 +429,7 @@ class PackageHttp: V8Package {
             };
         }
         @V8Function
-        fun POST(url: String, body: ByteArray, headers: MutableMap<String, String> = HashMap(), useBytes: Boolean = false) : IBridgeHttpResponse
+        fun POST(url: String, body: ByteArray, headers: MutableMap<String, String> = HashMap(), returnType: ReturnType = ReturnType.STRING) : IBridgeHttpResponse {
-                = POSTInternal(url, body, headers, if(useBytes) ReturnType.BYTES else ReturnType.STRING)
-        fun POSTInternal(url: String, body: ByteArray, headers: MutableMap<String, String> = HashMap(), returnType: ReturnType = ReturnType.STRING) : IBridgeHttpResponse {
             applyDefaultHeaders(headers);
             return logExceptions {
                 catchHttp {
@@ -479,16 +453,9 @@ 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);
-            val socket = SocketResult(_package, this, _client, url, socketHeaders);
+            return SocketResult(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>) {
@@ -594,15 +561,13 @@ 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(parent: PackageHttp, pack: PackageHttpClient, client: ManagedHttpClient, url: String, headers: Map<String,String>) {
+        constructor(pack: PackageHttpClient, client: ManagedHttpClient, url: String, headers: Map<String,String>) {
             _packageClient = pack;
-            _package = parent;
             _client = client;
             _url = url;
             _headers = headers;
@@ -628,7 +593,7 @@ class PackageHttp: V8Package {
                     override fun open() {
                         Logger.i(TAG, "Websocket opened: " + _url);
                         _isOpen = true;
-                        if(hasOpen && _listeners?.isClosed != true) {
+                        if(hasOpen) {
                             try {
                                 _listeners?.invokeVoid("open", arrayOf<Any>());
                             }
@@ -638,7 +603,7 @@ class PackageHttp: V8Package {
                         }
                     }
                     override fun message(msg: String) {
-                        if(hasMessage && _listeners?.isClosed != true) {
+                        if(hasMessage) {
                             try {
                                 _listeners?.invokeVoid("message", msg);
                             }
@@ -646,7 +611,7 @@ class PackageHttp: V8Package {
                         }
                     }
                     override fun closing(code: Int, reason: String) {
-                        if(hasClosing && _listeners?.isClosed != true)
+                        if(hasClosing)
                         {
                             try {
                                 _listeners?.invokeVoid("closing", code, reason);
@@ -658,7 +623,7 @@ class PackageHttp: V8Package {
                     }
                     override fun closed(code: Int, reason: String) {
                         _isOpen = false;
-                        if(hasClosed && _listeners?.isClosed != true) {
+                        if(hasClosed) {
                             try {
                                 _listeners?.invokeVoid("closed", code, reason);
                             }
@@ -666,15 +631,11 @@ class PackageHttp: V8Package {
                                 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 &&  _listeners?.isClosed != true) {
+                        if(hasFailure) {
                             try {
                                 _listeners?.invokeVoid("failure", exception.message);
                             }

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

@@ -5,7 +5,6 @@ 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
@@ -26,7 +25,6 @@ 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
@@ -34,11 +32,9 @@ 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
@@ -58,8 +54,6 @@ 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>();
@@ -74,32 +68,16 @@ class ChannelContentsFragment(private val subType: String? = null) : Fragment(),
     private fun getContentPager(channel: IPlatformChannel): IPager<IPlatformContent> {
         Logger.i(TAG, "getContentPager");
 
-        var pager: IPager<IPlatformContent>? = null
+        val lastPolycentricProfile = _lastPolycentricProfile;
-        val query = _query
+        var pager: IPager<IPlatformContent>? = null;
-        if (!query.isNullOrBlank()) {
+        if (lastPolycentricProfile != null)
-            if(subType != null) {
+            pager= StatePolycentric.instance.getChannelContent(lifecycleScope, lastPolycentricProfile);
-                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(pager == null) {
-                if(subType != null) {
+            if(subType != null)
-                    pager = StatePlatform.instance.getChannelContent(channel.url, subType);
+                pager = StatePlatform.instance.getChannelContent(channel.url, subType);
-                    Logger.i(TAG, "StatePlatform.instance.getChannelContent(channel.url = ${channel.url}, subType = ${subType})")
+            else
-                } else {
+                pager = StatePlatform.instance.getChannelContent(channel.url);
-                    pager = StatePlatform.instance.getChannelContent(channel.url);
-                    Logger.i(TAG, "StatePlatform.instance.getChannelContent(channel.url = ${channel.url})")
-                }
-            }
         }
         return pager;
     }
@@ -166,49 +144,19 @@ 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);
 
-        val searchView = SearchView(requireContext()).apply { layoutParams = FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT) }.apply {
+        _adapterResults = PreviewContentListAdapter(view.context, FeedStyle.THUMBNAIL, _results, null, Settings.instance.channel.progressBar).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);
@@ -225,7 +173,6 @@ class ChannelContentsFragment(private val subType: String? = null) : Fragment(),
         _recyclerResults?.layoutManager = _glmVideo;
         _recyclerResults?.addOnScrollListener(_scrollListener);
 
-
         return view;
     }
 
@@ -234,8 +181,6 @@ class ChannelContentsFragment(private val subType: String? = null) : Fragment(),
         _recyclerResults?.removeOnScrollListener(_scrollListener);
         _recyclerResults = null;
         _pager = null;
-        _query = null
-        _searchView = null
 
         _taskLoadVideos.cancel();
         _nextPageHandler.cancel();
@@ -358,7 +303,6 @@ 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);

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

@@ -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, false)
+            (activity as MainActivity).navigate(frag, parameter, withHistory)
         else
             Log.e(TAG, "Failed to navigate due to activity not being a main activity.")
     }

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

@@ -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>(withHistory = true) }))
+                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>() }))
             }
 
             //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>(withHistory = false)
+                    it.navigate<HomeFragment>()
                 }
             }),
-            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(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>(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>() }),
-            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(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>(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>() }),
-            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(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>(withHistory = false) }),
+            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>(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>() }),
-            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(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>(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>() }),
             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, withHistory = false);
+                it.navigate<BrowserFragment>(Settings.URL_FAQ);
             })
             //96 is reserved for privacy button
             //98 is reserved for buy button

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

@@ -1,814 +0,0 @@
-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 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 {}
-    }
-}

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

@@ -1,8 +1,6 @@
 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
@@ -68,7 +66,8 @@ 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 {
@@ -116,14 +115,11 @@ 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) {
 
@@ -131,18 +127,17 @@ class BuyFragment : MainFragment() {
                         val activationResult = StatePayment.instance.setPaymentLicense(licenseText);
 
                         withContext(Dispatchers.Main) {
-                            try {
+                            if(activationResult) {
-                                if(activationResult) {
+                                licenseInput.deactivate();
-                                    UIDialogs.showDialogOk(context, R.drawable.ic_check, context.getString(R.string.your_license_key_has_been_set_an_app_restart_might_be_required)) {
+                                licenseInput.clear();
-                                        _fragment.close(true)
+                                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));
-                                else
+                                _fragment.close(true);
-                                {
+                            }
-                                    UIDialogs.showDialogOk(context, R.drawable.ic_error_pred, context.getString(R.string.invalid_license_key));
+                            else
-                                }
+                            {
-                            } catch (e: Throwable) {
+                                UIDialogs.showDialogOk(context, R.drawable.ic_error_pred, context.getString(R.string.invalid_license_key));
-                                Logger.e(TAG, "Failed to update UI after buy complete", e)
                             }
                         }
                     }
@@ -163,6 +158,5 @@ class BuyFragment : MainFragment() {
 
     companion object {
         fun newInstance() = BuyFragment().apply {}
-        private val TAG = "BuyFragment"
     }
 }

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

@@ -47,7 +47,6 @@ 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
@@ -136,8 +135,6 @@ 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)
@@ -425,15 +422,17 @@ class ChannelFragment : MainFragment() {
             _fragment.lifecycleScope.launch(Dispatchers.IO) {
                 val plugin = StatePlatform.instance.getChannelClientOrNull(channel.url)
                 withContext(Dispatchers.Main) {
-                    buttons.add(Pair(R.drawable.ic_search) {
+                    if (plugin != null && plugin.capabilities.hasSearchChannelContents) {
-                        _fragment.navigate<SuggestionsFragment>(
+                        buttons.add(Pair(R.drawable.ic_search) {
-                            SuggestionsFragmentData(
+                            _fragment.navigate<SuggestionsFragment>(
-                                "", SearchType.VIDEO
+                                SuggestionsFragmentData(
+                                    "", SearchType.VIDEO, channel.url
+                                )
                             )
-                        )
+                        })
-                    })
-                    _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())) {

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

@@ -10,14 +10,12 @@ 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
@@ -198,24 +196,16 @@ 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) {
             ContentType.MEDIA -> {
-                StatePlayer.instance.clearQueue()
+                StatePlayer.instance.clearQueue();
-                fragment.navigate<VideoDetailFragment>(url).maximizeVideoDetail()
+                fragment.navigate<VideoDetailFragment>(url).maximizeVideoDetail();
-            }
+            };
-            ContentType.PLAYLIST -> fragment.navigate<RemotePlaylistFragment>(url)
+            ContentType.PLAYLIST -> fragment.navigate<RemotePlaylistFragment>(url);
-            ContentType.URL -> fragment.navigate<BrowserFragment>(url)
+            ContentType.URL -> fragment.navigate<BrowserFragment>(url);
-            ContentType.CHANNEL -> fragment.navigate<ChannelFragment>(url)
             else -> {};
         }
     }

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

@@ -2,18 +2,15 @@ package com.futo.platformplayer.fragment.mainactivity.main
 
 import android.annotation.SuppressLint
 import android.os.Bundle
-import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.view.allViews
 import androidx.lifecycle.lifecycleScope
 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.models.ResultCapabilities
-import com.futo.platformplayer.api.media.models.contents.ContentType
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.constructs.TaskHandler
@@ -21,12 +18,9 @@ import com.futo.platformplayer.engine.exceptions.ScriptCaptchaRequiredException
 import com.futo.platformplayer.fragment.mainactivity.topbar.SearchTopBarFragment
 import com.futo.platformplayer.isHttpUrl
 import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.models.SearchType
 import com.futo.platformplayer.states.StateMeta
 import com.futo.platformplayer.states.StatePlatform
 import com.futo.platformplayer.views.FeedStyle
-import com.futo.platformplayer.views.ToggleBar
-import com.futo.platformplayer.views.others.RadioGroupView
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -89,7 +83,7 @@ class ContentSearchResultsFragment : MainFragment() {
         private var _sortBy: String? = null;
         private var _filterValues: HashMap<String, List<String>> = hashMapOf();
         private var _enabledClientIds: List<String>? = null;
-        private var _searchType: SearchType? = null;
+        private var _channelUrl: String? = null;
 
         private val _taskSearch: TaskHandler<String, IPager<IPlatformContent>>;
         override val shouldShowTimeBar: Boolean get() = Settings.instance.search.progressBar
@@ -97,12 +91,11 @@ 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")
-                when (_searchType)
+                val channelUrl = _channelUrl;
-                {
+                if (channelUrl != null) {
-                    SearchType.VIDEO -> StatePlatform.instance.searchRefresh(fragment.lifecycleScope, query, null, _sortBy, _filterValues, _enabledClientIds)
+                    StatePlatform.instance.searchChannel(channelUrl, query, null, _sortBy, _filterValues, _enabledClientIds)
-                    SearchType.CREATOR -> StatePlatform.instance.searchChannelsAsContent(query)
+                } else {
-                    SearchType.PLAYLIST -> StatePlatform.instance.searchPlaylist(query)
+                    StatePlatform.instance.searchRefresh(fragment.lifecycleScope, query, null, _sortBy, _filterValues, _enabledClientIds)
-                    else -> throw Exception("Search type must be specified")
                 }
             })
             .success { loadedResult(it); }.exception<ScriptCaptchaRequiredException> {  }
@@ -112,25 +105,6 @@ class ContentSearchResultsFragment : MainFragment() {
             }
 
             setPreviewsEnabled(Settings.instance.search.previewFeedItems);
-
-            initializeToolbar();
-        }
-
-        fun initializeToolbar(){
-            if(_toolbarContentView.allViews.any { it is RadioGroupView })
-                _toolbarContentView.removeView(_toolbarContentView.allViews.find { it is RadioGroupView });
-
-            val radioGroup = RadioGroupView(context);
-            radioGroup.onSelectedChange.subscribe {
-
-                if (it.size != 1)
-                    setSearchType(SearchType.VIDEO);
-                else
-                setSearchType((it[0] ?: SearchType.VIDEO) as SearchType);
-            }
-            radioGroup?.setOptions(listOf(Pair("Media", SearchType.VIDEO), Pair("Creators", SearchType.CREATOR), Pair("Playlists", SearchType.PLAYLIST)), listOf(_searchType), false, true)
-
-            _toolbarContentView.addView(radioGroup);
         }
 
         override fun cleanup() {
@@ -141,7 +115,7 @@ class ContentSearchResultsFragment : MainFragment() {
         fun onShown(parameter: Any?) {
             if(parameter is SuggestionsFragmentData) {
                 setQuery(parameter.query, false);
-                setSearchType(parameter.searchType, false)
+                setChannelUrl(parameter.channelUrl, false);
 
                 fragment.topBar?.apply {
                     if (this is SearchTopBarFragment) {
@@ -157,7 +131,7 @@ class ContentSearchResultsFragment : MainFragment() {
                     onFilterClick.subscribe(this) {
                         _overlayContainer.let {
                             val filterValuesCopy = HashMap(_filterValues);
-                            val filtersOverlay = UISlideOverlays.showFiltersOverlay(lifecycleScope, it, _enabledClientIds!!, filterValuesCopy);
+                            val filtersOverlay = UISlideOverlays.showFiltersOverlay(lifecycleScope, it, _enabledClientIds!!, filterValuesCopy, _channelUrl != null);
                             filtersOverlay.onOK.subscribe { enabledClientIds, changed ->
                                 if (changed) {
                                     setFilterValues(filtersOverlay.commonCapabilities, filterValuesCopy);
@@ -204,7 +178,11 @@ class ContentSearchResultsFragment : MainFragment() {
 
             fragment.lifecycleScope.launch(Dispatchers.IO) {
                 try {
-                    val commonCapabilities = StatePlatform.instance.getCommonSearchCapabilities(StatePlatform.instance.getEnabledClients().map { it.id });
+                    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 sorts = commonCapabilities?.sorts ?: listOf();
                     if (sorts.size > 1) {
                         withContext(Dispatchers.Main) {
@@ -271,8 +249,8 @@ class ContentSearchResultsFragment : MainFragment() {
             }
         }
 
-        private fun setSearchType(searchType: SearchType, updateResults: Boolean = true) {
+        private fun setChannelUrl(channelUrl: String?, updateResults: Boolean = true) {
-            _searchType = searchType
+            _channelUrl = channelUrl;
 
             if (updateResults) {
                 clearResults();

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

@@ -16,8 +16,6 @@ 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() {
@@ -31,8 +29,6 @@ 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);
@@ -48,7 +44,7 @@ class CreatorsFragment : MainFragment() {
             _buttonClearSearch?.visibility = View.INVISIBLE;
         }
 
-        val adapter = SubscriptionAdapter(inflater, getString(R.string.confirm_delete_subscription), _ordering?.value?.toIntOrNull() ?: 5) { subs ->
+        val adapter = SubscriptionAdapter(inflater, getString(R.string.confirm_delete_subscription)) { subs ->
             _textMeta?.let {
                 it.text = "${subs.size} creator${if(subs.size > 1) "s" else ""}";
             }
@@ -65,7 +61,6 @@ 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
         };

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

@@ -14,14 +14,10 @@ import androidx.core.widget.addTextChangedListener
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.RecyclerView
 import com.futo.platformplayer.R
-import com.futo.platformplayer.Settings
-import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.downloads.VideoDownload
 import com.futo.platformplayer.downloads.VideoLocal
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.Playlist
-import com.futo.platformplayer.services.DownloadService
-import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StateDownloads
 import com.futo.platformplayer.states.StatePlayer
 import com.futo.platformplayer.states.StatePlaylists
@@ -58,15 +54,6 @@ class DownloadsFragment : MainFragment() {
         super.onResume()
         _view?.reloadUI();
 
-        if(StateDownloads.instance.getDownloading().any { it.state == VideoDownload.State.QUEUED } &&
-            !StateDownloads.instance.getDownloading().any { it.state == VideoDownload.State.DOWNLOADING } &&
-            Settings.instance.downloads.shouldDownload()) {
-            Logger.w(TAG, "Detected queued download, while not downloading, attempt recreating service");
-            StateApp.withContext {
-                DownloadService.getOrCreateService(it);
-            }
-        }
-
         StateDownloads.instance.onDownloadsChanged.subscribe(this) {
             lifecycleScope.launch(Dispatchers.Main) {
                 try {
@@ -150,7 +137,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", "sizeAsc", "sizeDesc");
+            val options = listOf("nameAsc", "nameDesc", "downloadDateAsc", "downloadDateDesc", "releasedAsc", "releasedDesc");
             spinnerSortBy.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
                 override fun onItemSelected(parent: AdapterView<*>, view: View?, pos: Int, id: Long) {
                     when(pos) {
@@ -160,8 +147,6 @@ 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()
@@ -259,8 +244,6 @@ 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
                 }
             }

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

@@ -136,6 +136,7 @@ abstract class FeedView<TFragment, TResult, TConverted, TPager, TViewHolder> : L
         _toolbarContentView = findViewById(R.id.container_toolbar_content);
 
         _nextPageHandler = TaskHandler<TPager, List<TResult>>({fragment.lifecycleScope}, {
+
             if (it is IAsyncPager<*>)
                 it.nextPageAsync();
             else

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

@@ -15,8 +15,6 @@ 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
@@ -24,14 +22,10 @@ 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
@@ -74,8 +68,6 @@ 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;
 
@@ -87,7 +79,6 @@ 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),
@@ -97,22 +88,6 @@ 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, _ ->
@@ -187,15 +162,14 @@ class HistoryFragment : MainFragment() {
                 else
                     it.nextPage();
 
-                return@TaskHandler filterResults(it.getResults());
+                return@TaskHandler it.getResults();
             }).success {
                 setLoading(false);
 
                 val posBefore = _results.size;
-                val res = filterResults(it)
+                _results.addAll(it);
-                _results.addAll(res);
+                _adapter.notifyItemRangeInserted(_adapter.childToParentPosition(posBefore), it.size);
-                _adapter.notifyItemRangeInserted(_adapter.childToParentPosition(posBefore), res.size);
+                ensureEnoughContentVisible(it)
-                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, {
@@ -204,10 +178,6 @@ class HistoryFragment : MainFragment() {
             };
         }
 
-        private fun filtersChanged() {
-            updatePager()
-        }
-
         private fun updatePager() {
             val query = _editSearch.text.toString();
             if (_editSearch.text.isNotEmpty()) {
@@ -276,22 +246,11 @@ 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 = filterResults(pager.getResults())
+            val toAdd = pager.getResults();
             _results.addAll(toAdd);
             _adapter.notifyDataSetChanged();
             ensureEnoughContentVisible(toAdd)

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

@@ -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() };

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

@@ -168,12 +168,7 @@ 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, {
+        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!!) })
-            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);
@@ -332,10 +327,6 @@ 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;

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

@@ -18,7 +18,6 @@ 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
@@ -45,7 +44,6 @@ 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));
             };
         }
@@ -95,7 +93,6 @@ 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));
             };
 

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

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

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

@@ -191,7 +191,7 @@ class SubscriptionsFeedFragment : MainFragment() {
 
         private var _bypassRateLimit = false;
         private val _lastExceptions: List<Throwable>? = null;
-        private val _taskGetPager = TaskHandler<Boolean, IPager<IPlatformContent>>({fragment.lifecycleScope}, { withRefresh ->
+        private val _taskGetPager = TaskHandler<Boolean, IPager<IPlatformContent>>({StateApp.instance.scope}, { 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(fragment.lifecycleScope, withRefresh, group);
+            val resp = StateSubscriptions.instance.getGlobalSubscriptionFeed(StateApp.instance.scope, withRefresh, group);
             val feed = StateSubscriptions.instance.getFeed(group?.id);
 
             val currentExs = feed?.exceptions ?: listOf();

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

@@ -18,10 +18,8 @@ import com.futo.platformplayer.states.StatePlatform
 import com.futo.platformplayer.stores.FragmentedStorage
 import com.futo.platformplayer.stores.SearchHistoryStorage
 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);
+data class SuggestionsFragmentData(val query: String, val searchType: SearchType, val channelUrl: String? = null);
 
 class SuggestionsFragment : MainFragment {
     override val isMainView : Boolean = true;
@@ -30,10 +28,10 @@ class SuggestionsFragment : MainFragment {
 
     private var  _recyclerSuggestions: RecyclerView? = null;
     private var _llmSuggestions: LinearLayoutManager? = null;
-    private var _radioGroupView: RadioGroupView? = null;
     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);
 
@@ -51,7 +49,14 @@ class SuggestionsFragment : MainFragment {
         _adapterSuggestions.onClicked.subscribe { suggestion ->
             val storage = FragmentedStorage.get<SearchHistoryStorage>();
             storage.add(suggestion);
-            navigate<ContentSearchResultsFragment>(SuggestionsFragmentData(suggestion, _searchType));
+
+            if (_searchType == SearchType.CREATOR) {
+                navigate<CreatorSearchResultsFragment>(suggestion);
+            } else if (_searchType == SearchType.PLAYLIST) {
+                navigate<PlaylistSearchResultsFragment>(suggestion);
+            } else {
+                navigate<ContentSearchResultsFragment>(SuggestionsFragmentData(suggestion, SearchType.VIDEO, _channelUrl));
+            }
         }
         _adapterSuggestions.onRemove.subscribe { suggestion ->
             val index = _suggestions.indexOf(suggestion);
@@ -75,15 +80,6 @@ class SuggestionsFragment : MainFragment {
         recyclerSuggestions.adapter = _adapterSuggestions;
         _recyclerSuggestions = recyclerSuggestions;
 
-        _radioGroupView = view.findViewById<RadioGroupView>(R.id.radio_group).apply {
-            onSelectedChange.subscribe {
-                if (it.size != 1)
-                    _searchType = SearchType.VIDEO
-                else
-                    _searchType = (it[0] ?: SearchType.VIDEO) as SearchType
-            }
-        }
-
         loadSuggestions();
         return view;
     }
@@ -108,31 +104,37 @@ 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)
-
         topBar?.apply {
             if (this is SearchTopBarFragment) {
                 onSearch.subscribe(this) {
-                    if(it.isHttpUrl()) {
+                    if (_searchType == SearchType.CREATOR) {
-                        if(StatePlatform.instance.hasEnabledPlaylistClient(it))
+                        navigate<CreatorSearchResultsFragment>(it);
-                            navigate<RemotePlaylistFragment>(it);
+                    } else if (_searchType == SearchType.PLAYLIST) {
-                        else if(StatePlatform.instance.hasEnabledChannelClient(it))
+                        navigate<PlaylistSearchResultsFragment>(it);
-                            navigate<ChannelFragment>(it);
+                    } else {
-                        else {
+                        if(it.isHttpUrl()) {
-                            val url = it;
+                            if(StatePlatform.instance.hasEnabledPlaylistClient(it))
-                            activity?.let {
+                                navigate<RemotePlaylistFragment>(it);
-                                close()
+                            else if(StatePlatform.instance.hasEnabledChannelClient(it))
-                                if(it is MainActivity)
+                                navigate<ChannelFragment>(it);
-                                    it.navigate(it.getFragment<VideoDetailFragment>(), url);
+                            else {
+                                val url = it;
+                                activity?.let {
+                                    close()
+                                    if(it is MainActivity)
+                                        it.navigate(it.getFragment<VideoDetailFragment>(), url);
+                                }
                             }
                         }
+                        else
+                            navigate<ContentSearchResultsFragment>(SuggestionsFragmentData(it, SearchType.VIDEO, _channelUrl));
                     }
-                    else
-                        navigate<ContentSearchResultsFragment>(SuggestionsFragmentData(it, _searchType));
                 };
 
                 onTextChange.subscribe(this) {
@@ -194,7 +196,6 @@ class SuggestionsFragment : MainFragment {
         super.onDestroyMainView();
         _getSuggestions.onError.clear();
         _recyclerSuggestions = null;
-        _radioGroupView = null
     }
 
     override fun onDestroy() {

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

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

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

@@ -46,7 +46,6 @@ 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
@@ -149,6 +148,7 @@ 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
@@ -571,7 +571,7 @@ class VideoDetailView : ConstraintLayout {
             _player.setIsReplay(true);
 
             val searchVideo = StatePlayer.instance.getCurrentQueueItem();
-            if (searchVideo is SerializedPlatformVideo? && Settings.instance.playback.deleteFromWatchLaterAuto) {
+            if (searchVideo is SerializedPlatformVideo?) {
                 searchVideo?.let { StatePlaylists.instance.removeFromWatchLater(it) };
             }
 
@@ -619,7 +619,6 @@ class VideoDetailView : ConstraintLayout {
                         loadCurrentVideo(lastPositionMilliseconds);
                         updatePillButtonVisibilities();
                         setCastEnabled(false);
-
                     }
                     else -> {}
                 }
@@ -648,15 +647,6 @@ 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;
@@ -698,20 +688,6 @@ 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); };
@@ -791,7 +767,6 @@ class VideoDetailView : ConstraintLayout {
             _lastAudioSource = null;
             _lastSubtitleSource = null;
             video = null;
-            _container_content_liveChat?.close();
             _player.clear();
             cleanupPlaybackTracker();
             Logger.i(TAG, "Keep screen on unset onClose")
@@ -1115,7 +1090,7 @@ class VideoDetailView : ConstraintLayout {
             when (Settings.instance.playback.backgroundPlay) {
                 0 -> handlePause();
                 1 -> {
-                    if(!(video?.isLive ?: false))
+                    if(!(video?.isLive ?: false) && Settings.instance.playback.backgroundSwitchToAudio)
                         _player.switchToAudioMode();
                     StatePlayer.instance.startOrUpdateMediaSession(context, video);
                 }
@@ -1166,7 +1141,6 @@ 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;
@@ -1536,68 +1510,60 @@ class VideoDetailView : ConstraintLayout {
 
         _rating.visibility = View.GONE;
 
-        if (StatePolycentric.instance.enabled) {
+        fragment.lifecycleScope.launch(Dispatchers.IO) {
-            fragment.lifecycleScope.launch(Dispatchers.IO) {
+            try {
-                try {
+                val queryReferencesResponse = ApiMethods.getQueryReferences(
-                    val queryReferencesResponse = ApiMethods.getQueryReferences(
+                    ApiMethods.SERVER, ref, null, null,
-                        ApiMethods.SERVER, ref, null, null,
+                    arrayListOf(
-                        arrayListOf(
+                        Protocol.QueryReferencesRequestCountLWWElementReferences.newBuilder()
-                            Protocol.QueryReferencesRequestCountLWWElementReferences.newBuilder()
+                            .setFromType(ContentType.OPINION.value).setValue(
-                                .setFromType(ContentType.OPINION.value).setValue(
+                            ByteString.copyFrom(Opinion.like.data)
-                                    ByteString.copyFrom(Opinion.like.data)
+                        ).build(),
-                                ).build(),
+                        Protocol.QueryReferencesRequestCountLWWElementReferences.newBuilder()
-                            Protocol.QueryReferencesRequestCountLWWElementReferences.newBuilder()
+                            .setFromType(ContentType.OPINION.value).setValue(
-                                .setFromType(ContentType.OPINION.value).setValue(
+                            ByteString.copyFrom(Opinion.dislike.data)
-                                    ByteString.copyFrom(Opinion.dislike.data)
+                        ).build()
-                                ).build()
+                    ),
-                        ),
+                    extraByteReferences = listOfNotNull(extraBytesRef)
-                        extraByteReferences = listOfNotNull(extraBytesRef)
+                );
-                    );
 
-                    val likes = queryReferencesResponse.countsList[0];
+                val likes = queryReferencesResponse.countsList[0];
-                    val dislikes = queryReferencesResponse.countsList[1];
+                val dislikes = queryReferencesResponse.countsList[1];
-                    val hasLiked =
+                val hasLiked = StatePolycentric.instance.hasLiked(ref.toByteArray())/* || extraBytesRef?.let { StatePolycentric.instance.hasLiked(it) } ?: false*/;
-                        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 hasDisliked =
-                        StatePolycentric.instance.hasDisliked(ref.toByteArray())/* || extraBytesRef?.let { StatePolycentric.instance.hasDisliked(it) } ?: false*/;
 
-                    withContext(Dispatchers.Main) {
+                withContext(Dispatchers.Main) {
-                        _rating.visibility = View.VISIBLE;
+                    _rating.visibility = View.VISIBLE;
-                        _rating.setRating(
+                    _rating.setRating(RatingLikeDislikes(likes, dislikes), hasLiked, hasDisliked);
-                            RatingLikeDislikes(likes, dislikes),
+                    _rating.onLikeDislikeUpdated.subscribe(this) { args ->
-                            hasLiked,
+                        if (args.hasLiked) {
-                            hasDisliked
+                            args.processHandle.opinion(ref, Opinion.like);
-                        );
+                        } else if (args.hasDisliked) {
-                        _rating.onLikeDislikeUpdated.subscribe(this) { args ->
+                            args.processHandle.opinion(ref, Opinion.dislike);
-                            if (args.hasLiked) {
+                        } else {
-                                args.processHandle.opinion(ref, Opinion.like);
+                            args.processHandle.opinion(ref, Opinion.neutral);
-                            } else if (args.hasDisliked) {
+                        }
-                                args.processHandle.opinion(ref, Opinion.dislike);
+
-                            } else {
+                        fragment.lifecycleScope.launch(Dispatchers.IO) {
-                                args.processHandle.opinion(ref, Opinion.neutral);
+                            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)
                             }
+                        }
 
-                            fragment.lifecycleScope.launch(Dispatchers.IO) {
+                        StatePolycentric.instance.updateLikeMap(
-                                try {
+                            ref,
-                                    Logger.i(TAG, "Started backfill");
+                            args.hasLiked,
-                                    args.processHandle.fullyBackfillServersAnnounceExceptions();
+                            args.hasDisliked
-                                    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;
             }
         }
 
@@ -2149,40 +2115,23 @@ 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,
-            qualityPlaybackSpeedTitle,
+            if (canSetSpeed) SlideUpMenuTitle(this.context).apply { setTitle(context.getString(R.string.playback_rate)) } else null,
             if (canSetSpeed) SlideUpMenuButtonList(this.context, null, "playback_rate").apply {
-                val playbackSpeeds = Settings.instance.playback.getPlaybackSpeeds();
+                setButtons(listOf("0.25", "0.5", "0.75", "1.0", "1.25", "1.5", "1.75", "2.0", "2.25"), currentPlaybackRate!!.toString());
-                val format = if(playbackSpeeds.size < 20) "%.2f" else "%.1f";
-                val playbackLabels = playbackSpeeds.map { String.format(format, it) }.toMutableList();
-                playbackLabels.add("+");
-                playbackLabels.add(0, "-");
-
-                setButtons(playbackLabels, String.format(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("%.2f", (currentPlaybackSpeed?.toDouble() ?: 1.0) + stepSpeed).toString();
-                    else if(v == "-")
-                        playbackSpeedString = String.format("%.2f", (currentPlaybackSpeed?.toDouble() ?: 1.0) - stepSpeed).toString();
-                    val newPlaybackSpeed = playbackSpeedString.toDouble();
                     if (_isCasting) {
                         val ad = StateCasting.instance.activeDevice ?: return@subscribe
                         if (!ad.canSetSpeed) {
                             return@subscribe
                         }
 
-                        qualityPlaybackSpeedTitle?.setTitle(context.getString(R.string.playback_rate) + " (${String.format("%.2f", newPlaybackSpeed)})");
+                        ad.changeSpeed(v.toDouble())
-                        ad.changeSpeed(newPlaybackSpeed)
+                        setSelected(v);
-                        setSelected(playbackSpeedString);
                     } else {
-                        qualityPlaybackSpeedTitle?.setTitle(context.getString(R.string.playback_rate) + " (${String.format("%.2f", newPlaybackSpeed)})");
+                        _player.setPlaybackRate(v.toFloat());
-                        _player.setPlaybackRate(playbackSpeedString.toFloat());
+                        setSelected(v);
-                        setSelected(playbackSpeedString);
                     }
                 };
             } else null,
@@ -2464,7 +2413,6 @@ 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;
@@ -2478,7 +2426,6 @@ 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;
@@ -2538,13 +2485,6 @@ class VideoDetailView : ConstraintLayout {
         }
     }
 
-    fun saveBrightness() {
-        _player.gestureControl.saveBrightness()
-    }
-    fun restoreBrightness() {
-        _player.gestureControl.restoreBrightness()
-    }
-
     fun setFullscreen(fullscreen : Boolean) {
         Logger.i(TAG, "setFullscreen(fullscreen=$fullscreen)")
         _player.setFullScreen(fullscreen)
@@ -2708,10 +2648,9 @@ 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");
                     }
 
@@ -2786,11 +2725,10 @@ 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(toBackgroundAction, playpauseAction))
+            .setActions(listOf(playpauseAction))
             .build();
     }
 
@@ -3103,12 +3041,7 @@ class VideoDetailView : ConstraintLayout {
             Logger.w(TAG, "Failed to load recommendations.", it);
         };
 
-    private val _taskLoadPolycentricProfile = TaskHandler<PlatformID, PolycentricProfile?>(StateApp.instance.scopeGetter, {
+    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!!) })
-        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);
@@ -3180,6 +3113,10 @@ class VideoDetailView : ConstraintLayout {
 
     fun applyFragment(frag: VideoDetailFragment) {
         fragment = frag;
+        fragment.onMinimize.subscribe {
+            _liveChat?.stop();
+            _container_content_liveChat.close();
+        }
     }
 
 

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

@@ -1,11 +1,9 @@
 package com.futo.platformplayer.fragment.mainactivity.main
 
-import android.content.Context
 import android.graphics.drawable.Animatable
 import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.View
-import android.view.inputmethod.InputMethodManager
 import android.widget.FrameLayout
 import android.widget.ImageButton
 import android.widget.ImageView
@@ -50,11 +48,6 @@ abstract class VideoListEditorView : LinearLayout {
     private var _loadedVideos: List<IPlatformVideo>? = null;
     private var _loadedVideosCanEdit: Boolean = false;
 
-    fun hideSearchKeyboard() {
-        (context?.getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager)?.hideSoftInputFromWindow(_search.textSearch.windowToken, 0)
-        _search.textSearch.clearFocus();
-    }
-
     constructor(inflater: LayoutInflater) : super(inflater.context) {
         inflater.inflate(R.layout.fragment_video_list_editor, this);
 
@@ -86,7 +79,6 @@ abstract class VideoListEditorView : LinearLayout {
                 _search.textSearch.text = "";
                 updateVideoFilters();
                 _buttonSearch.setImageResource(R.drawable.ic_search);
-                hideSearchKeyboard();
             }
             else {
                 _search.visibility = View.VISIBLE;
@@ -97,23 +89,23 @@ abstract class VideoListEditorView : LinearLayout {
         _buttonShare = findViewById(R.id.button_share);
         val onShare = _onShare;
         if(onShare != null) {
-            _buttonShare.setOnClickListener {  hideSearchKeyboard(); onShare.invoke() };
+            _buttonShare.setOnClickListener { onShare.invoke() };
             _buttonShare.visibility = View.VISIBLE;
         }
         else
             _buttonShare.visibility = View.GONE;
 
-        buttonPlayAll.setOnClickListener { hideSearchKeyboard();onPlayAllClick(); hideSearchKeyboard(); };
+        buttonPlayAll.setOnClickListener { onPlayAllClick(); };
-        buttonShuffle.setOnClickListener { hideSearchKeyboard();onShuffleClick(); hideSearchKeyboard(); };
+        buttonShuffle.setOnClickListener { onShuffleClick(); };
 
-        _buttonEdit.setOnClickListener {  hideSearchKeyboard(); onEditClick(); };
+        _buttonEdit.setOnClickListener { onEditClick(); };
         setButtonExportVisible(false);
         setButtonDownloadVisible(canEdit());
 
         videoListEditorView.onVideoOrderChanged.subscribe(::onVideoOrderChanged);
         videoListEditorView.onVideoRemoved.subscribe(::onVideoRemoved);
         videoListEditorView.onVideoOptions.subscribe(::onVideoOptions);
-        videoListEditorView.onVideoClicked.subscribe { hideSearchKeyboard(); onVideoClicked(it)};
+        videoListEditorView.onVideoClicked.subscribe(::onVideoClicked);
 
         _videoListEditorView = videoListEditorView;
     }
@@ -121,7 +113,6 @@ abstract class VideoListEditorView : LinearLayout {
     fun setOnShare(onShare: (()-> Unit)? = null) {
         _onShare = onShare;
         _buttonShare.setOnClickListener {
-            hideSearchKeyboard();
             onShare?.invoke();
         };
         _buttonShare.visibility = View.VISIBLE;
@@ -154,7 +145,7 @@ abstract class VideoListEditorView : LinearLayout {
             setButtonExportVisible(false);
             _buttonDownload.setImageResource(R.drawable.ic_loader_animated);
             _buttonDownload.drawable.assume<Animatable, Unit> { it.start() };
-            _buttonDownload.setOnClickListener { hideSearchKeyboard();
+            _buttonDownload.setOnClickListener {
                 UIDialogs.showConfirmationDialog(context, context.getString(R.string.are_you_sure_you_want_to_delete_the_downloaded_videos), {
                     StateDownloads.instance.deleteCachedPlaylist(playlistId);
                 });
@@ -163,7 +154,7 @@ abstract class VideoListEditorView : LinearLayout {
         else if(isDownloaded) {
             setButtonExportVisible(true)
             _buttonDownload.setImageResource(R.drawable.ic_download_off);
-            _buttonDownload.setOnClickListener { hideSearchKeyboard();
+            _buttonDownload.setOnClickListener {
                 UIDialogs.showConfirmationDialog(context, context.getString(R.string.are_you_sure_you_want_to_delete_the_downloaded_videos), {
                     StateDownloads.instance.deleteCachedPlaylist(playlistId);
                 });
@@ -172,7 +163,7 @@ abstract class VideoListEditorView : LinearLayout {
         else {
             setButtonExportVisible(false);
             _buttonDownload.setImageResource(R.drawable.ic_download);
-            _buttonDownload.setOnClickListener { hideSearchKeyboard();
+            _buttonDownload.setOnClickListener {
                 onDownload();
                 //UISlideOverlays.showDownloadPlaylistOverlay(playlist, overlayContainer);
             }
@@ -224,8 +215,7 @@ abstract class VideoListEditorView : LinearLayout {
 
     fun updateVideoFilters() {
         val videos = _loadedVideos ?: return;
-        val filteredVideos = filterVideos(videos)
+        _videoListEditorView.setVideos(filterVideos(videos), _loadedVideosCanEdit);
-        _videoListEditorView.setVideos(filteredVideos, _loadedVideosCanEdit && filteredVideos.size == videos.size);
     }
 
     protected fun setButtonDownloadVisible(isVisible: Boolean) {

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

@@ -1,223 +0,0 @@
-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 {}
-    }
-}

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

@@ -88,6 +88,7 @@ class SearchTopBarFragment : TopFragment() {
         } else if (parameter is SuggestionsFragmentData) {
             this.setText(parameter.query);
             _searchType = parameter.searchType;
+            _channelUrl = parameter.channelUrl;
         }
 
         if(currentMain is SuggestionsFragment)
@@ -113,7 +114,7 @@ class SearchTopBarFragment : TopFragment() {
     fun clear() {
         _editSearch?.text?.clear();
         if (currentMain !is SuggestionsFragment) {
-            navigate<SuggestionsFragment>(SuggestionsFragmentData("", _searchType), false);
+            navigate<SuggestionsFragment>(SuggestionsFragmentData("", _searchType, _channelUrl), false);
         } else {
             onSearch.emit("");
         }

app/src/main/java/com/futo/platformplayer/mdns/BroadcastService.kt

@@ -0,0 +1,11 @@
+package com.futo.platformplayer.mdns
+
+data class BroadcastService(
+    val deviceName: String,
+    val serviceName: String,
+    val port: UShort,
+    val ttl: UInt,
+    val weight: UShort,
+    val priority: UShort,
+    val texts: List<String>? = null
+)

app/src/main/java/com/futo/platformplayer/mdns/DnsPacket.kt

@@ -0,0 +1,93 @@
+package com.futo.platformplayer.mdns
+
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+enum class QueryResponse(val value: Byte) {
+    Query(0),
+    Response(1)
+}
+
+enum class DnsOpcode(val value: Byte) {
+    StandardQuery(0),
+    InverseQuery(1),
+    ServerStatusRequest(2)
+}
+
+enum class DnsResponseCode(val value: Byte) {
+    NoError(0),
+    FormatError(1),
+    ServerFailure(2),
+    NameError(3),
+    NotImplemented(4),
+    Refused(5)
+}
+
+data class DnsPacketHeader(
+    val identifier: UShort,
+    val queryResponse: Int,
+    val opcode: Int,
+    val authoritativeAnswer: Boolean,
+    val truncated: Boolean,
+    val recursionDesired: Boolean,
+    val recursionAvailable: Boolean,
+    val answerAuthenticated: Boolean,
+    val nonAuthenticatedData: Boolean,
+    val responseCode: DnsResponseCode
+)
+
+data class DnsPacket(
+    val header: DnsPacketHeader,
+    val questions: List<DnsQuestion>,
+    val answers: List<DnsResourceRecord>,
+    val authorities: List<DnsResourceRecord>,
+    val additionals: List<DnsResourceRecord>
+) {
+    companion object {
+        fun parse(data: ByteArray): DnsPacket {
+            val span = data.asUByteArray()
+            val flags = (span[2].toInt() shl 8 or span[3].toInt()).toUShort()
+            val questionCount = (span[4].toInt() shl 8 or span[5].toInt()).toUShort()
+            val answerCount = (span[6].toInt() shl 8 or span[7].toInt()).toUShort()
+            val authorityCount = (span[8].toInt() shl 8 or span[9].toInt()).toUShort()
+            val additionalCount = (span[10].toInt() shl 8 or span[11].toInt()).toUShort()
+
+            var position = 12
+
+            val questions = List(questionCount.toInt()) {
+                DnsQuestion.parse(data, position).also { position = it.second }
+            }.map { it.first }
+
+            val answers = List(answerCount.toInt()) {
+                DnsResourceRecord.parse(data, position).also { position = it.second }
+            }.map { it.first }
+
+            val authorities = List(authorityCount.toInt()) {
+                DnsResourceRecord.parse(data, position).also { position = it.second }
+            }.map { it.first }
+
+            val additionals = List(additionalCount.toInt()) {
+                DnsResourceRecord.parse(data, position).also { position = it.second }
+            }.map { it.first }
+
+            return DnsPacket(
+                header = DnsPacketHeader(
+                    identifier = (span[0].toInt() shl 8 or span[1].toInt()).toUShort(),
+                    queryResponse = ((flags.toUInt() shr 15) and 0b1u).toInt(),
+                    opcode = ((flags.toUInt() shr 11) and 0b1111u).toInt(),
+                    authoritativeAnswer = (flags.toInt() shr 10) and 0b1 != 0,
+                    truncated = (flags.toInt() shr 9) and 0b1 != 0,
+                    recursionDesired = (flags.toInt() shr 8) and 0b1 != 0,
+                    recursionAvailable = (flags.toInt() shr 7) and 0b1 != 0,
+                    answerAuthenticated = (flags.toInt() shr 5) and 0b1 != 0,
+                    nonAuthenticatedData = (flags.toInt() shr 4) and 0b1 != 0,
+                    responseCode = DnsResponseCode.entries[flags.toInt() and 0b1111]
+                ),
+                questions = questions,
+                answers = answers,
+                authorities = authorities,
+                additionals = additionals
+            )
+        }
+    }
+}

app/src/main/java/com/futo/platformplayer/mdns/DnsQuestion.kt

@@ -0,0 +1,110 @@
+package com.futo.platformplayer.mdns
+
+import com.futo.platformplayer.mdns.Extensions.readDomainName
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+
+enum class QuestionType(val value: UShort) {
+    A(1u),
+    NS(2u),
+    MD(3u),
+    MF(4u),
+    CNAME(5u),
+    SOA(6u),
+    MB(7u),
+    MG(8u),
+    MR(9u),
+    NULL(10u),
+    WKS(11u),
+    PTR(12u),
+    HINFO(13u),
+    MINFO(14u),
+    MX(15u),
+    TXT(16u),
+    RP(17u),
+    AFSDB(18u),
+    SIG(24u),
+    KEY(25u),
+    AAAA(28u),
+    LOC(29u),
+    SRV(33u),
+    NAPTR(35u),
+    KX(36u),
+    CERT(37u),
+    DNAME(39u),
+    APL(42u),
+    DS(43u),
+    SSHFP(44u),
+    IPSECKEY(45u),
+    RRSIG(46u),
+    NSEC(47u),
+    DNSKEY(48u),
+    DHCID(49u),
+    NSEC3(50u),
+    NSEC3PARAM(51u),
+    TSLA(52u),
+    SMIMEA(53u),
+    HIP(55u),
+    CDS(59u),
+    CDNSKEY(60u),
+    OPENPGPKEY(61u),
+    CSYNC(62u),
+    ZONEMD(63u),
+    SVCB(64u),
+    HTTPS(65u),
+    EUI48(108u),
+    EUI64(109u),
+    TKEY(249u),
+    TSIG(250u),
+    URI(256u),
+    CAA(257u),
+    TA(32768u),
+    DLV(32769u),
+    AXFR(252u),
+    IXFR(251u),
+    OPT(41u),
+    MAILB(253u),
+    MALA(254u),
+    All(252u)
+}
+
+enum class QuestionClass(val value: UShort) {
+    IN(1u),
+    CS(2u),
+    CH(3u),
+    HS(4u),
+    All(255u)
+}
+
+data class DnsQuestion(
+    override val name: String,
+    override val type: Int,
+    override val clazz: Int,
+    val queryUnicast: Boolean
+) : DnsResourceRecordBase(name, type, clazz) {
+    companion object {
+        fun parse(data: ByteArray, startPosition: Int): Pair<DnsQuestion, Int> {
+            val span = data.asUByteArray()
+            var position = startPosition
+            val qname = span.readDomainName(position).also { position = it.second }
+            val qtype = (span[position].toInt() shl 8 or span[position + 1].toInt()).toUShort()
+            position += 2
+            val qclass = (span[position].toInt() shl 8 or span[position + 1].toInt()).toUShort()
+            position += 2
+
+            return DnsQuestion(
+                name = qname.first,
+                type = qtype.toInt(),
+                queryUnicast = ((qclass.toInt() shr 15) and 0b1) != 0,
+                clazz = qclass.toInt() and 0b111111111111111
+            ) to position
+        }
+    }
+}
+
+open class DnsResourceRecordBase(
+    open val name: String,
+    open val type: Int,
+    open val clazz: Int
+)

app/src/main/java/com/futo/platformplayer/mdns/DnsReader.kt

@@ -0,0 +1,514 @@
+package com.futo.platformplayer.mdns
+
+import com.futo.platformplayer.mdns.Extensions.readDomainName
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+import java.nio.charset.StandardCharsets
+import kotlin.math.pow
+import java.net.InetAddress
+
+data class PTRRecord(val domainName: String)
+
+data class ARecord(val address: InetAddress)
+
+data class AAAARecord(val address: InetAddress)
+
+data class MXRecord(val preference: UShort, val exchange: String)
+
+data class CNAMERecord(val cname: String)
+
+data class TXTRecord(val texts: List<String>)
+
+data class SOARecord(
+    val primaryNameServer: String,
+    val responsibleAuthorityMailbox: String,
+    val serialNumber: Int,
+    val refreshInterval: Int,
+    val retryInterval: Int,
+    val expiryLimit: Int,
+    val minimumTTL: Int
+)
+
+data class SRVRecord(val priority: UShort, val weight: UShort, val port: UShort, val target: String)
+
+data class NSRecord(val nameServer: String)
+
+data class CAARecord(val flags: Byte, val tag: String, val value: String)
+
+data class HINFORecord(val cpu: String, val os: String)
+
+data class RPRecord(val mailbox: String, val txtDomainName: String)
+
+
+data class AFSDBRecord(val subtype: UShort, val hostname: String)
+data class LOCRecord(
+    val version: Byte,
+    val size: Double,
+    val horizontalPrecision: Double,
+    val verticalPrecision: Double,
+    val latitude: Double,
+    val longitude: Double,
+    val altitude: Double
+) {
+    companion object {
+        fun decodeSizeOrPrecision(coded: Byte): Double {
+            val baseValue = (coded.toInt() shr 4) and 0x0F
+            val exponent = coded.toInt() and 0x0F
+            return baseValue * 10.0.pow(exponent.toDouble())
+        }
+
+        fun decodeLatitudeOrLongitude(coded: Int): Double {
+            val arcSeconds = coded / 1E3
+            return arcSeconds / 3600.0
+        }
+
+        fun decodeAltitude(coded: Int): Double {
+            return (coded / 100.0) - 100000.0
+        }
+    }
+}
+
+data class NAPTRRecord(
+    val order: UShort,
+    val preference: UShort,
+    val flags: String,
+    val services: String,
+    val regexp: String,
+    val replacement: String
+)
+
+data class RRSIGRecord(
+    val typeCovered: UShort,
+    val algorithm: Byte,
+    val labels: Byte,
+    val originalTTL: UInt,
+    val signatureExpiration: UInt,
+    val signatureInception: UInt,
+    val keyTag: UShort,
+    val signersName: String,
+    val signature: ByteArray
+)
+
+data class KXRecord(val preference: UShort, val exchanger: String)
+
+data class CERTRecord(val type: UShort, val keyTag: UShort, val algorithm: Byte, val certificate: ByteArray)
+
+
+
+data class DNAMERecord(val target: String)
+
+data class DSRecord(val keyTag: UShort, val algorithm: Byte, val digestType: Byte, val digest: ByteArray)
+
+data class SSHFPRecord(val algorithm: Byte, val fingerprintType: Byte, val fingerprint: ByteArray)
+
+data class TLSARecord(val usage: Byte, val selector: Byte, val matchingType: Byte, val certificateAssociationData: ByteArray)
+
+data class SMIMEARecord(val usage: Byte, val selector: Byte, val matchingType: Byte, val certificateAssociationData: ByteArray)
+
+data class URIRecord(val priority: UShort, val weight: UShort, val target: String)
+
+data class NSECRecord(val ownerName: String, val typeBitMaps: List<Pair<Byte, ByteArray>>)
+data class NSEC3Record(
+    val hashAlgorithm: Byte,
+    val flags: Byte,
+    val iterations: UShort,
+    val salt: ByteArray,
+    val nextHashedOwnerName: ByteArray,
+    val typeBitMaps: List<UShort>
+)
+
+data class NSEC3PARAMRecord(val hashAlgorithm: Byte, val flags: Byte, val iterations: UShort, val salt: ByteArray)
+data class SPFRecord(val texts: List<String>)
+data class TKEYRecord(
+    val algorithm: String,
+    val inception: UInt,
+    val expiration: UInt,
+    val mode: UShort,
+    val error: UShort,
+    val keyData: ByteArray,
+    val otherData: ByteArray
+)
+
+data class TSIGRecord(
+    val algorithmName: String,
+    val timeSigned: UInt,
+    val fudge: UShort,
+    val mac: ByteArray,
+    val originalID: UShort,
+    val error: UShort,
+    val otherData: ByteArray
+)
+
+data class OPTRecordOption(val code: UShort, val data: ByteArray)
+data class OPTRecord(val options: List<OPTRecordOption>)
+
+class DnsReader(private val data: ByteArray, private var position: Int = 0, private val length: Int = data.size) {
+
+    private val endPosition: Int = position + length
+
+    fun readDomainName(): String {
+        return data.asUByteArray().readDomainName(position).also { position = it.second }.first
+    }
+
+    fun readDouble(): Double {
+        checkRemainingBytes(Double.SIZE_BYTES)
+        val result = ByteBuffer.wrap(data, position, Double.SIZE_BYTES).order(ByteOrder.BIG_ENDIAN).double
+        position += Double.SIZE_BYTES
+        return result
+    }
+
+    fun readInt16(): Short {
+        checkRemainingBytes(Short.SIZE_BYTES)
+        val result = ByteBuffer.wrap(data, position, Short.SIZE_BYTES).order(ByteOrder.BIG_ENDIAN).short
+        position += Short.SIZE_BYTES
+        return result
+    }
+
+    fun readInt32(): Int {
+        checkRemainingBytes(Int.SIZE_BYTES)
+        val result = ByteBuffer.wrap(data, position, Int.SIZE_BYTES).order(ByteOrder.BIG_ENDIAN).int
+        position += Int.SIZE_BYTES
+        return result
+    }
+
+    fun readInt64(): Long {
+        checkRemainingBytes(Long.SIZE_BYTES)
+        val result = ByteBuffer.wrap(data, position, Long.SIZE_BYTES).order(ByteOrder.BIG_ENDIAN).long
+        position += Long.SIZE_BYTES
+        return result
+    }
+
+    fun readSingle(): Float {
+        checkRemainingBytes(Float.SIZE_BYTES)
+        val result = ByteBuffer.wrap(data, position, Float.SIZE_BYTES).order(ByteOrder.BIG_ENDIAN).float
+        position += Float.SIZE_BYTES
+        return result
+    }
+
+    fun readByte(): Byte {
+        checkRemainingBytes(Byte.SIZE_BYTES)
+        return data[position++]
+    }
+
+    fun readBytes(length: Int): ByteArray {
+        checkRemainingBytes(length)
+        return ByteArray(length).also { data.copyInto(it, startIndex = position, endIndex = position + length) }
+            .also { position += length }
+    }
+
+    fun readUInt16(): UShort {
+        checkRemainingBytes(Short.SIZE_BYTES)
+        val result = ByteBuffer.wrap(data, position, Short.SIZE_BYTES).order(ByteOrder.BIG_ENDIAN).short.toUShort()
+        position += Short.SIZE_BYTES
+        return result
+    }
+
+    fun readUInt32(): UInt {
+        checkRemainingBytes(Int.SIZE_BYTES)
+        val result = ByteBuffer.wrap(data, position, Int.SIZE_BYTES).order(ByteOrder.BIG_ENDIAN).int.toUInt()
+        position += Int.SIZE_BYTES
+        return result
+    }
+
+    fun readUInt64(): ULong {
+        checkRemainingBytes(Long.SIZE_BYTES)
+        val result = ByteBuffer.wrap(data, position, Long.SIZE_BYTES).order(ByteOrder.BIG_ENDIAN).long.toULong()
+        position += Long.SIZE_BYTES
+        return result
+    }
+
+    fun readString(): String {
+        val length = data[position++].toInt()
+        checkRemainingBytes(length)
+        return String(data, position, length, StandardCharsets.UTF_8).also { position += length }
+    }
+
+    private fun checkRemainingBytes(requiredBytes: Int) {
+        if (position + requiredBytes > endPosition) throw IndexOutOfBoundsException()
+    }
+
+    fun readRPRecord(): RPRecord {
+        return RPRecord(readDomainName(), readDomainName())
+    }
+
+    fun readKXRecord(): KXRecord {
+        val preference = readUInt16()
+        val exchanger = readDomainName()
+        return KXRecord(preference, exchanger)
+    }
+
+    fun readCERTRecord(): CERTRecord {
+        val type = readUInt16()
+        val keyTag = readUInt16()
+        val algorithm = readByte()
+        val certificateLength = readUInt16().toInt() - 5
+        val certificate = readBytes(certificateLength)
+        return CERTRecord(type, keyTag, algorithm, certificate)
+    }
+
+    fun readPTRRecord(): PTRRecord {
+        return PTRRecord(readDomainName())
+    }
+
+    fun readARecord(): ARecord {
+        val address = readBytes(4)
+        return ARecord(InetAddress.getByAddress(address))
+    }
+
+    fun readAAAARecord(): AAAARecord {
+        val address = readBytes(16)
+        return AAAARecord(InetAddress.getByAddress(address))
+    }
+
+    fun readMXRecord(): MXRecord {
+        val preference = readUInt16()
+        val exchange = readDomainName()
+        return MXRecord(preference, exchange)
+    }
+
+    fun readCNAMERecord(): CNAMERecord {
+        return CNAMERecord(readDomainName())
+    }
+
+    fun readTXTRecord(): TXTRecord {
+        val texts = mutableListOf<String>()
+        while (position < endPosition) {
+            val textLength = data[position++].toInt()
+            checkRemainingBytes(textLength)
+            val text = String(data, position, textLength, StandardCharsets.UTF_8)
+            texts.add(text)
+            position += textLength
+        }
+        return TXTRecord(texts)
+    }
+
+    fun readSOARecord(): SOARecord {
+        val primaryNameServer = readDomainName()
+        val responsibleAuthorityMailbox = readDomainName()
+        val serialNumber = readInt32()
+        val refreshInterval = readInt32()
+        val retryInterval = readInt32()
+        val expiryLimit = readInt32()
+        val minimumTTL = readInt32()
+        return SOARecord(primaryNameServer, responsibleAuthorityMailbox, serialNumber, refreshInterval, retryInterval, expiryLimit, minimumTTL)
+    }
+
+    fun readSRVRecord(): SRVRecord {
+        val priority = readUInt16()
+        val weight = readUInt16()
+        val port = readUInt16()
+        val target = readDomainName()
+        return SRVRecord(priority, weight, port, target)
+    }
+
+    fun readNSRecord(): NSRecord {
+        return NSRecord(readDomainName())
+    }
+
+    fun readCAARecord(): CAARecord {
+        val length = readUInt16().toInt()
+        val flags = readByte()
+        val tagLength = readByte().toInt()
+        val tag = String(data, position, tagLength, StandardCharsets.US_ASCII).also { position += tagLength }
+        val valueLength = length - 1 - 1 - tagLength
+        val value = String(data, position, valueLength, StandardCharsets.US_ASCII).also { position += valueLength }
+        return CAARecord(flags, tag, value)
+    }
+
+    fun readHINFORecord(): HINFORecord {
+        val cpuLength = readByte().toInt()
+        val cpu = String(data, position, cpuLength, StandardCharsets.US_ASCII).also { position += cpuLength }
+        val osLength = readByte().toInt()
+        val os = String(data, position, osLength, StandardCharsets.US_ASCII).also { position += osLength }
+        return HINFORecord(cpu, os)
+    }
+
+    fun readAFSDBRecord(): AFSDBRecord {
+        return AFSDBRecord(readUInt16(), readDomainName())
+    }
+
+    fun readLOCRecord(): LOCRecord {
+        val version = readByte()
+        val size = LOCRecord.decodeSizeOrPrecision(readByte())
+        val horizontalPrecision = LOCRecord.decodeSizeOrPrecision(readByte())
+        val verticalPrecision = LOCRecord.decodeSizeOrPrecision(readByte())
+        val latitudeCoded = readInt32()
+        val longitudeCoded = readInt32()
+        val altitudeCoded = readInt32()
+        val latitude = LOCRecord.decodeLatitudeOrLongitude(latitudeCoded)
+        val longitude = LOCRecord.decodeLatitudeOrLongitude(longitudeCoded)
+        val altitude = LOCRecord.decodeAltitude(altitudeCoded)
+        return LOCRecord(version, size, horizontalPrecision, verticalPrecision, latitude, longitude, altitude)
+    }
+
+    fun readNAPTRRecord(): NAPTRRecord {
+        val order = readUInt16()
+        val preference = readUInt16()
+        val flags = readString()
+        val services = readString()
+        val regexp = readString()
+        val replacement = readDomainName()
+        return NAPTRRecord(order, preference, flags, services, regexp, replacement)
+    }
+
+    fun readDNAMERecord(): DNAMERecord {
+        return DNAMERecord(readDomainName())
+    }
+
+    fun readDSRecord(): DSRecord {
+        val keyTag = readUInt16()
+        val algorithm = readByte()
+        val digestType = readByte()
+        val digestLength = readUInt16().toInt() - 4
+        val digest = readBytes(digestLength)
+        return DSRecord(keyTag, algorithm, digestType, digest)
+    }
+
+    fun readSSHFPRecord(): SSHFPRecord {
+        val algorithm = readByte()
+        val fingerprintType = readByte()
+        val fingerprintLength = readUInt16().toInt() - 2
+        val fingerprint = readBytes(fingerprintLength)
+        return SSHFPRecord(algorithm, fingerprintType, fingerprint)
+    }
+
+    fun readTLSARecord(): TLSARecord {
+        val usage = readByte()
+        val selector = readByte()
+        val matchingType = readByte()
+        val dataLength = readUInt16().toInt() - 3
+        val certificateAssociationData = readBytes(dataLength)
+        return TLSARecord(usage, selector, matchingType, certificateAssociationData)
+    }
+
+    fun readSMIMEARecord(): SMIMEARecord {
+        val usage = readByte()
+        val selector = readByte()
+        val matchingType = readByte()
+        val dataLength = readUInt16().toInt() - 3
+        val certificateAssociationData = readBytes(dataLength)
+        return SMIMEARecord(usage, selector, matchingType, certificateAssociationData)
+    }
+
+    fun readURIRecord(): URIRecord {
+        val priority = readUInt16()
+        val weight = readUInt16()
+        val length = readUInt16().toInt()
+        val target = String(data, position, length, StandardCharsets.US_ASCII).also { position += length }
+        return URIRecord(priority, weight, target)
+    }
+
+    fun readRRSIGRecord(): RRSIGRecord {
+        val typeCovered = readUInt16()
+        val algorithm = readByte()
+        val labels = readByte()
+        val originalTTL = readUInt32()
+        val signatureExpiration = readUInt32()
+        val signatureInception = readUInt32()
+        val keyTag = readUInt16()
+        val signersName = readDomainName()
+        val signatureLength = readUInt16().toInt()
+        val signature = readBytes(signatureLength)
+        return RRSIGRecord(
+            typeCovered,
+            algorithm,
+            labels,
+            originalTTL,
+            signatureExpiration,
+            signatureInception,
+            keyTag,
+            signersName,
+            signature
+        )
+    }
+
+    fun readNSECRecord(): NSECRecord {
+        val ownerName = readDomainName()
+        val typeBitMaps = mutableListOf<Pair<Byte, ByteArray>>()
+        while (position < endPosition) {
+            val windowBlock = readByte()
+            val bitmapLength = readByte().toInt()
+            val bitmap = readBytes(bitmapLength)
+            typeBitMaps.add(windowBlock to bitmap)
+        }
+        return NSECRecord(ownerName, typeBitMaps)
+    }
+
+    fun readNSEC3Record(): NSEC3Record {
+        val hashAlgorithm = readByte()
+        val flags = readByte()
+        val iterations = readUInt16()
+        val saltLength = readByte().toInt()
+        val salt = readBytes(saltLength)
+        val hashLength = readByte().toInt()
+        val nextHashedOwnerName = readBytes(hashLength)
+        val bitMapLength = readUInt16().toInt()
+        val typeBitMaps = mutableListOf<UShort>()
+        val endPos = position + bitMapLength
+        while (position < endPos) {
+            typeBitMaps.add(readUInt16())
+        }
+        return NSEC3Record(hashAlgorithm, flags, iterations, salt, nextHashedOwnerName, typeBitMaps)
+    }
+
+    fun readNSEC3PARAMRecord(): NSEC3PARAMRecord {
+        val hashAlgorithm = readByte()
+        val flags = readByte()
+        val iterations = readUInt16()
+        val saltLength = readByte().toInt()
+        val salt = readBytes(saltLength)
+        return NSEC3PARAMRecord(hashAlgorithm, flags, iterations, salt)
+    }
+
+
+    fun readSPFRecord(): SPFRecord {
+        val length = readUInt16().toInt()
+        val texts = mutableListOf<String>()
+        val endPos = position + length
+        while (position < endPos) {
+            val textLength = readByte().toInt()
+            val text = String(data, position, textLength, StandardCharsets.US_ASCII).also { position += textLength }
+            texts.add(text)
+        }
+        return SPFRecord(texts)
+    }
+
+    fun readTKEYRecord(): TKEYRecord {
+        val algorithm = readDomainName()
+        val inception = readUInt32()
+        val expiration = readUInt32()
+        val mode = readUInt16()
+        val error = readUInt16()
+        val keySize = readUInt16().toInt()
+        val keyData = readBytes(keySize)
+        val otherSize = readUInt16().toInt()
+        val otherData = readBytes(otherSize)
+        return TKEYRecord(algorithm, inception, expiration, mode, error, keyData, otherData)
+    }
+
+    fun readTSIGRecord(): TSIGRecord {
+        val algorithmName = readDomainName()
+        val timeSigned = readUInt32()
+        val fudge = readUInt16()
+        val macSize = readUInt16().toInt()
+        val mac = readBytes(macSize)
+        val originalID = readUInt16()
+        val error = readUInt16()
+        val otherSize = readUInt16().toInt()
+        val otherData = readBytes(otherSize)
+        return TSIGRecord(algorithmName, timeSigned, fudge, mac, originalID, error, otherData)
+    }
+
+
+
+    fun readOPTRecord(): OPTRecord {
+        val options = mutableListOf<OPTRecordOption>()
+        while (position < endPosition) {
+            val optionCode = readUInt16()
+            val optionLength = readUInt16().toInt()
+            val optionData = readBytes(optionLength)
+            options.add(OPTRecordOption(optionCode, optionData))
+        }
+        return OPTRecord(options)
+    }
+}

app/src/main/java/com/futo/platformplayer/mdns/DnsResourceRecord.kt

@@ -0,0 +1,117 @@
+package com.futo.platformplayer.mdns
+
+import com.futo.platformplayer.mdns.Extensions.readDomainName
+
+enum class ResourceRecordType(val value: UShort) {
+    None(0u),
+    A(1u),
+    NS(2u),
+    MD(3u),
+    MF(4u),
+    CNAME(5u),
+    SOA(6u),
+    MB(7u),
+    MG(8u),
+    MR(9u),
+    NULL(10u),
+    WKS(11u),
+    PTR(12u),
+    HINFO(13u),
+    MINFO(14u),
+    MX(15u),
+    TXT(16u),
+    RP(17u),
+    AFSDB(18u),
+    SIG(24u),
+    KEY(25u),
+    AAAA(28u),
+    LOC(29u),
+    SRV(33u),
+    NAPTR(35u),
+    KX(36u),
+    CERT(37u),
+    DNAME(39u),
+    APL(42u),
+    DS(43u),
+    SSHFP(44u),
+    IPSECKEY(45u),
+    RRSIG(46u),
+    NSEC(47u),
+    DNSKEY(48u),
+    DHCID(49u),
+    NSEC3(50u),
+    NSEC3PARAM(51u),
+    TSLA(52u),
+    SMIMEA(53u),
+    HIP(55u),
+    CDS(59u),
+    CDNSKEY(60u),
+    OPENPGPKEY(61u),
+    CSYNC(62u),
+    ZONEMD(63u),
+    SVCB(64u),
+    HTTPS(65u),
+    EUI48(108u),
+    EUI64(109u),
+    TKEY(249u),
+    TSIG(250u),
+    URI(256u),
+    CAA(257u),
+    TA(32768u),
+    DLV(32769u),
+    AXFR(252u),
+    IXFR(251u),
+    OPT(41u)
+}
+
+enum class ResourceRecordClass(val value: UShort) {
+    IN(1u),
+    CS(2u),
+    CH(3u),
+    HS(4u)
+}
+
+data class DnsResourceRecord(
+    override val name: String,
+    override val type: Int,
+    override val clazz: Int,
+    val timeToLive: UInt,
+    val cacheFlush: Boolean,
+    val dataPosition: Int = -1,
+    val dataLength: Int = -1,
+    private val data: ByteArray? = null
+) : DnsResourceRecordBase(name, type, clazz) {
+
+    companion object {
+        fun parse(data: ByteArray, startPosition: Int): Pair<DnsResourceRecord, Int> {
+            val span = data.asUByteArray()
+            var position = startPosition
+            val name = span.readDomainName(position).also { position = it.second }
+            val type = (span[position].toInt() shl 8 or span[position + 1].toInt()).toUShort()
+            position += 2
+            val clazz = (span[position].toInt() shl 8 or span[position + 1].toInt()).toUShort()
+            position += 2
+            val ttl = (span[position].toInt() shl 24 or (span[position + 1].toInt() shl 16) or
+                    (span[position + 2].toInt() shl 8) or span[position + 3].toInt()).toUInt()
+            position += 4
+            val rdlength = (span[position].toInt() shl 8 or span[position + 1].toInt()).toUShort()
+            val rdposition = position + 2
+            position += 2 + rdlength.toInt()
+
+            return DnsResourceRecord(
+                name = name.first,
+                type = type.toInt(),
+                clazz = clazz.toInt() and 0b1111111_11111111,
+                timeToLive = ttl,
+                cacheFlush = ((clazz.toInt() shr 15) and 0b1) != 0,
+                dataPosition = rdposition,
+                dataLength = rdlength.toInt(),
+                data = data
+            ) to position
+        }
+    }
+
+    fun getDataReader(): DnsReader {
+        return DnsReader(data!!, dataPosition, dataLength)
+    }
+}

app/src/main/java/com/futo/platformplayer/mdns/DnsWriter.kt

@@ -0,0 +1,208 @@
+package com.futo.platformplayer.mdns
+
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+import java.nio.charset.StandardCharsets
+
+class DnsWriter {
+    private val data = mutableListOf<Byte>()
+    private val namePositions = mutableMapOf<String, Int>()
+
+    fun toByteArray(): ByteArray = data.toByteArray()
+
+    fun writePacket(
+        header: DnsPacketHeader,
+        questionCount: Int? = null, questionWriter: ((DnsWriter, Int) -> Unit)? = null,
+        answerCount: Int? = null, answerWriter: ((DnsWriter, Int) -> Unit)? = null,
+        authorityCount: Int? = null, authorityWriter: ((DnsWriter, Int) -> Unit)? = null,
+        additionalsCount: Int? = null, additionalWriter: ((DnsWriter, Int) -> Unit)? = null
+    ) {
+        if (questionCount != null && questionWriter == null || questionCount == null && questionWriter != null)
+            throw Exception("When question count is given, question writer should also be given.")
+        if (answerCount != null && answerWriter == null || answerCount == null && answerWriter != null)
+            throw Exception("When answer count is given, answer writer should also be given.")
+        if (authorityCount != null && authorityWriter == null || authorityCount == null && authorityWriter != null)
+            throw Exception("When authority count is given, authority writer should also be given.")
+        if (additionalsCount != null && additionalWriter == null || additionalsCount == null && additionalWriter != null)
+            throw Exception("When additionals count is given, additional writer should also be given.")
+
+        writeHeader(header, questionCount ?: 0, answerCount ?: 0, authorityCount ?: 0, additionalsCount ?: 0)
+
+        repeat(questionCount ?: 0) { questionWriter?.invoke(this, it) }
+        repeat(answerCount ?: 0) { answerWriter?.invoke(this, it) }
+        repeat(authorityCount ?: 0) { authorityWriter?.invoke(this, it) }
+        repeat(additionalsCount ?: 0) { additionalWriter?.invoke(this, it) }
+    }
+
+    fun writeHeader(header: DnsPacketHeader, questionCount: Int, answerCount: Int, authorityCount: Int, additionalsCount: Int) {
+        write(header.identifier)
+
+        var flags: UShort = 0u
+        flags = flags or ((header.queryResponse.toUInt() and 0xFFFFu) shl 15).toUShort()
+        flags = flags or ((header.opcode.toUInt() and 0xFFFFu) shl 11).toUShort()
+        flags = flags or ((if (header.authoritativeAnswer) 1u else 0u) shl 10).toUShort()
+        flags = flags or ((if (header.truncated) 1u else 0u) shl 9).toUShort()
+        flags = flags or ((if (header.recursionDesired) 1u else 0u) shl 8).toUShort()
+        flags = flags or ((if (header.recursionAvailable) 1u else 0u) shl 7).toUShort()
+        flags = flags or ((if (header.answerAuthenticated) 1u else 0u) shl 5).toUShort()
+        flags = flags or ((if (header.nonAuthenticatedData) 1u else 0u) shl 4).toUShort()
+        flags = flags or header.responseCode.value.toUShort()
+        write(flags)
+
+        write(questionCount.toUShort())
+        write(answerCount.toUShort())
+        write(authorityCount.toUShort())
+        write(additionalsCount.toUShort())
+    }
+
+    fun writeDomainName(name: String) {
+        synchronized(namePositions) {
+            val labels = name.split('.')
+            for (label in labels) {
+                val nameAtOffset = name.substring(name.indexOf(label))
+                if (namePositions.containsKey(nameAtOffset)) {
+                    val position = namePositions[nameAtOffset]!!
+                    val pointer = (0b11000000_00000000 or position).toUShort()
+                    write(pointer)
+                    return
+                }
+                if (label.isNotEmpty()) {
+                    val labelBytes = label.toByteArray(StandardCharsets.UTF_8)
+                    val nameStartPos = data.size
+                    write(labelBytes.size.toByte())
+                    write(labelBytes)
+                    namePositions[nameAtOffset] = nameStartPos
+                }
+            }
+            write(0.toByte())
+        }
+    }
+
+    fun write(value: DnsResourceRecord, dataWriter: (DnsWriter) -> Unit) {
+        writeDomainName(value.name)
+        write(value.type.toUShort())
+        val cls = ((if (value.cacheFlush) 1u else 0u) shl 15).toUShort() or value.clazz.toUShort()
+        write(cls)
+        write(value.timeToLive)
+
+        val lengthOffset = data.size
+        write(0.toUShort())
+        dataWriter(this)
+        val rdLength = data.size - lengthOffset - 2
+        val rdLengthBytes = ByteBuffer.allocate(2).order(ByteOrder.BIG_ENDIAN).putShort(rdLength.toShort()).array()
+        data[lengthOffset] = rdLengthBytes[0]
+        data[lengthOffset + 1] = rdLengthBytes[1]
+    }
+
+    fun write(value: DnsQuestion) {
+        writeDomainName(value.name)
+        write(value.type.toUShort())
+        write(((if (value.queryUnicast) 1u else 0u shl 15).toUShort() or value.clazz.toUShort()))
+    }
+
+    fun write(value: Double) {
+        val bytes = ByteBuffer.allocate(Double.SIZE_BYTES).order(ByteOrder.BIG_ENDIAN).putDouble(value).array()
+        write(bytes)
+    }
+
+    fun write(value: Short) {
+        val bytes = ByteBuffer.allocate(Short.SIZE_BYTES).order(ByteOrder.BIG_ENDIAN).putShort(value).array()
+        write(bytes)
+    }
+
+    fun write(value: Int) {
+        val bytes = ByteBuffer.allocate(Int.SIZE_BYTES).order(ByteOrder.BIG_ENDIAN).putInt(value).array()
+        write(bytes)
+    }
+
+    fun write(value: Long) {
+        val bytes = ByteBuffer.allocate(Long.SIZE_BYTES).order(ByteOrder.BIG_ENDIAN).putLong(value).array()
+        write(bytes)
+    }
+
+    fun write(value: Float) {
+        val bytes = ByteBuffer.allocate(Float.SIZE_BYTES).order(ByteOrder.BIG_ENDIAN).putFloat(value).array()
+        write(bytes)
+    }
+
+    fun write(value: Byte) {
+        data.add(value)
+    }
+
+    fun write(value: ByteArray) {
+        data.addAll(value.asIterable())
+    }
+
+    fun write(value: ByteArray, offset: Int, length: Int) {
+        data.addAll(value.slice(offset until offset + length))
+    }
+
+    fun write(value: UShort) {
+        val bytes = ByteBuffer.allocate(Short.SIZE_BYTES).order(ByteOrder.BIG_ENDIAN).putShort(value.toShort()).array()
+        write(bytes)
+    }
+
+    fun write(value: UInt) {
+        val bytes = ByteBuffer.allocate(Int.SIZE_BYTES).order(ByteOrder.BIG_ENDIAN).putInt(value.toInt()).array()
+        write(bytes)
+    }
+
+    fun write(value: ULong) {
+        val bytes = ByteBuffer.allocate(Long.SIZE_BYTES).order(ByteOrder.BIG_ENDIAN).putLong(value.toLong()).array()
+        write(bytes)
+    }
+
+    fun write(value: String) {
+        val bytes = value.toByteArray(StandardCharsets.UTF_8)
+        write(bytes.size.toByte())
+        write(bytes)
+    }
+
+    fun write(value: PTRRecord) {
+        writeDomainName(value.domainName)
+    }
+
+    fun write(value: ARecord) {
+        val bytes = value.address.address
+        if (bytes.size != 4) throw Exception("Unexpected amount of address bytes.")
+        write(bytes)
+    }
+
+    fun write(value: AAAARecord) {
+        val bytes = value.address.address
+        if (bytes.size != 16) throw Exception("Unexpected amount of address bytes.")
+        write(bytes)
+    }
+
+    fun write(value: TXTRecord) {
+        value.texts.forEach {
+            val bytes = it.toByteArray(StandardCharsets.UTF_8)
+            write(bytes.size.toByte())
+            write(bytes)
+        }
+    }
+
+    fun write(value: SRVRecord) {
+        write(value.priority)
+        write(value.weight)
+        write(value.port)
+        writeDomainName(value.target)
+    }
+
+    fun write(value: NSECRecord) {
+        writeDomainName(value.ownerName)
+        value.typeBitMaps.forEach { (windowBlock, bitmap) ->
+            write(windowBlock)
+            write(bitmap.size.toByte())
+            write(bitmap)
+        }
+    }
+
+    fun write(value: OPTRecord) {
+        value.options.forEach { option ->
+            write(option.code)
+            write(option.data.size.toUShort())
+            write(option.data)
+        }
+    }
+}

app/src/main/java/com/futo/platformplayer/mdns/Extensions.kt

@@ -0,0 +1,63 @@
+package com.futo.platformplayer.mdns
+
+import android.util.Log
+
+object Extensions {
+    fun ByteArray.toByteDump(): String {
+        val result = StringBuilder()
+        for (i in indices) {
+            result.append(String.format("%02X ", this[i]))
+
+            if ((i + 1) % 16 == 0 || i == size - 1) {
+                val padding = 3 * (16 - (i % 16 + 1))
+                if (i == size - 1 && (i + 1) % 16 != 0) result.append(" ".repeat(padding))
+
+                result.append("; ")
+                val start = i - (i % 16)
+                val end = minOf(i, size - 1)
+                for (j in start..end) {
+                    val ch = if (this[j] in 32..127) this[j].toChar() else '.'
+                    result.append(ch)
+                }
+                if (i != size - 1) result.appendLine()
+            }
+        }
+        return result.toString()
+    }
+
+    fun UByteArray.readDomainName(startPosition: Int): Pair<String, Int> {
+        var position = startPosition
+        return readDomainName(position, 0)
+    }
+
+    private fun UByteArray.readDomainName(position: Int, depth: Int = 0): Pair<String, Int> {
+        if (depth > 16) throw Exception("Exceeded maximum recursion depth in DNS packet. Possible circular reference.")
+
+        val domainParts = mutableListOf<String>()
+        var newPosition = position
+
+        while (true) {
+            if (newPosition < 0)
+                println()
+
+            val length = this[newPosition].toUByte()
+            if ((length and 0b11000000u).toUInt() == 0b11000000u) {
+                val offset = (((length and 0b00111111u).toUInt()) shl 8) or this[newPosition + 1].toUInt()
+                val (part, _) = this.readDomainName(offset.toInt(), depth + 1)
+                domainParts.add(part)
+                newPosition += 2
+                break
+            } else if (length.toUInt() == 0u) {
+                newPosition++
+                break
+            } else {
+                newPosition++
+                val part = String(this.asByteArray(), newPosition, length.toInt(), Charsets.UTF_8)
+                domainParts.add(part)
+                newPosition += length.toInt()
+            }
+        }
+
+        return domainParts.joinToString(".") to newPosition
+    }
+}

app/src/main/java/com/futo/platformplayer/mdns/MDNSListener.kt

@@ -0,0 +1,495 @@
+package com.futo.platformplayer.mdns
+
+import com.futo.platformplayer.logging.Logger
+import kotlinx.coroutines.*
+import java.net.*
+import java.util.*
+import java.util.concurrent.locks.ReentrantLock
+import kotlin.concurrent.withLock
+
+class MDNSListener {
+    companion object {
+        private val TAG = "MDNSListener"
+        const val MulticastPort = 5353
+        val MulticastAddressIPv4: InetAddress = InetAddress.getByName("224.0.0.251")
+        val MulticastAddressIPv6: InetAddress = InetAddress.getByName("FF02::FB")
+        val MdnsEndpointIPv6: InetSocketAddress = InetSocketAddress(MulticastAddressIPv6, MulticastPort)
+        val MdnsEndpointIPv4: InetSocketAddress = InetSocketAddress(MulticastAddressIPv4, MulticastPort)
+    }
+
+    private val _lockObject = ReentrantLock()
+    private var _receiver4: MulticastSocket? = null
+    private var _receiver6: MulticastSocket? = null
+    private val _senders = mutableListOf<MulticastSocket>()
+    private val _nicMonitor = NICMonitor()
+    private val _serviceRecordAggregator = ServiceRecordAggregator()
+    private var _started = false
+    private var _threadReceiver4: Thread? = null
+    private var _threadReceiver6: Thread? = null
+    private var _scope: CoroutineScope? = null
+
+    var onPacket: ((DnsPacket) -> Unit)? = null
+    var onServicesUpdated: ((List<DnsService>) -> Unit)? = null
+
+    private val _recordLockObject = ReentrantLock()
+    private val _recordsA = mutableListOf<Pair<DnsResourceRecord, ARecord>>()
+    private val _recordsAAAA = mutableListOf<Pair<DnsResourceRecord, AAAARecord>>()
+    private val _recordsPTR = mutableListOf<Pair<DnsResourceRecord, PTRRecord>>()
+    private val _recordsTXT = mutableListOf<Pair<DnsResourceRecord, TXTRecord>>()
+    private val _recordsSRV = mutableListOf<Pair<DnsResourceRecord, SRVRecord>>()
+    private val _services = mutableListOf<BroadcastService>()
+
+    init {
+        _nicMonitor.added = { onNicsAdded(it) }
+        _nicMonitor.removed = { onNicsRemoved(it) }
+        _serviceRecordAggregator.onServicesUpdated = { onServicesUpdated?.invoke(it) }
+    }
+
+    fun start() {
+        if (_started) {
+            Logger.i(TAG, "Already started.")
+            return
+        }
+        _started = true
+
+        _scope = CoroutineScope(Dispatchers.IO);
+
+        Logger.i(TAG, "Starting")
+        _lockObject.withLock {
+            val receiver4 = MulticastSocket(null).apply {
+                reuseAddress = true
+                bind(InetSocketAddress(InetAddress.getByName("0.0.0.0"), MulticastPort))
+            }
+            _receiver4 = receiver4
+
+            val receiver6 = MulticastSocket(null).apply {
+                reuseAddress = true
+                bind(InetSocketAddress(InetAddress.getByName("::"), MulticastPort))
+            }
+            _receiver6 = receiver6
+
+            _nicMonitor.start()
+            _serviceRecordAggregator.start()
+            onNicsAdded(_nicMonitor.current)
+
+            _threadReceiver4 = Thread {
+                receiveLoop(receiver4)
+            }.apply { start() }
+
+            _threadReceiver6 = Thread {
+                receiveLoop(receiver6)
+            }.apply { start() }
+        }
+    }
+
+    fun queryServices(names: Array<String>) {
+        if (names.isEmpty()) throw IllegalArgumentException("At least one name must be specified.")
+
+        val writer = DnsWriter()
+        writer.writePacket(
+            DnsPacketHeader(
+                identifier = 0u,
+                queryResponse = QueryResponse.Query.value.toInt(),
+                opcode = DnsOpcode.StandardQuery.value.toInt(),
+                truncated = false,
+                nonAuthenticatedData = false,
+                recursionDesired = false,
+                answerAuthenticated = false,
+                authoritativeAnswer = false,
+                recursionAvailable = false,
+                responseCode = DnsResponseCode.NoError
+            ),
+            questionCount = names.size,
+            questionWriter = { w, i ->
+                w.write(
+                    DnsQuestion(
+                        name = names[i],
+                        type = QuestionType.PTR.value.toInt(),
+                        clazz = QuestionClass.IN.value.toInt(),
+                        queryUnicast = false
+                    )
+                )
+            }
+        )
+
+        send(writer.toByteArray())
+    }
+
+    private fun send(data: ByteArray) {
+        _lockObject.withLock {
+            for (sender in _senders) {
+                try {
+                    val endPoint = if (sender.localAddress is Inet4Address) MdnsEndpointIPv4 else MdnsEndpointIPv6
+                    sender.send(DatagramPacket(data, data.size, endPoint))
+                } catch (e: Exception) {
+                    Logger.i(TAG, "Failed to send on ${sender.localSocketAddress}: ${e.message}.")
+                }
+            }
+        }
+    }
+
+    fun queryAllQuestions(names: Array<String>) {
+        if (names.isEmpty()) throw IllegalArgumentException("At least one name must be specified.")
+
+        val questions = names.flatMap { _serviceRecordAggregator.getAllQuestions(it) }
+        questions.groupBy { it.name }.forEach { (_, questionsForHost) ->
+            val writer = DnsWriter()
+            writer.writePacket(
+                DnsPacketHeader(
+                    identifier = 0u,
+                    queryResponse = QueryResponse.Query.value.toInt(),
+                    opcode = DnsOpcode.StandardQuery.value.toInt(),
+                    truncated = false,
+                    nonAuthenticatedData = false,
+                    recursionDesired = false,
+                    answerAuthenticated = false,
+                    authoritativeAnswer = false,
+                    recursionAvailable = false,
+                    responseCode = DnsResponseCode.NoError
+                ),
+                questionCount = questionsForHost.size,
+                questionWriter = { w, i -> w.write(questionsForHost[i]) }
+            )
+            send(writer.toByteArray())
+        }
+    }
+
+    private fun onNicsAdded(nics: List<NetworkInterface>) {
+        _lockObject.withLock {
+            if (!_started) return
+
+            val addresses = nics.flatMap { nic ->
+                nic.interfaceAddresses.map { it.address }
+                    .filter { it is Inet4Address || (it is Inet6Address && it.isLinkLocalAddress) }
+            }
+
+            addresses.forEach { address ->
+                Logger.i(TAG, "New address discovered $address")
+
+                try {
+                    when (address) {
+                        is Inet4Address -> {
+                            _receiver4?.let { receiver4 ->
+                                //receiver4.setOption(StandardSocketOptions.IP_MULTICAST_IF, NetworkInterface.getByInetAddress(address))
+                                receiver4.joinGroup(InetSocketAddress(MulticastAddressIPv4, MulticastPort), NetworkInterface.getByInetAddress(address))
+                            }
+
+                            val sender = MulticastSocket(null).apply {
+                                reuseAddress = true
+                                bind(InetSocketAddress(address, MulticastPort))
+                                joinGroup(InetSocketAddress(MulticastAddressIPv4, MulticastPort), NetworkInterface.getByInetAddress(address))
+                            }
+                            _senders.add(sender)
+                        }
+
+                        is Inet6Address -> {
+                            _receiver6?.let { receiver6 ->
+                                //receiver6.setOption(StandardSocketOptions.IP_MULTICAST_IF, NetworkInterface.getByInetAddress(address))
+                                receiver6.joinGroup(InetSocketAddress(MulticastAddressIPv6, MulticastPort), NetworkInterface.getByInetAddress(address))
+                            }
+
+                            val sender = MulticastSocket(null).apply {
+                                reuseAddress = true
+                                bind(InetSocketAddress(address, MulticastPort))
+                                joinGroup(InetSocketAddress(MulticastAddressIPv6, MulticastPort), NetworkInterface.getByInetAddress(address))
+                            }
+                            _senders.add(sender)
+                        }
+
+                        else -> throw UnsupportedOperationException("Address type ${address.javaClass.name} is not supported.")
+                    }
+                } catch (e: Exception) {
+                    Logger.i(TAG, "Exception occurred when processing added address $address: ${e.message}.")
+                    // Close the socket if there was an error
+                    (_senders.lastOrNull() as? MulticastSocket)?.close()
+                }
+            }
+        }
+
+        if (nics.isNotEmpty()) {
+            try {
+                updateBroadcastRecords()
+                broadcastRecords()
+            } catch (e: Exception) {
+                Logger.i(TAG, "Exception occurred when broadcasting records: ${e.message}.")
+            }
+        }
+    }
+
+    private fun onNicsRemoved(nics: List<NetworkInterface>) {
+        _lockObject.withLock {
+            if (!_started) return
+            //TODO: Cleanup?
+        }
+
+        if (nics.isNotEmpty()) {
+            try {
+                updateBroadcastRecords()
+                broadcastRecords()
+            } catch (e: Exception) {
+                Logger.e(TAG, "Exception occurred when broadcasting records", e)
+            }
+        }
+    }
+
+    private fun receiveLoop(client: DatagramSocket) {
+        Logger.i(TAG, "Started receive loop")
+
+        val buffer = ByteArray(8972)
+        val packet = DatagramPacket(buffer, buffer.size)
+        while (_started) {
+            try {
+                client.receive(packet)
+                handleResult(packet)
+            } catch (e: Exception) {
+                Logger.e(TAG, "An exception occurred while handling UDP result:", e)
+            }
+        }
+
+        Logger.i(TAG, "Stopped receive loop")
+    }
+
+    fun broadcastService(
+        deviceName: String,
+        serviceName: String,
+        port: UShort,
+        ttl: UInt = 120u,
+        weight: UShort = 0u,
+        priority: UShort = 0u,
+        texts: List<String>? = null
+    ) {
+        _recordLockObject.withLock {
+            _services.add(
+                BroadcastService(
+                    deviceName = deviceName,
+                    port = port,
+                    priority = priority,
+                    serviceName = serviceName,
+                    texts = texts,
+                    ttl = ttl,
+                    weight = weight
+                )
+            )
+        }
+
+        updateBroadcastRecords()
+        broadcastRecords()
+    }
+
+    private fun updateBroadcastRecords() {
+        _recordLockObject.withLock {
+            _recordsSRV.clear()
+            _recordsPTR.clear()
+            _recordsA.clear()
+            _recordsAAAA.clear()
+            _recordsTXT.clear()
+
+            _services.forEach { service ->
+                val id = UUID.randomUUID().toString()
+                val deviceDomainName = "${service.deviceName}.${service.serviceName}"
+                val addressName = "$id.local"
+
+                _recordsSRV.add(
+                    DnsResourceRecord(
+                        clazz = ResourceRecordClass.IN.value.toInt(),
+                        type = ResourceRecordType.SRV.value.toInt(),
+                        timeToLive = service.ttl,
+                        name = deviceDomainName,
+                        cacheFlush = false
+                    ) to SRVRecord(
+                        target = addressName,
+                        port = service.port,
+                        priority = service.priority,
+                        weight = service.weight
+                    )
+                )
+
+                _recordsPTR.add(
+                    DnsResourceRecord(
+                        clazz = ResourceRecordClass.IN.value.toInt(),
+                        type = ResourceRecordType.PTR.value.toInt(),
+                        timeToLive = service.ttl,
+                        name = service.serviceName,
+                        cacheFlush = false
+                    ) to PTRRecord(
+                        domainName = deviceDomainName
+                    )
+                )
+
+                val addresses = _nicMonitor.current.flatMap { nic ->
+                    nic.interfaceAddresses.map { it.address }
+                }
+
+                addresses.forEach { address ->
+                    when (address) {
+                        is Inet4Address -> _recordsA.add(
+                            DnsResourceRecord(
+                                clazz = ResourceRecordClass.IN.value.toInt(),
+                                type = ResourceRecordType.A.value.toInt(),
+                                timeToLive = service.ttl,
+                                name = addressName,
+                                cacheFlush = false
+                            ) to ARecord(
+                                address = address
+                            )
+                        )
+
+                        is Inet6Address -> _recordsAAAA.add(
+                            DnsResourceRecord(
+                                clazz = ResourceRecordClass.IN.value.toInt(),
+                                type = ResourceRecordType.AAAA.value.toInt(),
+                                timeToLive = service.ttl,
+                                name = addressName,
+                                cacheFlush = false
+                            ) to AAAARecord(
+                                address = address
+                            )
+                        )
+
+                        else -> Logger.i(TAG, "Invalid address type: $address.")
+                    }
+                }
+
+                if (service.texts != null) {
+                    _recordsTXT.add(
+                        DnsResourceRecord(
+                            clazz = ResourceRecordClass.IN.value.toInt(),
+                            type = ResourceRecordType.TXT.value.toInt(),
+                            timeToLive = service.ttl,
+                            name = deviceDomainName,
+                            cacheFlush = false
+                        ) to TXTRecord(
+                            texts = service.texts
+                        )
+                    )
+                }
+            }
+        }
+    }
+
+    private fun broadcastRecords(questions: List<DnsQuestion>? = null) {
+        val writer = DnsWriter()
+        _recordLockObject.withLock {
+            val recordsA: List<Pair<DnsResourceRecord, ARecord>>
+            val recordsAAAA: List<Pair<DnsResourceRecord, AAAARecord>>
+            val recordsPTR: List<Pair<DnsResourceRecord, PTRRecord>>
+            val recordsTXT: List<Pair<DnsResourceRecord, TXTRecord>>
+            val recordsSRV: List<Pair<DnsResourceRecord, SRVRecord>>
+
+            if (questions != null) {
+                recordsA = _recordsA.filter { r -> questions.any { q -> q.name == r.first.name && q.clazz == r.first.clazz && q.type == r.first.type } }
+                recordsAAAA = _recordsAAAA.filter { r -> questions.any { q -> q.name == r.first.name && q.clazz == r.first.clazz && q.type == r.first.type } }
+                recordsPTR = _recordsPTR.filter { r -> questions.any { q -> q.name == r.first.name && q.clazz == r.first.clazz && q.type == r.first.type } }
+                recordsSRV = _recordsSRV.filter { r -> questions.any { q -> q.name == r.first.name && q.clazz == r.first.clazz && q.type == r.first.type } }
+                recordsTXT = _recordsTXT.filter { r -> questions.any { q -> q.name == r.first.name && q.clazz == r.first.clazz && q.type == r.first.type } }
+            } else {
+                recordsA = _recordsA
+                recordsAAAA = _recordsAAAA
+                recordsPTR = _recordsPTR
+                recordsSRV = _recordsSRV
+                recordsTXT = _recordsTXT
+            }
+
+            val answerCount = recordsA.size + recordsAAAA.size + recordsPTR.size + recordsSRV.size + recordsTXT.size
+            if (answerCount < 1) return
+
+            val txtOffset = recordsA.size + recordsAAAA.size + recordsPTR.size + recordsSRV.size
+            val srvOffset = recordsA.size + recordsAAAA.size + recordsPTR.size
+            val ptrOffset = recordsA.size + recordsAAAA.size
+            val aaaaOffset = recordsA.size
+
+            writer.writePacket(
+                DnsPacketHeader(
+                    identifier = 0u,
+                    queryResponse = QueryResponse.Response.value.toInt(),
+                    opcode = DnsOpcode.StandardQuery.value.toInt(),
+                    truncated = false,
+                    nonAuthenticatedData = false,
+                    recursionDesired = false,
+                    answerAuthenticated = false,
+                    authoritativeAnswer = true,
+                    recursionAvailable = false,
+                    responseCode = DnsResponseCode.NoError
+                ),
+                answerCount = answerCount,
+                answerWriter = { w, i ->
+                    when {
+                        i >= txtOffset -> {
+                            val record = recordsTXT[i - txtOffset]
+                            w.write(record.first) { it.write(record.second) }
+                        }
+
+                        i >= srvOffset -> {
+                            val record = recordsSRV[i - srvOffset]
+                            w.write(record.first) { it.write(record.second) }
+                        }
+
+                        i >= ptrOffset -> {
+                            val record = recordsPTR[i - ptrOffset]
+                            w.write(record.first) { it.write(record.second) }
+                        }
+
+                        i >= aaaaOffset -> {
+                            val record = recordsAAAA[i - aaaaOffset]
+                            w.write(record.first) { it.write(record.second) }
+                        }
+
+                        else -> {
+                            val record = recordsA[i]
+                            w.write(record.first) { it.write(record.second) }
+                        }
+                    }
+                }
+            )
+        }
+
+        send(writer.toByteArray())
+    }
+
+    private fun handleResult(result: DatagramPacket) {
+        try {
+            val packet = DnsPacket.parse(result.data)
+            if (packet.questions.isNotEmpty()) {
+                _scope?.launch(Dispatchers.IO) {
+                    try {
+                        broadcastRecords(packet.questions)
+                    } catch (e: Throwable) {
+                        Logger.i(TAG, "Broadcasting records failed", e)
+                    }
+                }
+
+            }
+            _serviceRecordAggregator.add(packet)
+            onPacket?.invoke(packet)
+        } catch (e: Exception) {
+            Logger.v(TAG, "Failed to handle packet: ${Base64.getEncoder().encodeToString(result.data.slice(IntRange(0, result.length - 1)).toByteArray())}", e)
+        }
+    }
+
+    fun stop() {
+        _lockObject.withLock {
+            _started = false
+
+            _scope?.cancel()
+            _scope = null
+
+            _nicMonitor.stop()
+            _serviceRecordAggregator.stop()
+
+            _receiver4?.close()
+            _receiver4 = null
+
+            _receiver6?.close()
+            _receiver6 = null
+
+            _senders.forEach { it.close() }
+            _senders.clear()
+        }
+
+        _threadReceiver4?.join()
+        _threadReceiver4 = null
+
+        _threadReceiver6?.join()
+        _threadReceiver6 = null
+    }
+}

app/src/main/java/com/futo/platformplayer/mdns/NICMonitor.kt

@@ -0,0 +1,66 @@
+package com.futo.platformplayer.mdns
+
+import kotlinx.coroutines.*
+import java.net.NetworkInterface
+
+class NICMonitor {
+    private val lockObject = Any()
+    private val nics = mutableListOf<NetworkInterface>()
+    private var cts: Job? = null
+
+    val current: List<NetworkInterface>
+        get() = synchronized(nics) { nics.toList() }
+
+    var added: ((List<NetworkInterface>) -> Unit)? = null
+    var removed: ((List<NetworkInterface>) -> Unit)? = null
+
+    fun start() {
+        synchronized(lockObject) {
+            if (cts != null) throw Exception("Already started.")
+
+            cts = CoroutineScope(Dispatchers.Default).launch {
+                loopAsync()
+            }
+        }
+
+        nics.clear()
+        nics.addAll(getCurrentInterfaces().toList())
+    }
+
+    fun stop() {
+        synchronized(lockObject) {
+            cts?.cancel()
+            cts = null
+        }
+
+        synchronized(nics) {
+            nics.clear()
+        }
+    }
+
+    private suspend fun loopAsync() {
+        while (cts?.isActive == true) {
+            try {
+                val currentNics = getCurrentInterfaces().toList()
+                removed?.invoke(nics.filter { k -> currentNics.none { n -> k.name == n.name } })
+                added?.invoke(currentNics.filter { nic -> nics.none { k -> k.name == nic.name } })
+
+                synchronized(nics) {
+                    nics.clear()
+                    nics.addAll(currentNics)
+                }
+            } catch (ex: Exception) {
+                // Ignored
+            }
+            delay(5000)
+        }
+    }
+
+    private fun getCurrentInterfaces(): List<NetworkInterface> {
+        val nics = NetworkInterface.getNetworkInterfaces().toList()
+            .filter { it.isUp && !it.isLoopback }
+
+        return if (nics.isNotEmpty()) nics else NetworkInterface.getNetworkInterfaces().toList()
+            .filter { it.isUp }
+    }
+}

app/src/main/java/com/futo/platformplayer/mdns/ServiceDiscoverer.kt

@@ -0,0 +1,71 @@
+package com.futo.platformplayer.mdns
+
+import com.futo.platformplayer.logging.Logger
+import java.lang.Thread.sleep
+
+class ServiceDiscoverer(names: Array<String>, private val _onServicesUpdated: (List<DnsService>) -> Unit) {
+    private val _names: Array<String>
+    private var _listener: MDNSListener? = null
+    private var _started = false
+    private var _thread: Thread? = null
+
+    init {
+        if (names.isEmpty()) throw IllegalArgumentException("At least one name must be specified.")
+        _names = names
+    }
+
+    fun broadcastService(
+        deviceName: String,
+        serviceName: String,
+        port: UShort,
+        ttl: UInt = 120u,
+        weight: UShort = 0u,
+        priority: UShort = 0u,
+        texts: List<String>? = null
+    ) {
+        _listener?.let {
+            it.broadcastService(deviceName, serviceName, port, ttl, weight, priority, texts)
+        }
+    }
+
+    fun stop() {
+        _started = false
+        _listener?.stop()
+        _listener = null
+        _thread?.join()
+        _thread = null
+    }
+
+    fun start() {
+        if (_started) {
+            Logger.i(TAG, "Already started.")
+            return
+        }
+        _started = true
+
+        val listener = MDNSListener()
+        _listener = listener
+        listener.onServicesUpdated = { _onServicesUpdated?.invoke(it) }
+        listener.start()
+
+        _thread = Thread {
+            try {
+                sleep(2000)
+
+                while (_started) {
+                    listener.queryServices(_names)
+                    sleep(2000)
+                    listener.queryAllQuestions(_names)
+                    sleep(2000)
+                }
+            } catch (e: Throwable) {
+                Logger.i(TAG, "Exception in loop thread", e)
+                stop()
+            }
+        }.apply { start() }
+    }
+
+    companion object {
+        private val TAG = "ServiceDiscoverer"
+    }
+}

app/src/main/java/com/futo/platformplayer/mdns/ServiceRecordAggregator.kt

@@ -0,0 +1,226 @@
+package com.futo.platformplayer.mdns
+
+import com.futo.platformplayer.logging.Logger
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import java.net.InetAddress
+import java.util.Date
+
+data class DnsService(
+    var name: String,
+    var target: String,
+    var port: UShort,
+    val addresses: MutableList<InetAddress> = mutableListOf(),
+    val pointers: MutableList<String> = mutableListOf(),
+    val texts: MutableList<String> = mutableListOf()
+)
+
+data class CachedDnsAddressRecord(
+    val expirationTime: Date,
+    val address: InetAddress
+)
+
+data class CachedDnsTxtRecord(
+    val expirationTime: Date,
+    val texts: List<String>
+)
+
+data class CachedDnsPtrRecord(
+    val expirationTime: Date,
+    val target: String
+)
+
+data class CachedDnsSrvRecord(
+    val expirationTime: Date,
+    val service: SRVRecord
+)
+
+class ServiceRecordAggregator {
+    private val _lockObject = Any()
+    private val _cachedAddressRecords = mutableMapOf<String, MutableList<CachedDnsAddressRecord>>()
+    private val _cachedTxtRecords = mutableMapOf<String, CachedDnsTxtRecord>()
+    private val _cachedPtrRecords = mutableMapOf<String, MutableList<CachedDnsPtrRecord>>()
+    private val _cachedSrvRecords = mutableMapOf<String, CachedDnsSrvRecord>()
+    private val _currentServices = mutableListOf<DnsService>()
+    private var _cts: Job? = null
+
+    var onServicesUpdated: ((List<DnsService>) -> Unit)? = null
+
+    fun start() {
+        synchronized(_lockObject) {
+            if (_cts != null) throw Exception("Already started.")
+
+            _cts = CoroutineScope(Dispatchers.Default).launch {
+                try {
+                    while (isActive) {
+                        val now = Date()
+                        synchronized(_currentServices) {
+                            _cachedAddressRecords.forEach { it.value.removeAll { record -> now.after(record.expirationTime) } }
+                            _cachedTxtRecords.entries.removeIf { now.after(it.value.expirationTime) }
+                            _cachedSrvRecords.entries.removeIf { now.after(it.value.expirationTime) }
+                            _cachedPtrRecords.forEach { it.value.removeAll { record -> now.after(record.expirationTime) } }
+
+                            val newServices = getCurrentServices()
+                            _currentServices.clear()
+                            _currentServices.addAll(newServices)
+                        }
+
+                        onServicesUpdated?.invoke(_currentServices.toList())
+                        delay(5000)
+                    }
+                } catch (e: Throwable) {
+                    Logger.e(TAG, "Unexpected failure in MDNS loop", e)
+                }
+            }
+        }
+    }
+
+    fun stop() {
+        synchronized(_lockObject) {
+            _cts?.cancel()
+            _cts = null
+        }
+    }
+
+    fun add(packet: DnsPacket) {
+        val currentServices: List<DnsService>
+        val dnsResourceRecords = packet.answers + packet.additionals + packet.authorities
+        val txtRecords = dnsResourceRecords.filter { it.type == ResourceRecordType.TXT.value.toInt() }.map { it to it.getDataReader().readTXTRecord() }
+        val aRecords = dnsResourceRecords.filter { it.type == ResourceRecordType.A.value.toInt() }.map { it to it.getDataReader().readARecord() }
+        val aaaaRecords = dnsResourceRecords.filter { it.type == ResourceRecordType.AAAA.value.toInt() }.map { it to it.getDataReader().readAAAARecord() }
+        val srvRecords = dnsResourceRecords.filter { it.type == ResourceRecordType.SRV.value.toInt() }.map { it to it.getDataReader().readSRVRecord() }
+        val ptrRecords = dnsResourceRecords.filter { it.type == ResourceRecordType.PTR.value.toInt() }.map { it to it.getDataReader().readPTRRecord() }
+
+        /*val builder = StringBuilder()
+        builder.appendLine("Received records:")
+        srvRecords.forEach { builder.appendLine("SRV ${it.first.name} ${it.first.type} ${it.first.clazz} TTL ${it.first.timeToLive}: (Port: ${it.second.port}, Target: ${it.second.target}, Priority: ${it.second.priority}, Weight: ${it.second.weight})") }
+        ptrRecords.forEach { builder.appendLine("PTR ${it.first.name} ${it.first.type} ${it.first.clazz} TTL ${it.first.timeToLive}: ${it.second.domainName}") }
+        txtRecords.forEach { builder.appendLine("TXT ${it.first.name} ${it.first.type} ${it.first.clazz} TTL ${it.first.timeToLive}: ${it.second.texts.joinToString(", ")}") }
+        aRecords.forEach { builder.appendLine("A ${it.first.name} ${it.first.type} ${it.first.clazz} TTL ${it.first.timeToLive}: ${it.second.address}") }
+        aaaaRecords.forEach { builder.appendLine("AAAA ${it.first.name} ${it.first.type} ${it.first.clazz} TTL ${it.first.timeToLive}: ${it.second.address}") }
+        Logger.i(TAG, "$builder")*/
+
+        synchronized(this._currentServices) {
+            ptrRecords.forEach { record ->
+                val cachedPtrRecord = _cachedPtrRecords.getOrPut(record.first.name) { mutableListOf() }
+                val newPtrRecord = CachedDnsPtrRecord(Date(System.currentTimeMillis() + record.first.timeToLive.toLong() * 1000L), record.second.domainName)
+                cachedPtrRecord.replaceOrAdd(newPtrRecord) { it.target == record.second.domainName }
+            }
+
+            aRecords.forEach { aRecord ->
+                val cachedARecord = _cachedAddressRecords.getOrPut(aRecord.first.name) { mutableListOf() }
+                val newARecord = CachedDnsAddressRecord(Date(System.currentTimeMillis() + aRecord.first.timeToLive.toLong() * 1000L), aRecord.second.address)
+                cachedARecord.replaceOrAdd(newARecord) { it.address == newARecord.address }
+            }
+
+            aaaaRecords.forEach { aaaaRecord ->
+                val cachedAaaaRecord = _cachedAddressRecords.getOrPut(aaaaRecord.first.name) { mutableListOf() }
+                val newAaaaRecord = CachedDnsAddressRecord(Date(System.currentTimeMillis() + aaaaRecord.first.timeToLive.toLong() * 1000L), aaaaRecord.second.address)
+                cachedAaaaRecord.replaceOrAdd(newAaaaRecord) { it.address == newAaaaRecord.address }
+            }
+
+            txtRecords.forEach { txtRecord ->
+                _cachedTxtRecords[txtRecord.first.name] = CachedDnsTxtRecord(Date(System.currentTimeMillis() + txtRecord.first.timeToLive.toLong() * 1000L), txtRecord.second.texts)
+            }
+
+            srvRecords.forEach { srvRecord ->
+                _cachedSrvRecords[srvRecord.first.name] = CachedDnsSrvRecord(Date(System.currentTimeMillis() + srvRecord.first.timeToLive.toLong() * 1000L), srvRecord.second)
+            }
+
+            currentServices = getCurrentServices()
+            this._currentServices.clear()
+            this._currentServices.addAll(currentServices)
+        }
+
+        onServicesUpdated?.invoke(currentServices)
+    }
+
+    fun getAllQuestions(serviceName: String): List<DnsQuestion> {
+        val questions = mutableListOf<DnsQuestion>()
+        synchronized(_currentServices) {
+            val servicePtrRecords = _cachedPtrRecords[serviceName] ?: return emptyList()
+
+            val ptrWithoutSrvRecord = servicePtrRecords.filterNot { _cachedSrvRecords.containsKey(it.target) }.map { it.target }
+            questions.addAll(ptrWithoutSrvRecord.flatMap { s ->
+                listOf(
+                    DnsQuestion(
+                        name = s,
+                        type = QuestionType.SRV.value.toInt(),
+                        clazz = QuestionClass.IN.value.toInt(),
+                        queryUnicast = false
+                    )
+                )
+            })
+
+            val incompleteCurrentServices = _currentServices.filter { it.addresses.isEmpty() && it.name.endsWith(serviceName) }
+            questions.addAll(incompleteCurrentServices.flatMap { s ->
+                listOf(
+                    DnsQuestion(
+                        name = s.name,
+                        type = QuestionType.TXT.value.toInt(),
+                        clazz = QuestionClass.IN.value.toInt(),
+                        queryUnicast = false
+                    ),
+                    DnsQuestion(
+                        name = s.target,
+                        type = QuestionType.A.value.toInt(),
+                        clazz = QuestionClass.IN.value.toInt(),
+                        queryUnicast = false
+                    ),
+                    DnsQuestion(
+                        name = s.target,
+                        type = QuestionType.AAAA.value.toInt(),
+                        clazz = QuestionClass.IN.value.toInt(),
+                        queryUnicast = false
+                    )
+                )
+            })
+        }
+        return questions
+    }
+
+    private fun getCurrentServices(): MutableList<DnsService> {
+        val currentServices = _cachedSrvRecords.map { (key, value) ->
+            DnsService(
+                name = key,
+                target = value.service.target,
+                port = value.service.port
+            )
+        }.toMutableList()
+
+        currentServices.forEach { service ->
+            _cachedAddressRecords[service.target]?.let {
+                service.addresses.addAll(it.map { record -> record.address })
+            }
+        }
+
+        currentServices.forEach { service ->
+            service.pointers.addAll(_cachedPtrRecords.filter { it.value.any { ptr -> ptr.target == service.name } }.map { it.key })
+        }
+
+        currentServices.forEach { service ->
+            _cachedTxtRecords[service.name]?.let {
+                service.texts.addAll(it.texts)
+            }
+        }
+
+        return currentServices
+    }
+
+    private inline fun <T> MutableList<T>.replaceOrAdd(newElement: T, predicate: (T) -> Boolean) {
+        val index = indexOfFirst(predicate)
+        if (index >= 0) {
+            this[index] = newElement
+        } else {
+            add(newElement)
+        }
+    }
+
+    private companion object {
+        private const val TAG = "ServiceRecordAggregator"
+    }
+}

app/src/main/java/com/futo/platformplayer/models/ImageVariable.kt

@@ -29,7 +29,7 @@ data class ImageVariable(
             Glide.with(imageView)
                 .load(bitmap)
                 .into(imageView)
-        } else if(resId != null && resId > 0) {
+        } else if(resId != null) {
             Glide.with(imageView)
                 .load(resId)
                 .into(imageView)

app/src/main/java/com/futo/platformplayer/others/LoginWebViewClient.kt

@@ -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" || domain.matchesDomain(it) })
+            if(_pluginConfig == null || _pluginConfig.allowUrls.any { it == "everywhere" || it.lowercase().matchesDomain(cookieDomain) })
                 _authConfig.cookiesToFind?.let { cookiesToFind ->
                     val cookies = cookieString.split(";");
                     for(cookieStr in cookies) {

app/src/main/java/com/futo/platformplayer/others/PlatformLinkMovementMethod.kt

@@ -8,14 +8,11 @@ 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.Dispatchers
+import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 
 class PlatformLinkMovementMethod(private val _context: Context) : LinkMovementMethod() {
 
@@ -63,39 +60,31 @@ 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)) {
-                    for (link in pressedLinks!!) {
+                        runBlocking {
-                        Logger.i(TAG) { "Link clicked '${link.url}'." }
+                            for (link in pressedLinks!!) {
+                                Logger.i(TAG) { "Link clicked '${link.url}'." }
 
-                        val c = _context
+                                if (_context is MainActivity) {
-                        if (c is MainActivity) {
+                                    if (_context.handleUrl(link.url)) continue
-                            c.lifecycleScope.launch(Dispatchers.IO) {
+                                    if (timestampRegex.matches(link.url)) {
-                                if (c.handleUrl(link.url)) {
+                                        val tokens = link.url.split(':')
-                                    return@launch
+                                        var time_s = -1L
-                                }
+                                        when (tokens.size) {
-                                if (timestampRegex.matches(link.url)) {
+                                            2 -> time_s = tokens[0].toLong() * 60 + tokens[1].toLong()
-                                    val tokens = link.url.split(':')
+                                            3 -> time_s = tokens[0].toLong() * 3600 +
-                                    var time_s = -1L
+                                                    tokens[1].toLong() * 60 +
-                                    when (tokens.size) {
+                                                    tokens[2].toLong()
-                                        2 -> time_s = tokens[0].toLong() * 60 + tokens[1].toLong()
+                                        }
-                                        3 -> time_s = tokens[0].toLong() * 3600 +
+
-                                                tokens[1].toLong() * 60 +
+                                        if (time_s != -1L) {
-                                                tokens[2].toLong()
+                                            MediaControlReceiver.onSeekToReceived.emit(time_s * 1000)
-                                    }
+                                            continue
-
-                                    if (time_s != -1L) {
-                                        withContext(Dispatchers.Main) {
-                                            MediaControlReceiver.onSeekToReceived.emit(time_s * 1000)
                                         }
-                                        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

app/src/main/java/com/futo/platformplayer/others/WebViewRequirementExtractor.kt

@@ -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" || domain.matchesDomain(it) })
+            if(allowedUrls.any { it == "everywhere" || it.lowercase().matchesDomain(cookieDomain) })
                 cookiesToFind?.let { cookiesToFind ->
                     val cookies = cookieString.split(";");
                     for(cookieStr in cookies) {

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

@@ -1,11 +1,5 @@
 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
@@ -13,15 +7,12 @@ 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()
 
@@ -58,31 +49,6 @@ 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()
@@ -95,25 +61,7 @@ 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 {
@@ -138,7 +86,7 @@ class HLS {
                 }
             }
 
-            return VariantPlaylist(version, targetDuration, mediaSequence, discontinuitySequence, programDateTime, playlistType, streamInfo, segments, decryptionInfo)
+            return VariantPlaylist(version, targetDuration, mediaSequence, discontinuitySequence, programDateTime, playlistType, streamInfo, segments)
         }
 
         fun parseAndGetVideoSources(source: Any, content: String, url: String): List<HLSVariantVideoUrlSource> {
@@ -322,7 +270,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:")
@@ -371,13 +319,30 @@ class HLS {
 
         fun getVideoSources(): List<HLSVariantVideoUrlSource> {
             return variantPlaylistsRefs.map {
-                variantReferenceToVariant(it)
+                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)
             }
         }
 
         fun getAudioSources(): List<HLSVariantAudioUrlSource> {
             return mediaRenditions.mapNotNull {
-                return@mapNotNull mediaRenditionToVariant(it)
+                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
+                }
             }
         }
 
@@ -403,11 +368,6 @@ class HLS {
         }
     }
 
-    data class DecryptionInfo(
-        val keyUrl: String,
-        val iv: String?
-    )
-
     data class VariantPlaylist(
         val version: Int?,
         val targetDuration: Int?,
@@ -416,8 +376,7 @@ 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")

app/src/main/java/com/futo/platformplayer/receivers/MediaControlReceiver.kt

@@ -21,7 +21,6 @@ class MediaControlReceiver : BroadcastReceiver() {
                 EVENT_NEXT -> onNextReceived.emit();
                 EVENT_PREV -> onPreviousReceived.emit();
                 EVENT_CLOSE -> onCloseReceived.emit();
-                EVENT_BACKGROUND -> onBackgroundReceived.emit();
             }
         }
         catch(ex: Throwable) {
@@ -39,7 +38,6 @@ 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();
@@ -50,7 +48,6 @@ 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);
@@ -67,8 +64,5 @@ 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);
     }
 }

app/src/main/java/com/futo/platformplayer/serializers/OffsetDateTimeSerializer.kt

@@ -1,6 +1,5 @@
 package com.futo.platformplayer.serializers
 
-import com.futo.platformplayer.sToOffsetDateTimeUTC
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.descriptors.PrimitiveKind
 import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
@@ -38,7 +37,7 @@ class OffsetDateTimeSerializer : KSerializer<OffsetDateTime> {
             return OffsetDateTime.MAX;
         else if(epochSecond < -9999999999)
             return OffsetDateTime.MIN;
-        return epochSecond.sToOffsetDateTimeUTC()
+        return OffsetDateTime.of(LocalDateTime.ofEpochSecond(epochSecond, 0, ZoneOffset.UTC), ZoneOffset.UTC);
     }
 }
 class OffsetDateTimeStringSerializer : KSerializer<OffsetDateTime> {

app/src/main/java/com/futo/platformplayer/states/StateApp.kt

@@ -29,7 +29,6 @@ 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
@@ -412,15 +411,7 @@ class StateApp {
         }
 
         if (Settings.instance.synchronization.enabled) {
-            StateSync.instance.start(context)
+            StateSync.instance.start()
-        }
-
-        settingsActivityClosed.subscribe {
-            if (Settings.instance.synchronization.enabled) {
-                StateSync.instance.start(context)
-            } else {
-                StateSync.instance.stop()
-            }
         }
 
         Logger.onLogSubmitted.subscribe {
@@ -518,33 +509,22 @@ class StateApp {
 
         //Migration
         Logger.i(TAG, "MainApp Started: Check [Migrations]");
-
+        migrateStores(context, listOf(
-        scopeOrNull?.launch(Dispatchers.IO) {
+            StateSubscriptions.instance.toMigrateCheck(),
-            try {
+            StatePlaylists.instance.toMigrateCheck()
-                migrateStores(context, listOf(
+        ).flatten(), 0);
-                    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) {
                 Logger.i(TAG, "MainApp Started: Fetch [Subscriptions]");
                 val subRequestCounts = StateSubscriptions.instance.getSubscriptionRequestCount();
                 val reqCountStr = subRequestCounts.map { "    ${it.key.config.name}: ${it.value}/${it.key.getSubscriptionRateLimit()}" }.joinToString("\n");
-                val isBelowRateLimit = !subRequestCounts.any { clientCount ->
+                val isRateLimitReached = !subRequestCounts.any { clientCount -> clientCount.key.getSubscriptionRateLimit()?.let { rateLimit -> clientCount.value > rateLimit } == true };
-                    clientCount.key.getSubscriptionRateLimit()?.let { rateLimit -> clientCount.value > rateLimit } == true
+                if (isRateLimitReached) {
-                };
-                if (isBelowRateLimit) {
                     Logger.w(TAG, "Subscriptions request on boot, request counts:\n${reqCountStr}");
                     delay(5000);
-                    scopeOrNull?.let {
+                    if(StateSubscriptions.instance.getOldestUpdateTime().getNowDiffMinutes() > 5)
-                        if(StateSubscriptions.instance.getOldestUpdateTime().getNowDiffMinutes() > 5)
+                        StateSubscriptions.instance.updateSubscriptionFeed(scope, false);
-                            StateSubscriptions.instance.updateSubscriptionFeed(it, false);
-                    }
                 }
                 else
                     Logger.w(TAG, "Too many subscription requests required:\n${reqCountStr}");
@@ -695,27 +675,15 @@ class StateApp {
     }
 
 
-    private suspend fun migrateStores(context: Context, managedStores: List<ManagedStore<*>>, index: Int) {
+    private fun migrateStores(context: Context, managedStores: List<ManagedStore<*>>, index: Int) {
         if(managedStores.size <= index)
             return;
         val store = managedStores[index];
-        if(store.hasMissingReconstructions()) {
+        if(store.hasMissingReconstructions())
-            withContext(Dispatchers.Main) {
+            UIDialogs.showMigrateDialog(context, store) {
-                try {
+                migrateStores(context, managedStores, index + 1);
-                    UIDialogs.showMigrateDialog(context, store) {
+            };
-                        scopeOrNull?.launch(Dispatchers.IO) {
+        else
-                            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);
     }
 
@@ -735,7 +703,6 @@ class StateApp {
 
         StatePlayer.instance.closeMediaSession();
         StateCasting.instance.stop();
-        StateSync.instance.stop();
         StatePlayer.dispose();
         Companion.dispose();
         _fileLogConsumer?.close();

app/src/main/java/com/futo/platformplayer/states/StateDownloads.kt

@@ -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 download");
+            throw IllegalStateException("Video [${videoState.name}] is already queued for dowload");
 
         val existing = getCachedVideo(videoState.id);
         if(existing != null) {

app/src/main/java/com/futo/platformplayer/states/StateHistory.kt

@@ -131,13 +131,8 @@ class StateHistory {
     fun getHistoryPager(): IPager<HistoryVideo> {
         return _historyDBStore.getObjectPager();
     }
-    fun getHistorySearchPager(query: String, withAuthor: Boolean = false): IPager<HistoryVideo> {
+    fun getHistorySearchPager(query: String): IPager<HistoryVideo> {
-        return if(!withAuthor)
+        return _historyDBStore.queryLikeObjectPager(DBHistory.Index::name, "%${query}%", 10);
-            _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];

app/src/main/java/com/futo/platformplayer/states/StatePlatform.kt

@@ -5,6 +5,7 @@ import androidx.collection.LruCache
 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
@@ -45,6 +46,7 @@ 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
@@ -54,6 +56,7 @@ 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
@@ -91,11 +94,9 @@ 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;
 
@@ -112,14 +113,14 @@ class StatePlatform {
 
             Logger.i(StatePlatform::class.java.name, "Fetching video details [${url}]");
             if(!StateApp.instance.privateMode) {
-                _enabledClients.find { _instantClientPool.getClientPooled(it).isContentDetailsUrl(url) }?.let {
+                _enabledClients.find { 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 { _instantClientPool.getClientPooled(it).isContentDetailsUrl(url) }?.let {
+                _enabledClients.find { it.isContentDetailsUrl(url) }?.let {
                     _privateClientPool.getClientPooled(it).getContentDetails(url)
                 }
                     ?: throw NoPlatformClientException("No client enabled that supports this url ($url)");
@@ -191,7 +192,6 @@ class StatePlatform {
                 _availableClients.clear();
 
                 _icons.clear();
-                _iconsByName.clear()
                 _icons[StateDeveloper.DEV_ID] = ImageVariable(null, R.drawable.ic_security_red);
 
                 StatePlugins.instance.updateEmbeddedPlugins(context);
@@ -200,8 +200,6 @@ 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 ->
@@ -301,15 +299,6 @@ 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);
@@ -643,33 +632,12 @@ class StatePlatform {
         return pager;
     }
 
-    fun searchChannelsAsContent(query: String): IPager<IPlatformContent> {
-        Logger.i(TAG, "Platform - searchChannels");
-        val pagers = mutableMapOf<IPager<IPlatformContent>, Float>();
-        getSortedEnabledClient().parallelStream().forEach {
-            try {
-                if (it.capabilities.hasChannelSearch)
-                    pagers.put(it.searchChannelsAsContent(query), 1f);
-            }
-            catch(ex: Throwable) {
-                Logger.e(TAG, "Failed search channels", ex)
-                UIDialogs.toast("Failed search channels on [${it.name}]\n(${ex.message})");
-            }
-        };
-        if(pagers.isEmpty())
-            return EmptyPager<IPlatformContent>();
-
-        val pager = MultiDistributionContentPager(pagers);
-        pager.initialize();
-        return pager;
-    }
-
 
     //Video
-    fun hasEnabledContentClient(url: String) : Boolean = getEnabledClients().any { _instantClientPool.getClientPooled(it).isContentDetailsUrl(url) };
+    fun hasEnabledVideoClient(url: String) : Boolean = getEnabledClients().any { 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 { _instantClientPool.getClientPooled(it).isContentDetailsUrl(url) };
+    fun getContentClientOrNull(url: String) : IPlatformClient? = getEnabledClients().find { it.isContentDetailsUrl(url) };
     fun getContentDetails(url: String, forceRefetch: Boolean = false): Deferred<IPlatformContentDetails> {
         Logger.i(TAG, "Platform - getContentDetails (${url})");
         if(forceRefetch)
@@ -710,14 +678,14 @@ class StatePlatform {
         return client.getContentRecommendations(url);
     }
 
-    fun hasEnabledChannelClient(url : String) : Boolean = getEnabledClients().any { _instantClientPool.getClientPooled(it).isChannelUrl(url) };
+    fun hasEnabledChannelClient(url : String) : Boolean = getEnabledClients().any { 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 { _instantClientPool.getClientPooled(it).isChannelUrl(url) }
+            getEnabledClients().find { it.isChannelUrl(url) }
         else
-            getEnabledClients().find { !exclude.contains(it.id) && _instantClientPool.getClientPooled(it).isChannelUrl(url) };
+            getEnabledClients().find { !exclude.contains(it.id) && it.isChannelUrl(url) };
 
     fun getChannel(url: String, updateSubscriptions: Boolean = true): Deferred<IPlatformChannel>  {
         Logger.i(TAG, "Platform - getChannel");
@@ -729,7 +697,7 @@ class StatePlatform {
         }
     }
 
-    fun getChannelContent(baseClient: IPlatformClient, channelUrl: String, isSubscriptionOptimized: Boolean = false, usePooledClients: Int = 0, type: String? = null): IPager<IPlatformContent> {
+    fun getChannelContent(baseClient: IPlatformClient, channelUrl: String, isSubscriptionOptimized: Boolean = false, usePooledClients: Int = 0): IPager<IPlatformContent> {
         val clientCapabilities = baseClient.getChannelCapabilities();
         val client = if(usePooledClients > 1)
             _channelClientPool.getClientPooled(baseClient, usePooledClients);
@@ -738,75 +706,66 @@ class StatePlatform {
         var lastStream: OffsetDateTime? = null;
 
         val pagerResult: IPager<IPlatformContent>;
-        if (type == null) {
+        if(!clientCapabilities.hasType(ResultCapabilities.TYPE_MIXED) &&
-            if(!clientCapabilities.hasType(ResultCapabilities.TYPE_MIXED) &&
+                (   clientCapabilities.hasType(ResultCapabilities.TYPE_VIDEOS) ||
-                    (   clientCapabilities.hasType(ResultCapabilities.TYPE_VIDEOS) ||
+                    clientCapabilities.hasType(ResultCapabilities.TYPE_STREAMS) ||
-                        clientCapabilities.hasType(ResultCapabilities.TYPE_STREAMS) ||
+                    clientCapabilities.hasType(ResultCapabilities.TYPE_LIVE) ||
-                        clientCapabilities.hasType(ResultCapabilities.TYPE_LIVE) ||
+                    clientCapabilities.hasType(ResultCapabilities.TYPE_POSTS)
-                        clientCapabilities.hasType(ResultCapabilities.TYPE_POSTS)
+                )) {
-                    )) {
+            val toQuery = mutableListOf<String>();
-                val toQuery = mutableListOf<String>();
+            if(clientCapabilities.hasType(ResultCapabilities.TYPE_VIDEOS))
-                if(clientCapabilities.hasType(ResultCapabilities.TYPE_VIDEOS))
+                toQuery.add(ResultCapabilities.TYPE_VIDEOS);
-                    toQuery.add(ResultCapabilities.TYPE_VIDEOS);
+            if(clientCapabilities.hasType(ResultCapabilities.TYPE_STREAMS))
-                if(clientCapabilities.hasType(ResultCapabilities.TYPE_STREAMS))
+                toQuery.add(ResultCapabilities.TYPE_STREAMS);
-                    toQuery.add(ResultCapabilities.TYPE_STREAMS);
+            if(clientCapabilities.hasType(ResultCapabilities.TYPE_LIVE))
-                if(clientCapabilities.hasType(ResultCapabilities.TYPE_LIVE))
+                toQuery.add(ResultCapabilities.TYPE_LIVE);
-                    toQuery.add(ResultCapabilities.TYPE_LIVE);
+            if(clientCapabilities.hasType(ResultCapabilities.TYPE_POSTS))
-                if(clientCapabilities.hasType(ResultCapabilities.TYPE_POSTS))
+                toQuery.add(ResultCapabilities.TYPE_POSTS);
-                    toQuery.add(ResultCapabilities.TYPE_POSTS);
 
-                if(isSubscriptionOptimized) {
+            if(isSubscriptionOptimized) {
-                    val sub = StateSubscriptions.instance.getSubscription(channelUrl);
+                val sub = StateSubscriptions.instance.getSubscription(channelUrl);
-                    if(sub != null) {
+                if(sub != null) {
-                        if(!sub.shouldFetchStreams()) {
+                    if(!sub.shouldFetchStreams()) {
-                            Logger.i(TAG, "Subscription [${sub.channel.name}:${channelUrl}] Last livestream > 7 days, skipping live streams [${sub.lastLiveStream.getNowDiffDays()} days ago]");
+                        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);
+                        toQuery.remove(ResultCapabilities.TYPE_LIVE);
-                        }
+                    }
-                        if(!sub.shouldFetchLiveStreams()) {
+                    if(!sub.shouldFetchLiveStreams()) {
-                            Logger.i(TAG, "Subscription [${sub.channel.name}:${channelUrl}] Last livestream > 15 days, skipping streams [${sub.lastLiveStream.getNowDiffDays()} days ago]");
+                        Logger.i(TAG, "Subscription [${sub.channel.name}:${channelUrl}] Last livestream > 15 days, skipping streams [${sub.lastLiveStream.getNowDiffDays()} days ago]");
-                            toQuery.remove(ResultCapabilities.TYPE_STREAMS);
+                        toQuery.remove(ResultCapabilities.TYPE_STREAMS);
-                        }
+                    }
-                        if(!sub.shouldFetchPosts()) {
+                    if(!sub.shouldFetchPosts()) {
-                            Logger.i(TAG, "Subscription [${sub.channel.name}:${channelUrl}] Last livestream > 5 days, skipping posts [${sub.lastPost.getNowDiffDays()} days ago]");
+                        Logger.i(TAG, "Subscription [${sub.channel.name}:${channelUrl}] Last livestream > 5 days, skipping posts [${sub.lastPost.getNowDiffDays()} days ago]");
-                            toQuery.remove(ResultCapabilities.TYPE_POSTS);
+                        toQuery.remove(ResultCapabilities.TYPE_POSTS);
-                        }
                     }
                 }
+            }
 
-                //Merged pager
+            //Merged pager
-                val pagers = toQuery
+            val pagers = toQuery
-                    .parallelStream()
+                .parallelStream()
-                    .map {
+                .map {
-                        val results = client.getChannelContents(channelUrl, it, ResultCapabilities.ORDER_CHONOLOGICAL) ;
+                    val results = client.getChannelContents(channelUrl, it, ResultCapabilities.ORDER_CHONOLOGICAL) ;
 
-                        when(it) {
+                    when(it) {
-                            ResultCapabilities.TYPE_STREAMS -> {
+                        ResultCapabilities.TYPE_STREAMS -> {
-                                val streamResults = results.getResults();
+                            val streamResults = results.getResults();
-                                if(streamResults.size == 0)
+                            if(streamResults.size == 0)
-                                    lastStream = OffsetDateTime.MIN;
+                                lastStream = OffsetDateTime.MIN;
-                                else
+                            else
-                                    lastStream = results.getResults().firstOrNull()?.datetime;
+                                lastStream = results.getResults().firstOrNull()?.datetime;
-                            }
                         }
-                        return@map results;
                     }
-                    .asSequence()
+                    return@map results;
-                    .toList();
+                }
+                .asSequence()
+                .toList();
 
-                val pager = MultiChronoContentPager(pagers.toTypedArray());
+            val pager = MultiChronoContentPager(pagers.toTypedArray());
-                pager.initialize();
+            pager.initialize();
-                pagerResult = pager;
+            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);
@@ -858,10 +817,10 @@ class StatePlatform {
 
         return pagerResult;
     }
-    fun getChannelContent(channelUrl: String, isSubscriptionOptimized: Boolean = false, usePooledClients: Int = 0, ignorePlugins: List<String>? = null, type: String? = null): IPager<IPlatformContent> {
+    fun getChannelContent(channelUrl: String, isSubscriptionOptimized: Boolean = false, usePooledClients: Int = 0, ignorePlugins: List<String>? = null): IPager<IPlatformContent> {
         Logger.i(TAG, "Platform - getChannelVideos");
         val baseClient = getChannelClient(channelUrl, ignorePlugins);
-        return getChannelContent(baseClient, channelUrl, isSubscriptionOptimized, usePooledClients, type);
+        return getChannelContent(baseClient, channelUrl, isSubscriptionOptimized, usePooledClients);
     }
     fun getChannelContent(channelUrl: String, type: String?, ordering: String = ResultCapabilities.ORDER_CHONOLOGICAL): IPager<IPlatformContent> {
         val client = getChannelClient(channelUrl);
@@ -913,9 +872,9 @@ class StatePlatform {
         return urls;
     }
 
-    fun hasEnabledPlaylistClient(url: String) : Boolean = getEnabledClients().any { _instantClientPool.getClientPooled(it).isPlaylistUrl(url) };
+    fun hasEnabledPlaylistClient(url: String) : Boolean = getEnabledClients().any { it.isPlaylistUrl(url) };
-    fun getPlaylistClientOrNull(url: String): IPlatformClient? = getEnabledClients().find { _instantClientPool.getClientPooled(it).isPlaylistUrl(url) }
+    fun getPlaylistClientOrNull(url: String): IPlatformClient? = getEnabledClients().find { it.isPlaylistUrl(url) }
-    fun getPlaylistClient(url: String): IPlatformClient = getEnabledClients().find { _instantClientPool.getClientPooled(it).isPlaylistUrl(url) }
+    fun getPlaylistClient(url: String): IPlatformClient = getEnabledClients().find { it.isPlaylistUrl(url) }
         ?: throw NoPlatformClientException("No client enabled that supports this playlist url (${url})");
     fun getPlaylist(url: String): IPlatformPlaylistDetails {
         return getPlaylistClient(url).getPlaylist(url);