Merge branch 'refs/heads/master' into raw-dash-audio-widevine

# Conflicts:
#	app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/sources/JSDashManifestRawAudioSource.kt

.gitattributes

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

.gitmodules

@@ -88,21 +88,3 @@
 [submodule "app/src/unstable/assets/sources/apple-podcasts"]
 	path = app/src/unstable/assets/sources/apple-podcasts
 	url = ../plugins/apple-podcasts.git
-[submodule "app/src/stable/assets/sources/tedtalks"]
-	path = app/src/stable/assets/sources/tedtalks
-	url = ../plugins/tedtalks.git
-[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:smart-exception-java:0.2.1'
+    implementation 'com.arthenica:ffmpeg-kit-full:5.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

@@ -1,338 +0,0 @@
-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 relayPort = 9000
-
-    /** Creates a client connected to the live relay server. */
-    private suspend fun createClient(
-        onHandshakeComplete: ((SyncSocketSession) -> Unit)? = null,
-        onData: ((SyncSocketSession, UByte, UByte, ByteBuffer) -> Unit)? = null,
-        onNewChannel: ((SyncSocketSession, ChannelRelayed) -> Unit)? = null,
-        isHandshakeAllowed: ((LinkType, SyncSocketSession, String, String?, UInt) -> Boolean)? = null,
-        onException: ((Throwable) -> Unit)? = null
-    ): SyncSocketSession = withContext(Dispatchers.IO) {
-        val p = Noise.createDH("25519")
-        p.generateKeyPair()
-        val socket = Socket(relayHost, relayPort)
-        val inputStream = LittleEndianDataInputStream(socket.getInputStream())
-        val outputStream = LittleEndianDataOutputStream(socket.getOutputStream())
-        val tcs = CompletableDeferred<Boolean>()
-        val socketSession = SyncSocketSession(
-            relayHost,
-            p,
-            inputStream,
-            outputStream,
-            onClose = { socket.close() },
-            onHandshakeComplete = { s ->
-                onHandshakeComplete?.invoke(s)
-                tcs.complete(true)
-            },
-            onData = onData ?: { _, _, _, _ -> },
-            onNewChannel = onNewChannel ?: { _, _ -> },
-            isHandshakeAllowed = isHandshakeAllowed ?: { _, _, _, _, _ -> true }
-        )
-        socketSession.authorizable = AlwaysAuthorized()
-        try {
-            socketSession.startAsInitiator(relayKey)
-        } catch (e: Throwable) {
-            onException?.invoke(e)
-        }
-        withTimeout(5000.milliseconds) { tcs.await() }
-        return@withContext socketSession
-    }
-
-    @Test
-    fun multipleClientsHandshake_Success() = runBlocking {
-        val client1 = createClient()
-        val client2 = createClient()
-        assertNotNull(client1.remotePublicKey, "Client 1 handshake failed")
-        assertNotNull(client2.remotePublicKey, "Client 2 handshake failed")
-        client1.stop()
-        client2.stop()
-    }
-
-    @Test
-    fun publishAndRequestConnectionInfo_Authorized_Success() = runBlocking {
-        val clientA = createClient()
-        val clientB = createClient()
-        val clientC = createClient()
-        clientA.publishConnectionInformation(arrayOf(clientB.localPublicKey), 12345, true, true, true, true)
-        delay(100.milliseconds)
-        val infoB = clientB.requestConnectionInfo(clientA.localPublicKey)
-        val infoC = clientC.requestConnectionInfo(clientA.localPublicKey)
-        assertNotNull("Client B should receive connection info", infoB)
-        assertEquals(12345.toUShort(), infoB!!.port)
-        assertNull("Client C should not receive connection info (unauthorized)", infoC)
-        clientA.stop()
-        clientB.stop()
-        clientC.stop()
-    }
-
-    @Test
-    fun relayedTransport_Bidirectional_Success() = runBlocking {
-        val tcsA = CompletableDeferred<ChannelRelayed>()
-        val tcsB = CompletableDeferred<ChannelRelayed>()
-        val clientA = createClient(onNewChannel = { _, c -> tcsA.complete(c) })
-        val clientB = createClient(onNewChannel = { _, c -> tcsB.complete(c) })
-        val channelTask = async { clientA.startRelayedChannel(clientB.localPublicKey) }
-        val channelA = withTimeout(5000.milliseconds) { tcsA.await() }
-        channelA.authorizable = AlwaysAuthorized()
-        val channelB = withTimeout(5000.milliseconds) { tcsB.await() }
-        channelB.authorizable = AlwaysAuthorized()
-        channelTask.await()
-
-        val tcsDataB = CompletableDeferred<ByteArray>()
-        channelB.setDataHandler { _, _, o, so, d ->
-            val b = ByteArray(d.remaining())
-            d.get(b)
-            if (o == Opcode.DATA.value && so == 0u.toUByte()) tcsDataB.complete(b)
-        }
-        channelA.send(Opcode.DATA.value, 0u, ByteBuffer.wrap(byteArrayOf(1, 2, 3)))
-
-        val tcsDataA = CompletableDeferred<ByteArray>()
-        channelA.setDataHandler { _, _, o, so, d ->
-            val b = ByteArray(d.remaining())
-            d.get(b)
-            if (o == Opcode.DATA.value && so == 0u.toUByte()) tcsDataA.complete(b)
-        }
-        channelB.send(Opcode.DATA.value, 0u, ByteBuffer.wrap(byteArrayOf(4, 5, 6)))
-
-        val receivedB = withTimeout(5000.milliseconds) { tcsDataB.await() }
-        val receivedA = withTimeout(5000.milliseconds) { tcsDataA.await() }
-        assertArrayEquals(byteArrayOf(1, 2, 3), receivedB)
-        assertArrayEquals(byteArrayOf(4, 5, 6), receivedA)
-        clientA.stop()
-        clientB.stop()
-    }
-
-    @Test
-    fun relayedTransport_MaximumMessageSize_Success() = runBlocking {
-        val MAX_DATA_PER_PACKET = SyncSocketSession.MAXIMUM_PACKET_SIZE - SyncSocketSession.HEADER_SIZE - 8 - 16 - 16
-        val maxSizeData = ByteArray(MAX_DATA_PER_PACKET).apply { Random.nextBytes(this) }
-        val tcsA = CompletableDeferred<ChannelRelayed>()
-        val tcsB = CompletableDeferred<ChannelRelayed>()
-        val clientA = createClient(onNewChannel = { _, c -> tcsA.complete(c) })
-        val clientB = createClient(onNewChannel = { _, c -> tcsB.complete(c) })
-        val channelTask = async { clientA.startRelayedChannel(clientB.localPublicKey) }
-        val channelA = withTimeout(5000.milliseconds) { tcsA.await() }
-        channelA.authorizable = AlwaysAuthorized()
-        val channelB = withTimeout(5000.milliseconds) { tcsB.await() }
-        channelB.authorizable = AlwaysAuthorized()
-        channelTask.await()
-
-        val tcsDataB = CompletableDeferred<ByteArray>()
-        channelB.setDataHandler { _, _, o, so, d ->
-            val b = ByteArray(d.remaining())
-            d.get(b)
-            if (o == Opcode.DATA.value && so == 0u.toUByte()) tcsDataB.complete(b)
-        }
-        channelA.send(Opcode.DATA.value, 0u, ByteBuffer.wrap(maxSizeData))
-        val receivedData = withTimeout(5000.milliseconds) { tcsDataB.await() }
-        assertArrayEquals(maxSizeData, receivedData)
-        clientA.stop()
-        clientB.stop()
-    }
-
-    @Test
-    fun publishAndGetRecord_Success() = runBlocking {
-        val clientA = createClient()
-        val clientB = createClient()
-        val clientC = createClient()
-        val data = byteArrayOf(1, 2, 3)
-        val success = clientA.publishRecords(listOf(clientB.localPublicKey), "testKey", data)
-        val recordB = clientB.getRecord(clientA.localPublicKey, "testKey")
-        val recordC = clientC.getRecord(clientA.localPublicKey, "testKey")
-        assertTrue(success)
-        assertNotNull(recordB)
-        assertArrayEquals(data, recordB!!.first)
-        assertNull("Unauthorized client should not access record", recordC)
-        clientA.stop()
-        clientB.stop()
-        clientC.stop()
-    }
-
-    @Test
-    fun getNonExistentRecord_ReturnsNull() = runBlocking {
-        val clientA = createClient()
-        val clientB = createClient()
-        val record = clientB.getRecord(clientA.localPublicKey, "nonExistentKey")
-        assertNull("Getting non-existent record should return null", record)
-        clientA.stop()
-        clientB.stop()
-    }
-
-    @Test
-    fun updateRecord_TimestampUpdated() = runBlocking {
-        val clientA = createClient()
-        val clientB = createClient()
-        val key = "updateKey"
-        val data1 = byteArrayOf(1)
-        val data2 = byteArrayOf(2)
-        clientA.publishRecords(listOf(clientB.localPublicKey), key, data1)
-        val record1 = clientB.getRecord(clientA.localPublicKey, key)
-        delay(1000.milliseconds)
-        clientA.publishRecords(listOf(clientB.localPublicKey), key, data2)
-        val record2 = clientB.getRecord(clientA.localPublicKey, key)
-        assertNotNull(record1)
-        assertNotNull(record2)
-        assertTrue(record2!!.second > record1!!.second)
-        assertArrayEquals(data2, record2.first)
-        clientA.stop()
-        clientB.stop()
-    }
-
-    @Test
-    fun deleteRecord_Success() = runBlocking {
-        val clientA = createClient()
-        val clientB = createClient()
-        val data = byteArrayOf(1, 2, 3)
-        clientA.publishRecords(listOf(clientB.localPublicKey), "toDelete", data)
-        val success = clientB.deleteRecords(clientA.localPublicKey, clientB.localPublicKey, listOf("toDelete"))
-        val record = clientB.getRecord(clientA.localPublicKey, "toDelete")
-        assertTrue(success)
-        assertNull(record)
-        clientA.stop()
-        clientB.stop()
-    }
-
-    @Test
-    fun listRecordKeys_Success() = runBlocking {
-        val clientA = createClient()
-        val clientB = createClient()
-        val keys = arrayOf("key1", "key2", "key3")
-        keys.forEach { key ->
-            clientA.publishRecords(listOf(clientB.localPublicKey), key, byteArrayOf(1))
-        }
-        val listedKeys = clientB.listRecordKeys(clientA.localPublicKey, clientB.localPublicKey)
-        assertArrayEquals(keys, listedKeys.map { it.first }.toTypedArray())
-        clientA.stop()
-        clientB.stop()
-    }
-
-    @Test
-    fun singleLargeMessageViaRelayedChannel_Success() = runBlocking {
-        val largeData = ByteArray(100000).apply { Random.nextBytes(this) }
-        val tcsA = CompletableDeferred<ChannelRelayed>()
-        val tcsB = CompletableDeferred<ChannelRelayed>()
-        val clientA = createClient(onNewChannel = { _, c -> tcsA.complete(c) })
-        val clientB = createClient(onNewChannel = { _, c -> tcsB.complete(c) })
-        val channelTask = async { clientA.startRelayedChannel(clientB.localPublicKey) }
-        val channelA = withTimeout(5000.milliseconds) { tcsA.await() }
-        channelA.authorizable = AlwaysAuthorized()
-        val channelB = withTimeout(5000.milliseconds) { tcsB.await() }
-        channelB.authorizable = AlwaysAuthorized()
-        channelTask.await()
-
-        val tcsDataB = CompletableDeferred<ByteArray>()
-        channelB.setDataHandler { _, _, o, so, d ->
-            val b = ByteArray(d.remaining())
-            d.get(b)
-            if (o == Opcode.DATA.value && so == 0u.toUByte()) tcsDataB.complete(b)
-        }
-        channelA.send(Opcode.DATA.value, 0u, ByteBuffer.wrap(largeData))
-        val receivedData = withTimeout(10000.milliseconds) { tcsDataB.await() }
-        assertArrayEquals(largeData, receivedData)
-        clientA.stop()
-        clientB.stop()
-    }
-
-    @Test
-    fun publishAndGetLargeRecord_Success() = runBlocking {
-        val largeData = ByteArray(1000000).apply { Random.nextBytes(this) }
-        val clientA = createClient()
-        val clientB = createClient()
-        val success = clientA.publishRecords(listOf(clientB.localPublicKey), "largeRecord", largeData)
-        val record = clientB.getRecord(clientA.localPublicKey, "largeRecord")
-        assertTrue(success)
-        assertNotNull(record)
-        assertArrayEquals(largeData, record!!.first)
-        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 {
-    override val isAuthorized: Boolean get() = true
-}

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

@@ -15,7 +15,6 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"/>
     <uses-permission android:name="android.permission.WRITE_SETTINGS" tools:ignore="ProtectedPermissions"/>
-    <uses-permission android:name="android.permission.UPDATE_PACKAGES_WITHOUT_USER_ACTION" />
 
     <application
         android:allowBackup="true"
@@ -56,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"
@@ -157,6 +156,7 @@
             android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.SettingsActivity"
+            android:screenOrientation="sensorPortrait"
             android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.DeveloperActivity"
@@ -240,4 +240,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,
-        CODE: 3
+        MARKUP: 2
     },
     Chapter: {
         NORMAL: 0,
@@ -292,39 +291,15 @@ class PlatformPostDetails extends PlatformPost {
     }
 }
 
-class PlatformWeb extends PlatformContent {
-    constructor(obj) {
-        super(obj, 7);
-        obj = obj ?? {};
-        this.plugin_type = "PlatformWeb";
-    }
-}
-class PlatformWebDetails extends PlatformWeb {
-    constructor(obj) {
-        super(obj, 7);
-        obj = obj ?? {};
-        this.plugin_type = "PlatformWebDetails";
-        this.html = obj.html;
-    }
-}
-
-class PlatformArticle extends PlatformContent {
-    constructor(obj) {
-        super(obj, 3);
-        obj = obj ?? {};
-        this.plugin_type = "PlatformArticle";
-        this.rating = obj.rating ?? new RatingLikes(-1);
-        this.summary = obj.summary ?? "";
-        this.thumbnails = obj.thumbnails ?? new Thumbnails([]);
-    }
-}
-class PlatformArticleDetails extends PlatformArticle {
+class PlatformArticleDetails extends PlatformContent {
     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 {
@@ -405,16 +372,20 @@ class VideoUrlSource {
         this.url = obj.url;
         if(obj.requestModifier)
             this.requestModifier = obj.requestModifier;
+
+        // deprecated api conversion
+        if(obj.licenseUri)
+            this.drmLicenseUri = obj.licenseUri;
+
+        if(obj.drmLicenseUri)
+            this.drmLicenseUri = obj.drmLicenseUri;
+        if(obj.getLicenseRequestExecutor)
+            this.getLicenseRequestExecutor = obj.getLicenseRequestExecutor;
     }
 }
 class VideoUrlWidevineSource extends VideoUrlSource {
     constructor(obj) {
         super(obj);
-        this.plugin_type = "VideoUrlWidevineSource";
-
-        this.licenseUri = obj.licenseUri;
-        if(obj.getLicenseRequestExecutor)
-            this.getLicenseRequestExecutor = obj.getLicenseRequestExecutor;
     }
 }
 class VideoUrlRangeSource extends VideoUrlSource {
@@ -442,16 +413,6 @@ class AudioUrlSource {
         this.language = obj.language ?? Language.UNKNOWN;
         if(obj.requestModifier)
             this.requestModifier = obj.requestModifier;
-    }
-}
-class AudioUrlWidevineSource extends AudioUrlSource {
-    constructor(obj) {
-        super(obj);
-        this.plugin_type = "AudioUrlWidevineSource";
-
-        this.licenseUri = obj.licenseUri;
-        if(obj.getLicenseRequestExecutor)
-            this.getLicenseRequestExecutor = obj.getLicenseRequestExecutor;
 
         // deprecated api conversion
         if(obj.bearerToken) {
@@ -469,6 +430,19 @@ class AudioUrlWidevineSource extends AudioUrlSource {
                 }
             }
         }
+        // deprecated api conversion
+        if(obj.licenseUri)
+            this.drmLicenseUri = obj.licenseUri;
+
+        if(obj.drmLicenseUri)
+            this.drmLicenseUri = obj.drmLicenseUri;
+        if(obj.getLicenseRequestExecutor)
+            this.getLicenseRequestExecutor = obj.getLicenseRequestExecutor;
+    }
+}
+class AudioUrlWidevineSource extends AudioUrlSource {
+    constructor(obj) {
+        super(obj);
     }
 }
 class AudioUrlRangeSource extends AudioUrlSource {
@@ -509,16 +483,22 @@ class DashSource {
             this.language = obj.language;
         if(obj.requestModifier)
             this.requestModifier = obj.requestModifier;
+        if(obj.getRequestExecutor)
+            this.getRequestExecutor = obj.getRequestExecutor;
+
+        // deprecated api conversion
+        if(obj.licenseUri)
+            this.drmLicenseUri = obj.licenseUri;
+
+        if(obj.drmLicenseUri)
+            this.drmLicenseUri = obj.drmLicenseUri;
+        if(obj.getLicenseRequestExecutor)
+            this.getLicenseRequestExecutor = obj.getLicenseRequestExecutor;
     }
 }
 class DashWidevineSource extends DashSource {
     constructor(obj) {
         super(obj);
-        this.plugin_type = "DashWidevineSource";
-
-        this.licenseUri = obj.licenseUri;
-        if(obj.getLicenseRequestExecutor)
-            this.getLicenseRequestExecutor = obj.getLicenseRequestExecutor;
     }
 }
 class DashManifestRawSource {
@@ -551,6 +531,11 @@ class DashManifestRawAudioSource {
         this.manifest = obj.manifest ?? null;
         if(obj.requestModifier)
             this.requestModifier = obj.requestModifier;
+
+        if(obj.drmLicenseUri)
+            this.drmLicenseUri = obj.drmLicenseUri;
+        if(obj.getLicenseRequestExecutor)
+            this.getLicenseRequestExecutor = obj.getLicenseRequestExecutor;
     }
 }
 
@@ -628,8 +613,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(".");
-        if(queryParts.size < 2)
+
+        val parts = queryDomain.lowercase().split(".");
+        if(parts.size < 3)
             throw IllegalStateException("Illegal use of wildcards on First-Level-Domain (" + queryDomain + ")");
-        else {
-            val possibleDomain = "." + queryParts.joinToString(".");
-            if(slds.contains(possibleDomain))
+        if(parts.size >= 3){
+            val isSLD = slds.contains("." + parts[parts.size - 2] + "." + parts[parts.size - 1]);
+            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)
-        "." + domainParts.drop(1).joinToString(".")
+    val sldParts = "." + domainParts[domainParts.size - 2].lowercase() + "." + domainParts[domainParts.size - 1].lowercase();
+    if(slds.contains(sldParts))
+        return "." + domainParts.drop(domainParts.size - 3).joinToString(".");
     else
-        "." + domainParts.joinToString(".");
-    if(slds.contains(wildcardDomain.lowercase()))
-        "." + domainParts.joinToString(".");
-    return wildcardDomain;
+        return "." + domainParts.drop(domainParts.size - 2).joinToString(".");
 }

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

@@ -216,16 +216,9 @@ private fun ByteArray.toInetAddress(): InetAddress {
     return InetAddress.getByAddress(this);
 }
 
-fun getConnectedSocket(attemptAddresses: List<InetAddress>, port: Int): Socket? {
-    ensureNotMainThread()
-
+fun getConnectedSocket(addresses: List<InetAddress>, port: Int): Socket? {
     val timeout = 2000
 
-
-    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")})");
-
     if (addresses.isEmpty()) {
         return null;
     }

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

@@ -1,13 +1,13 @@
 package com.futo.platformplayer
 
 import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.polycentric.PolycentricCache
 import com.futo.platformplayer.states.AnnouncementType
 import com.futo.platformplayer.states.StateAnnouncement
 import com.futo.platformplayer.states.StatePlatform
 import com.futo.polycentric.core.ProcessHandle
 import com.futo.polycentric.core.Store
 import com.futo.polycentric.core.SystemState
-import com.futo.polycentric.core.base64UrlToByteArray
 import userpackage.Protocol
 import kotlin.math.abs
 import kotlin.math.min
@@ -40,25 +40,33 @@ fun Protocol.ImageBundle?.selectHighestResolutionImage(): Protocol.ImageManifest
     return imageManifestsList.filter { it.byteCount < maximumFileSize }.maxByOrNull { abs(it.width * it.height) }
 }
 
-fun String.getDataLinkFromUrl(): Protocol.URLInfoDataLink? {
-    val urlData = if (this.startsWith("polycentric://")) {
-        this.substring("polycentric://".length)
-    } else this;
-
-    val urlBytes = urlData.base64UrlToByteArray();
-    val urlInfo = Protocol.URLInfo.parseFrom(urlBytes);
-    if (urlInfo.urlType != 4L) {
-        return null
-    }
-
-    val dataLink = Protocol.URLInfoDataLink.parseFrom(urlInfo.body);
-    return dataLink
-}
-
 fun Protocol.Claim.resolveChannelUrl(): String? {
     return StatePlatform.instance.resolveChannelUrlByClaimTemplates(this.claimType.toInt(), this.claimFieldsList.associate { Pair(it.key.toInt(), it.value) })
 }
 
 fun Protocol.Claim.resolveChannelUrls(): List<String> {
     return StatePlatform.instance.resolveChannelUrlsByClaimTemplates(this.claimType.toInt(), this.claimFieldsList.associate { Pair(it.key.toInt(), it.value) })
+}
+
+suspend fun ProcessHandle.fullyBackfillServersAnnounceExceptions() {
+    val systemState = SystemState.fromStorageTypeSystemState(Store.instance.getSystemState(system))
+    if (!systemState.servers.contains(PolycentricCache.SERVER)) {
+        Logger.w("Backfill", "Polycentric prod server not added, adding it.")
+        addServer(PolycentricCache.SERVER)
+    }
+
+    val exceptions = fullyBackfillServers()
+    for (pair in exceptions) {
+        val server = pair.key
+        val exception = pair.value
+
+        StateAnnouncement.instance.registerAnnouncement(
+            "backfill-failed",
+            "Backfill failed",
+            "Failed to backfill server $server. $exception",
+            AnnouncementType.SESSION_RECURRING
+        );
+
+        Logger.e("Backfill", "Failed to backfill server $server.", exception)
+    }
 }

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

@@ -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")
-            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]"
-            }
+            "[${hostAddress}]"
         }
         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

@@ -205,7 +205,7 @@ class Settings : FragmentedStorageFileJson() {
     var home = HomeSettings();
     @Serializable
     class HomeSettings {
-        @FormField(R.string.feed_style, FieldForm.DROPDOWN, R.string.may_require_restart, 3)
+        @FormField(R.string.feed_style, FieldForm.DROPDOWN, R.string.may_require_restart, 5)
         @DropdownFieldOptionsId(R.array.feed_style)
         var homeFeedStyle: Int = 1;
 
@@ -216,11 +216,6 @@ class Settings : FragmentedStorageFileJson() {
                 return FeedStyle.THUMBNAIL;
         }
 
-        @FormField(R.string.show_home_filters, FieldForm.TOGGLE, R.string.show_home_filters_description, 4)
-        var showHomeFilters: Boolean = true;
-        @FormField(R.string.show_home_filters_plugin_names, FieldForm.TOGGLE, R.string.show_home_filters_plugin_names_description, 5)
-        var showHomeFiltersPluginNames: Boolean = false;
-
         @FormField(R.string.preview_feed_items, FieldForm.TOGGLE, R.string.preview_feed_items_description, 6)
         var previewFeedItems: Boolean = true;
 
@@ -299,9 +294,6 @@ class Settings : FragmentedStorageFileJson() {
         @FormField(R.string.show_subscription_group, FieldForm.TOGGLE, R.string.show_subscription_group_description, 5)
         var showSubscriptionGroups: Boolean = true;
 
-        @FormField(R.string.use_subscription_exchange, FieldForm.TOGGLE, R.string.use_subscription_exchange_description, 6)
-        var useSubscriptionExchange: Boolean = false;
-
         @FormField(R.string.preview_feed_items, FieldForm.TOGGLE, R.string.preview_feed_items_description, 6)
         var previewFeedItems: Boolean = true;
 
@@ -364,7 +356,7 @@ class Settings : FragmentedStorageFileJson() {
     var playback = PlaybackSettings();
     @Serializable
     class PlaybackSettings {
-        @FormField(R.string.primary_language, FieldForm.DROPDOWN, -1, -2)
+        @FormField(R.string.primary_language, FieldForm.DROPDOWN, -1, -1)
         @DropdownFieldOptionsId(R.array.audio_languages)
         var primaryLanguage: Int = 0;
 
@@ -388,8 +380,6 @@ class Settings : FragmentedStorageFileJson() {
                 else -> null
             }
         }
-        @FormField(R.string.prefer_original_audio, FieldForm.TOGGLE, R.string.prefer_original_audio_description, -1)
-        var preferOriginalAudio: Boolean = true;
 
         //= context.resources.getStringArray(R.array.audio_languages)[primaryLanguage];
 
@@ -499,22 +489,6 @@ class Settings : FragmentedStorageFileJson() {
 
         @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.comments, "group", R.string.comments_description, 6)
@@ -599,15 +573,10 @@ class Settings : FragmentedStorageFileJson() {
         @Serializable(with = FlexibleBooleanSerializer::class)
         var keepScreenOn: Boolean = true;
 
-        @FormField(R.string.always_proxy_requests, FieldForm.TOGGLE, R.string.always_proxy_requests_description, 3)
+        @FormField(R.string.always_proxy_requests, FieldForm.TOGGLE, R.string.always_proxy_requests_description, 1)
         @Serializable(with = FlexibleBooleanSerializer::class)
         var alwaysProxyRequests: Boolean = false;
 
-
-        @FormField(R.string.allow_ipv6, FieldForm.TOGGLE, R.string.allow_ipv6_description, 4)
-        @Serializable(with = FlexibleBooleanSerializer::class)
-        var allowIpv6: Boolean = true;
-
         /*TODO: Should we have a different casting quality?
         @FormField("Preferred Casting Quality", FieldForm.DROPDOWN, "", 3)
         @DropdownFieldOptionsId(R.array.preferred_quality_array)
@@ -942,7 +911,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;
@@ -952,21 +921,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)
@@ -1035,4 +989,4 @@ class Settings : FragmentedStorageFileJson() {
         }
     }
     //endregion
-}
+}

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

@@ -5,7 +5,6 @@ import android.app.AlertDialog
 import android.content.Context
 import android.content.Intent
 import android.graphics.Color
-import android.graphics.drawable.Animatable
 import android.net.Uri
 import android.text.Layout
 import android.text.method.ScrollingMovementMethod
@@ -200,21 +199,16 @@ class UIDialogs {
             dialog.show();
         }
 
-        fun showDialog(context: Context, icon: Int, text: String, textDetails: String? = null, code: String? = null, defaultCloseAction: Int, vararg actions: Action): AlertDialog {
-            return showDialog(context, icon, false, text, textDetails, code, defaultCloseAction, *actions);
-        }
-        fun showDialog(context: Context, icon: Int, animated: Boolean, text: String, textDetails: String? = null, code: String? = null, defaultCloseAction: Int, vararg actions: Action): AlertDialog {
+        fun showDialog(context: Context, icon: Int, text: String, textDetails: String? = null, code: String? = null, defaultCloseAction: Int, vararg actions: Action) {
             val builder = AlertDialog.Builder(context);
             val view = LayoutInflater.from(context).inflate(R.layout.dialog_multi_button, null);
             builder.setView(view);
-            builder.setCancelable(defaultCloseAction > -2);
+
             val dialog = builder.create();
             registerDialogOpened(dialog);
 
             view.findViewById<ImageView>(R.id.dialog_icon).apply {
                 this.setImageResource(icon);
-                if(animated)
-                    this.drawable.assume<Animatable, Unit> { it.start() };
             }
             view.findViewById<TextView>(R.id.dialog_text).apply {
                 this.text = text;
@@ -281,7 +275,6 @@ class UIDialogs {
                 registerDialogClosed(dialog);
             }
             dialog.show();
-            return dialog;
         }
 
         fun showGeneralErrorDialog(context: Context, msg: String, ex: Throwable? = null, button: String = "Ok", onOk: (()->Unit)? = null) {
@@ -319,11 +312,7 @@ class UIDialogs {
                         closeAction?.invoke()
                     }, UIDialogs.ActionStyle.NONE),
                     UIDialogs.Action(context.getString(R.string.retry), {
-                        try {
-                            retryAction?.invoke();
-                        } catch (e: Throwable) {
-                            Logger.e(TAG, "Unhandled exception retrying", e)
-                        }
+                        retryAction?.invoke();
                     }, UIDialogs.ActionStyle.PRIMARY)
                 );
             else
@@ -337,11 +326,7 @@ class UIDialogs {
                         closeAction?.invoke()
                     }, UIDialogs.ActionStyle.NONE),
                     UIDialogs.Action(context.getString(R.string.retry), {
-                        try {
-                            retryAction?.invoke();
-                        } catch (e: Throwable) {
-                            Logger.e(TAG, "Unhandled exception retrying", e)
-                        }
+                        retryAction?.invoke();
                     }, 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())
-                    val playlist = DefaultHlsPlaylistParserFactory().createPlaylistParser()
-                        .parse(sourceUrl.toUri(), inputStream)
+                    masterPlaylist = HLS.parseMasterPlaylist(masterPlaylistContent, sourceUrl)
 
-                    if (playlist is HlsMediaPlaylist) {
-                        if (source is IHLSManifestAudioSource) {
-                            val variant = HLS.mediaRenditionToVariant(MediaRendition("AUDIO", playlist.baseUri, "Single Playlist", null, null, null, null, null))!!
+                    masterPlaylist.getAudioSources().forEach { it ->
 
-                            val estSize = VideoHelper.estimateSourceSize(variant);
-                            val prefix = if(estSize > 0) "±" + estSize.toHumanBytesSize() + " " else "";
-                            audioButtons.add(SlideUpMenuItem(
-                                container.context,
-                                R.drawable.ic_music,
-                                variant.name,
-                                listOf(variant.language, variant.codec).mapNotNull { x -> x.ifEmpty { null } }.joinToString(", "),
-                                (prefix + variant.codec).trim(),
-                                tag = variant,
-                                call = {
-                                    selectedAudioVariant = variant
-                                    slideUpMenuOverlay.selectOption(audioButtons, variant)
-                                    slideUpMenuOverlay.setOk(container.context.getString(R.string.download))
-                                },
-                                invokeParent = false
-                            ))
-                        } 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)
+                        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))
-                            }, false))
-                        }*/
+                            },
+                            invokeParent = false
+                        ))
+                    }
 
-                        masterPlaylist.getVideoSources().forEach {
-                            val estSize = VideoHelper.estimateSourceSize(it);
-                            val prefix = if(estSize > 0) "±" + estSize.toHumanBytesSize() + " " else "";
-                            videoButtons.add(SlideUpMenuItem(
-                                container.context,
-                                R.drawable.ic_movie,
-                                it.name,
-                                "${it.width}x${it.height}",
-                                (prefix + it.codec).trim(),
-                                tag = it,
-                                call = {
-                                    selectedVideoVariant = it
-                                    slideUpMenuOverlay.selectOption(videoButtons, it)
-                                    if (audioButtons.isEmpty()){
-                                        slideUpMenuOverlay.setOk(container.context.getString(R.string.download))
-                                    }
-                                },
-                                invokeParent = false
-                            ))
-                        }
+                    /*masterPlaylist.getSubtitleSources().forEach { it ->
+                        subtitleButtons.add(SlideUpMenuItem(container.context, R.drawable.ic_music, it.name, listOf(it.format).mapNotNull { x -> x.ifEmpty { null } }.joinToString(", "), it, {
+                            selectedSubtitleVariant = it
+                            slideUpMenuOverlay.selectOption(subtitleButtons, it)
+                            slideUpMenuOverlay.setOk(container.context.getString(R.string.download))
+                        }, false))
+                    }*/
+
+                    masterPlaylist.getVideoSources().forEach {
+                        val estSize = VideoHelper.estimateSourceSize(it);
+                        val prefix = if(estSize > 0) "±" + estSize.toHumanBytesSize() + " " else "";
+                        videoButtons.add(SlideUpMenuItem(
+                            container.context,
+                            R.drawable.ic_movie,
+                            it.name,
+                            "${it.width}x${it.height}",
+                            (prefix + it.codec).trim(),
+                            tag = it,
+                            call = {
+                                selectedVideoVariant = it
+                                slideUpMenuOverlay.selectOption(videoButtons, it)
+                                if (audioButtons.isEmpty()){
+                                    slideUpMenuOverlay.setOk(container.context.getString(R.string.download))
+                                }
+                            },
+                            invokeParent = false
+                        ))
                     }
 
                     val newItems = arrayListOf<View>()
@@ -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, 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(
-                    container.context, container.context.getString(R.string.add_to), "addto",
-                    SlideUpMenuItem(
-                        container.context,
+                SlideUpMenuGroup(container.context, container.context.getString(R.string.add_to), "addto",
+                    SlideUpMenuItem(container.context,
                         R.drawable.ic_queue_add,
                         container.context.getString(R.string.add_to_queue),
                         "${queue.size} " + container.context.getString(R.string.videos),
                         tag = "queue",
                         call = { StatePlayer.instance.addToQueue(video); }),
-                    SlideUpMenuItem(
-                        container.context,
+                    SlideUpMenuItem(container.context,
                         R.drawable.ic_watchlist_add,
                         "${container.context.getString(R.string.add_to)} " + StatePlayer.TYPE_WATCHLATER + "",
                         "${watchLater.size} " + container.context.getString(R.string.videos),
                         tag = "watch later",
                         call = { StatePlaylists.instance.addToWatchLater(SerializedPlatformVideo.fromVideo(video), true); }),
-                    SlideUpMenuItem(
-                        container.context,
+                    SlideUpMenuItem(container.context,
                         R.drawable.ic_history,
                         container.context.getString(R.string.add_to_history),
                         "Mark as watched",
                         tag = "history",
                         call = { StateHistory.instance.markAsWatched(video); }),
-                ));
+            ));
 
             val playlistItems = arrayListOf<SlideUpMenuItem>();
             playlistItems.add(SlideUpMenuItem(
@@ -1133,17 +1063,14 @@ class UISlideOverlays {
             val queue = StatePlayer.instance.getQueue();
             val watchLater = StatePlaylists.instance.getWatchLater();
             items.add(
-                SlideUpMenuGroup(
-                    container.context, container.context.getString(R.string.other), "other",
-                    SlideUpMenuItem(
-                        container.context,
+                SlideUpMenuGroup(container.context, container.context.getString(R.string.other), "other",
+                    SlideUpMenuItem(container.context,
                         R.drawable.ic_queue_add,
                         container.context.getString(R.string.queue),
                         "${queue.size} " + container.context.getString(R.string.videos),
                         tag = "queue",
                         call = { StatePlayer.instance.addToQueue(video); }),
-                    SlideUpMenuItem(
-                        container.context,
+                    SlideUpMenuItem(container.context,
                         R.drawable.ic_watchlist_add,
                         StatePlayer.TYPE_WATCHLATER,
                         "${watchLater.size} " + container.context.getString(R.string.videos),
@@ -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 {
-            val overlay = SlideUpMenuFilters(lifecycleScope, container, enabledClientsIds, filterValues);
+        fun showFiltersOverlay(lifecycleScope: CoroutineScope, container: ViewGroup, enabledClientsIds: List<String>, filterValues: HashMap<String, List<String>>, isChannelSearch: Boolean = false): SlideUpMenuFilters {
+            val overlay = SlideUpMenuFilters(lifecycleScope, container, enabledClientsIds, filterValues, isChannelSearch);
             overlay.show();
             return overlay;
         }
@@ -1221,7 +1148,7 @@ class UISlideOverlays {
                     container.context.getString(R.string.decide_which_buttons_should_be_pinned),
                     tag = "",
                     call = {
-                        showOrderOverlay(container, container.context.getString(R.string.select_your_pins_in_order),  (visible + hidden).map { Pair(it.text.text.toString(), it.tagRef!!) }, {
+                        showOrderOverlay(container, container.context.getString(R.string.select_your_pins_in_order),  (visible + hidden).map { Pair(it.text.text.toString(), it.tagRef!!) }) {
                             val selected = it
                                 .map { x -> visible.find { it.tagRef == x } ?: hidden.find { it.tagRef == x } }
                                 .filter { it != null }
@@ -1229,7 +1156,7 @@ class UISlideOverlays {
                                 .toList();
 
                             onPinnedbuttons?.invoke(selected + (visible + hidden).filter { !selected.contains(it) });
-                        });
+                        }
                     },
                     invokeParent = false
                 ))
@@ -1237,40 +1164,29 @@ class UISlideOverlays {
 
             return SlideUpMenuOverlay(container.context, container, container.context.getString(R.string.more_options), null, true, *views).apply { show() };
         }
-        fun showOrderOverlay(container: ViewGroup, title: String, options: List<Pair<String, Any>>, onOrdered: (List<Any>)->Unit, description: String? = null) {
+
+        fun showOrderOverlay(container: ViewGroup, title: String, options: List<Pair<String, Any>>, onOrdered: (List<Any>)->Unit) {
             val selection: MutableList<Any> = mutableListOf();
 
             var overlay: SlideUpMenuOverlay? = null;
 
             overlay = SlideUpMenuOverlay(container.context, container, title, container.context.getString(R.string.save), true,
-                listOf(
-                    if(!description.isNullOrEmpty()) SlideUpMenuGroup(container.context, "", description, "", listOf()) else null,
-                ).filterNotNull() +
-                (options.map { SlideUpMenuItem(
+                options.map { SlideUpMenuItem(
                     container.context,
                     R.drawable.ic_move_up,
                     it.first,
                     "",
                     tag = it.second,
                     call = {
-                        val overlayItem = overlay?.getSlideUpItemByTag(it.second);
                         if(overlay!!.selectOption(null, it.second, true, true)) {
-                            if(!selection.contains(it.second)) {
+                            if(!selection.contains(it.second))
                                 selection.add(it.second);
-                                if(overlayItem != null) {
-                                    overlayItem.setSubText(selection.indexOf(it.second).toString());
-                                }
-                            }
-                        } else {
+                        } else
                             selection.remove(it.second);
-                            if(overlayItem != null) {
-                                overlayItem.setSubText("");
-                            }
-                        }
                     },
                     invokeParent = false
                 )
-                }));
+                });
             overlay.onOK.subscribe {
                 onOrdered.invoke(selection);
                 overlay.hide();

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

@@ -27,23 +27,14 @@ import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.PlatformVideoWithTime
 import com.futo.platformplayer.others.PlatformLinkMovementMethod
 import java.io.ByteArrayInputStream
-import java.io.ByteArrayOutputStream
+import java.io.File
 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
+import java.nio.ByteOrder
 import java.util.*
 import java.util.concurrent.ThreadLocalRandom
-import java.util.zip.GZIPInputStream
-import java.util.zip.GZIPOutputStream
 
 private val _allowedCharacters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz ";
 fun getRandomString(sizeOfRandomString: Int): String {
@@ -75,14 +66,7 @@ fun warnIfMainThread(context: String) {
 }
 
 fun ensureNotMainThread() {
-    val isMainLooper = try {
-        Looper.myLooper() == Looper.getMainLooper()
-    } catch (e: Throwable) {
-        //Ignore, for unit tests where its not mocked
-        false
-    }
-
-    if (isMainLooper) {
+    if (Looper.myLooper() == Looper.getMainLooper()) {
         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 +269,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;
 }
@@ -295,140 +279,3 @@ fun ByteBuffer.toUtf8String(): String {
     get(remainingBytes)
     return String(remainingBytes, Charsets.UTF_8)
 }
-
-fun generateReadablePassword(length: Int): String {
-    val validChars = "ABCDEFGHJKLMNPQRSTUVWXYZabcdefghjkmnpqrstuvwxyz23456789"
-    val secureRandom = SecureRandom()
-    val randomBytes = ByteArray(length)
-    secureRandom.nextBytes(randomBytes)
-    val sb = StringBuilder(length)
-    for (byte in randomBytes) {
-        val index = (byte.toInt() and 0xFF) % validChars.length
-        sb.append(validChars[index])
-    }
-    return sb.toString()
-}
-
-fun ByteArray.toGzip(): ByteArray {
-    if (this == null || this.isEmpty()) return ByteArray(0)
-
-    val gzipTimeStart = OffsetDateTime.now();
-
-    val outputStream = ByteArrayOutputStream()
-    GZIPOutputStream(outputStream).use { gzip ->
-        gzip.write(this)
-    }
-    val result = outputStream.toByteArray();
-    Logger.i("Utility", "Gzip compression time: ${gzipTimeStart.getNowDiffMiliseconds()}ms");
-    return result;
-}
-
-fun ByteArray.fromGzip(): ByteArray {
-    if (this == null || this.isEmpty()) return ByteArray(0)
-
-    val inputStream = ByteArrayInputStream(this)
-    val outputStream = ByteArrayOutputStream()
-
-    GZIPInputStream(inputStream).use { gzip ->
-        val buffer = ByteArray(1024)
-        var bytesRead: Int
-        while (gzip.read(buffer).also { bytesRead = it } != -1) {
-            outputStream.write(buffer, 0, bytesRead)
-        }
-    }
-    return outputStream.toByteArray()
-}
-
-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/AddSourceOptionsActivity.kt

@@ -10,13 +10,11 @@ import androidx.appcompat.app.AppCompatActivity
 import com.futo.platformplayer.*
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.views.buttons.BigButton
-import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuTextInput
 import com.google.zxing.integration.android.IntentIntegrator
 
 class AddSourceOptionsActivity : AppCompatActivity() {
     lateinit var _buttonBack: ImageButton;
 
-    lateinit var _overlayContainer: FrameLayout;
     lateinit var _buttonQR: BigButton;
     lateinit var _buttonBrowse: BigButton;
     lateinit var _buttonURL: BigButton;
@@ -56,7 +54,6 @@ class AddSourceOptionsActivity : AppCompatActivity() {
         setContentView(R.layout.activity_add_source_options);
         setNavigationBarColorAndIcons();
 
-        _overlayContainer = findViewById(R.id.overlay_container);
         _buttonBack = findViewById(R.id.button_back);
 
         _buttonQR = findViewById(R.id.option_qr);
@@ -84,25 +81,7 @@ class AddSourceOptionsActivity : AppCompatActivity() {
         }
 
         _buttonURL.onClick.subscribe {
-            val nameInput = SlideUpMenuTextInput(this, "ex. https://yourplugin.com/config.json");
-            UISlideOverlays.showOverlay(_overlayContainer, "Enter your url", "Install", {
-
-                val content = nameInput.text;
-
-                val url = if (content.startsWith("https://")) {
-                    content
-                } else if (content.startsWith("grayjay://plugin/")) {
-                    content.substring("grayjay://plugin/".length)
-                } else {
-                    UIDialogs.toast(this, getString(R.string.not_a_plugin_url))
-                    return@showOverlay;
-                }
-
-                val intent = Intent(this, AddSourceActivity::class.java).apply {
-                    data = Uri.parse(url);
-                };
-                startActivity(intent);
-            }, nameInput)
+            UIDialogs.toast(this, getString(R.string.not_implemented_yet));
         }
     }
 }

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

@@ -113,7 +113,7 @@ class LoginActivity : AppCompatActivity() {
 
     companion object {
         private val TAG = "LoginActivity";
-        private val REGEX_LOGIN_BUTTON = Regex("[a-zA-Z\\-\\.#:_ ]*");
+        private val REGEX_LOGIN_BUTTON = Regex("[a-zA-Z\\-\\.#_ ]*");
 
         private var _callback: ((SourceAuth?) -> Unit)? = null;
 

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.app.UiModeManager
+import android.content.ComponentName
 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;
@@ -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);
-            } catch (e: Throwable) {
-                Logger.e(TAG, "Unhandled exception in updateAvailableClients", e)
-            }
+            StatePlatform.instance.updateAvailableClients(this@MainActivity);
         }
 
         //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
-            updatePrivateModeVisibility()
+            if (it) {
+                _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 {
-            updatePrivateModeVisibility()
-        }
-
-        _fragVideoDetail.onMaximized.subscribe {
-            updatePrivateModeVisibility()
+            if (it) {
+                _buttonIncognito.elevation = -99f;
+                _buttonIncognito.alpha = 0f;
+            } else {
+                if (StateApp.instance.privateMode) {
+                    _buttonIncognito.elevation = 99f;
+                    _buttonIncognito.alpha = 1f;
+                } else {
+                    _buttonIncognito.elevation = -99f;
+                    _buttonIncognito.alpha = 0f;
+                }
+            }
         }
 
         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) {
-                    try {
-                        handleUrlAll(targetData)
-                    } catch (e: Throwable) {
-                        Logger.e(TAG, "Unhandled exception in handleUrlAll", e)
-                    }
+                runBlocking {
+                    handleUrlAll(targetData)
                 }
             }
         } 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) {
-                    navigateWhenReady(_fragMainChannel, url);
+                lifecycleScope.launch(Dispatchers.Main) {
+                    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) {
-                    navigateWhenReady(_fragMainRemotePlaylist, url);
+                lifecycleScope.launch(Dispatchers.Main) {
+                    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
@@ -1247,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/PolycentricCreateProfileActivity.kt

@@ -11,16 +11,16 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.R
 import com.futo.platformplayer.UIDialogs
+import com.futo.platformplayer.fullyBackfillServersAnnounceExceptions
 import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.polycentric.PolycentricCache
 import com.futo.platformplayer.polycentric.PolycentricStorage
 import com.futo.platformplayer.setNavigationBarColorAndIcons
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StatePolycentric
 import com.futo.platformplayer.views.LoaderView
-import com.futo.polycentric.core.ApiMethods
 import com.futo.polycentric.core.ProcessHandle
 import com.futo.polycentric.core.Store
-import com.futo.polycentric.core.fullyBackfillServersAnnounceExceptions
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -87,7 +87,7 @@ class PolycentricCreateProfileActivity : AppCompatActivity() {
                                 Logger.e(TAG, "Failed to save process secret to secret storage.", e)
                             }
 
-                            processHandle.addServer(ApiMethods.SERVER);
+                            processHandle.addServer(PolycentricCache.SERVER);
                             processHandle.setUsername(username);
                             StatePolycentric.instance.setProcessHandle(processHandle);
                         } catch (e: Throwable) {

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

@@ -12,12 +12,12 @@ import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.R
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.polycentric.PolycentricCache
 import com.futo.platformplayer.polycentric.PolycentricStorage
 import com.futo.platformplayer.setNavigationBarColorAndIcons
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StatePolycentric
 import com.futo.platformplayer.views.overlays.LoaderOverlay
-import com.futo.polycentric.core.ApiMethods
 import com.futo.polycentric.core.KeyPair
 import com.futo.polycentric.core.Process
 import com.futo.polycentric.core.ProcessSecret
@@ -145,7 +145,7 @@ class PolycentricImportProfileActivity : AppCompatActivity() {
                 }
 
                 StatePolycentric.instance.setProcessHandle(processHandle);
-                processHandle.fullyBackfillClient(ApiMethods.SERVER);
+                processHandle.fullyBackfillClient(PolycentricCache.SERVER);
                 withContext(Dispatchers.Main) {
                     startActivity(Intent(this@PolycentricImportProfileActivity, PolycentricProfileActivity::class.java));
                     finish();

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

@@ -21,8 +21,10 @@ import com.bumptech.glide.Glide
 import com.futo.platformplayer.R
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.dp
+import com.futo.platformplayer.fullyBackfillServersAnnounceExceptions
 import com.futo.platformplayer.images.GlideHelper.Companion.crossfade
 import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.polycentric.PolycentricCache
 import com.futo.platformplayer.polycentric.PolycentricStorage
 import com.futo.platformplayer.selectBestImage
 import com.futo.platformplayer.setNavigationBarColorAndIcons
@@ -30,10 +32,8 @@ import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StatePolycentric
 import com.futo.platformplayer.views.buttons.BigButton
 import com.futo.platformplayer.views.overlays.LoaderOverlay
-import com.futo.polycentric.core.ApiMethods
 import com.futo.polycentric.core.Store
 import com.futo.polycentric.core.SystemState
-import com.futo.polycentric.core.fullyBackfillServersAnnounceExceptions
 import com.futo.polycentric.core.systemToURLInfoSystemLinkUrl
 import com.futo.polycentric.core.toBase64Url
 import com.futo.polycentric.core.toURLInfoSystemLinkUrl
@@ -145,7 +145,7 @@ class PolycentricProfileActivity : AppCompatActivity() {
 
             lifecycleScope.launch(Dispatchers.IO) {
                 try {
-                    processHandle.fullyBackfillClient(ApiMethods.SERVER)
+                    processHandle.fullyBackfillClient(PolycentricCache.SERVER)
 
                     withContext(Dispatchers.Main) {
                         updateUI();

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,9 @@ 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")
+        syncDeviceView.setLinkType(if (connected) LinkType.Local else LinkType.None)
+            .setName(publicKey)
+            .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) { session, complete, message ->
                         lifecycleScope.launch(Dispatchers.Main) {
-                            if (complete != null) {
-                                if (complete) {
-                                    _layoutPairingSuccess.visibility = View.VISIBLE
-                                    _layoutPairing.visibility = View.GONE
-                                } else {
-                                    _textError.text = message
-                                    _layoutPairingError.visibility = View.VISIBLE
-                                    _layoutPairing.visibility = View.GONE
-                                }
+                            if (complete) {
+                                _layoutPairingSuccess.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 pairingCode = StateSync.instance.syncService?.pairingCode
-        if (publicKey == null || pairingCode == null) {
-            setCode("Public key or pairing code was not known, is sync enabled?")
-        } else {
-            val selfDeviceInfo = SyncDeviceInfo(publicKey, ips.toTypedArray(), StateSync.PORT, pairingCode)
-            val json = Json.encodeToString(selfDeviceInfo)
-            val base64 = Base64.encodeToString(json.toByteArray(), Base64.URL_SAFE or Base64.NO_PADDING or Base64.NO_WRAP)
-            val url = "grayjay://sync/${base64}"
-            setCode(url)
-        }
-
+        val selfDeviceInfo = SyncDeviceInfo(StateSync.instance.publicKey!!, ips.toTypedArray(), StateSync.PORT)
+        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/contents/IPlatformContent.kt

@@ -2,8 +2,6 @@ package com.futo.platformplayer.api.media.models.contents
 
 import com.futo.platformplayer.api.media.PlatformID
 import com.futo.platformplayer.api.media.models.PlatformAuthorLink
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonNames
 import java.time.OffsetDateTime
 
 interface IPlatformContent {

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),
-    CODE(3);
+    MARKUP(2);
 
     companion object {
         fun fromInt(value: Int): TextType

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

@@ -3,7 +3,7 @@ package com.futo.platformplayer.api.media.models.streams
 import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
 import com.futo.platformplayer.downloads.VideoLocal
 
-class DownloadedVideoMuxedSourceDescriptor(
+class LocalVideoMuxedSourceDescriptor(
         private val video: VideoLocal
     ) : VideoMuxedSourceDescriptor() {
     override val videoSources: Array<IVideoSource> get() = video.videoSource.toTypedArray();

app/src/main/java/com/futo/platformplayer/api/media/models/streams/sources/AudioUrlSource.kt

@@ -13,8 +13,7 @@ class AudioUrlSource(
     override val codec: String = "",
     override val language: String = Language.UNKNOWN,
     override val duration: Long? = null,
-    override var priority: Boolean = false,
-    override var original: Boolean = false
+    override var priority: Boolean = false
 ) : IAudioUrlSource, IStreamMetaDataSource{
     override var streamMetaData: StreamMetaData? = null;
 
@@ -37,9 +36,7 @@ class AudioUrlSource(
                 source.container,
                 source.codec,
                 source.language,
-                source.duration,
-                source.priority,
-                source.original
+                source.duration
             );
             ret.streamMetaData = streamData;
 

app/src/main/java/com/futo/platformplayer/api/media/models/streams/sources/HLSVariantUrlSource.kt

@@ -27,7 +27,6 @@ class HLSVariantAudioUrlSource(
     override val language: String,
     override val duration: Long?,
     override val priority: Boolean,
-    override val original: Boolean,
     val url: String
 ) : IAudioUrlSource {
     override fun getAudioUrl(): String {

app/src/main/java/com/futo/platformplayer/api/media/models/streams/sources/IAudioSource.kt

@@ -8,5 +8,4 @@ interface IAudioSource {
     val language : String;
     val duration : Long?;
     val priority: Boolean;
-    val original: Boolean;
 }

app/src/main/java/com/futo/platformplayer/api/media/models/streams/sources/IAudioUrlWidevineSource.kt

@@ -1,3 +0,0 @@
-package com.futo.platformplayer.api.media.models.streams.sources
-
-interface IAudioUrlWidevineSource : IAudioUrlSource, IWidevineSource

app/src/main/java/com/futo/platformplayer/api/media/models/streams/sources/IDashManifestWidevineSource.kt

@@ -1,5 +0,0 @@
-package com.futo.platformplayer.api.media.models.streams.sources
-
-interface IDashManifestWidevineSource : IWidevineSource {
-    val url: String
-}

app/src/main/java/com/futo/platformplayer/api/media/models/streams/sources/IVideoUrlWidevineSource.kt

@@ -1,3 +0,0 @@
-package com.futo.platformplayer.api.media.models.streams.sources
-
-interface IVideoUrlWidevineSource : IVideoUrlSource, IWidevineSource

app/src/main/java/com/futo/platformplayer/api/media/models/streams/sources/IWidevineSource.kt

@@ -1,9 +0,0 @@
-package com.futo.platformplayer.api.media.models.streams.sources
-
-import com.futo.platformplayer.api.media.platforms.js.models.JSRequestExecutor
-
-interface IWidevineSource {
-    val licenseUri: String
-    val hasLicenseRequestExecutor: Boolean
-    fun getLicenseRequestExecutor(): JSRequestExecutor?
-}

app/src/main/java/com/futo/platformplayer/api/media/models/streams/sources/LocalAudioSource.kt

@@ -15,7 +15,6 @@ class LocalAudioSource : IAudioSource, IStreamMetaDataSource {
     override val duration: Long? = null;
 
     override var priority: Boolean = false;
-    override val original: Boolean = false;
 
     val filePath : String;
     val fileSize: Long;

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

@@ -10,18 +10,15 @@ import com.futo.polycentric.core.combineHashCodes
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonNames
 import java.time.OffsetDateTime
 
 @kotlinx.serialization.Serializable
 open class SerializedPlatformVideo(
-    override val contentType: ContentType = ContentType.MEDIA,
     override val id: PlatformID,
     override val name: String,
     override val thumbnails: Thumbnails,
     override val author: PlatformAuthorLink,
     @kotlinx.serialization.Serializable(with = OffsetDateTimeNullableSerializer::class)
-    @JsonNames("datetime", "dateTime")
     override val datetime: OffsetDateTime? = null,
     override val url: String,
     override val shareUrl: String = "",
@@ -30,6 +27,7 @@ open class SerializedPlatformVideo(
     override val viewCount: Long,
     override val isShort: Boolean = false
 ) : IPlatformVideo, SerializedPlatformContent {
+    override val contentType: ContentType = ContentType.MEDIA;
 
     override val isLive: Boolean = false;
 
@@ -46,7 +44,6 @@ open class SerializedPlatformVideo(
     companion object {
         fun fromVideo(video: IPlatformVideo) : SerializedPlatformVideo {
             return SerializedPlatformVideo(
-                ContentType.MEDIA,
                 video.id,
                 video.name,
                 video.thumbnails,

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 {
-        val client = DevJSClient(_context, descriptor, _script, if(!privateCopy) _auth else null, _captcha, if (noSaveState) null else saveState(), devID);
-        if (noSaveState)
-            client.initialize()
-        return client
+    override fun getCopy(privateCopy: Boolean): JSClient {
+        return DevJSClient(_context, descriptor, _script, if(!privateCopy) _auth else null, _captcha, saveState(), devID);
     }
 
     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 {
-        val client = JSClient(_context, descriptor, if (noSaveState) null else saveState(), _script, withoutCredentials);
-        if (noSaveState)
-            client.initialize()
-        return client
+    open fun getCopy(withoutCredentials: Boolean = false): JSClient {
+        return JSClient(_context, descriptor, saveState(), _script, withoutCredentials);
     }
 
     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;
-    override val thumbnails: Thumbnails?;
-    override val segments: List<IJSArticleSegment>;
+    val summary: String;
+    val thumbnails: Thumbnails?;
+    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();
-        if(datetimeInt == null || datetimeInt == 0.toLong())
+        val datetimeInt = _content.getOrThrow<Int>(config, "datetime", contextName).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/api/media/platforms/js/models/sources/JSAudioUrlSource.kt

@@ -21,8 +21,6 @@ open class JSAudioUrlSource : IAudioUrlSource, JSSource {
 
     override var priority: Boolean = false;
 
-    override var original: Boolean = false;
-
     constructor(plugin: JSClient, obj: V8ValueObject) : super(TYPE_AUDIOURL, plugin, obj) {
         val contextName = "AudioUrlSource";
         val config = plugin.config;
@@ -37,7 +35,6 @@ open class JSAudioUrlSource : IAudioUrlSource, JSSource {
         name = _obj.getOrDefault(config, "name", contextName, "${container} ${bitrate}") ?: "${container} ${bitrate}";
 
         priority = if(_obj.has("priority")) obj.getOrThrow(config, "priority", contextName) else false;
-        original =  if(_obj.has("original")) obj.getOrThrow(config, "original", contextName) else false;
     }
 
     override fun getAudioUrl() : String {

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

@@ -1,41 +0,0 @@
-package com.futo.platformplayer.api.media.platforms.js.models.sources
-
-import com.caoccao.javet.values.reference.V8ValueObject
-import com.futo.platformplayer.api.media.models.streams.sources.IAudioUrlWidevineSource
-import com.futo.platformplayer.api.media.platforms.js.JSClient
-import com.futo.platformplayer.api.media.platforms.js.models.JSRequestExecutor
-import com.futo.platformplayer.engine.V8Plugin
-import com.futo.platformplayer.getOrThrow
-
-class JSAudioUrlWidevineSource : JSAudioUrlSource, IAudioUrlWidevineSource {
-    override val licenseUri: String
-    override val hasLicenseRequestExecutor: Boolean
-
-    @Suppress("ConvertSecondaryConstructorToPrimary")
-    constructor(plugin: JSClient, obj: V8ValueObject) : super(plugin, obj) {
-        val contextName = "JSAudioUrlWidevineSource"
-        val config = plugin.config
-
-        licenseUri = _obj.getOrThrow(config, "licenseUri", contextName)
-        hasLicenseRequestExecutor = obj.has("getLicenseRequestExecutor")
-    }
-
-    override fun getLicenseRequestExecutor(): JSRequestExecutor? {
-        if (!hasLicenseRequestExecutor || _obj.isClosed)
-            return null
-
-        val result = V8Plugin.catchScriptErrors<Any>(_config, "[${_config.name}] JSAudioUrlWidevineSource", "obj.getLicenseRequestExecutor()") {
-            _obj.invoke("getLicenseRequestExecutor", arrayOf<Any>())
-        }
-
-        if (result !is V8ValueObject)
-            return null
-
-        return JSRequestExecutor(_plugin, result)
-    }
-
-    override fun toString(): String {
-        val url = getAudioUrl()
-        return "(name=$name, container=$container, bitrate=$bitrate, codec=$codec, url=$url, language=$language, duration=$duration, hasLicenseRequestExecutor=${hasLicenseRequestExecutor}, licenseUri=$licenseUri)"
-    }
-}

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

@@ -2,16 +2,11 @@ package com.futo.platformplayer.api.media.platforms.js.models.sources
 
 import com.caoccao.javet.values.reference.V8ValueObject
 import com.futo.platformplayer.api.media.models.streams.sources.IAudioSource
-import com.futo.platformplayer.api.media.models.streams.sources.IDashManifestSource
-import com.futo.platformplayer.api.media.models.streams.sources.IVideoUrlSource
 import com.futo.platformplayer.api.media.models.streams.sources.other.IStreamMetaDataSource
 import com.futo.platformplayer.api.media.models.streams.sources.other.StreamMetaData
 import com.futo.platformplayer.api.media.platforms.js.DevJSClient
 import com.futo.platformplayer.api.media.platforms.js.JSClient
-import com.futo.platformplayer.engine.IV8PluginConfig
-import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.getOrDefault
-import com.futo.platformplayer.getOrNull
 import com.futo.platformplayer.getOrThrow
 import com.futo.platformplayer.others.Language
 import com.futo.platformplayer.states.StateDeveloper
@@ -23,7 +18,6 @@ class JSDashManifestRawAudioSource : JSSource, IAudioSource, IJSDashManifestRawS
     override val bitrate: Int;
     override val duration: Long;
     override val priority: Boolean;
-    override var original: Boolean = false;
 
     override val language: String;
 
@@ -46,7 +40,6 @@ class JSDashManifestRawAudioSource : JSSource, IAudioSource, IJSDashManifestRawS
         duration = _obj.getOrDefault(config, "duration", contextName, 0) ?: 0;
         priority = _obj.getOrDefault(config, "priority", contextName, false) ?: false;
         language = _obj.getOrDefault(config, "language", contextName, Language.UNKNOWN) ?: Language.UNKNOWN;
-        original =  if(_obj.has("original")) obj.getOrThrow(config, "original", contextName) else false;
         hasGenerate = _obj.has("generate");
     }
 
@@ -81,4 +74,4 @@ class JSDashManifestRawAudioSource : JSSource, IAudioSource, IJSDashManifestRawS
         }
         return result;
     }
-}
+}

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

@@ -1,60 +0,0 @@
-package com.futo.platformplayer.api.media.platforms.js.models.sources
-
-import com.caoccao.javet.values.reference.V8ValueObject
-import com.futo.platformplayer.api.media.models.streams.sources.IDashManifestSource
-import com.futo.platformplayer.api.media.models.streams.sources.IDashManifestWidevineSource
-import com.futo.platformplayer.api.media.models.streams.sources.IVideoUrlSource
-import com.futo.platformplayer.api.media.platforms.js.JSClient
-import com.futo.platformplayer.api.media.platforms.js.models.JSRequestExecutor
-import com.futo.platformplayer.engine.V8Plugin
-import com.futo.platformplayer.getOrNull
-import com.futo.platformplayer.getOrThrow
-
-class JSDashManifestWidevineSource : IVideoUrlSource, IDashManifestSource,
-    IDashManifestWidevineSource, JSSource {
-    override val width: Int = 0
-    override val height: Int = 0
-    override val container: String = "application/dash+xml"
-    override val codec: String = "Dash"
-    override val name: String
-    override val bitrate: Int? = null
-    override val url: String
-    override val duration: Long
-
-    override var priority: Boolean = false
-
-    override val licenseUri: String
-    override val hasLicenseRequestExecutor: Boolean
-
-    @Suppress("ConvertSecondaryConstructorToPrimary")
-    constructor(plugin: JSClient, obj: V8ValueObject) : super(TYPE_DASH, plugin, obj) {
-        val contextName = "DashWidevineSource"
-        val config = plugin.config
-        name = _obj.getOrThrow(config, "name", contextName)
-        url = _obj.getOrThrow(config, "url", contextName)
-        duration = _obj.getOrThrow(config, "duration", contextName)
-
-        priority = obj.getOrNull(config, "priority", contextName) ?: false
-
-        licenseUri = _obj.getOrThrow(config, "licenseUri", contextName)
-        hasLicenseRequestExecutor = obj.has("getLicenseRequestExecutor")
-    }
-
-    override fun getLicenseRequestExecutor(): JSRequestExecutor? {
-        if (!hasLicenseRequestExecutor || _obj.isClosed)
-            return null
-
-        val result = V8Plugin.catchScriptErrors<Any>(_config, "[${_config.name}] JSDashManifestWidevineSource", "obj.getLicenseRequestExecutor()") {
-            _obj.invoke("getLicenseRequestExecutor", arrayOf<Any>())
-        }
-
-        if (result !is V8ValueObject)
-            return null
-
-        return JSRequestExecutor(_plugin, result)
-    }
-
-    override fun getVideoUrl(): String {
-        return url
-    }
-}

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

@@ -21,7 +21,6 @@ class JSHLSManifestAudioSource : IHLSManifestAudioSource, JSSource {
     override val language: String;
 
     override var priority: Boolean = false;
-    override var original: Boolean = false;
 
     constructor(plugin: JSClient, obj: V8ValueObject) : super(TYPE_HLS, plugin, obj) {
         val contextName = "HLSAudioSource";
@@ -33,7 +32,6 @@ class JSHLSManifestAudioSource : IHLSManifestAudioSource, JSSource {
         language = _obj.getOrThrow(config, "language", contextName);
 
         priority = obj.getOrNull(config, "priority", contextName) ?: false;
-        original =  if(_obj.has("original")) obj.getOrThrow(config, "original", contextName) else false;
     }
 
 

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

@@ -1,7 +1,5 @@
 package com.futo.platformplayer.api.media.platforms.js.models.sources
 
-import androidx.media3.datasource.DefaultHttpDataSource
-import androidx.media3.datasource.HttpDataSource
 import com.caoccao.javet.values.V8Value
 import com.caoccao.javet.values.reference.V8ValueObject
 import com.futo.platformplayer.api.media.models.modifier.AdhocRequestModifier
@@ -15,9 +13,9 @@ import com.futo.platformplayer.api.media.platforms.js.models.JSRequestModifier
 import com.futo.platformplayer.engine.IV8PluginConfig
 import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.getOrDefault
+import com.futo.platformplayer.getOrThrow
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.orNull
-import com.futo.platformplayer.views.video.datasources.JSHttpDataSource
 
 abstract class JSSource {
     protected val _plugin: JSClient;
@@ -30,6 +28,9 @@ abstract class JSSource {
     val hasRequestExecutor: Boolean;
     private val _requestExecutor: JSRequest?;
 
+    val drmLicenseUri: String?
+    val hasLicenseRequestExecutor: Boolean
+
     val requiresCustomDatasource: Boolean get() {
         return hasRequestModifier || hasRequestExecutor;
     }
@@ -51,6 +52,9 @@ abstract class JSSource {
             JSRequest(plugin, it, null, null, true);
         }
         hasRequestExecutor = _requestExecutor != null || obj.has("getRequestExecutor");
+
+        drmLicenseUri = _obj.getOrDefault(_config, "drmLicenseUri", "JSSource.drmLicenseUri", null)
+        hasLicenseRequestExecutor = obj.has("getLicenseRequestExecutor")
     }
 
     fun getRequestModifier(): IRequestModifier? {
@@ -84,6 +88,19 @@ abstract class JSSource {
 
         return JSRequestExecutor(_plugin, result)
     }
+    fun getLicenseRequestExecutor(): JSRequestExecutor? {
+        if (!hasLicenseRequestExecutor || _obj.isClosed)
+            return null
+
+        val result = V8Plugin.catchScriptErrors<Any>(_config, "[${_config.name}] JSSource", "obj.getLicenseRequestExecutor()") {
+            _obj.invoke("getLicenseRequestExecutor", arrayOf<Any>())
+        }
+
+        if (result !is V8ValueObject)
+            return null
+
+        return JSRequestExecutor(_plugin, result)
+    }
 
     fun getUnderlyingPlugin(): JSClient? {
         return _plugin;
@@ -98,22 +115,17 @@ abstract class JSSource {
         const val TYPE_AUDIO_WITH_METADATA = "AudioUrlRangeSource";
         const val TYPE_VIDEO_WITH_METADATA = "VideoUrlRangeSource";
         const val TYPE_DASH = "DashSource";
-        const val TYPE_DASH_WIDEVINE = "DashWidevineSource";
         const val TYPE_DASH_RAW = "DashRawSource";
         const val TYPE_DASH_RAW_AUDIO = "DashRawAudioSource";
         const val TYPE_HLS = "HLSSource";
-        const val TYPE_AUDIOURL_WIDEVINE = "AudioUrlWidevineSource"
-        const val TYPE_VIDEOURL_WIDEVINE = "VideoUrlWidevineSource"
 
         fun fromV8VideoNullable(plugin: JSClient, obj: V8Value?) : IVideoSource? = obj.orNull { fromV8Video(plugin, it as V8ValueObject) };
         fun fromV8Video(plugin: JSClient, obj: V8ValueObject) : IVideoSource? {
             val type = obj.getString("plugin_type");
             return when(type) {
                 TYPE_VIDEOURL -> JSVideoUrlSource(plugin, obj);
-                TYPE_VIDEOURL_WIDEVINE -> JSVideoUrlWidevineSource(plugin, obj);
                 TYPE_VIDEO_WITH_METADATA -> JSVideoUrlRangeSource(plugin, obj);
                 TYPE_HLS -> fromV8HLS(plugin, obj);
-                TYPE_DASH_WIDEVINE -> JSDashManifestWidevineSource(plugin, obj)
                 TYPE_DASH -> fromV8Dash(plugin, obj);
                 TYPE_DASH_RAW -> fromV8DashRaw(plugin, obj);
                 else -> {
@@ -135,7 +147,6 @@ abstract class JSSource {
                 TYPE_HLS -> JSHLSManifestAudioSource.fromV8HLS(plugin, obj);
                 TYPE_AUDIOURL -> JSAudioUrlSource(plugin, obj);
                 TYPE_DASH_RAW_AUDIO -> fromV8DashRawAudio(plugin, obj);
-                TYPE_AUDIOURL_WIDEVINE -> JSAudioUrlWidevineSource(plugin, obj);
                 TYPE_AUDIO_WITH_METADATA -> JSAudioUrlRangeSource(plugin, obj);
                 else -> {
                     Logger.w("JSSource", "Unknown audio type ${type}");

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

@@ -1,41 +0,0 @@
-package com.futo.platformplayer.api.media.platforms.js.models.sources
-
-import com.caoccao.javet.values.reference.V8ValueObject
-import com.futo.platformplayer.api.media.models.streams.sources.IVideoUrlWidevineSource
-import com.futo.platformplayer.api.media.platforms.js.JSClient
-import com.futo.platformplayer.api.media.platforms.js.models.JSRequestExecutor
-import com.futo.platformplayer.engine.V8Plugin
-import com.futo.platformplayer.getOrThrow
-
-class JSVideoUrlWidevineSource : JSVideoUrlSource, IVideoUrlWidevineSource {
-    override val licenseUri: String
-    override val hasLicenseRequestExecutor: Boolean
-
-    @Suppress("ConvertSecondaryConstructorToPrimary")
-    constructor(plugin: JSClient, obj: V8ValueObject) : super(plugin, obj) {
-        val contextName = "JSAudioUrlWidevineSource"
-        val config = plugin.config
-
-        licenseUri = _obj.getOrThrow(config, "licenseUri", contextName)
-        hasLicenseRequestExecutor = obj.has("getLicenseRequestExecutor")
-    }
-
-    override fun getLicenseRequestExecutor(): JSRequestExecutor? {
-        if (!hasLicenseRequestExecutor || _obj.isClosed)
-            return null
-
-        val result = V8Plugin.catchScriptErrors<Any>(_config, "[${_config.name}] JSAudioUrlWidevineSource", "obj.getLicenseRequestExecutor()") {
-            _obj.invoke("getLicenseRequestExecutor", arrayOf<Any>())
-        }
-
-        if (result !is V8ValueObject)
-            return null
-
-        return JSRequestExecutor(_plugin, result)
-    }
-
-    override fun toString(): String {
-        val url = getVideoUrl()
-        return "(width=$width, height=$height, container=$container, codec=$codec, name=$name, bitrate=$bitrate, duration=$duration, url=$url, hasLicenseRequestExecutor=$hasLicenseRequestExecutor, licenseUri=$licenseUri)"
-    }
-}

app/src/main/java/com/futo/platformplayer/api/media/platforms/local/LocalClient.kt

@@ -1,5 +0,0 @@
-package com.futo.platformplayer.api.media.platforms.local
-
-class LocalClient {
-    //TODO
-}

app/src/main/java/com/futo/platformplayer/api/media/platforms/local/models/LocalVideoDetails.kt

@@ -1,85 +0,0 @@
-package com.futo.platformplayer.api.media.platforms.local.models
-
-import com.futo.platformplayer.api.media.IPlatformClient
-import com.futo.platformplayer.api.media.PlatformID
-import com.futo.platformplayer.api.media.models.PlatformAuthorLink
-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.playback.IPlaybackTracker
-import com.futo.platformplayer.api.media.models.ratings.IRating
-import com.futo.platformplayer.api.media.models.ratings.RatingLikes
-import com.futo.platformplayer.api.media.models.streams.IVideoSourceDescriptor
-import com.futo.platformplayer.api.media.models.streams.DownloadedVideoMuxedSourceDescriptor
-import com.futo.platformplayer.api.media.models.streams.sources.IDashManifestSource
-import com.futo.platformplayer.api.media.models.streams.sources.IHLSManifestSource
-import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
-import com.futo.platformplayer.api.media.models.subtitles.ISubtitleSource
-import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
-import com.futo.platformplayer.api.media.platforms.local.models.sources.LocalVideoFileSource
-import com.futo.platformplayer.api.media.structures.IPager
-import com.futo.platformplayer.downloads.VideoLocal
-import java.io.File
-import java.time.Instant
-import java.time.OffsetDateTime
-import java.time.ZoneId
-
-class LocalVideoDetails: IPlatformVideoDetails {
-
-    override val contentType: ContentType get() = ContentType.UNKNOWN;
-
-    override val id: PlatformID;
-    override val name: String;
-    override val author: PlatformAuthorLink;
-
-    override val datetime: OffsetDateTime?;
-
-    override val url: String;
-    override val shareUrl: String;
-    override val rating: IRating = RatingLikes(0);
-    override val description: String = "";
-
-    override val video: IVideoSourceDescriptor;
-    override val preview: IVideoSourceDescriptor? = null;
-    override val live: IVideoSource? = null;
-    override val dash: IDashManifestSource? = null;
-    override val hls: IHLSManifestSource? = null;
-    override val subtitles: List<ISubtitleSource> = listOf()
-
-    override val thumbnails: Thumbnails;
-    override val duration: Long;
-    override val viewCount: Long = 0;
-    override val isLive: Boolean = false;
-    override val isShort: Boolean = false;
-
-    constructor(file: File) {
-        id = PlatformID("Local", file.path, "LOCAL")
-        name = file.name;
-        author = PlatformAuthorLink.UNKNOWN;
-
-        url = file.canonicalPath;
-        shareUrl = "";
-
-        duration = 0;
-        thumbnails = Thumbnails(arrayOf());
-
-        datetime = OffsetDateTime.ofInstant(
-            Instant.ofEpochMilli(file.lastModified()),
-            ZoneId.systemDefault()
-        );
-        video = LocalVideoMuxedSourceDescriptor(LocalVideoFileSource(file));
-    }
-
-    override fun getComments(client: IPlatformClient): IPager<IPlatformComment>? {
-        return null;
-    }
-
-    override fun getPlaybackTracker(): IPlaybackTracker? {
-        return null;
-    }
-
-    override fun getContentRecommendations(client: IPlatformClient): IPager<IPlatformContent>? {
-        return null;
-    }
-}

app/src/main/java/com/futo/platformplayer/api/media/platforms/local/models/LocalVideoMuxedSourceDescriptor.kt

@@ -1,13 +0,0 @@
-package com.futo.platformplayer.api.media.platforms.local.models
-
-import com.futo.platformplayer.api.media.models.streams.VideoMuxedSourceDescriptor
-import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
-import com.futo.platformplayer.api.media.models.streams.sources.LocalVideoSource
-import com.futo.platformplayer.api.media.platforms.local.models.sources.LocalVideoFileSource
-import com.futo.platformplayer.downloads.VideoLocal
-
-class LocalVideoMuxedSourceDescriptor(
-    private val video: LocalVideoFileSource
-) : VideoMuxedSourceDescriptor() {
-    override val videoSources: Array<IVideoSource> get() = arrayOf(video);
-}

app/src/main/java/com/futo/platformplayer/api/media/platforms/local/models/MediaStoreVideo.kt

@@ -1,25 +0,0 @@
-package com.futo.platformplayer.api.media.platforms.local.models
-
-import android.content.Context
-import android.database.Cursor
-import android.provider.MediaStore
-import android.provider.MediaStore.Video
-
-class MediaStoreVideo {
-
-
-    companion object {
-        val URI = MediaStore.Files.getContentUri("external");
-        val PROJECTION = arrayOf(Video.Media._ID, Video.Media.TITLE, Video.Media.DURATION, Video.Media.HEIGHT, Video.Media.WIDTH, Video.Media.MIME_TYPE);
-        val ORDER = MediaStore.Video.Media.TITLE;
-
-        fun readMediaStoreVideo(cursor: Cursor) {
-
-        }
-
-        fun query(context: Context, selection: String, args: Array<String>, order: String? = null): Cursor? {
-            val cursor = context.contentResolver.query(URI, PROJECTION, selection, args, order ?: ORDER, null);
-            return cursor;
-        }
-    }
-}

app/src/main/java/com/futo/platformplayer/api/media/platforms/local/models/sources/LocalVideoFileSource.kt

@@ -1,31 +0,0 @@
-package com.futo.platformplayer.api.media.platforms.local.models.sources
-
-import android.content.Context
-import android.provider.MediaStore
-import android.provider.MediaStore.Video
-import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
-import com.futo.platformplayer.api.media.models.streams.sources.VideoUrlSource
-import com.futo.platformplayer.helpers.VideoHelper
-import java.io.File
-
-class LocalVideoFileSource: IVideoSource {
-
-
-    override val name: String;
-    override val width: Int;
-    override val height: Int;
-    override val container: String;
-    override val codec: String = ""
-    override val bitrate: Int = 0
-    override val duration: Long;
-    override val priority: Boolean = false;
-
-    constructor(file: File) {
-        name = file.name;
-        width = 0;
-        height = 0;
-        container = VideoHelper.videoExtensionToMimetype(file.extension) ?: "";
-        duration = 0;
-    }
-
-}

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

@@ -6,7 +6,7 @@ import com.futo.platformplayer.constructs.Event1
  * A RefreshPager represents a pager that can be modified overtime (eg. By getting more results later, by recreating the pager)
  * When the onPagerChanged event is emitted, a new pager instance is passed, or requested via getCurrentPager
  */
-interface IRefreshPager<T>: IPager<T> {
+interface IRefreshPager<T> {
     val onPagerChanged: Event1<IPager<T>>;
     val onPagerError: Event1<Throwable>;
 

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

@@ -1,7 +1,5 @@
 package com.futo.platformplayer.api.media.structures
 
-import com.futo.platformplayer.api.media.structures.ReusablePager.Window
-import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.logging.Logger
 
 /**
@@ -11,8 +9,8 @@ import com.futo.platformplayer.logging.Logger
  * A "Window" is effectively a pager that just reads previous results from the shared results, but when the end is reached, it will call nextPage on the parent if possible for new results.
  * This allows multiple Windows to exist of the same pager, without messing with position, or duplicate requests
  */
-open class ReusablePager<T>: INestedPager<T>, IReusablePager<T> {
-    protected var _pager: IPager<T>;
+class ReusablePager<T>: INestedPager<T>, IPager<T> {
+    private val _pager: IPager<T>;
     val previousResults = arrayListOf<T>();
 
     constructor(subPager: IPager<T>) {
@@ -46,7 +44,7 @@ open class ReusablePager<T>: INestedPager<T>, IReusablePager<T> {
         return previousResults;
     }
 
-    override fun getWindow(): Window<T> {
+    fun getWindow(): Window<T> {
         return Window(this);
     }
 
@@ -97,118 +95,4 @@ open class ReusablePager<T>: INestedPager<T>, IReusablePager<T> {
             return ReusablePager(this);
         }
     }
-}
-
-
-public class ReusableRefreshPager<T>: INestedPager<T>, IReusablePager<T> {
-    protected var _pager: IRefreshPager<T>;
-    val previousResults = arrayListOf<T>();
-
-    private var _currentPage: IPager<T>;
-
-
-    val onPagerChanged = Event1<IPager<T>>()
-    val onPagerError = Event1<Throwable>()
-
-    constructor(subPager: IRefreshPager<T>) {
-        this._pager = subPager;
-        _currentPage = this;
-        synchronized(previousResults) {
-            previousResults.addAll(subPager.getResults());
-        }
-        _pager.onPagerError.subscribe(onPagerError::emit);
-        _pager.onPagerChanged.subscribe {
-            _currentPage = it;
-            synchronized(previousResults) {
-                previousResults.clear();
-                previousResults.addAll(it.getResults());
-            }
-
-            onPagerChanged.emit(_currentPage);
-        };
-    }
-
-    override fun findPager(query: (IPager<T>) -> Boolean): IPager<T>? {
-        if(query(_pager))
-            return _pager;
-        else if(_pager is INestedPager<*>)
-            return (_pager as INestedPager<T>).findPager(query);
-        return null;
-    }
-
-    override fun hasMorePages(): Boolean {
-        return _pager.hasMorePages();
-    }
-
-    override fun nextPage() {
-        _pager.nextPage();
-    }
-
-    override fun getResults(): List<T> {
-        val results = _pager.getResults();
-        synchronized(previousResults) {
-            previousResults.addAll(results);
-        }
-        return previousResults;
-    }
-
-    override fun getWindow(): RefreshWindow<T> {
-        return RefreshWindow(this);
-    }
-
-
-    class RefreshWindow<T>: IPager<T>, INestedPager<T>, IRefreshPager<T> {
-        private val _parent: ReusableRefreshPager<T>;
-        private var _position: Int = 0;
-        private var _read: Int = 0;
-
-        private var _currentResults: List<T>;
-
-        override val onPagerChanged = Event1<IPager<T>>();
-        override val onPagerError = Event1<Throwable>();
-
-
-        override fun getCurrentPager(): IPager<T> {
-            return _parent.getWindow();
-        }
-
-        constructor(parent: ReusableRefreshPager<T>) {
-            _parent = parent;
-
-            synchronized(_parent.previousResults) {
-                _currentResults = _parent.previousResults.toList();
-                _read += _currentResults.size;
-            }
-            parent.onPagerChanged.subscribe(onPagerChanged::emit);
-            parent.onPagerError.subscribe(onPagerError::emit);
-        }
-
-
-        override fun hasMorePages(): Boolean {
-            return _parent.previousResults.size > _read || _parent.hasMorePages();
-        }
-
-        override fun nextPage() {
-            synchronized(_parent.previousResults) {
-                if (_parent.previousResults.size <= _read) {
-                    _parent.nextPage();
-                    _parent.getResults();
-                }
-                _currentResults = _parent.previousResults.drop(_read).toList();
-                _read += _currentResults.size;
-            }
-        }
-
-        override fun getResults(): List<T> {
-            return _currentResults;
-        }
-
-        override fun findPager(query: (IPager<T>) -> Boolean): IPager<T>? {
-            return _parent.findPager(query);
-        }
-    }
-}
-
-interface IReusablePager<T>: IPager<T> {
-    fun getWindow(): IPager<T>;
 }

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);
-                                if (msg.namespace != "urn:x-cast:com.google.cast.tp.heartbeat") {
-                                    Logger.i(TAG, "Received message: $msg");
+                                val message = ChromeCast.CastMessage.parseFrom(messageBytes);
+                                if (message.namespace != "urn:x-cast:com.google.cast.tp.heartbeat") {
+                                    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
-                        _mediaSessionId = null
-                        setTime(0.0)
-                        _transportId = null
+                    _sessionId = null;
+                    _mediaSessionId = null;
+                    setTime(0.0);
+                    _transportId = null;
+                    Logger.w(TAG, "Session not found.");
 
-                        if (_launching && _launchRetries < MAX_LAUNCH_RETRIES) {
-                            Logger.i(TAG, "No player yet; attempting launch #${_launchRetries + 1}")
-                            _launchRetries++
-                            launchPlayer()
-                        } else if (!_launching && _launchRetries < MAX_LAUNCH_RETRIES) {
-                            // Maybe the first GET_STATUS came back empty; still try launching
-                            Logger.i(TAG, "Player not found; triggering launch #${_launchRetries + 1}")
-                            _launching = true
-                            _launchRetries++
-                            launchPlayer()
-                        } else {
-                            Logger.e(TAG, "Player not found after $_launchRetries attempts; giving up.")
-                            Logger.i(TAG, "Unable to start media receiver on device")
-                            stop()
-                        }
+                    if (_launching) {
+                        Logger.i(TAG, "Player not found, launching.");
+                        launchPlayer();
                     } else {
-                        if (_retryJob == null) {
-                            Logger.i(TAG, "Scheduled retry job over 5 seconds")
-                            _retryJob = _scopeIO?.launch(Dispatchers.IO) {
-                                delay(5000)
-                                getStatus()
-                                _retryJob = null
-                            }
-                        }
+                        Logger.i(TAG, "Player not found, disconnecting.");
+                        stop();
                     }
                 } else {
-                    _launching = false
-                    _launchRetries = 0
+                    _launching = false;
                 }
 
                 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

@@ -3,7 +3,6 @@ package com.futo.platformplayer.casting
 import android.os.Looper
 import android.util.Base64
 import android.util.Log
-import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.casting.models.FCastDecryptedMessage
 import com.futo.platformplayer.casting.models.FCastEncryptedMessage
@@ -25,7 +24,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
@@ -34,7 +32,6 @@ import java.io.IOException
 import java.io.InputStream
 import java.io.OutputStream
 import java.math.BigInteger
-import java.net.Inet4Address
 import java.net.InetAddress
 import java.net.InetSocketAddress
 import java.net.Socket
@@ -93,7 +90,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 +287,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 +324,9 @@ class FCastCastingDevice : CastingDevice {
                         continue;
                     }
 
-                    localAddress = _socket?.localAddress
-                    _lastPongTime = System.currentTimeMillis()
-                    connectionState = CastConnectionState.CONNECTED
+                    localAddress = _socket?.localAddress;
+                    connectionState = CastConnectionState.CONNECTED;
+                    _lastPongTime = -1L
 
                     val buffer = ByteArray(4096);
 
@@ -406,32 +402,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)
-                            if (System.currentTimeMillis() - _lastPongTime > 15000) {
-                                Logger.w(TAG, "Closing socket due to last pong time being larger than 15 seconds.")
-                                try {
-                                    _socket?.close()
-                                } catch (e: Throwable) {
-                                    Log.w(TAG, "Failed to close socket.", e)
-                                }
-                            }
+                            _socket?.close()
+                            _inputStream?.close()
+                            _outputStream?.close()
                         } catch (e: Throwable) {
-                            Log.w(TAG, "Failed to send ping.")
-                            try {
-                                _socket?.close()
-                                _inputStream?.close()
-                                _outputStream?.close()
-                            } catch (e: Throwable) {
-                                Log.w(TAG, "Failed to close socket.", e)
-                            }
+                            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

@@ -1,20 +1,14 @@
 package com.futo.platformplayer.casting
 
-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 java.net.Inet4Address
+import android.util.Xml
 import androidx.annotation.OptIn
 import androidx.media3.common.util.UnstableApi
-import com.futo.platformplayer.R
 import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.api.http.ManagedHttpClient
@@ -43,8 +37,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 +53,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 +68,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 +82,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(
-        "_googlecast._tcp" to createDiscoveryListener(::addOrUpdateChromeCastDevice),
-        "_airplay._tcp" to createDiscoveryListener(::addOrUpdateAirPlayDevice),
-        "_fastcast._tcp" to createDiscoveryListener(::addOrUpdateFastCastDevice),
-        "_fcast._tcp" to createDiscoveryListener(::addOrUpdateFastCastDevice)
-    )
+    private fun handleServiceUpdated(services: List<DnsService>) {
+        for (s in services) {
+            //TODO: Addresses IPv4 only?
+            val addresses = s.addresses.toTypedArray()
+            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,33 +188,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
     }
 
     @Synchronized
     fun startDiscovering() {
-        _nsdManager?.apply {
-            _discoveryListeners.forEach {
-                discoverServices(it.key, NsdManager.PROTOCOL_DNS_SD, it.value)
-            }
+        try {
+            _serviceDiscoverer.start()
+        } catch (e: Throwable) {
+            Logger.i(TAG, "Failed to start ServiceDiscoverer", e)
         }
     }
 
     @Synchronized
     fun stopDiscovering() {
-        _nsdManager?.apply {
-            _discoveryListeners.forEach {
-                try {
-                    stopServiceDiscovery(it.value)
-                } catch (e: Throwable) {
-                    Logger.w(TAG, "Failed to stop service discovery", e)
-                }
-            }
+        try {
+            _serviceDiscoverer.stop()
+        } catch (e: Throwable) {
+            Logger.i(TAG, "Failed to stop ServiceDiscoverer", e)
         }
     }
 
@@ -212,90 +237,8 @@ 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();
-    private var _currentDialog: AlertDialog? = null;
-
     @Synchronized
     fun connectDevice(device: CastingDevice) {
         if (activeDevice == device)
@@ -329,41 +272,10 @@ class StateCasting {
             invokeInMainScopeIfRequired {
                 StateApp.withContext(false) { context ->
                     context.let {
-                        Logger.i(TAG, "Casting state changed to ${castConnectionState}");
                         when (castConnectionState) {
-                            CastConnectionState.CONNECTED -> {
-                                Logger.i(TAG, "Casting connected to [${device.name}]");
-                                UIDialogs.appToast("Connected to device")
-                                synchronized(_castingDialogLock) {
-                                    if(_currentDialog != null) {
-                                        _currentDialog?.hide();
-                                        _currentDialog = null;
-                                    }
-                                }
-                            }
-                            CastConnectionState.CONNECTING -> {
-                                Logger.i(TAG, "Casting connecting to [${device.name}]");
-                                UIDialogs.toast(it, "Connecting to device...")
-                                synchronized(_castingDialogLock) {
-                                    if(_currentDialog == null) {
-                                        _currentDialog = UIDialogs.showDialog(context, R.drawable.ic_loader_animated, true,
-                                                "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();
-                                            }));
-                                    }
-                                }
-                            }
-                            CastConnectionState.DISCONNECTED -> {
-                                UIDialogs.toast(it, "Disconnected from device")
-                                synchronized(_castingDialogLock) {
-                                    if(_currentDialog != null) {
-                                        _currentDialog?.hide();
-                                        _currentDialog = null;
-                                    }
-                                }
-                            }
+                            CastConnectionState.CONNECTED -> UIDialogs.toast(it, "Connected to device")
+                            CastConnectionState.CONNECTING -> UIDialogs.toast(it, "Connecting to device...")
+                            CastConnectionState.DISCONNECTED -> UIDialogs.toast(it, "Disconnected from device")
                         }
                     }
                 };
@@ -383,6 +295,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) {
@@ -404,22 +319,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
-        _storage.removeDevice(name)
+        val name = device.name ?: return;
+        _storage.removeDevice(name);
+        rememberedDevices.remove(device);
     }
 
     private fun invokeInMainScopeIfRequired(action: () -> Unit){
@@ -488,7 +402,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) {
@@ -583,7 +497,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;
@@ -602,7 +516,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;
@@ -621,7 +535,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}"
@@ -717,7 +631,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}"
@@ -767,7 +681,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}"
@@ -832,7 +746,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}"
@@ -1002,7 +916,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}"
@@ -1132,7 +1046,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}"
@@ -1218,15 +1132,6 @@ class StateCasting {
         }
     }
 
-    private fun getLocalUrl(ad: CastingDevice): String {
-        var address = ad.localAddress!!
-        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();
@@ -1234,7 +1139,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);
-                        } catch (e: Throwable) {
-                            Logger.e(TAG, "Unhandled exception in .exception handler 1", e)
-                        }
+                        onError.emit(e, parameter);
                         handled = true;
                     }
                 }
@@ -103,14 +99,10 @@ class TaskHandler<TParameter, TResult> {
                     if (id != _idGenerator)
                         return@withContext;
 
-                    try {
-                        if (!onError.emit(e, parameter)) {
-                            Logger.e(TAG, "Uncaught exception handled by TaskHandler.", e);
-                        } else {
-                            //Logger.w(TAG, "Handled exception in TaskHandler invoke.", e); (Prevents duplicate logs)
-                        }
-                    } catch (e: Throwable) {
-                        Logger.e(TAG, "Unhandled exception in .exception handler 2", e)
+                    if (!onError.emit(e, parameter)) {
+                        Logger.e(TAG, "Uncaught exception handled by TaskHandler.", e);
+                    } else {
+                        //Logger.w(TAG, "Handled exception in TaskHandler invoke.", e); (Prevents duplicate logs)
                     }
                 }
             }

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

@@ -7,9 +7,7 @@ import android.app.PendingIntent.getBroadcast
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageInstaller
-import android.content.pm.PackageInstaller.SessionParams.USER_ACTION_NOT_REQUIRED
 import android.graphics.drawable.Animatable
-import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -157,9 +155,6 @@ class AutoUpdateDialog(context: Context?) : AlertDialog(context) {
 
             val packageInstaller: PackageInstaller = context.packageManager.packageInstaller;
             val params = PackageInstaller.SessionParams(PackageInstaller.SessionParams.MODE_FULL_INSTALL);
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                params.setRequireUserAction(USER_ACTION_NOT_REQUIRED)
-            }
             val sessionId = packageInstaller.createSession(params);
             session = packageInstaller.openSession(sessionId)
 

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

@@ -22,6 +22,7 @@ import com.futo.platformplayer.api.media.models.comments.PolycentricPlatformComm
 import com.futo.platformplayer.api.media.models.ratings.RatingLikeDislikes
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.dp
+import com.futo.platformplayer.fullyBackfillServersAnnounceExceptions
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.selectBestImage
 import com.futo.platformplayer.states.StateApp
@@ -29,7 +30,6 @@ import com.futo.platformplayer.states.StatePolycentric
 import com.futo.polycentric.core.ClaimType
 import com.futo.polycentric.core.Store
 import com.futo.polycentric.core.SystemState
-import com.futo.polycentric.core.fullyBackfillServersAnnounceExceptions
 import com.futo.polycentric.core.systemToURLInfoSystemLinkUrl
 import com.futo.polycentric.core.toURLInfoSystemLinkUrl
 import com.google.android.material.button.MaterialButton

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 _buttonScanQR: LinearLayout;
+    private lateinit var _buttonAdd: ImageButton;
+    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 val _rememberedDevices: MutableSet<String> = mutableSetOf()
-    private val _unifiedDevices: MutableList<DeviceAdapterEntry> = mutableListOf()
+    private lateinit var _rememberedAdapter: DeviceAdapter;
+    private val _devices: ArrayList<CastingDevice> = arrayListOf();
+    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 ->
-            val isRemembered = _rememberedDevices.contains(d.name)
-            val newIsRemembered = !isRemembered
-            if (newIsRemembered) {
-                StateCasting.instance.addRememberedDevice(d)
-                val name = d.name
-                if (name != null) {
-                    _rememberedDevices.add(name)
-                }
-            } else {
-                StateCasting.instance.removeRememberedDevice(d)
-                _rememberedDevices.remove(d.name)
+        _rememberedAdapter = DeviceAdapter(_rememberedDevices, true);
+        _rememberedAdapter.onRemove.subscribe { d ->
+            if (StateCasting.instance.activeDevice == d) {
+                d.stopCasting();
             }
-            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)
+            UIDialogs.showCastingDialog(context)
         }
+        _recyclerRememberedDevices.adapter = _rememberedAdapter;
+        _recyclerRememberedDevices.layoutManager = LinearLayoutManager(context);
 
         _buttonClose.setOnClickListener { dismiss(); };
         _buttonAdd.setOnClickListener {
@@ -104,112 +105,77 @@ class ConnectCastingDialog(context: Context?) : AlertDialog(context) {
         Logger.i(TAG, "Dialog shown.");
 
         StateCasting.instance.startDiscovering()
+
         (_imageLoader.drawable as Animatable?)?.start();
 
-        synchronized(StateCasting.instance.devices) {
-            _devices.addAll(StateCasting.instance.devices.values.mapNotNull { it.name })
+        _devices.clear();
+        synchronized (StateCasting.instance.devices) {
+            _devices.addAll(StateCasting.instance.devices.values);
         }
 
-        _rememberedDevices.addAll(StateCasting.instance.getRememberedCastingDeviceNames())
-        updateUnifiedList()
-
-        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()
-                }
-            }
+        _rememberedDevices.clear();
+        synchronized (StateCasting.instance.rememberedDevices) {
+            _rememberedDevices.addAll(StateCasting.instance.rememberedDevices);
         }
 
         _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()
-        (_imageLoader.drawable as Animatable?)?.stop()
+        super.dismiss();
+
+        (_imageLoader.drawable as Animatable?)?.stop();
+
         StateCasting.instance.stopDiscovering()
-        StateCasting.instance.onDeviceAdded.remove(this)
-        StateCasting.instance.onDeviceChanged.remove(this)
-        StateCasting.instance.onDeviceRemoved.remove(this)
-        StateCasting.instance.onActiveDeviceConnectionStateChanged.remove(this)
-    }
-
-    private fun updateUnifiedList() {
-        val oldList = ArrayList(_unifiedDevices)
-        val newList = buildUnifiedList()
-
-        val diffResult = DiffUtil.calculateDiff(object : DiffUtil.Callback() {
-            override fun getOldListSize() = oldList.size
-            override fun getNewListSize() = newList.size
-            override fun areItemsTheSame(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
-            }
-            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
+        StateCasting.instance.onDeviceAdded.remove(this);
+        StateCasting.instance.onDeviceChanged.remove(this);
+        StateCasting.instance.onDeviceRemoved.remove(this);
+        StateCasting.instance.onActiveDeviceConnectionStateChanged.remove(this);
     }
 
     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 =
-                "-i \"concat:${segmentFiles.joinToString("|")}\" -c copy \"${targetFile.absolutePath}\""
+            val fileList = File(context.cacheDir, "fileList-${UUID.randomUUID()}.txt")
+            fileList.writeText(segmentFiles.joinToString("\n") { "file '${it.absolutePath}'" })
+
+            val cmd = "-f concat -safe 0 -i \"${fileList.absolutePath}\" -c copy \"${targetFile.absolutePath}\""
 
             val 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!!;
     }
-
-    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 {
+    private fun downloadSource_Sequential(client: ManagedHttpClient, fileStream: FileOutputStream, url: String, 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)
-                    ?: throw Exception("Failed to create file in external directory.");
+            val f = downloadRoot.createFile(a.container, outputFileName)
+                ?: throw Exception("Failed to create file in external directory.");
 
             Logger.i(TAG, "Copying audio.");
 

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

@@ -10,7 +10,7 @@ import com.futo.platformplayer.api.media.models.contents.IPlatformContent
 import com.futo.platformplayer.api.media.models.playback.IPlaybackTracker
 import com.futo.platformplayer.api.media.models.ratings.IRating
 import com.futo.platformplayer.api.media.models.streams.IVideoSourceDescriptor
-import com.futo.platformplayer.api.media.models.streams.DownloadedVideoMuxedSourceDescriptor
+import com.futo.platformplayer.api.media.models.streams.LocalVideoMuxedSourceDescriptor
 import com.futo.platformplayer.api.media.models.streams.LocalVideoUnMuxedSourceDescriptor
 import com.futo.platformplayer.api.media.models.streams.sources.IDashManifestSource
 import com.futo.platformplayer.api.media.models.streams.sources.IHLSManifestSource
@@ -57,7 +57,7 @@ class VideoLocal: IPlatformVideoDetails, IStoreItem {
     override val video: IVideoSourceDescriptor get() = if(audioSource.isNotEmpty())
         LocalVideoUnMuxedSourceDescriptor(this)
     else
-        DownloadedVideoMuxedSourceDescriptor(this);
+        LocalVideoMuxedSourceDescriptor(this);
     override val preview: IVideoSourceDescriptor? get() = videoSerialized.preview;
 
     override val live: IVideoSource? get() = videoSerialized.live;

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
-            = 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 {
+        fun request(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
-            = 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 {
+        fun requestWithBody(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
-            = GETInternal(url, headers, if(useBytes) ReturnType.BYTES else ReturnType.STRING)
-        fun GETInternal(url: String, headers: MutableMap<String, String> = HashMap(), returnType: ReturnType = ReturnType.STRING) : IBridgeHttpResponse {
+        fun GET(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
-            = 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 {
+        fun POST(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
-                = 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 {
+        fun POST(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);
-            Logger.w(TAG, "PackageHttp Socket opened");
-            synchronized(_package.aliveSockets) {
-                _package.aliveSockets.add(socket);
-            }
-            return socket;
+            return SocketResult(this, _client, url, socketHeaders);
         }
 
         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/ChannelAboutFragment.kt

@@ -13,6 +13,7 @@ import com.futo.platformplayer.R
 import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
 import com.futo.platformplayer.dp
 import com.futo.platformplayer.fixHtmlLinks
+import com.futo.platformplayer.fragment.mainactivity.main.PolycentricProfile
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.resolveChannelUrl
 import com.futo.platformplayer.selectBestImage
@@ -20,7 +21,6 @@ import com.futo.platformplayer.setPlatformPlayerLinkMovementMethod
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.toHumanNumber
 import com.futo.platformplayer.views.platform.PlatformLinkView
-import com.futo.polycentric.core.PolycentricProfile
 import com.futo.polycentric.core.toName
 import com.futo.polycentric.core.toURLInfoSystemLinkUrl
 
@@ -134,7 +134,9 @@ class ChannelAboutFragment : Fragment, IChannelTabFragment {
             }
         }
         if(!map.containsKey("Harbor"))
-            map.set("Harbor", polycentricProfile.getHarborUrl());
+            this.context?.let {
+                map.set("Harbor", polycentricProfile.getHarborUrl(it));
+            }
 
         if (map.isNotEmpty())
             setLinks(map, if (polycentricProfile.systemState.username.isNotBlank()) polycentricProfile.systemState.username else _lastChannel?.name ?: "")

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,23 +25,20 @@ 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
 import com.futo.platformplayer.fragment.mainactivity.main.FeedView
+import com.futo.platformplayer.fragment.mainactivity.main.PolycentricProfile
 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
-import com.futo.polycentric.core.PolycentricProfile
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlin.math.max
@@ -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 query = _query
-        if (!query.isNullOrBlank()) {
-            if(subType != null) {
-                Logger.i(TAG, "StatePlatform.instance.searchChannel(channel.url = ${channel.url}, query = ${query}, subType = ${subType})")
-                pager = StatePlatform.instance.searchChannel(channel.url, query, subType);
-            } else {
-                Logger.i(TAG, "StatePlatform.instance.searchChannel(channel.url = ${channel.url}, query = ${query})")
-                pager = StatePlatform.instance.searchChannel(channel.url, query);
-            }
-        } else {
-            val lastPolycentricProfile = _lastPolycentricProfile;
-            if (lastPolycentricProfile != null && StatePolycentric.instance.enabled) {
-                pager = StatePolycentric.instance.getChannelContent(lifecycleScope, lastPolycentricProfile, type = subType);
-                Logger.i(TAG, "StatePolycentric.instance.getChannelContent(lifecycleScope, lastPolycentricProfile, type = ${subType})")
-            }
+        val lastPolycentricProfile = _lastPolycentricProfile;
+        var pager: IPager<IPlatformContent>? = null;
+        if (lastPolycentricProfile != null)
+            pager= StatePolycentric.instance.getChannelContent(lifecycleScope, lastPolycentricProfile);
 
-            if(pager == null) {
-                if(subType != null) {
-                    pager = StatePlatform.instance.getChannelContent(channel.url, subType);
-                    Logger.i(TAG, "StatePlatform.instance.getChannelContent(channel.url = ${channel.url}, subType = ${subType})")
-                } else {
-                    pager = StatePlatform.instance.getChannelContent(channel.url);
-                    Logger.i(TAG, "StatePlatform.instance.getChannelContent(channel.url = ${channel.url})")
-                }
-            }
+        if(pager == null) {
+            if(subType != null)
+                pager = StatePlatform.instance.getChannelContent(channel.url, subType);
+            else
+                pager = StatePlatform.instance.getChannelContent(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 {
-            onEnter.subscribe {
-                setQuery(it)
-            }
-        }
-        _searchView = searchView
-        updateSearchViewVisibility()
-
-        _adapterResults = PreviewContentListAdapter(view.context, FeedStyle.THUMBNAIL, _results, null, Settings.instance.channel.progressBar, viewsToPrepend = arrayListOf(searchView)).apply {
+        _adapterResults = PreviewContentListAdapter(view.context, FeedStyle.THUMBNAIL, _results, null, Settings.instance.channel.progressBar).apply {
             this.onContentUrlClicked.subscribe(this@ChannelContentsFragment.onContentUrlClicked::emit);
             this.onUrlClicked.subscribe(this@ChannelContentsFragment.onUrlClicked::emit);
             this.onContentClicked.subscribe(this@ChannelContentsFragment.onContentClicked::emit);
@@ -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/channel/tab/ChannelListFragment.kt

@@ -16,12 +16,12 @@ import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.constructs.TaskHandler
 import com.futo.platformplayer.engine.exceptions.ScriptCaptchaRequiredException
 import com.futo.platformplayer.fragment.mainactivity.main.ChannelFragment
+import com.futo.platformplayer.fragment.mainactivity.main.PolycentricProfile
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.resolveChannelUrl
 import com.futo.platformplayer.states.StatePlatform
 import com.futo.platformplayer.views.adapters.InsertedViewAdapterWithLoader
 import com.futo.platformplayer.views.adapters.viewholders.CreatorViewHolder
-import com.futo.polycentric.core.PolycentricProfile
 
 class ChannelListFragment : Fragment, IChannelTabFragment {
     private var _channels: ArrayList<IPlatformChannel> = arrayListOf();

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

@@ -8,8 +8,8 @@ import android.widget.TextView
 import androidx.fragment.app.Fragment
 import com.futo.platformplayer.R
 import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
+import com.futo.platformplayer.fragment.mainactivity.main.PolycentricProfile
 import com.futo.platformplayer.views.SupportView
-import com.futo.polycentric.core.PolycentricProfile
 
 
 class ChannelMonetizationFragment : Fragment, IChannelTabFragment {

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

@@ -1,7 +1,7 @@
 package com.futo.platformplayer.fragment.channel.tab
 
 import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
-import com.futo.polycentric.core.PolycentricProfile
+import com.futo.platformplayer.fragment.mainactivity.main.PolycentricProfile
 
 interface IChannelTabFragment {
     fun setChannel(channel: IPlatformChannel)

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 = false) }))
+                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,18 +383,18 @@ 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(2, R.drawable.ic_creators, R.drawable.ic_creators_filled, R.string.creators, canToggle = false, { it.currentMain is CreatorsFragment }, { it.navigate<CreatorsFragment>(withHistory = false) }),
-            ButtonDefinition(3, R.drawable.ic_sources, R.drawable.ic_sources_filled, R.string.sources, canToggle = false, { it.currentMain is SourcesFragment }, { it.navigate<SourcesFragment>(withHistory = false) }),
-            ButtonDefinition(4, R.drawable.ic_playlist, R.drawable.ic_playlist_filled, R.string.playlists, canToggle = false, { it.currentMain is PlaylistsFragment }, { it.navigate<PlaylistsFragment>(withHistory = false) }),
-            ButtonDefinition(5, R.drawable.ic_history, R.drawable.ic_history, R.string.history, canToggle = false, { it.currentMain is HistoryFragment }, { it.navigate<HistoryFragment>(withHistory = false) }),
-            ButtonDefinition(6, R.drawable.ic_download, R.drawable.ic_download, R.string.downloads, canToggle = false, { it.currentMain is DownloadsFragment }, { it.navigate<DownloadsFragment>(withHistory = false) }),
-            ButtonDefinition(8, R.drawable.ic_chat, R.drawable.ic_chat_filled, R.string.comments, canToggle = true, { it.currentMain is CommentsFragment }, { it.navigate<CommentsFragment>(withHistory = false) }),
-            ButtonDefinition(9, R.drawable.ic_subscriptions, R.drawable.ic_subscriptions_filled, R.string.subscription_group_menu, canToggle = true, { it.currentMain is SubscriptionGroupListFragment }, { it.navigate<SubscriptionGroupListFragment>(withHistory = false) }),
-            ButtonDefinition(10, R.drawable.ic_help_square, R.drawable.ic_help_square_fill, R.string.tutorials, canToggle = true, { it.currentMain is TutorialFragment }, { it.navigate<TutorialFragment>(withHistory = false) }),
+            ButtonDefinition(1, R.drawable.ic_subscriptions, R.drawable.ic_subscriptions_filled, R.string.subscriptions, canToggle = true, { it.currentMain is SubscriptionsFeedFragment }, { it.navigate<SubscriptionsFeedFragment>() }),
+            ButtonDefinition(2, R.drawable.ic_creators, R.drawable.ic_creators_filled, R.string.creators, canToggle = false, { it.currentMain is CreatorsFragment }, { it.navigate<CreatorsFragment>() }),
+            ButtonDefinition(3, R.drawable.ic_sources, R.drawable.ic_sources_filled, R.string.sources, canToggle = false, { it.currentMain is SourcesFragment }, { it.navigate<SourcesFragment>() }),
+            ButtonDefinition(4, R.drawable.ic_playlist, R.drawable.ic_playlist_filled, R.string.playlists, canToggle = false, { it.currentMain is PlaylistsFragment }, { it.navigate<PlaylistsFragment>() }),
+            ButtonDefinition(5, R.drawable.ic_history, R.drawable.ic_history, R.string.history, canToggle = false, { it.currentMain is HistoryFragment }, { it.navigate<HistoryFragment>() }),
+            ButtonDefinition(6, R.drawable.ic_download, R.drawable.ic_download, R.string.downloads, canToggle = false, { it.currentMain is DownloadsFragment }, { it.navigate<DownloadsFragment>() }),
+            ButtonDefinition(8, R.drawable.ic_chat, R.drawable.ic_chat_filled, R.string.comments, canToggle = true, { it.currentMain is CommentsFragment }, { it.navigate<CommentsFragment>() }),
+            ButtonDefinition(9, R.drawable.ic_subscriptions, R.drawable.ic_subscriptions_filled, R.string.subscription_group_menu, canToggle = true, { it.currentMain is SubscriptionGroupListFragment }, { it.navigate<SubscriptionGroupListFragment>() }),
+            ButtonDefinition(10, R.drawable.ic_help_square, R.drawable.ic_help_square_fill, R.string.tutorials, canToggle = true, { it.currentMain is TutorialFragment }, { it.navigate<TutorialFragment>() }),
             ButtonDefinition(7, R.drawable.ic_settings, R.drawable.ic_settings_filled, R.string.settings, canToggle = false, { false }, {
                 val c = it.context ?: return@ButtonDefinition;
                 Logger.i(TAG, "settings preventPictureInPicture()");
@@ -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/ChannelFragment.kt

@@ -42,12 +42,12 @@ import com.futo.platformplayer.images.GlideHelper.Companion.crossfade
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.SearchType
 import com.futo.platformplayer.models.Subscription
+import com.futo.platformplayer.polycentric.PolycentricCache
 import com.futo.platformplayer.selectBestImage
 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
@@ -55,14 +55,29 @@ import com.futo.platformplayer.views.adapters.ChannelViewPagerAdapter
 import com.futo.platformplayer.views.others.CreatorThumbnail
 import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuOverlay
 import com.futo.platformplayer.views.subscriptions.SubscribeButton
-import com.futo.polycentric.core.ApiMethods
-import com.futo.polycentric.core.PolycentricProfile
+import com.futo.polycentric.core.OwnedClaim
+import com.futo.polycentric.core.PublicKey
+import com.futo.polycentric.core.Store
+import com.futo.polycentric.core.SystemState
+import com.futo.polycentric.core.systemToURLInfoSystemLinkUrl
 import com.futo.polycentric.core.toURLInfoSystemLinkUrl
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class PolycentricProfile(
+    val system: PublicKey, val systemState: SystemState, val ownedClaims: List<OwnedClaim>
+) {
+    fun getHarborUrl(context: Context): String{
+        val systemState = SystemState.fromStorageTypeSystemState(Store.instance.getSystemState(system));
+        val url = system.systemToURLInfoSystemLinkUrl(systemState.servers.asIterable());
+        return "https://harbor.social/" + url.substring("polycentric://".length);
+    }
+}
 
 class ChannelFragment : MainFragment() {
     override val isMainView: Boolean = true
@@ -129,16 +144,15 @@ class ChannelFragment : MainFragment() {
 
         private val _onPageChangeCallback = object : ViewPager2.OnPageChangeCallback() {}
 
-        private val _taskLoadPolycentricProfile: TaskHandler<PlatformID, PolycentricProfile?>
+        private val _taskLoadPolycentricProfile: TaskHandler<PlatformID, PolycentricCache.CachedPolycentricProfile?>
         private val _taskGetChannel: TaskHandler<String, IPlatformChannel>
 
         init {
             inflater.inflate(R.layout.fragment_channel, this)
-            _taskLoadPolycentricProfile = TaskHandler<PlatformID, PolycentricProfile?>({ fragment.lifecycleScope },
+            _taskLoadPolycentricProfile =
+                TaskHandler<PlatformID, PolycentricCache.CachedPolycentricProfile?>({ 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!!)
+                        return@TaskHandler PolycentricCache.instance.getProfileAsync(id)
                     }).success { setPolycentricProfile(it, animate = true) }.exception<Throwable> {
                     Logger.w(TAG, "Failed to load polycentric profile.", it)
                 }
@@ -314,7 +328,7 @@ class ChannelFragment : MainFragment() {
                             _creatorThumbnail.setThumbnail(parameter.thumbnail, true)
                             Glide.with(_imageBanner).clear(_imageBanner)
 
-                            loadPolycentricProfile(parameter.id)
+                            loadPolycentricProfile(parameter.id, parameter.url)
                         }
 
                         _url = parameter.url
@@ -328,7 +342,7 @@ class ChannelFragment : MainFragment() {
                             _creatorThumbnail.setThumbnail(parameter.channel.thumbnail, true)
                             Glide.with(_imageBanner).clear(_imageBanner)
 
-                            loadPolycentricProfile(parameter.channel.id)
+                            loadPolycentricProfile(parameter.channel.id, parameter.channel.url)
                         }
 
                         _url = parameter.channel.url
@@ -345,8 +359,16 @@ class ChannelFragment : MainFragment() {
             _tabs.selectTab(_tabs.getTabAt(selectedTabIndex))
         }
 
-        private fun loadPolycentricProfile(id: PlatformID) {
-            _taskLoadPolycentricProfile.run(id)
+        private fun loadPolycentricProfile(id: PlatformID, url: String) {
+            val cachedPolycentricProfile = PolycentricCache.instance.getCachedProfile(url, true)
+            if (cachedPolycentricProfile != null) {
+                setPolycentricProfile(cachedPolycentricProfile, animate = true)
+                if (cachedPolycentricProfile.expired) {
+                    _taskLoadPolycentricProfile.run(id)
+                }
+            } else {
+                _taskLoadPolycentricProfile.run(id)
+            }
         }
 
         private fun setLoading(isLoading: Boolean) {
@@ -425,15 +447,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) {
-                        _fragment.navigate<SuggestionsFragment>(
-                            SuggestionsFragmentData(
-                                "", SearchType.VIDEO
+                    if (plugin != null && plugin.capabilities.hasSearchChannelContents) {
+                        buttons.add(Pair(R.drawable.ic_search) {
+                            _fragment.navigate<SuggestionsFragment>(
+                                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())) {
@@ -509,13 +533,20 @@ class ChannelFragment : MainFragment() {
 
         private fun setPolycentricProfileOr(url: String, or: () -> Unit) {
             setPolycentricProfile(null, animate = false)
-            or()
+
+            val cachedProfile = channel?.let { PolycentricCache.instance.getCachedProfile(url) }
+            if (cachedProfile != null) {
+                setPolycentricProfile(cachedProfile, animate = false)
+            } else {
+                or()
+            }
         }
 
         private fun setPolycentricProfile(
-            profile: PolycentricProfile?, animate: Boolean
+            cachedPolycentricProfile: PolycentricCache.CachedPolycentricProfile?, animate: Boolean
         ) {
             val dp35 = 35.dp(resources)
+            val profile = cachedPolycentricProfile?.profile
             val avatar = profile?.systemState?.avatar?.selectBestImage(dp35 * dp35)?.let {
                 it.toURLInfoSystemLinkUrl(
                     profile.system.toProto(), it.process, profile.systemState.servers.toList()

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

@@ -23,6 +23,7 @@ import com.futo.platformplayer.api.media.models.comments.IPlatformComment
 import com.futo.platformplayer.api.media.models.comments.PolycentricPlatformComment
 import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
 import com.futo.platformplayer.constructs.TaskHandler
+import com.futo.platformplayer.fullyBackfillServersAnnounceExceptions
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StatePlatform
@@ -31,7 +32,6 @@ import com.futo.platformplayer.views.adapters.CommentWithReferenceViewHolder
 import com.futo.platformplayer.views.adapters.InsertedViewAdapterWithLoader
 import com.futo.platformplayer.views.overlays.RepliesOverlay
 import com.futo.polycentric.core.PublicKey
-import com.futo.polycentric.core.fullyBackfillServersAnnounceExceptions
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import java.net.UnknownHostException

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()
-                fragment.navigate<VideoDetailFragment>(url).maximizeVideoDetail()
-            }
-            ContentType.PLAYLIST -> fragment.navigate<RemotePlaylistFragment>(url)
-            ContentType.URL -> fragment.navigate<BrowserFragment>(url)
-            ContentType.CHANNEL -> fragment.navigate<ChannelFragment>(url)
+                StatePlayer.instance.clearQueue();
+                fragment.navigate<VideoDetailFragment>(url).maximizeVideoDetail();
+            };
+            ContentType.PLAYLIST -> fragment.navigate<RemotePlaylistFragment>(url);
+            ContentType.URL -> fragment.navigate<BrowserFragment>(url);
             else -> {};
         }
     }

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

@@ -2,18 +2,14 @@ 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 +17,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 +82,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 +90,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)
-                {
-                    SearchType.VIDEO -> StatePlatform.instance.searchRefresh(fragment.lifecycleScope, query, null, _sortBy, _filterValues, _enabledClientIds)
-                    SearchType.CREATOR -> StatePlatform.instance.searchChannelsAsContent(query)
-                    SearchType.PLAYLIST -> StatePlatform.instance.searchPlaylist(query)
-                    else -> throw Exception("Search type must be specified")
+                val channelUrl = _channelUrl;
+                if (channelUrl != null) {
+                    StatePlatform.instance.searchChannel(channelUrl, query, null, _sortBy, _filterValues, _enabledClientIds)
+                } else {
+                    StatePlatform.instance.searchRefresh(fragment.lifecycleScope, query, null, _sortBy, _filterValues, _enabledClientIds)
                 }
             })
             .success { loadedResult(it); }.exception<ScriptCaptchaRequiredException> {  }
@@ -112,25 +104,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 +114,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 +130,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);
@@ -187,14 +160,8 @@ class ContentSearchResultsFragment : MainFragment() {
                                 navigate<RemotePlaylistFragment>(it);
                             else if(StatePlatform.instance.hasEnabledChannelClient(it))
                                 navigate<ChannelFragment>(it);
-                            else {
-                                val url = it;
-                                activity?.let {
-                                    close()
-                                    if(it is MainActivity)
-                                        it.navigate(it.getFragment<VideoDetailFragment>(), url);
-                                }
-                            }
+                            else
+                                navigate<VideoDetailFragment>(it);
                         }
                         else
                             setQuery(it, true);
@@ -204,7 +171,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 +242,8 @@ class ContentSearchResultsFragment : MainFragment() {
             }
         }
 
-        private fun setSearchType(searchType: SearchType, updateResults: Boolean = true) {
-            _searchType = searchType
+        private fun setChannelUrl(channelUrl: String?, updateResults: Boolean = true) {
+            _channelUrl = channelUrl;
 
             if (updateResults) {
                 clearResults();

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

@@ -14,19 +14,13 @@ 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
-import com.futo.platformplayer.stores.FragmentedStorage
-import com.futo.platformplayer.stores.StringStorage
 import com.futo.platformplayer.toHumanBytesSize
 import com.futo.platformplayer.toHumanDuration
 import com.futo.platformplayer.views.AnyInsertedAdapterView
@@ -58,15 +52,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 {
@@ -118,15 +103,12 @@ class DownloadsFragment : MainFragment() {
         private val _listDownloaded: AnyInsertedAdapterView<VideoLocal, VideoDownloadViewHolder>;
 
         private var lastDownloads: List<VideoLocal>? = null;
-        private var ordering = FragmentedStorage.get<StringStorage>("downloads_ordering")
+        private var ordering: String? = "nameAsc";
 
         constructor(frag: DownloadsFragment, inflater: LayoutInflater): super(frag.requireContext()) {
             inflater.inflate(R.layout.fragment_downloads, this);
             _frag = frag;
 
-            if(ordering.value.isNullOrBlank())
-                ordering.value = "nameAsc";
-
             _usageUsed = findViewById(R.id.downloads_usage_used);
             _usageAvailable = findViewById(R.id.downloads_usage_available);
             _usageProgress = findViewById(R.id.downloads_usage_progress);
@@ -150,23 +132,22 @@ 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");
+            spinnerSortBy.setSelection(0);
             spinnerSortBy.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
                 override fun onItemSelected(parent: AdapterView<*>, view: View?, pos: Int, id: Long) {
                     when(pos) {
-                        0 -> ordering.setAndSave("nameAsc")
-                        1 -> ordering.setAndSave("nameDesc")
-                        2 -> ordering.setAndSave("downloadDateAsc")
-                        3 -> ordering.setAndSave("downloadDateDesc")
-                        4 -> ordering.setAndSave("releasedAsc")
-                        5 -> ordering.setAndSave("releasedDesc")
-                        else -> ordering.setAndSave("")
+                        0 -> ordering = "nameAsc"
+                        1 -> ordering = "nameDesc"
+                        2 -> ordering = "downloadDateAsc"
+                        3 -> ordering = "downloadDateDesc"
+                        4 -> ordering = "releasedAsc"
+                        5 -> ordering = "releasedDesc"
+                        else -> ordering = null
                     }
                     updateContentFilters()
                 }
                 override fun onNothingSelected(parent: AdapterView<*>?) = Unit
             };
-            spinnerSortBy.setSelection(Math.max(0, options.indexOf(ordering.value)));
 
             _listDownloaded = findViewById<RecyclerView>(R.id.list_downloaded)
                 .asAnyWithTop(findViewById(R.id.downloads_top)) {
@@ -248,9 +229,9 @@ class DownloadsFragment : MainFragment() {
         fun filterDownloads(vids: List<VideoLocal>): List<VideoLocal>{
             var vidsToReturn = vids;
             if(!_listDownloadSearch.text.isNullOrEmpty())
-                vidsToReturn = vids.filter { it.name.contains(_listDownloadSearch.text, true) || it.author.name.contains(_listDownloadSearch.text, true) };
-            if(!ordering.value.isNullOrEmpty()) {
-                vidsToReturn = when(ordering.value){
+                vidsToReturn = vids.filter { it.name.contains(_listDownloadSearch.text, true) };
+            if(!ordering.isNullOrEmpty()) {
+                vidsToReturn = when(ordering){
                     "downloadDateAsc" -> vidsToReturn.sortedBy { it.downloadDate ?: OffsetDateTime.MAX };
                     "downloadDateDesc" -> vidsToReturn.sortedByDescending { it.downloadDate ?: OffsetDateTime.MIN };
                     "nameAsc" -> vidsToReturn.sortedBy { it.name.lowercase() }

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

@@ -3,15 +3,12 @@ package com.futo.platformplayer.fragment.mainactivity.main
 import android.content.Context
 import android.content.res.Configuration
 import android.graphics.Color
-import android.util.DisplayMetrics
-import android.view.Display
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.*
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.LayoutManager
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@@ -23,7 +20,6 @@ import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.constructs.TaskHandler
 import com.futo.platformplayer.engine.exceptions.PluginException
 import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.views.FeedStyle
 import com.futo.platformplayer.views.others.ProgressBar
 import com.futo.platformplayer.views.others.TagsView
@@ -32,9 +28,7 @@ import com.futo.platformplayer.views.adapters.InsertedViewHolder
 import com.futo.platformplayer.views.announcements.AnnouncementView
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import java.time.OffsetDateTime
 import kotlin.math.max
 
@@ -74,7 +68,6 @@ abstract class FeedView<TFragment, TResult, TConverted, TPager, TViewHolder> : L
 
     private val _scrollListener: RecyclerView.OnScrollListener;
     private var _automaticNextPageCounter = 0;
-    private val _automaticBackoff = arrayOf(0, 500, 1000, 1000, 2000, 5000, 5000, 5000);
 
     constructor(fragment: TFragment, inflater: LayoutInflater, cachedRecyclerData: RecyclerData<InsertedViewAdapterWithLoader<TViewHolder>, GridLayoutManager, TPager, TResult, TConverted, InsertedViewHolder<TViewHolder>>? = null) : super(inflater.context) {
         this.fragment = fragment;
@@ -189,61 +182,29 @@ abstract class FeedView<TFragment, TResult, TConverted, TPager, TViewHolder> : L
 
     private fun ensureEnoughContentVisible(filteredResults: List<TConverted>) {
         val canScroll = if (recyclerData.results.isEmpty()) false else {
-            val height = resources.displayMetrics.heightPixels;
-
             val layoutManager = recyclerData.layoutManager
             val firstVisibleItemPosition = layoutManager.findFirstVisibleItemPosition()
-            val firstVisibleItemView = if(firstVisibleItemPosition != RecyclerView.NO_POSITION) layoutManager.findViewByPosition(firstVisibleItemPosition) else null;
-            val lastVisibleItemPosition = layoutManager.findLastCompletelyVisibleItemPosition();
-            val lastVisibleItemView = if(lastVisibleItemPosition != RecyclerView.NO_POSITION) layoutManager.findViewByPosition(lastVisibleItemPosition) else null;
-            val rows = if(recyclerData.layoutManager is GridLayoutManager) Math.max(1, recyclerData.results.size / recyclerData.layoutManager.spanCount) else 1;
-            val rowsHeight = (firstVisibleItemView?.height ?: 0) * rows;
-            if(lastVisibleItemView != null && lastVisibleItemPosition == (recyclerData.results.size - 1)) {
-                false;
-            }
-            else if (firstVisibleItemView != null && height != null && rowsHeight < height) {
-                false;
+
+            if (firstVisibleItemPosition != RecyclerView.NO_POSITION) {
+                val firstVisibleView = layoutManager.findViewByPosition(firstVisibleItemPosition)
+                val itemHeight = firstVisibleView?.height ?: 0
+                val occupiedSpace = recyclerData.results.size / recyclerData.layoutManager.spanCount * itemHeight
+                val recyclerViewHeight = _recyclerResults.height
+                Logger.i(TAG, "ensureEnoughContentVisible loadNextPage occupiedSpace=$occupiedSpace recyclerViewHeight=$recyclerViewHeight")
+                occupiedSpace >= recyclerViewHeight
             } else {
-                true;
+                false
             }
         }
-
         Logger.i(TAG, "ensureEnoughContentVisible loadNextPage canScroll=$canScroll _automaticNextPageCounter=$_automaticNextPageCounter")
         if (!canScroll || filteredResults.isEmpty()) {
             _automaticNextPageCounter++
-            if(_automaticNextPageCounter < _automaticBackoff.size) {
-                if(_automaticNextPageCounter > 0) {
-                    val automaticNextPageCounterSaved = _automaticNextPageCounter;
-                    fragment.lifecycleScope.launch(Dispatchers.Default) {
-                        val backoff = _automaticBackoff[Math.min(_automaticBackoff.size - 1, _automaticNextPageCounter)];
-
-                        withContext(Dispatchers.Main) {
-                            setLoading(true);
-                        }
-                        delay(backoff.toLong());
-                        if(automaticNextPageCounterSaved == _automaticNextPageCounter) {
-                            withContext(Dispatchers.Main) {
-                                loadNextPage();
-                            }
-                        }
-                        else {
-                            withContext(Dispatchers.Main) {
-                                setLoading(false);
-                            }
-                        }
-                    }
-                }
-                else
-                    loadNextPage();
-            }
+            if(_automaticNextPageCounter <= 4)
+                loadNextPage()
         } else {
-            Logger.i(TAG, "ensureEnoughContentVisible automaticNextPageCounter reset");
             _automaticNextPageCounter = 0;
         }
     }
-    fun resetAutomaticNextPageCounter(){
-        _automaticNextPageCounter = 0;
-    }
 
     protected fun setTextCentered(text: String?) {
         _textCentered.text = text;

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(res);
-                _adapter.notifyItemRangeInserted(_adapter.childToParentPosition(posBefore), res.size);
-                ensureEnoughContentVisible(res)
+                _results.addAll(it);
+                _adapter.notifyItemRangeInserted(_adapter.childToParentPosition(posBefore), it.size);
+                ensureEnoughContentVisible(it)
             }.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)