Add search type selector to suggestions fragment.

Implemented remote sync.

See merge request videostreaming/grayjay!93

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

@@ -0,0 +1,266 @@
+package com.futo.platformplayer
+
+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.net.Socket
+import java.nio.ByteBuffer
+import kotlin.random.Random
+import kotlin.time.Duration.Companion.milliseconds
+
+class SyncServerTests {
+
+    //private val relayHost = "relay.grayjay.app"
+    //private val relayKey = "xGbHRzDOvE6plRbQaFgSen82eijF+gxS0yeUaeEErkw="
+    private val relayKey = "XlUaSpIlRaCg0TGzZ7JYmPupgUHDqTZXUUBco2K7ejw="
+    private val relayHost = "192.168.1.175"
+    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: ((SyncSocketSession, String, String?) -> Boolean)? = 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()
+        socketSession.startAsInitiator(relayKey)
+        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()
+    }
+}
+
+class AlwaysAuthorized : IAuthorizable {
+    override val isAuthorized: Boolean get() = true
+}

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

@@ -216,9 +216,14 @@ private fun ByteArray.toInetAddress(): InetAddress {
     return InetAddress.getByAddress(this);
 }
 
-fun getConnectedSocket(addresses: List<InetAddress>, port: Int): Socket? {
+fun getConnectedSocket(attemptAddresses: 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/Settings.kt

@@ -583,10 +583,15 @@ 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, 1)
+        @FormField(R.string.always_proxy_requests, FieldForm.TOGGLE, R.string.always_proxy_requests_description, 3)
         @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 = false;
+
         /*TODO: Should we have a different casting quality?
         @FormField("Preferred Casting Quality", FieldForm.DROPDOWN, "", 3)
         @DropdownFieldOptionsId(R.array.preferred_quality_array)
@@ -931,6 +936,15 @@ 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.info, FieldForm.GROUP, -1, 21)

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

@@ -5,6 +5,7 @@ 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
@@ -199,16 +200,21 @@ class UIDialogs {
             dialog.show();
         }
 
-        fun showDialog(context: Context, icon: Int, text: String, textDetails: String? = null, code: String? = null, defaultCloseAction: Int, vararg actions: Action) {
+        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 {
             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;
@@ -275,6 +281,7 @@ class UIDialogs {
                 registerDialogClosed(dialog);
             }
             dialog.show();
+            return dialog;
         }
 
         fun showGeneralErrorDialog(context: Context, msg: String, ex: Throwable? = null, button: String = "Ok", onOk: (()->Unit)? = null) {

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

@@ -27,14 +27,17 @@ 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.File
+import java.io.ByteArrayOutputStream
 import java.io.IOException
 import java.io.InputStream
 import java.io.OutputStream
 import java.nio.ByteBuffer
-import java.nio.ByteOrder
+import java.security.SecureRandom
+import java.time.OffsetDateTime
 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 {
@@ -279,3 +282,46 @@ 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()
+}

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

@@ -100,7 +100,8 @@ class SyncHomeActivity : AppCompatActivity() {
 
     private fun updateDeviceView(syncDeviceView: SyncDeviceView, publicKey: String, session: SyncSession?): SyncDeviceView {
         val connected = session?.connected ?: false
-        syncDeviceView.setLinkType(if (connected) LinkType.Local else LinkType.None)
+
+        syncDeviceView.setLinkType(session?.linkType ?: LinkType.None)
             .setName(session?.displayName ?: StateSync.instance.getCachedName(publicKey) ?: publicKey)
             //TODO: also display public key?
             .setStatus(if (connected) "Connected" else "Disconnected")

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

@@ -109,9 +109,9 @@ class SyncPairActivity : AppCompatActivity() {
 
             lifecycleScope.launch(Dispatchers.IO) {
                 try {
-                    StateSync.instance.connect(deviceInfo) { session, complete, message ->
+                    StateSync.instance.connect(deviceInfo) { complete, message ->
                         lifecycleScope.launch(Dispatchers.Main) {
-                            if (complete) {
+                            if (complete != null && complete) {
                                 _layoutPairingSuccess.visibility = View.VISIBLE
                                 _layoutPairing.visibility = View.GONE
                             } else {

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

@@ -67,7 +67,7 @@ class SyncShowPairingCodeActivity : AppCompatActivity() {
         }
 
         val ips = getIPs()
-        val selfDeviceInfo = SyncDeviceInfo(StateSync.instance.publicKey!!, ips.toTypedArray(), StateSync.PORT)
+        val selfDeviceInfo = SyncDeviceInfo(StateSync.instance.publicKey!!, ips.toTypedArray(), StateSync.PORT, StateSync.instance.pairingCode)
         val json = Json.encodeToString(selfDeviceInfo)
         val base64 = Base64.encodeToString(json.toByteArray(), Base64.URL_SAFE or Base64.NO_PADDING or Base64.NO_WRAP)
         val url = "grayjay://sync/${base64}"

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

@@ -1,5 +1,6 @@
 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
@@ -66,6 +67,11 @@ 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/models/PlatformAuthorLink.kt

@@ -2,7 +2,10 @@ 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
 
@@ -42,4 +45,21 @@ 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/contents/ContentType.kt

@@ -12,6 +12,7 @@ enum class ContentType(val value: Int) {
     URL(9),
 
     NESTED_VIDEO(11),
+    CHANNEL(60),
 
     LOCKED(70),
 

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

@@ -10,6 +10,7 @@ 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
@@ -31,6 +32,7 @@ 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
@@ -361,6 +363,10 @@ 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/models/IJSContent.kt

@@ -1,6 +1,7 @@
 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
@@ -26,6 +27,7 @@ interface IJSContent: IPlatformContent  {
                 ContentType.NESTED_VIDEO -> JSNestedMediaContent(config, obj);
                 ContentType.PLAYLIST -> JSPlaylist(config, obj);
                 ContentType.LOCKED -> JSLockedContent(config, obj);
+                ContentType.CHANNEL -> JSChannelContent(config, obj)
                 else -> throw NotImplementedError("Unknown content type ${type}");
             }
         }

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

@@ -5,7 +5,6 @@ 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.getOrThrow<Int>(config, "datetime", contextName).toLong();
+        val datetimeInt = _content.getOrDefault<Int>(config, "datetime", contextName, null)?.toLong();
-        if(datetimeInt == 0.toLong())
+        if(datetimeInt == null || 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,6 +2,7 @@ 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
@@ -15,4 +16,14 @@ 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/casting/FCastCastingDevice.kt

@@ -3,6 +3,7 @@ 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
@@ -32,6 +33,7 @@ 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
@@ -90,7 +92,7 @@ class FCastCastingDevice : CastingDevice {
     private var _version: Long = 1;
     private var _thread: Thread? = null
     private var _pingThread: Thread? = null
-    private var _lastPongTime = -1L
+    @Volatile private var _lastPongTime = System.currentTimeMillis()
     private var _outputStreamLock = Object()
 
     constructor(name: String, addresses: Array<InetAddress>, port: Int) : super() {
@@ -324,9 +326,9 @@ class FCastCastingDevice : CastingDevice {
                         continue;
                     }
 
-                    localAddress = _socket?.localAddress;
+                    localAddress = _socket?.localAddress
-                    connectionState = CastConnectionState.CONNECTED;
+                    _lastPongTime = System.currentTimeMillis()
-                    _lastPongTime = -1L
+                    connectionState = CastConnectionState.CONNECTED
 
                     val buffer = ByteArray(4096);
 
@@ -402,36 +404,32 @@ class FCastCastingDevice : CastingDevice {
 
             _pingThread = Thread {
                 Logger.i(TAG, "Started ping loop.")
-
                 while (_scopeIO?.isActive == true) {
-                    try {
+                    if (connectionState == CastConnectionState.CONNECTED) {
-                        send(Opcode.Ping)
-                    } catch (e: Throwable) {
-                        Log.w(TAG, "Failed to send ping.")
-
                         try {
-                            _socket?.close()
+                            send(Opcode.Ping)
-                            _inputStream?.close()
+                            if (System.currentTimeMillis() - _lastPongTime > 15000) {
-                            _outputStream?.close()
+                                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)
+                                }
+                            }
                         } catch (e: Throwable) {
-                            Log.w(TAG, "Failed to close socket.", e)
+                            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)
+                            }
                         }
                     }
-
+                    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,5 +1,6 @@
 package com.futo.platformplayer.casting
 
+import android.app.AlertDialog
 import android.content.ContentResolver
 import android.content.Context
 import android.net.Uri
@@ -9,6 +10,7 @@ import android.util.Log
 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
@@ -239,6 +241,9 @@ class StateCasting {
         Logger.i(TAG, "CastingService stopped.")
     }
 
+    private val _castingDialogLock = Any();
+    private var _currentDialog: AlertDialog? = null;
+
     @Synchronized
     fun connectDevice(device: CastingDevice) {
         if (activeDevice == device)
@@ -272,10 +277,41 @@ class StateCasting {
             invokeInMainScopeIfRequired {
                 StateApp.withContext(false) { context ->
                     context.let {
+                        Logger.i(TAG, "Casting state changed to ${castConnectionState}");
                         when (castConnectionState) {
-                            CastConnectionState.CONNECTED -> UIDialogs.toast(it, "Connected to device")
+                            CastConnectionState.CONNECTED -> {
-                            CastConnectionState.CONNECTING -> UIDialogs.toast(it, "Connecting to device...")
+                                Logger.i(TAG, "Casting connected to [${device.name}]");
-                            CastConnectionState.DISCONNECTED -> UIDialogs.toast(it, "Disconnected from device")
+                                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;
+                                    }
+                                }
+                            }
                         }
                     }
                 };

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

@@ -73,11 +73,11 @@ class ConnectCastingDialog(context: Context?) : AlertDialog(context) {
         };
         _rememberedAdapter.onConnect.subscribe { _ ->
             dismiss()
-            UIDialogs.showCastingDialog(context)
+            //UIDialogs.showCastingDialog(context)
         }
         _adapter.onConnect.subscribe { _ ->
             dismiss()
-            UIDialogs.showCastingDialog(context)
+            //UIDialogs.showCastingDialog(context)
         }
         _recyclerRememberedDevices.adapter = _rememberedAdapter;
         _recyclerRememberedDevices.layoutManager = LinearLayoutManager(context);

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

@@ -201,11 +201,12 @@ abstract class ContentFeedView<TFragment> : FeedView<TFragment, IPlatformContent
     protected open fun onContentUrlClicked(url: String, contentType: ContentType) {
         when(contentType) {
             ContentType.MEDIA -> {
-                StatePlayer.instance.clearQueue();
+                StatePlayer.instance.clearQueue()
-                fragment.navigate<VideoDetailFragment>(url).maximizeVideoDetail();
+                fragment.navigate<VideoDetailFragment>(url).maximizeVideoDetail()
-            };
+            }
-            ContentType.PLAYLIST -> fragment.navigate<RemotePlaylistFragment>(url);
+            ContentType.PLAYLIST -> fragment.navigate<RemotePlaylistFragment>(url)
-            ContentType.URL -> fragment.navigate<BrowserFragment>(url);
+            ContentType.URL -> fragment.navigate<BrowserFragment>(url)
+            ContentType.CHANNEL -> fragment.navigate<ChannelFragment>(url)
             else -> {};
         }
     }

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

@@ -11,6 +11,7 @@ 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
@@ -18,6 +19,7 @@ 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
@@ -84,6 +86,7 @@ class ContentSearchResultsFragment : MainFragment() {
         private var _filterValues: HashMap<String, List<String>> = hashMapOf();
         private var _enabledClientIds: List<String>? = null;
         private var _channelUrl: String? = null;
+        private var _searchType: SearchType? = null;
 
         private val _taskSearch: TaskHandler<String, IPager<IPlatformContent>>;
         override val shouldShowTimeBar: Boolean get() = Settings.instance.search.progressBar
@@ -95,7 +98,13 @@ class ContentSearchResultsFragment : MainFragment() {
                 if (channelUrl != null) {
                     StatePlatform.instance.searchChannel(channelUrl, query, null, _sortBy, _filterValues, _enabledClientIds)
                 } else {
-                    StatePlatform.instance.searchRefresh(fragment.lifecycleScope, query, null, _sortBy, _filterValues, _enabledClientIds)
+                    when (_searchType)
+                    {
+                        SearchType.VIDEO -> StatePlatform.instance.searchRefresh(fragment.lifecycleScope, query, null, _sortBy, _filterValues, _enabledClientIds)
+                        SearchType.CREATOR -> StatePlatform.instance.searchChannelsAsContent(query)
+                        SearchType.PLAYLIST -> StatePlatform.instance.searchPlaylist(query)
+                        else -> throw Exception("Search type must be specified")
+                    }
                 }
             })
             .success { loadedResult(it); }.exception<ScriptCaptchaRequiredException> {  }
@@ -116,6 +125,7 @@ class ContentSearchResultsFragment : MainFragment() {
             if(parameter is SuggestionsFragmentData) {
                 setQuery(parameter.query, false);
                 setChannelUrl(parameter.channelUrl, false);
+                setSearchType(parameter.searchType, false)
 
                 fragment.topBar?.apply {
                     if (this is SearchTopBarFragment) {
@@ -258,6 +268,15 @@ class ContentSearchResultsFragment : MainFragment() {
             }
         }
 
+        private fun setSearchType(searchType: SearchType, updateResults: Boolean = true) {
+            _searchType = searchType
+
+            if (updateResults) {
+                clearResults();
+                loadResults();
+            }
+        }
+
         private fun setSortBy(sortBy: String?, updateResults: Boolean = true) {
             _sortBy = sortBy;
 

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

@@ -136,7 +136,6 @@ abstract class FeedView<TFragment, TResult, TConverted, TPager, TViewHolder> : L
         _toolbarContentView = findViewById(R.id.container_toolbar_content);
 
         _nextPageHandler = TaskHandler<TPager, List<TResult>>({fragment.lifecycleScope}, {
-
             if (it is IAsyncPager<*>)
                 it.nextPageAsync();
             else
@@ -197,10 +196,12 @@ abstract class FeedView<TFragment, TResult, TConverted, TPager, TViewHolder> : L
             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 && firstVisibleItemView.height * recyclerData.results.size < height) {
+            else if (firstVisibleItemView != null && height != null && rowsHeight < height) {
                 false;
             } else {
                 true;

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

@@ -250,39 +250,53 @@ class HomeFragment : MainFragment() {
                     layoutParams =
                         LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
                 }
-                fragment._togglePluginsDisabled.clear();
+
                 synchronized(_filterLock) {
-                    val buttonsPlugins = (if (_togglesConfig.contains("plugins"))
+                    var buttonsPlugins: List<ToggleBar.Toggle> = listOf()
+                    buttonsPlugins = (if (_togglesConfig.contains("plugins"))
                         (StatePlatform.instance.getEnabledClients()
                             .filter { it is JSClient && it.enableInHome }
                             .map { plugin ->
-                                ToggleBar.Toggle(if(Settings.instance.home.showHomeFiltersPluginNames) plugin.name else "", plugin.icon, !fragment._togglePluginsDisabled.contains(plugin.id), {
+                                ToggleBar.Toggle(if(Settings.instance.home.showHomeFiltersPluginNames) plugin.name else "", plugin.icon, !fragment._togglePluginsDisabled.contains(plugin.id), { view, active ->
-                                    if (it) {
+                                    var dontSwap = false;
+                                    if (active) {
                                         if (fragment._togglePluginsDisabled.contains(plugin.id))
                                             fragment._togglePluginsDisabled.remove(plugin.id);
                                     } else {
-                                        if (!fragment._togglePluginsDisabled.contains(plugin.id))
+                                        if (!fragment._togglePluginsDisabled.contains(plugin.id)) {
-                                            fragment._togglePluginsDisabled.add(plugin.id);
+                                            val enabledClients = StatePlatform.instance.getEnabledClients();
+                                            val availableAfterDisable = enabledClients.count { !fragment._togglePluginsDisabled.contains(it.id) && it.id != plugin.id };
+                                            if(availableAfterDisable > 0)
+                                                fragment._togglePluginsDisabled.add(plugin.id);
+                                            else {
+                                                UIDialogs.appToast("Home needs atleast 1 plugin active");
+                                                dontSwap = true;
+                                            }
+                                        }
+                                    }
+                                    if(!dontSwap)
+                                        reloadForFilters();
+                                    else {
+                                        view.setToggle(!active);
                                     }
-                                    reloadForFilters();
                                 }).withTag("plugins")
                             })
                     else listOf())
                     val buttons = (listOf<ToggleBar.Toggle?>(
                         (if (_togglesConfig.contains("today"))
-                            ToggleBar.Toggle("Today", fragment._toggleRecent) {
+                            ToggleBar.Toggle("Today", fragment._toggleRecent) { view, active ->
-                                fragment._toggleRecent = it; reloadForFilters()
+                                fragment._toggleRecent = active; reloadForFilters()
                             }
                                 .withTag("today") else null),
                         (if (_togglesConfig.contains("watched"))
-                            ToggleBar.Toggle("Unwatched", fragment._toggleWatched) {
+                            ToggleBar.Toggle("Unwatched", fragment._toggleWatched) { view, active ->
-                                fragment._toggleWatched = it; reloadForFilters()
+                                fragment._toggleWatched = active; reloadForFilters()
                             }
                                 .withTag("watched") else null),
                     ).filterNotNull() + buttonsPlugins)
                         .sortedBy { _togglesConfig.indexOf(it.tag ?: "") } ?: listOf()
 
-                    val buttonSettings = ToggleBar.Toggle("", R.drawable.ic_settings, true, {
+                    val buttonSettings = ToggleBar.Toggle("", R.drawable.ic_settings, true, { view, active ->
                         showOrderOverlay(_overlayContainer,
                             "Visible home filters",
                             listOf(

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

@@ -18,6 +18,7 @@ import com.futo.platformplayer.constructs.TaskHandler
 import com.futo.platformplayer.engine.exceptions.PluginException
 import com.futo.platformplayer.exceptions.ChannelException
 import com.futo.platformplayer.exceptions.RateLimitException
+import com.futo.platformplayer.fragment.mainactivity.main.SubscriptionsFeedFragment.SubscriptionsFeedView.FeedFilterSettings
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.SearchType
 import com.futo.platformplayer.models.SubscriptionGroup
@@ -56,6 +57,9 @@ class SubscriptionsFeedFragment : MainFragment() {
     private var _group: SubscriptionGroup? = null;
     private var _cachedRecyclerData: FeedView.RecyclerData<InsertedViewAdapterWithLoader<ContentPreviewViewHolder>, GridLayoutManager, IPager<IPlatformContent>, IPlatformContent, IPlatformContent, InsertedViewHolder<ContentPreviewViewHolder>>? = null;
 
+    private val _filterLock = Object();
+    private val _filterSettings = FragmentedStorage.get<FeedFilterSettings>("subFeedFilter");
+
     override fun onShownWithView(parameter: Any?, isBack: Boolean) {
         super.onShownWithView(parameter, isBack);
         _view?.onShown();
@@ -184,8 +188,6 @@ class SubscriptionsFeedFragment : MainFragment() {
                 return Json.encodeToString(this);
             }
         }
-        private val _filterLock = Object();
-        private val _filterSettings = FragmentedStorage.get<FeedFilterSettings>("subFeedFilter");
 
         private var _bypassRateLimit = false;
         private val _lastExceptions: List<Throwable>? = null;
@@ -284,13 +286,18 @@ class SubscriptionsFeedFragment : MainFragment() {
                     fragment.navigate<SubscriptionGroupFragment>(g);
             };
 
-            synchronized(_filterLock) {
+            synchronized(fragment._filterLock) {
                 _subscriptionBar?.setToggles(
-                    SubscriptionBar.Toggle(context.getString(R.string.videos), _filterSettings.allowContentTypes.contains(ContentType.MEDIA)) { toggleFilterContentTypes(listOf(ContentType.MEDIA, ContentType.NESTED_VIDEO), it);  },
+                    SubscriptionBar.Toggle(context.getString(R.string.videos), fragment._filterSettings.allowContentTypes.contains(ContentType.MEDIA)) {  view, active ->
-                    SubscriptionBar.Toggle(context.getString(R.string.posts),  _filterSettings.allowContentTypes.contains(ContentType.POST)) { toggleFilterContentType(ContentType.POST, it); },
+                        toggleFilterContentTypes(listOf(ContentType.MEDIA, ContentType.NESTED_VIDEO), active);  },
-                    SubscriptionBar.Toggle(context.getString(R.string.live), _filterSettings.allowLive) { _filterSettings.allowLive = it; _filterSettings.save(); loadResults(false); },
+                    SubscriptionBar.Toggle(context.getString(R.string.posts),  fragment._filterSettings.allowContentTypes.contains(ContentType.POST)) {  view, active ->
-                    SubscriptionBar.Toggle(context.getString(R.string.planned), _filterSettings.allowPlanned) { _filterSettings.allowPlanned = it; _filterSettings.save(); loadResults(false); },
+                        toggleFilterContentType(ContentType.POST, active); },
-                    SubscriptionBar.Toggle(context.getString(R.string.watched), _filterSettings.allowWatched) { _filterSettings.allowWatched = it; _filterSettings.save(); loadResults(false); }
+                    SubscriptionBar.Toggle(context.getString(R.string.live), fragment._filterSettings.allowLive) {  view, active ->
+                        fragment._filterSettings.allowLive = active; fragment._filterSettings.save(); loadResults(false); },
+                    SubscriptionBar.Toggle(context.getString(R.string.planned), fragment._filterSettings.allowPlanned) {  view, active ->
+                        fragment._filterSettings.allowPlanned = active; fragment._filterSettings.save(); loadResults(false); },
+                    SubscriptionBar.Toggle(context.getString(R.string.watched), fragment._filterSettings.allowWatched) {  view, active ->
+                        fragment._filterSettings.allowWatched = active; fragment._filterSettings.save(); loadResults(false); }
                 );
             }
 
@@ -301,13 +308,13 @@ class SubscriptionsFeedFragment : MainFragment() {
                 toggleFilterContentType(contentType, isTrue);
         }
         private fun toggleFilterContentType(contentType: ContentType, isTrue: Boolean) {
-            synchronized(_filterLock) {
+            synchronized(fragment._filterLock) {
                 if(!isTrue) {
-                    _filterSettings.allowContentTypes.remove(contentType);
+                    fragment._filterSettings.allowContentTypes.remove(contentType);
-                } else if(!_filterSettings.allowContentTypes.contains(contentType)) {
+                } else if(!fragment._filterSettings.allowContentTypes.contains(contentType)) {
-                    _filterSettings.allowContentTypes.add(contentType)
+                    fragment._filterSettings.allowContentTypes.add(contentType)
                 }
-                _filterSettings.save();
+                fragment._filterSettings.save();
             };
             if(Settings.instance.subscriptions.fetchOnTabOpen) { //TODO: Do this different, temporary workaround
                 loadResults(false);
@@ -320,9 +327,9 @@ class SubscriptionsFeedFragment : MainFragment() {
             val nowSoon = OffsetDateTime.now().plusMinutes(5);
             val filterGroup = subGroup;
             return results.filter {
-                val allowedContentType = _filterSettings.allowContentTypes.contains(if(it.contentType == ContentType.NESTED_VIDEO || it.contentType == ContentType.LOCKED) ContentType.MEDIA else it.contentType);
+                val allowedContentType = fragment._filterSettings.allowContentTypes.contains(if(it.contentType == ContentType.NESTED_VIDEO || it.contentType == ContentType.LOCKED) ContentType.MEDIA else it.contentType);
 
-                if(it is IPlatformVideo && it.duration > 0 && !_filterSettings.allowWatched && StateHistory.instance.isHistoryWatched(it.url, it.duration))
+                if(it is IPlatformVideo && it.duration > 0 && !fragment._filterSettings.allowWatched && StateHistory.instance.isHistoryWatched(it.url, it.duration))
                     return@filter false;
 
                 //TODO: Check against a sub cache
@@ -331,11 +338,11 @@ class SubscriptionsFeedFragment : MainFragment() {
 
 
                 if(it.datetime?.isAfter(nowSoon) == true) {
-                    if(!_filterSettings.allowPlanned)
+                    if(!fragment._filterSettings.allowPlanned)
                         return@filter false;
                 }
 
-                if(_filterSettings.allowLive) { //If allowLive, always show live
+                if(fragment._filterSettings.allowLive) { //If allowLive, always show live
                     if(it is IPlatformVideo && it.isLive)
                         return@filter true;
                 }

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

@@ -18,6 +18,8 @@ import com.futo.platformplayer.states.StatePlatform
 import com.futo.platformplayer.stores.FragmentedStorage
 import com.futo.platformplayer.stores.SearchHistoryStorage
 import com.futo.platformplayer.views.adapters.SearchSuggestionAdapter
+import com.futo.platformplayer.views.others.RadioGroupView
+import com.futo.platformplayer.views.others.TagsView
 
 data class SuggestionsFragmentData(val query: String, val searchType: SearchType, val channelUrl: String? = null);
 
@@ -28,6 +30,7 @@ class SuggestionsFragment : MainFragment {
 
     private var  _recyclerSuggestions: RecyclerView? = null;
     private var _llmSuggestions: LinearLayoutManager? = null;
+    private var _radioGroupView: RadioGroupView? = null;
     private val _suggestions: ArrayList<String> = ArrayList();
     private var _query: String? = null;
     private var _searchType: SearchType = SearchType.VIDEO;
@@ -49,14 +52,7 @@ class SuggestionsFragment : MainFragment {
         _adapterSuggestions.onClicked.subscribe { suggestion ->
             val storage = FragmentedStorage.get<SearchHistoryStorage>();
             storage.add(suggestion);
-
+            navigate<ContentSearchResultsFragment>(SuggestionsFragmentData(suggestion, _searchType, _channelUrl));
-            if (_searchType == SearchType.CREATOR) {
-                navigate<CreatorSearchResultsFragment>(suggestion);
-            } else if (_searchType == SearchType.PLAYLIST) {
-                navigate<PlaylistSearchResultsFragment>(suggestion);
-            } else {
-                navigate<ContentSearchResultsFragment>(SuggestionsFragmentData(suggestion, SearchType.VIDEO, _channelUrl));
-            }
         }
         _adapterSuggestions.onRemove.subscribe { suggestion ->
             val index = _suggestions.indexOf(suggestion);
@@ -80,6 +76,15 @@ class SuggestionsFragment : MainFragment {
         recyclerSuggestions.adapter = _adapterSuggestions;
         _recyclerSuggestions = recyclerSuggestions;
 
+        _radioGroupView = view.findViewById<RadioGroupView>(R.id.radio_group).apply {
+            onSelectedChange.subscribe {
+                if (it.size != 1)
+                    _searchType = SearchType.VIDEO
+                else
+                    _searchType = (it[0] ?: SearchType.VIDEO) as SearchType
+            }
+        }
+
         loadSuggestions();
         return view;
     }
@@ -110,31 +115,27 @@ class SuggestionsFragment : MainFragment {
             _channelUrl = null;
         }
 
+        _radioGroupView?.setOptions(listOf(Pair("Media", SearchType.VIDEO), Pair("Creators", SearchType.CREATOR), Pair("Playlists", SearchType.PLAYLIST)), listOf(_searchType), false, true)
+
         topBar?.apply {
             if (this is SearchTopBarFragment) {
                 onSearch.subscribe(this) {
-                    if (_searchType == SearchType.CREATOR) {
+                    if(it.isHttpUrl()) {
-                        navigate<CreatorSearchResultsFragment>(it);
+                        if(StatePlatform.instance.hasEnabledPlaylistClient(it))
-                    } else if (_searchType == SearchType.PLAYLIST) {
+                            navigate<RemotePlaylistFragment>(it);
-                        navigate<PlaylistSearchResultsFragment>(it);
+                        else if(StatePlatform.instance.hasEnabledChannelClient(it))
-                    } else {
+                            navigate<ChannelFragment>(it);
-                        if(it.isHttpUrl()) {
+                        else {
-                            if(StatePlatform.instance.hasEnabledPlaylistClient(it))
+                            val url = it;
-                                navigate<RemotePlaylistFragment>(it);
+                            activity?.let {
-                            else if(StatePlatform.instance.hasEnabledChannelClient(it))
+                                close()
-                                navigate<ChannelFragment>(it);
+                                if(it is MainActivity)
-                            else {
+                                    it.navigate(it.getFragment<VideoDetailFragment>(), url);
-                                val url = it;
-                                activity?.let {
-                                    close()
-                                    if(it is MainActivity)
-                                        it.navigate(it.getFragment<VideoDetailFragment>(), url);
-                                }
                             }
                         }
-                        else
-                            navigate<ContentSearchResultsFragment>(SuggestionsFragmentData(it, SearchType.VIDEO, _channelUrl));
                     }
+                    else
+                        navigate<ContentSearchResultsFragment>(SuggestionsFragmentData(it, _searchType, _channelUrl));
                 };
 
                 onTextChange.subscribe(this) {
@@ -196,6 +197,7 @@ class SuggestionsFragment : MainFragment {
         super.onDestroyMainView();
         _getSuggestions.onError.clear();
         _recyclerSuggestions = null;
+        _radioGroupView = null
     }
 
     override fun onDestroy() {

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

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

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

@@ -632,6 +632,27 @@ class StatePlatform {
         return pager;
     }
 
+    fun searchChannelsAsContent(query: String): IPager<IPlatformContent> {
+        Logger.i(TAG, "Platform - searchChannels");
+        val pagers = mutableMapOf<IPager<IPlatformContent>, Float>();
+        getSortedEnabledClient().parallelStream().forEach {
+            try {
+                if (it.capabilities.hasChannelSearch)
+                    pagers.put(it.searchChannelsAsContent(query), 1f);
+            }
+            catch(ex: Throwable) {
+                Logger.e(TAG, "Failed search channels", ex)
+                UIDialogs.toast("Failed search channels on [${it.name}]\n(${ex.message})");
+            }
+        };
+        if(pagers.isEmpty())
+            return EmptyPager<IPlatformContent>();
+
+        val pager = MultiDistributionContentPager(pagers);
+        pager.initialize();
+        return pager;
+    }
+
 
     //Video
     fun hasEnabledVideoClient(url: String) : Boolean = getEnabledClients().any { it.isContentDetailsUrl(url) };

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

@@ -6,38 +6,60 @@ import com.futo.platformplayer.LittleEndianDataInputStream
 import com.futo.platformplayer.LittleEndianDataOutputStream
 import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
+import com.futo.platformplayer.activities.MainActivity
 import com.futo.platformplayer.activities.SyncShowPairingCodeActivity
+import com.futo.platformplayer.api.media.Serializer
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.constructs.Event2
 import com.futo.platformplayer.encryption.GEncryptionProvider
+import com.futo.platformplayer.generateReadablePassword
 import com.futo.platformplayer.getConnectedSocket
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.mdns.DnsService
 import com.futo.platformplayer.mdns.ServiceDiscoverer
+import com.futo.platformplayer.models.HistoryVideo
+import com.futo.platformplayer.models.Subscription
 import com.futo.platformplayer.noise.protocol.DHState
 import com.futo.platformplayer.noise.protocol.Noise
+import com.futo.platformplayer.smartMerge
 import com.futo.platformplayer.stores.FragmentedStorage
 import com.futo.platformplayer.stores.StringStringMapStorage
 import com.futo.platformplayer.stores.StringArrayStorage
 import com.futo.platformplayer.stores.StringStorage
 import com.futo.platformplayer.stores.StringTMapStorage
 import com.futo.platformplayer.sync.SyncSessionData
+import com.futo.platformplayer.sync.internal.ChannelSocket
 import com.futo.platformplayer.sync.internal.GJSyncOpcodes
+import com.futo.platformplayer.sync.internal.IAuthorizable
+import com.futo.platformplayer.sync.internal.IChannel
+import com.futo.platformplayer.sync.internal.LinkType
+import com.futo.platformplayer.sync.internal.Opcode
 import com.futo.platformplayer.sync.internal.SyncDeviceInfo
 import com.futo.platformplayer.sync.internal.SyncKeyPair
 import com.futo.platformplayer.sync.internal.SyncSession
 import com.futo.platformplayer.sync.internal.SyncSocketSession
+import com.futo.platformplayer.sync.models.SendToDevicePackage
+import com.futo.platformplayer.sync.models.SyncPlaylistsPackage
+import com.futo.platformplayer.sync.models.SyncSubscriptionGroupsPackage
+import com.futo.platformplayer.sync.models.SyncSubscriptionsPackage
+import com.futo.platformplayer.sync.models.SyncWatchLaterPackage
 import com.futo.polycentric.core.base64ToByteArray
 import com.futo.polycentric.core.toBase64
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
+import java.io.ByteArrayInputStream
 import java.net.InetAddress
 import java.net.InetSocketAddress
 import java.net.ServerSocket
 import java.net.Socket
+import java.nio.ByteBuffer
+import java.time.Instant
+import java.time.OffsetDateTime
+import java.time.ZoneOffset
 import java.util.Base64
 import java.util.Locale
 import kotlin.system.measureTimeMillis
@@ -59,13 +81,20 @@ class StateSync {
     //TODO: Should sync mdns and casting mdns be merged?
     //TODO: Decrease interval that devices are updated
     //TODO: Send less data
-    val _serviceDiscoverer = ServiceDiscoverer(arrayOf("_gsync._tcp.local")) { handleServiceUpdated(it) }
+    private val _serviceDiscoverer = ServiceDiscoverer(arrayOf("_gsync._tcp.local")) { handleServiceUpdated(it) }
+    private val _pairingCode: String? = generateReadablePassword(8)
+    val pairingCode: String? get() = _pairingCode
+    private var _relaySession: SyncSocketSession? = null
+    private var _threadRelay: Thread? = null
+    private val _remotePendingStatusUpdate = mutableMapOf<String, (complete: Boolean?, message: String) -> Unit>()
 
     var keyPair: DHState? = null
     var publicKey: String? = null
     val deviceRemoved: Event1<String> = Event1()
     val deviceUpdatedOrAdded: Event2<String, SyncSession> = Event2()
 
+    //TODO: Should authorize acknowledge be implemented?
+
     fun hasAuthorizedDevice(): Boolean {
         synchronized(_sessions) {
             return _sessions.any{ it.value.connected && it.value.isAuthorized };
@@ -127,10 +156,7 @@ class StateSync {
 
                 while (_started) {
                     val socket = serverSocket.accept()
-                    val session = createSocketSession(socket, true) { session, socketSession ->
+                    val session = createSocketSession(socket, true)
-
-                    }
-
                     session.startAsResponder()
                 }
             } catch (e: Throwable) {
@@ -164,8 +190,6 @@ class StateSync {
 
                     for (connectPair in addressesToConnect) {
                         try {
-                            val syncDeviceInfo = SyncDeviceInfo(connectPair.first, arrayOf(connectPair.second), PORT)
-
                             val now = System.currentTimeMillis()
                             val lastConnectTime = synchronized(_lastConnectTimesIp) {
                                 _lastConnectTimesIp[connectPair.first] ?: 0
@@ -178,7 +202,7 @@ class StateSync {
                                 }
 
                                 Logger.i(TAG, "Attempting to connect to authorized device by last known IP '${connectPair.first}' with pkey=${connectPair.first}")
-                                connect(syncDeviceInfo)
+                                connect(arrayOf(connectPair.second), PORT, connectPair.first, null)
                             }
                         } catch (e: Throwable) {
                             Logger.i(TAG, "Failed to connect to " + connectPair.first, e)
@@ -188,6 +212,125 @@ class StateSync {
                 }
             }.apply { start() }
         }
+
+        if (Settings.instance.synchronization.discoverThroughRelay) {
+            _threadRelay = Thread {
+                while (_started) {
+                    try {
+                        Log.i(TAG, "Starting relay session...")
+
+                        var socketClosed = false;
+                        val socket = Socket(RELAY_SERVER, 9000)
+                        _relaySession = SyncSocketSession(
+                            (socket.remoteSocketAddress as InetSocketAddress).address.hostAddress!!,
+                            keyPair!!,
+                            LittleEndianDataInputStream(socket.getInputStream()),
+                            LittleEndianDataOutputStream(socket.getOutputStream()),
+                            isHandshakeAllowed = { linkType, syncSocketSession, publicKey, pairingCode -> isHandshakeAllowed(linkType, syncSocketSession, publicKey, pairingCode) },
+                            onNewChannel = { _, c ->
+                                val remotePublicKey = c.remotePublicKey
+                                if (remotePublicKey == null) {
+                                    Log.e(TAG, "Remote public key should never be null in onNewChannel.")
+                                    return@SyncSocketSession
+                                }
+
+                                Log.i(TAG, "New channel established from relay (pk: '$remotePublicKey').")
+
+                                var session: SyncSession?
+                                synchronized(_sessions) {
+                                    session = _sessions[remotePublicKey]
+                                    if (session == null) {
+                                        val remoteDeviceName = synchronized(_nameStorage) {
+                                            _nameStorage.get(remotePublicKey)
+                                        }
+                                        session = createNewSyncSession(remotePublicKey, remoteDeviceName)
+                                        _sessions[remotePublicKey] = session!!
+                                    }
+                                    session!!.addChannel(c)
+                                }
+
+                                c.setDataHandler { _, channel, opcode, subOpcode, data ->
+                                    session?.handlePacket(opcode, subOpcode, data)
+                                }
+                                c.setCloseHandler { channel ->
+                                    session?.removeChannel(channel)
+                                }
+                            },
+                            onChannelEstablished = { _, channel, isResponder ->
+                                handleAuthorization(channel, isResponder)
+                            },
+                            onClose = { socketClosed = true },
+                            onHandshakeComplete = { relaySession ->
+                                Thread {
+                                    try {
+                                        while (_started && !socketClosed) {
+                                            val unconnectedAuthorizedDevices = synchronized(_authorizedDevices) {
+                                                _authorizedDevices.values.filter { !isConnected(it) }.toTypedArray()
+                                            }
+
+                                            relaySession.publishConnectionInformation(unconnectedAuthorizedDevices, PORT, Settings.instance.synchronization.discoverThroughRelay, false, false, Settings.instance.synchronization.discoverThroughRelay && Settings.instance.synchronization.connectThroughRelay)
+
+                                            val connectionInfos = runBlocking { relaySession.requestBulkConnectionInfo(unconnectedAuthorizedDevices) }
+
+                                            for ((targetKey, connectionInfo) in connectionInfos) {
+                                                val potentialLocalAddresses = connectionInfo.ipv4Addresses.union(connectionInfo.ipv6Addresses)
+                                                    .filter { it != connectionInfo.remoteIp }
+                                                if (connectionInfo.allowLocalDirect) {
+                                                    Thread {
+                                                        try {
+                                                            Log.v(TAG, "Attempting to connect directly, locally to '$targetKey'.")
+                                                            connect(potentialLocalAddresses.map { it }.toTypedArray(), PORT, targetKey, null)
+                                                        } catch (e: Throwable) {
+                                                            Log.e(TAG, "Failed to start direct connection using connection info with $targetKey.", e)
+                                                        }
+                                                    }.start()
+                                                }
+
+                                                if (connectionInfo.allowRemoteDirect) {
+                                                    // TODO: Implement direct remote connection if needed
+                                                }
+
+                                                if (connectionInfo.allowRemoteHolePunched) {
+                                                    // TODO: Implement hole punching if needed
+                                                }
+
+                                                if (connectionInfo.allowRemoteRelayed && Settings.instance.synchronization.connectThroughRelay) {
+                                                    try {
+                                                        Log.v(TAG, "Attempting relayed connection with '$targetKey'.")
+                                                        runBlocking { relaySession.startRelayedChannel(targetKey, null) }
+                                                    } catch (e: Throwable) {
+                                                        Log.e(TAG, "Failed to start relayed channel with $targetKey.", e)
+                                                    }
+                                                }
+                                            }
+
+                                            Thread.sleep(15000)
+                                        }
+                                    } catch (e: Throwable) {
+                                        Log.e(TAG, "Unhandled exception in relay session.", e)
+                                        relaySession.stop()
+                                    }
+                                }.start()
+                            }
+                        )
+
+                        _relaySession!!.authorizable = object : IAuthorizable {
+                            override val isAuthorized: Boolean get() = true
+                        }
+
+                        _relaySession!!.startAsInitiator(RELAY_PUBLIC_KEY, null)
+
+                        Log.i(TAG, "Started relay session.")
+                    } catch (e: Throwable) {
+                        Log.e(TAG, "Relay session failed.", e)
+                        Thread.sleep(5000)
+                    } finally {
+                        _relaySession?.stop()
+                        _relaySession = null
+                    }
+                }
+            }.apply { start() }
+        }
     }
 
     private fun getDeviceName(): String {
@@ -219,14 +362,14 @@ class StateSync {
         }
     }
     fun getSessions(): List<SyncSession> {
-        return synchronized(_sessions) {
+        synchronized(_sessions) {
             return _sessions.values.toList()
-        };
+        }
     }
     fun getAuthorizedSessions(): List<SyncSession> {
-        return synchronized(_sessions) {
+        synchronized(_sessions) {
             return _sessions.values.filter { it.isAuthorized }.toList()
-        };
+        }
     }
 
     fun getSyncSessionData(key: String): SyncSessionData {
@@ -253,7 +396,7 @@ class StateSync {
                 val urlSafePkey = s.texts.firstOrNull { it.startsWith("pk=") }?.substring("pk=".length) ?: continue
                 val pkey = Base64.getEncoder().encodeToString(Base64.getDecoder().decode(urlSafePkey.replace('-', '+').replace('_', '/')))
 
-                val syncDeviceInfo = SyncDeviceInfo(pkey, addresses, port)
+                val syncDeviceInfo = SyncDeviceInfo(pkey, addresses, port, null)
                 val authorized = isAuthorized(pkey)
 
                 if (authorized && !isConnected(pkey)) {
@@ -288,12 +431,342 @@ class StateSync {
         deviceRemoved.emit(remotePublicKey)
     }
 
-    private fun createSocketSession(socket: Socket, isResponder: Boolean, onAuthorized: (session: SyncSession, socketSession: SyncSocketSession) -> Unit): SyncSocketSession {
+
-        var session: SyncSession? = null
+    private fun handleSyncSubscriptionPackage(origin: SyncSession, pack: SyncSubscriptionsPackage) {
-        return SyncSocketSession((socket.remoteSocketAddress as InetSocketAddress).address.hostAddress!!, keyPair!!, LittleEndianDataInputStream(socket.getInputStream()), LittleEndianDataOutputStream(socket.getOutputStream()),
+        val added = mutableListOf<Subscription>()
-            onClose = { s ->
+        for(sub in pack.subscriptions) {
-                session?.removeSocketSession(s)
+            if(!StateSubscriptions.instance.isSubscribed(sub.channel)) {
+                val removalTime = StateSubscriptions.instance.getSubscriptionRemovalTime(sub.channel.url);
+                if(sub.creationTime > removalTime) {
+                    val newSub = StateSubscriptions.instance.addSubscription(sub.channel, sub.creationTime);
+                    added.add(newSub);
+                }
+            }
+        }
+        if(added.size > 3)
+            UIDialogs.appToast("${added.size} Subscriptions from ${origin.remotePublicKey.substring(0, Math.min(8, origin.remotePublicKey.length))}");
+        else if(added.size > 0)
+            UIDialogs.appToast("Subscriptions from ${origin.remotePublicKey.substring(0, Math.min(8, origin.remotePublicKey.length))}:\n" +
+                    added.map { it.channel.name }.joinToString("\n"));
+
+
+        if(pack.subscriptions.isNotEmpty()) {
+            for (subRemoved in pack.subscriptionRemovals) {
+                val removed = StateSubscriptions.instance.applySubscriptionRemovals(pack.subscriptionRemovals);
+                if(removed.size > 3) {
+                    UIDialogs.appToast("Removed ${removed.size} Subscriptions from ${origin.remotePublicKey.substring(0, 8.coerceAtMost(origin.remotePublicKey.length))}");
+                } else if(removed.isNotEmpty()) {
+                    UIDialogs.appToast("Subscriptions removed from ${origin.remotePublicKey.substring(0, 8.coerceAtMost(origin.remotePublicKey.length))}:\n" + removed.map { it.channel.name }.joinToString("\n"));
+                }
+            }
+        }
+    }
+
+    private fun handleData(session: SyncSession, opcode: UByte, subOpcode: UByte, data: ByteBuffer) {
+        val remotePublicKey = session.remotePublicKey
+        when (subOpcode) {
+            GJSyncOpcodes.sendToDevices -> {
+                StateApp.instance.scopeOrNull?.launch(Dispatchers.Main) {
+                    val context = StateApp.instance.contextOrNull;
+                    if (context != null && context is MainActivity) {
+                        val dataBody = ByteArray(data.remaining());
+                        val remainder = data.remaining();
+                        data.get(dataBody, 0, remainder);
+                        val json = String(dataBody, Charsets.UTF_8);
+                        val obj = Json.decodeFromString<SendToDevicePackage>(json);
+                        UIDialogs.appToast("Received url from device [${session.remotePublicKey}]:\n{${obj.url}");
+                        context.handleUrl(obj.url, obj.position);
+                    }
+                };
+            }
+
+            GJSyncOpcodes.syncStateExchange -> {
+                val dataBody = ByteArray(data.remaining());
+                data.get(dataBody);
+                val json = String(dataBody, Charsets.UTF_8);
+                val syncSessionData = Serializer.json.decodeFromString<SyncSessionData>(json);
+
+                Logger.i(TAG, "Received SyncSessionData from $remotePublicKey");
+
+
+                session.sendData(GJSyncOpcodes.syncSubscriptions, StateSubscriptions.instance.getSyncSubscriptionsPackageString());
+                session.sendData(GJSyncOpcodes.syncSubscriptionGroups, StateSubscriptionGroups.instance.getSyncSubscriptionGroupsPackageString());
+                session.sendData(GJSyncOpcodes.syncPlaylists, StatePlaylists.instance.getSyncPlaylistsPackageString())
+
+                session.sendData(GJSyncOpcodes.syncWatchLater, Json.encodeToString(StatePlaylists.instance.getWatchLaterSyncPacket(false)));
+
+                val recentHistory = StateHistory.instance.getRecentHistory(syncSessionData.lastHistory);
+                if(recentHistory.isNotEmpty())
+                    session.sendJsonData(GJSyncOpcodes.syncHistory, recentHistory);
+            }
+
+            GJSyncOpcodes.syncExport -> {
+                val dataBody = ByteArray(data.remaining());
+                val bytesStr = ByteArrayInputStream(data.array(), data.position(), data.remaining());
+                bytesStr.use { bytesStrBytes ->
+                    val exportStruct = StateBackup.ExportStructure.fromZipBytes(bytesStrBytes);
+                    for (store in exportStruct.stores) {
+                        if (store.key.equals("subscriptions", true)) {
+                            val subStore =
+                                StateSubscriptions.instance.getUnderlyingSubscriptionsStore();
+                            StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
+                                val pack = SyncSubscriptionsPackage(
+                                    store.value.map {
+                                        subStore.fromReconstruction(it, exportStruct.cache)
+                                    },
+                                    StateSubscriptions.instance.getSubscriptionRemovals()
+                                );
+                                handleSyncSubscriptionPackage(session, pack);
+                            }
+                        }
+                    }
+                }
+            }
+
+            GJSyncOpcodes.syncSubscriptions -> {
+                val dataBody = ByteArray(data.remaining());
+                data.get(dataBody);
+                val json = String(dataBody, Charsets.UTF_8);
+                val subPackage = Serializer.json.decodeFromString<SyncSubscriptionsPackage>(json);
+                handleSyncSubscriptionPackage(session, subPackage);
+
+                val newestSub = subPackage.subscriptions.maxOf { it.creationTime };
+
+                val sesData = getSyncSessionData(remotePublicKey);
+                if(newestSub > sesData.lastSubscription) {
+                    sesData.lastSubscription = newestSub;
+                    saveSyncSessionData(sesData);
+                }
+            }
+
+            GJSyncOpcodes.syncSubscriptionGroups -> {
+                val dataBody = ByteArray(data.remaining());
+                data.get(dataBody);
+                val json = String(dataBody, Charsets.UTF_8);
+                val pack = Serializer.json.decodeFromString<SyncSubscriptionGroupsPackage>(json);
+
+                var lastSubgroupChange = OffsetDateTime.MIN;
+                for(group in pack.groups){
+                    if(group.lastChange > lastSubgroupChange)
+                        lastSubgroupChange = group.lastChange;
+
+                    val existing = StateSubscriptionGroups.instance.getSubscriptionGroup(group.id);
+
+                    if(existing == null)
+                        StateSubscriptionGroups.instance.updateSubscriptionGroup(group, false, true);
+                    else if(existing.lastChange < group.lastChange) {
+                        existing.name = group.name;
+                        existing.urls = group.urls;
+                        existing.image = group.image;
+                        existing.priority = group.priority;
+                        existing.lastChange = group.lastChange;
+                        StateSubscriptionGroups.instance.updateSubscriptionGroup(existing, false, true);
+                    }
+                }
+                for(removal in pack.groupRemovals) {
+                    val creation = StateSubscriptionGroups.instance.getSubscriptionGroup(removal.key);
+                    val removalTime = OffsetDateTime.ofInstant(Instant.ofEpochSecond(removal.value, 0), ZoneOffset.UTC);
+                    if(creation != null && creation.creationTime < removalTime)
+                        StateSubscriptionGroups.instance.deleteSubscriptionGroup(removal.key, false);
+                }
+            }
+
+            GJSyncOpcodes.syncPlaylists -> {
+                val dataBody = ByteArray(data.remaining());
+                data.get(dataBody);
+                val json = String(dataBody, Charsets.UTF_8);
+                val pack = Serializer.json.decodeFromString<SyncPlaylistsPackage>(json);
+
+                for(playlist in pack.playlists) {
+                    val existing = StatePlaylists.instance.getPlaylist(playlist.id);
+
+                    if(existing == null)
+                        StatePlaylists.instance.createOrUpdatePlaylist(playlist, false);
+                    else if(existing.dateUpdate.toLocalDateTime() < playlist.dateUpdate.toLocalDateTime()) {
+                        existing.dateUpdate = playlist.dateUpdate;
+                        existing.name = playlist.name;
+                        existing.videos = playlist.videos;
+                        existing.dateCreation = playlist.dateCreation;
+                        existing.datePlayed = playlist.datePlayed;
+                        StatePlaylists.instance.createOrUpdatePlaylist(existing, false);
+                    }
+                }
+                for(removal in pack.playlistRemovals) {
+                    val creation = StatePlaylists.instance.getPlaylist(removal.key);
+                    val removalTime = OffsetDateTime.ofInstant(Instant.ofEpochSecond(removal.value, 0), ZoneOffset.UTC);
+                    if(creation != null && creation.dateCreation < removalTime)
+                        StatePlaylists.instance.removePlaylist(creation, false);
+
+                }
+            }
+
+            GJSyncOpcodes.syncWatchLater -> {
+                val dataBody = ByteArray(data.remaining());
+                data.get(dataBody);
+                val json = String(dataBody, Charsets.UTF_8);
+                val pack = Serializer.json.decodeFromString<SyncWatchLaterPackage>(json);
+
+                Logger.i(TAG, "SyncWatchLater received ${pack.videos.size} (${pack.videoAdds?.size}, ${pack.videoRemovals?.size})");
+
+                val allExisting = StatePlaylists.instance.getWatchLater();
+                for(video in pack.videos) {
+                    val existing = allExisting.firstOrNull { it.url == video.url };
+                    val time = if(pack.videoAdds != null && pack.videoAdds.containsKey(video.url)) OffsetDateTime.ofInstant(Instant.ofEpochSecond(pack.videoAdds[video.url] ?: 0), ZoneOffset.UTC) else OffsetDateTime.MIN;
+
+                    if(existing == null) {
+                        StatePlaylists.instance.addToWatchLater(video, false);
+                        if(time > OffsetDateTime.MIN)
+                            StatePlaylists.instance.setWatchLaterAddTime(video.url, time);
+                    }
+                }
+                for(removal in pack.videoRemovals) {
+                    val watchLater = allExisting.firstOrNull { it.url == removal.key } ?: continue;
+                    val creation = StatePlaylists.instance.getWatchLaterRemovalTime(watchLater.url) ?: OffsetDateTime.MIN;
+                    val removalTime = OffsetDateTime.ofInstant(Instant.ofEpochSecond(removal.value), ZoneOffset.UTC);
+                    if(creation < removalTime)
+                        StatePlaylists.instance.removeFromWatchLater(watchLater, false, removalTime);
+                }
+
+                val packReorderTime = OffsetDateTime.ofInstant(Instant.ofEpochSecond(pack.reorderTime), ZoneOffset.UTC);
+                val localReorderTime = StatePlaylists.instance.getWatchLaterLastReorderTime();
+                if(localReorderTime < packReorderTime && pack.ordering != null) {
+                    StatePlaylists.instance.updateWatchLaterOrdering(smartMerge(pack.ordering!!, StatePlaylists.instance.getWatchLaterOrdering()), true);
+                }
+            }
+
+            GJSyncOpcodes.syncHistory -> {
+                val dataBody = ByteArray(data.remaining());
+                data.get(dataBody);
+                val json = String(dataBody, Charsets.UTF_8);
+                val history = Serializer.json.decodeFromString<List<HistoryVideo>>(json);
+                Logger.i(TAG, "SyncHistory received ${history.size} videos from ${remotePublicKey}");
+
+                var lastHistory = OffsetDateTime.MIN;
+                for(video in history){
+                    val hist = StateHistory.instance.getHistoryByVideo(video.video, true, video.date);
+                    if(hist != null)
+                        StateHistory.instance.updateHistoryPosition(video.video, hist, true, video.position, video.date)
+                    if(lastHistory < video.date)
+                        lastHistory = video.date;
+                }
+
+                if(lastHistory != OffsetDateTime.MIN && history.size > 1) {
+                    val sesData = getSyncSessionData(remotePublicKey);
+                    if (lastHistory > sesData.lastHistory) {
+                        sesData.lastHistory = lastHistory;
+                        saveSyncSessionData(sesData);
+                    }
+                }
+            }
+        }
+    }
+
+    private fun onAuthorized(remotePublicKey: String) {
+        synchronized(_remotePendingStatusUpdate) {
+            _remotePendingStatusUpdate.remove(remotePublicKey)?.invoke(true, "Authorized")
+        }
+    }
+
+    private fun onUnuthorized(remotePublicKey: String) {
+        synchronized(_remotePendingStatusUpdate) {
+            _remotePendingStatusUpdate.remove(remotePublicKey)?.invoke(false, "Unauthorized")
+        }
+    }
+
+    private fun createNewSyncSession(remotePublicKey: String, remoteDeviceName: String?): SyncSession {
+        return SyncSession(
+            remotePublicKey,
+            onAuthorized = { it, isNewlyAuthorized, isNewSession ->
+                if (!isNewSession) {
+                    return@SyncSession
+                }
+
+                it.remoteDeviceName?.let { remoteDeviceName ->
+                    synchronized(_nameStorage) {
+                        _nameStorage.setAndSave(remotePublicKey, remoteDeviceName)
+                    }
+                }
+
+                Logger.i(TAG, "$remotePublicKey authorized (name: ${it.displayName})")
+                onAuthorized(remotePublicKey)
+                _authorizedDevices.addDistinct(remotePublicKey)
+                _authorizedDevices.save()
+                deviceUpdatedOrAdded.emit(it.remotePublicKey, it)
+
+                checkForSync(it);
             },
+            onUnauthorized = {
+                unauthorize(remotePublicKey)
+
+                Logger.i(TAG, "$remotePublicKey unauthorized (name: ${it.displayName})")
+                onUnuthorized(remotePublicKey)
+
+                synchronized(_sessions) {
+                    it.close()
+                    _sessions.remove(remotePublicKey)
+                }
+            },
+            onConnectedChanged = { it, connected ->
+                Logger.i(TAG, "$remotePublicKey connected: $connected")
+                deviceUpdatedOrAdded.emit(it.remotePublicKey, it)
+            },
+            onClose = {
+                Logger.i(TAG, "$remotePublicKey closed")
+
+                synchronized(_sessions)
+                {
+                    _sessions.remove(it.remotePublicKey)
+                }
+
+                deviceRemoved.emit(it.remotePublicKey)
+
+                synchronized(_remotePendingStatusUpdate) {
+                    _remotePendingStatusUpdate.remove(remotePublicKey)?.invoke(false, "Connection closed")
+                }
+            },
+            dataHandler = { it, opcode, subOpcode, data ->
+                handleData(it, opcode, subOpcode, data)
+            },
+            remoteDeviceName
+        )
+    }
+
+    private fun isHandshakeAllowed(linkType: LinkType, syncSocketSession: SyncSocketSession, publicKey: String, pairingCode: String?): Boolean {
+        Log.v(TAG, "Check if handshake allowed from '$publicKey'.")
+        if (publicKey == RELAY_PUBLIC_KEY)
+            return true
+
+        synchronized(_authorizedDevices) {
+            if (_authorizedDevices.values.contains(publicKey)) {
+                if (linkType == LinkType.Relayed && !Settings.instance.synchronization.connectThroughRelay)
+                    return false
+                return true
+            }
+        }
+
+        Log.v(TAG, "Check if handshake allowed with pairing code '$pairingCode' with active pairing code '$_pairingCode'.")
+        if (_pairingCode == null || pairingCode.isNullOrEmpty())
+            return false
+
+        if (linkType == LinkType.Relayed && !Settings.instance.synchronization.pairThroughRelay)
+            return false
+
+        return _pairingCode == pairingCode
+    }
+
+    private fun createSocketSession(socket: Socket, isResponder: Boolean): SyncSocketSession {
+        var session: SyncSession? = null
+        var channelSocket: ChannelSocket? = null
+        return SyncSocketSession(
+            (socket.remoteSocketAddress as InetSocketAddress).address.hostAddress!!,
+            keyPair!!,
+            LittleEndianDataInputStream(socket.getInputStream()),
+            LittleEndianDataOutputStream(socket.getOutputStream()),
+            onClose = { s ->
+                if (channelSocket != null)
+                    session?.removeChannel(channelSocket!!)
+            },
+            isHandshakeAllowed = { linkType, syncSocketSession, publicKey, pairingCode -> isHandshakeAllowed(linkType, syncSocketSession, publicKey, pairingCode) },
             onHandshakeComplete = { s ->
                 val remotePublicKey = s.remotePublicKey
                 if (remotePublicKey == null) {
@@ -303,6 +776,8 @@ class StateSync {
 
                 Logger.i(TAG, "Handshake complete with (LocalPublicKey = ${s.localPublicKey}, RemotePublicKey = ${s.remotePublicKey})")
 
+                channelSocket = ChannelSocket(s)
+
                 synchronized(_sessions) {
                     session = _sessions[s.remotePublicKey]
                     if (session == null) {
@@ -310,126 +785,99 @@ class StateSync {
                             _nameStorage.get(remotePublicKey)
                         }
 
-                        session = SyncSession(remotePublicKey, onAuthorized = { it, isNewlyAuthorized, isNewSession ->
+                        synchronized(_lastAddressStorage) {
-                            if (!isNewSession) {
+                            _lastAddressStorage.setAndSave(remotePublicKey, s.remoteAddress)
-                                return@SyncSession
+                        }
-                            }
 
-                            it.remoteDeviceName?.let { remoteDeviceName ->
+                        session = createNewSyncSession(remotePublicKey, remoteDeviceName)
-                                synchronized(_nameStorage) {
-                                    _nameStorage.setAndSave(remotePublicKey, remoteDeviceName)
-                                }
-                            }
-
-                            Logger.i(TAG, "${s.remotePublicKey} authorized (name: ${it.displayName})")
-                            synchronized(_lastAddressStorage) {
-                                _lastAddressStorage.setAndSave(remotePublicKey, s.remoteAddress)
-                            }
-
-                            onAuthorized(it, s)
-                            _authorizedDevices.addDistinct(remotePublicKey)
-                            _authorizedDevices.save()
-                            deviceUpdatedOrAdded.emit(it.remotePublicKey, session!!)
-
-                            checkForSync(it);
-                        }, onUnauthorized = {
-                            unauthorize(remotePublicKey)
-
-                            synchronized(_sessions) {
-                                session?.close()
-                                _sessions.remove(remotePublicKey)
-                            }
-                        }, onConnectedChanged = { it, connected ->
-                            Logger.i(TAG, "${s.remotePublicKey} connected: " + connected)
-                            deviceUpdatedOrAdded.emit(it.remotePublicKey, session!!)
-                        }, onClose = {
-                            Logger.i(TAG, "${s.remotePublicKey} closed")
-
-                            synchronized(_sessions)
-                            {
-                                _sessions.remove(it.remotePublicKey)
-                            }
-
-                            deviceRemoved.emit(it.remotePublicKey)
-
-                        }, remoteDeviceName)
                         _sessions[remotePublicKey] = session!!
                     }
-                    session!!.addSocketSession(s)
+                    session!!.addChannel(channelSocket!!)
                 }
 
-                if (isResponder) {
+                handleAuthorization(channelSocket!!, isResponder)
-                    val isAuthorized = synchronized(_authorizedDevices) {
-                        _authorizedDevices.values.contains(remotePublicKey)
-                    }
-
-                    if (!isAuthorized) {
-                        val scope = StateApp.instance.scopeOrNull
-                        val activity = SyncShowPairingCodeActivity.activity
-
-                        if (scope != null && activity != null) {
-                            scope.launch(Dispatchers.Main) {
-                                UIDialogs.showConfirmationDialog(activity, "Allow connection from ${remotePublicKey}?", action = {
-                                    scope.launch(Dispatchers.IO) {
-                                        try {
-                                            session!!.authorize(s)
-                                            Logger.i(TAG, "Connection authorized for $remotePublicKey by confirmation")
-                                        } catch (e: Throwable) {
-                                            Logger.e(TAG, "Failed to send authorize", e)
-                                        }
-                                    }
-                                }, cancelAction = {
-                                    scope.launch(Dispatchers.IO) {
-                                        try {
-                                            unauthorize(remotePublicKey)
-                                        } catch (e: Throwable) {
-                                            Logger.w(TAG, "Failed to send unauthorize", e)
-                                        }
-
-                                        synchronized(_sessions) {
-                                            session?.close()
-                                            _sessions.remove(remotePublicKey)
-                                        }
-                                    }
-                                })
-                            }
-                        } else {
-                            val publicKey = session!!.remotePublicKey
-                            session!!.unauthorize(s)
-                            session!!.close()
-
-                            synchronized(_sessions) {
-                                _sessions.remove(publicKey)
-                            }
-
-                            Logger.i(TAG, "Connection unauthorized for ${remotePublicKey} because not authorized and not on pairing activity to ask")
-                        }
-                    } else {
-                        //Responder does not need to check because already approved
-                        session!!.authorize(s)
-                        Logger.i(TAG, "Connection authorized for ${remotePublicKey} because already authorized")
-                    }
-                } else {
-                    //Initiator does not need to check because the manual action of scanning the QR counts as approval
-                    session!!.authorize(s)
-                    Logger.i(TAG, "Connection authorized for ${remotePublicKey} because initiator")
-                }
             },
             onData = { s, opcode, subOpcode, data ->
-                session?.handlePacket(s, opcode, subOpcode, data)
+                session?.handlePacket(opcode, subOpcode, data)
-            })
+            }
+        )
+    }
+
+    private fun handleAuthorization(channel: IChannel, isResponder: Boolean) {
+        val syncSession = channel.syncSession!!
+        val remotePublicKey = channel.remotePublicKey!!
+
+        if (isResponder) {
+            val isAuthorized = synchronized(_authorizedDevices) {
+                _authorizedDevices.values.contains(remotePublicKey)
+            }
+
+            if (!isAuthorized) {
+                val scope = StateApp.instance.scopeOrNull
+                val activity = SyncShowPairingCodeActivity.activity
+
+                if (scope != null && activity != null) {
+                    scope.launch(Dispatchers.Main) {
+                        UIDialogs.showConfirmationDialog(activity, "Allow connection from ${remotePublicKey}?",
+                            action = {
+                                scope.launch(Dispatchers.IO) {
+                                    try {
+                                        syncSession.authorize()
+                                        Logger.i(TAG, "Connection authorized for $remotePublicKey by confirmation")
+                                    } catch (e: Throwable) {
+                                        Logger.e(TAG, "Failed to send authorize", e)
+                                    }
+                                }
+                            },
+                            cancelAction = {
+                                scope.launch(Dispatchers.IO) {
+                                    try {
+                                        unauthorize(remotePublicKey)
+                                    } catch (e: Throwable) {
+                                        Logger.w(TAG, "Failed to send unauthorize", e)
+                                    }
+
+                                    syncSession.close()
+                                    synchronized(_sessions) {
+                                        _sessions.remove(remotePublicKey)
+                                    }
+                                }
+                            }
+                        )
+                    }
+                } else {
+                    val publicKey = syncSession.remotePublicKey
+                    syncSession.unauthorize()
+                    syncSession.close()
+
+                    synchronized(_sessions) {
+                        _sessions.remove(publicKey)
+                    }
+
+                    Logger.i(TAG, "Connection unauthorized for $remotePublicKey because not authorized and not on pairing activity to ask")
+                }
+            } else {
+                //Responder does not need to check because already approved
+                syncSession.authorize()
+                Logger.i(TAG, "Connection authorized for $remotePublicKey because already authorized")
+            }
+        } else {
+            //Initiator does not need to check because the manual action of scanning the QR counts as approval
+            syncSession.authorize()
+            Logger.i(TAG, "Connection authorized for $remotePublicKey because initiator")
+        }
     }
 
     inline fun <reified T> broadcastJsonData(subOpcode: UByte, data: T) {
-        broadcast(SyncSocketSession.Opcode.DATA.value, subOpcode, Json.encodeToString(data));
+        broadcast(Opcode.DATA.value, subOpcode, Json.encodeToString(data));
     }
     fun broadcastData(subOpcode: UByte, data: String) {
-        broadcast(SyncSocketSession.Opcode.DATA.value, subOpcode, data.toByteArray(Charsets.UTF_8));
+        broadcast(Opcode.DATA.value, subOpcode, ByteBuffer.wrap(data.toByteArray(Charsets.UTF_8)));
     }
     fun broadcast(opcode: UByte, subOpcode: UByte, data: String) {
-        broadcast(opcode, subOpcode, data.toByteArray(Charsets.UTF_8));
+        broadcast(opcode, subOpcode, ByteBuffer.wrap(data.toByteArray(Charsets.UTF_8)));
     }
-    fun broadcast(opcode: UByte, subOpcode: UByte, data: ByteArray) {
+    fun broadcast(opcode: UByte, subOpcode: UByte, data: ByteBuffer) {
         for(session in getAuthorizedSessions()) {
             try {
                 session.send(opcode, subOpcode, data);
@@ -456,21 +904,53 @@ class StateSync {
         _serverSocket?.close()
         _serverSocket = null
 
-        //_thread?.join()
+        _thread?.interrupt()
         _thread = null
+        _connectThread?.interrupt()
         _connectThread = null
+        _threadRelay?.interrupt()
+        _threadRelay = null
+
+        _relaySession?.stop()
+        _relaySession = null
     }
 
-    fun connect(deviceInfo: SyncDeviceInfo, onStatusUpdate: ((session: SyncSocketSession?, complete: Boolean, message: String) -> Unit)? = null): SyncSocketSession {
+    fun connect(deviceInfo: SyncDeviceInfo, onStatusUpdate: ((complete: Boolean?, message: String) -> Unit)? = null) {
-        onStatusUpdate?.invoke(null, false, "Connecting...")
+        try {
-        val socket = getConnectedSocket(deviceInfo.addresses.map { InetAddress.getByName(it) }, deviceInfo.port) ?: throw Exception("Failed to connect")
+            connect(deviceInfo.addresses, deviceInfo.port, deviceInfo.publicKey, deviceInfo.pairingCode, onStatusUpdate)
-        onStatusUpdate?.invoke(null, false, "Handshaking...")
+        } catch (e: Throwable) {
+            Logger.e(TAG, "Failed to connect directly", e)
+            val relaySession = _relaySession
+            if (relaySession != null && Settings.instance.synchronization.pairThroughRelay) {
+                onStatusUpdate?.invoke(null, "Connecting via relay...")
 
-        val session = createSocketSession(socket, false) { _, ss ->
+                runBlocking {
-            onStatusUpdate?.invoke(ss, true, "Handshake complete")
+                    if (onStatusUpdate != null) {
+                        synchronized(_remotePendingStatusUpdate) {
+                            _remotePendingStatusUpdate[deviceInfo.publicKey] = onStatusUpdate
+                        }
+                    }
+                    relaySession.startRelayedChannel(deviceInfo.publicKey, deviceInfo.pairingCode)
+                }
+            } else {
+                throw e
+            }
+        }
+    }
+
+    fun connect(addresses: Array<String>, port: Int, publicKey: String, pairingCode: String?, onStatusUpdate: ((complete: Boolean?, message: String) -> Unit)? = null): SyncSocketSession {
+        onStatusUpdate?.invoke(null, "Connecting directly...")
+        val socket = getConnectedSocket(addresses.map { InetAddress.getByName(it) }, port) ?: throw Exception("Failed to connect")
+        onStatusUpdate?.invoke(null, "Handshaking...")
+
+        val session = createSocketSession(socket, false)
+        if (onStatusUpdate != null) {
+            synchronized(_remotePendingStatusUpdate) {
+                _remotePendingStatusUpdate[publicKey] = onStatusUpdate
+            }
         }
 
-        session.startAsInitiator(deviceInfo.publicKey)
+        session.startAsInitiator(publicKey, pairingCode)
         return session
     }
 
@@ -526,6 +1006,8 @@ class StateSync {
         val hash = "BLAKE2b"
         var protocolName = "Noise_${pattern}_${dh}_${cipher}_${hash}"
         val version = 1
+        val RELAY_SERVER = "relay.grayjay.app"
+        val RELAY_PUBLIC_KEY = "xGbHRzDOvE6plRbQaFgSen82eijF+gxS0yeUaeEErkw="
 
         private const val TAG = "StateSync"
         const val PORT = 12315

app/src/main/java/com/futo/platformplayer/subscription/SubscriptionsTaskFetchAlgorithm.kt

@@ -15,12 +15,14 @@ import com.futo.platformplayer.api.media.structures.EmptyPager
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.api.media.structures.MultiChronoContentPager
 import com.futo.platformplayer.api.media.structures.PlatformContentPager
+import com.futo.platformplayer.debug.Stopwatch
 import com.futo.platformplayer.engine.exceptions.PluginException
 import com.futo.platformplayer.engine.exceptions.ScriptCaptchaRequiredException
 import com.futo.platformplayer.engine.exceptions.ScriptCriticalException
 import com.futo.platformplayer.exceptions.ChannelException
 import com.futo.platformplayer.findNonRuntimeException
 import com.futo.platformplayer.fragment.mainactivity.main.SubscriptionsFeedFragment
+import com.futo.platformplayer.getNowDiffMiliseconds
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.Subscription
 import com.futo.platformplayer.states.StateApp
@@ -32,6 +34,8 @@ import com.futo.platformplayer.subsexchange.ChannelRequest
 import com.futo.platformplayer.subsexchange.ChannelResolve
 import com.futo.platformplayer.subsexchange.ExchangeContract
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import java.time.OffsetDateTime
 import java.util.concurrent.ExecutionException
 import java.util.concurrent.ForkJoinPool
@@ -149,42 +153,56 @@ abstract class SubscriptionsTaskFetchAlgorithm(
 
             //Resolve Subscription Exchange
             if(contract != null) {
-                try {
+                fun resolve() {
-                    resolveTime = measureTimeMillis {
+                    try {
-                        val resolves = taskResults.filter { it.pager != null && (it.task.type == ResultCapabilities.TYPE_MIXED || it.task.type == ResultCapabilities.TYPE_VIDEOS) && contract!!.required.contains(it.task.url) }.map {
+                        resolveTime = measureTimeMillis {
-                            ChannelResolve(
+                            val resolves = taskResults.filter { it.pager != null && (it.task.type == ResultCapabilities.TYPE_MIXED || it.task.type == ResultCapabilities.TYPE_VIDEOS) && contract!!.required.contains(it.task.url) }.map {
-                                it.task.url,
+                                ChannelResolve(
-                                it.pager!!.getResults().filter { it is IPlatformVideo }.map { SerializedPlatformVideo.fromVideo(it as IPlatformVideo) }
+                                    it.task.url,
-                            )
+                                    it.pager!!.getResults().filter { it is IPlatformVideo }.map { SerializedPlatformVideo.fromVideo(it as IPlatformVideo) }
-                        }.toTypedArray()
+                                )
-                        val resolve = subsExchangeClient?.resolveContract(
+                            }.toTypedArray()
-                            contract!!,
+
-                            *resolves
+                            val resolveRequestStart = OffsetDateTime.now();
-                        );
+
-                        if (resolve != null) {
+                            val resolve = subsExchangeClient?.resolveContract(
-                            resolveCount = resolves.size;
+                                contract!!,
-                            UIDialogs.appToast("SubsExchange (Res: ${resolves.size}, Prov: ${resolve.size}")
+                                *resolves
-                            for(result in resolve){
+                            );
-                                val task = providedTasks?.find { it.url == result.channelUrl };
+
-                                if(task != null) {
+                            Logger.i(TAG, "Subscription Exchange contract resolved request in ${resolveRequestStart.getNowDiffMiliseconds()}ms");
-                                    taskResults.add(SubscriptionTaskResult(task, PlatformContentPager(result.content, result.content.size), null));
+
-                                    providedTasks?.remove(task);
+                            if (resolve != null) {
+                                resolveCount = resolves.size;
+                                UIDialogs.appToast("SubsExchange (Res: ${resolves.size}, Prov: ${resolve.size}")
+                                for(result in resolve){
+                                    val task = providedTasks?.find { it.url == result.channelUrl };
+                                    if(task != null) {
+                                        taskResults.add(SubscriptionTaskResult(task, PlatformContentPager(result.content, result.content.size), null));
+                                        providedTasks?.remove(task);
+                                    }
+                                }
+                            }
+                            if (providedTasks != null) {
+                                for(task in providedTasks!!) {
+                                    taskResults.add(SubscriptionTaskResult(task, null, IllegalStateException("No data received from exchange")));
                                 }
                             }
                         }
-                        if (providedTasks != null) {
+                        Logger.i(TAG, "Subscription Exchange contract resolved in ${resolveTime}ms");
-                            for(task in providedTasks!!) {
-                                taskResults.add(SubscriptionTaskResult(task, null, IllegalStateException("No data received from exchange")));
-                            }
-                        }
-                    }
-                    Logger.i(TAG, "Subscription Exchange contract resolved in ${resolveTime}ms");
 
+                    }
+                    catch(ex: Throwable) {
+                        //TODO: fetch remainder after all?
+                        Logger.e(TAG, "Failed to resolve Subscription Exchange contract due to: " + ex.message, ex);
+                    }
                 }
-                catch(ex: Throwable) {
+                if(providedTasks?.size ?: 0 == 0)
-                    //TODO: fetch remainder after all?
+                    scope.launch(Dispatchers.IO) {
-                    Logger.e(TAG, "Failed to resolve Subscription Exchange contract due to: " + ex.message, ex);
+                        resolve();
-                }
+                    }
+                else
+                    resolve();
             }
         }
 

app/src/main/java/com/futo/platformplayer/subsexchange/SubsExchangeClient.kt

@@ -1,10 +1,14 @@
 import com.futo.platformplayer.api.media.Serializer
+import com.futo.platformplayer.getNowDiffMiliseconds
 import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.subscription.SubscriptionFetchAlgorithm.Companion.TAG
 import com.futo.platformplayer.subsexchange.ChannelRequest
 import com.futo.platformplayer.subsexchange.ChannelResolve
 import com.futo.platformplayer.subsexchange.ChannelResult
 import com.futo.platformplayer.subsexchange.ExchangeContract
 import com.futo.platformplayer.subsexchange.ExchangeContractResolve
+import com.futo.platformplayer.toGzip
+import com.futo.platformplayer.toHumanBytesSize
 import kotlinx.serialization.*
 import kotlinx.serialization.json.*
 import kotlinx.coroutines.Dispatchers
@@ -26,6 +30,7 @@ import java.nio.charset.StandardCharsets
 import java.security.KeyPairGenerator
 import java.security.spec.PKCS8EncodedKeySpec
 import java.security.spec.RSAPublicKeySpec
+import java.time.OffsetDateTime
 
 
 class SubsExchangeClient(private val server: String, private val privateKey: String, private val contractTimeout: Int = 1000) {
@@ -40,24 +45,27 @@ class SubsExchangeClient(private val server: String, private val privateKey: Str
 
     // Endpoint: Contract
     fun requestContract(vararg channels: ChannelRequest): ExchangeContract {
-        val data = post("/api/Channel/Contract", Json.encodeToString(channels), "application/json", contractTimeout)
+        val data = post("/api/Channel/Contract", Json.encodeToString(channels).toByteArray(Charsets.UTF_8), "application/json", contractTimeout)
         return Json.decodeFromString(data)
     }
     suspend fun requestContractAsync(vararg channels: ChannelRequest): ExchangeContract {
-        val data = postAsync("/api/Channel/Contract", Json.encodeToString(channels), "application/json")
+        val data = postAsync("/api/Channel/Contract", Json.encodeToString(channels).toByteArray(Charsets.UTF_8), "application/json")
         return Json.decodeFromString(data)
     }
 
     // Endpoint: Resolve
     fun resolveContract(contract: ExchangeContract, vararg resolves: ChannelResolve): Array<ChannelResult> {
         val contractResolve = convertResolves(*resolves)
-        val result = post("/api/Channel/Resolve?contractId=${contract.id}", Serializer.json.encodeToString(contractResolve), "application/json")
+        val contractResolveJson = Serializer.json.encodeToString(contractResolve);
-        Logger.v("SubsExchangeClient", "Resolve:" + result);
+        val contractResolveTimeStart = OffsetDateTime.now();
+        val result = post("/api/Channel/Resolve?contractId=${contract.id}", contractResolveJson.toByteArray(Charsets.UTF_8), "application/json", 0, true)
+        val contractResolveTime = contractResolveTimeStart.getNowDiffMiliseconds();
+        Logger.v("SubsExchangeClient", "Subscription Exchange Resolve Request [${contractResolveTime}ms]:" + result);
         return Serializer.json.decodeFromString(result)
     }
     suspend fun resolveContractAsync(contract: ExchangeContract, vararg resolves: ChannelResolve): Array<ChannelResult> {
         val contractResolve = convertResolves(*resolves)
-        val result = postAsync("/api/Channel/Resolve?contractId=${contract.id}", Serializer.json.encodeToString(contractResolve), "application/json")
+        val result = postAsync("/api/Channel/Resolve?contractId=${contract.id}", Serializer.json.encodeToString(contractResolve).toByteArray(Charsets.UTF_8), "application/json", true)
         return Serializer.json.decodeFromString(result)
     }
 
@@ -74,7 +82,7 @@ class SubsExchangeClient(private val server: String, private val privateKey: Str
     }
 
     // IO methods
-    private fun post(query: String, body: String, contentType: String, timeout: Int = 0): String {
+    private fun post(query: String, body: ByteArray, contentType: String, timeout: Int = 0, gzip: Boolean = false): String {
         val url = URL("${server.trim('/')}$query")
         with(url.openConnection() as HttpURLConnection) {
             if(timeout > 0)
@@ -82,7 +90,16 @@ class SubsExchangeClient(private val server: String, private val privateKey: Str
             requestMethod = "POST"
             setRequestProperty("Content-Type", contentType)
             doOutput = true
-            OutputStreamWriter(outputStream, StandardCharsets.UTF_8).use { it.write(body); it.flush() }
+
+
+            if(gzip) {
+                val gzipData = body.toGzip();
+                setRequestProperty("Content-Encoding", "gzip");
+                outputStream.write(gzipData);
+                Logger.i("SubsExchangeClient", "SubsExchange using gzip (${body.size.toHumanBytesSize()} => ${gzipData.size.toHumanBytesSize()}");
+            }
+            else
+                outputStream.write(body);
 
             val status = responseCode;
             Logger.i("SubsExchangeClient", "POST [${url}]: ${status}");
@@ -105,9 +122,9 @@ class SubsExchangeClient(private val server: String, private val privateKey: Str
             }
         }
     }
-    private suspend fun postAsync(query: String, body: String, contentType: String): String {
+    private suspend fun postAsync(query: String, body: ByteArray, contentType: String, gzip: Boolean = false): String {
         return withContext(Dispatchers.IO) {
-            post(query, body, contentType)
+            post(query, body, contentType, 0, gzip)
         }
     }
 

app/src/main/java/com/futo/platformplayer/sync/internal/Channel.kt

@@ -0,0 +1,335 @@
+package com.futo.platformplayer.sync.internal
+
+import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.noise.protocol.CipherStatePair
+import com.futo.platformplayer.noise.protocol.DHState
+import com.futo.platformplayer.noise.protocol.HandshakeState
+import com.futo.platformplayer.states.StateSync
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+import java.util.Base64
+
+interface IChannel : AutoCloseable {
+    val remotePublicKey: String?
+    val remoteVersion: Int?
+    var authorizable: IAuthorizable?
+    var syncSession: SyncSession?
+    fun setDataHandler(onData: ((SyncSocketSession, IChannel, UByte, UByte, ByteBuffer) -> Unit)?)
+    fun send(opcode: UByte, subOpcode: UByte = 0u, data: ByteBuffer? = null)
+    fun setCloseHandler(onClose: ((IChannel) -> Unit)?)
+    val linkType: LinkType
+}
+
+class ChannelSocket(private val session: SyncSocketSession) : IChannel {
+    override val remotePublicKey: String? get() = session.remotePublicKey
+    override val remoteVersion: Int? get() = session.remoteVersion
+    private var onData: ((SyncSocketSession, IChannel, UByte, UByte, ByteBuffer) -> Unit)? = null
+    private var onClose: ((IChannel) -> Unit)? = null
+    override val linkType: LinkType get() = LinkType.Direct
+
+    override var authorizable: IAuthorizable?
+        get() = session.authorizable
+        set(value) { session.authorizable = value }
+    override var syncSession: SyncSession? = null
+
+    override fun setDataHandler(onData: ((SyncSocketSession, IChannel, UByte, UByte, ByteBuffer) -> Unit)?) {
+        this.onData = onData
+    }
+
+    override fun setCloseHandler(onClose: ((IChannel) -> Unit)?) {
+        this.onClose = onClose
+    }
+
+    override fun close() {
+        session.stop()
+        onClose?.invoke(this)
+    }
+
+    fun invokeDataHandler(opcode: UByte, subOpcode: UByte, data: ByteBuffer) {
+        onData?.invoke(session, this, opcode, subOpcode, data)
+    }
+
+    override fun send(opcode: UByte, subOpcode: UByte, data: ByteBuffer?) {
+        if (data != null) {
+            session.send(opcode, subOpcode, data)
+        } else {
+            session.send(opcode, subOpcode)
+        }
+    }
+}
+
+class ChannelRelayed(
+    private val session: SyncSocketSession,
+    private val localKeyPair: DHState,
+    private val publicKey: String,
+    private val initiator: Boolean
+) : IChannel {
+    private val sendLock = Object()
+    private val decryptLock = Object()
+    private var handshakeState: HandshakeState? = if (initiator) {
+        HandshakeState(StateSync.protocolName, HandshakeState.INITIATOR).apply {
+            localKeyPair.copyFrom(this@ChannelRelayed.localKeyPair)
+            remotePublicKey.setPublicKey(Base64.getDecoder().decode(publicKey), 0)
+        }
+    } else {
+        HandshakeState(StateSync.protocolName, HandshakeState.RESPONDER).apply {
+            localKeyPair.copyFrom(this@ChannelRelayed.localKeyPair)
+        }
+    }
+    private var transport: CipherStatePair? = null
+    override var authorizable: IAuthorizable? = null
+    val isAuthorized: Boolean get() = authorizable?.isAuthorized ?: false
+    var connectionId: Long = 0L
+    override var remotePublicKey: String? = publicKey
+        private set
+    override var remoteVersion: Int? = null
+        private set
+    override var syncSession: SyncSession? = null
+    override val linkType: LinkType get() = LinkType.Relayed
+
+    private var onData: ((SyncSocketSession, IChannel, UByte, UByte, ByteBuffer) -> Unit)? = null
+    private var onClose: ((IChannel) -> Unit)? = null
+    private var disposed = false
+
+    init {
+        handshakeState?.start()
+    }
+
+    override fun setDataHandler(onData: ((SyncSocketSession, IChannel, UByte, UByte, ByteBuffer) -> Unit)?) {
+        this.onData = onData
+    }
+
+    override fun setCloseHandler(onClose: ((IChannel) -> Unit)?) {
+        this.onClose = onClose
+    }
+
+    override fun close() {
+        disposed = true
+
+        if (connectionId != 0L) {
+            Thread {
+                try {
+                    session.sendRelayError(connectionId, SyncErrorCode.ConnectionClosed)
+                } catch (e: Exception) {
+                    Logger.e("ChannelRelayed", "Exception while sending relay error", e)
+                }
+            }.start()
+        }
+
+        transport?.sender?.destroy()
+        transport?.receiver?.destroy()
+        transport = null
+        handshakeState?.destroy()
+        handshakeState = null
+
+        onClose?.invoke(this)
+    }
+
+    private fun throwIfDisposed() {
+        if (disposed) throw IllegalStateException("ChannelRelayed is disposed")
+    }
+
+    fun invokeDataHandler(opcode: UByte, subOpcode: UByte, data: ByteBuffer) {
+        onData?.invoke(session, this, opcode, subOpcode, data)
+    }
+
+    private fun completeHandshake(remoteVersion: Int, transport: CipherStatePair) {
+        throwIfDisposed()
+
+        this.remoteVersion = remoteVersion
+        val remoteKeyBytes = ByteArray(handshakeState!!.remotePublicKey.publicKeyLength)
+        handshakeState!!.remotePublicKey.getPublicKey(remoteKeyBytes, 0)
+        this.remotePublicKey = Base64.getEncoder().encodeToString(remoteKeyBytes)
+        handshakeState?.destroy()
+        handshakeState = null
+        this.transport = transport
+        Logger.i("ChannelRelayed", "Completed handshake for connectionId $connectionId")
+    }
+
+    private fun sendPacket(packet: ByteArray) {
+        throwIfDisposed()
+
+        synchronized(sendLock) {
+            val encryptedPayload = ByteArray(packet.size + 16)
+            val encryptedLength = transport!!.sender.encryptWithAd(null, packet, 0, encryptedPayload, 0, packet.size)
+
+            val relayedPacket = ByteArray(8 + encryptedLength)
+            ByteBuffer.wrap(relayedPacket).order(ByteOrder.LITTLE_ENDIAN).apply {
+                putLong(connectionId)
+                put(encryptedPayload, 0, encryptedLength)
+            }
+
+            session.send(Opcode.RELAY.value, RelayOpcode.DATA.value, ByteBuffer.wrap(relayedPacket).order(ByteOrder.LITTLE_ENDIAN))
+        }
+    }
+
+    fun sendError(errorCode: SyncErrorCode) {
+        throwIfDisposed()
+
+        synchronized(sendLock) {
+            val packet = ByteArray(4)
+            ByteBuffer.wrap(packet).order(ByteOrder.LITTLE_ENDIAN).putInt(errorCode.value)
+
+            val encryptedPayload = ByteArray(4 + 16)
+            val encryptedLength = transport!!.sender.encryptWithAd(null, packet, 0, encryptedPayload, 0, packet.size)
+
+            val relayedPacket = ByteArray(8 + encryptedLength)
+            ByteBuffer.wrap(relayedPacket).order(ByteOrder.LITTLE_ENDIAN).apply {
+                putLong(connectionId)
+                put(encryptedPayload, 0, encryptedLength)
+            }
+
+            session.send(Opcode.RELAY.value, RelayOpcode.ERROR.value, ByteBuffer.wrap(relayedPacket))
+        }
+    }
+
+    override fun send(opcode: UByte, subOpcode: UByte, data: ByteBuffer?) {
+        throwIfDisposed()
+
+        val actualCount = data?.remaining() ?: 0
+        val ENCRYPTION_OVERHEAD = 16
+        val CONNECTION_ID_SIZE = 8
+        val HEADER_SIZE = 6
+        val MAX_DATA_PER_PACKET = SyncSocketSession.MAXIMUM_PACKET_SIZE - HEADER_SIZE - CONNECTION_ID_SIZE - ENCRYPTION_OVERHEAD - 16
+
+        if (actualCount > MAX_DATA_PER_PACKET && data != null) {
+            val streamId = session.generateStreamId()
+            val totalSize = actualCount
+            var sendOffset = 0
+
+            while (sendOffset < totalSize) {
+                val bytesRemaining = totalSize - sendOffset
+                val bytesToSend = minOf(MAX_DATA_PER_PACKET - 8 - 2, bytesRemaining)
+
+                val streamData: ByteArray
+                val streamOpcode: StreamOpcode
+                if (sendOffset == 0) {
+                    streamOpcode = StreamOpcode.START
+                    streamData = ByteArray(4 + 4 + 1 + 1 + bytesToSend)
+                    ByteBuffer.wrap(streamData).order(ByteOrder.LITTLE_ENDIAN).apply {
+                        putInt(streamId)
+                        putInt(totalSize)
+                        put(opcode.toByte())
+                        put(subOpcode.toByte())
+                        put(data.array(), data.position() + sendOffset, bytesToSend)
+                    }
+                } else {
+                    streamData = ByteArray(4 + 4 + bytesToSend)
+                    ByteBuffer.wrap(streamData).order(ByteOrder.LITTLE_ENDIAN).apply {
+                        putInt(streamId)
+                        putInt(sendOffset)
+                        put(data.array(), data.position() + sendOffset, bytesToSend)
+                    }
+                    streamOpcode = if (bytesToSend < bytesRemaining) StreamOpcode.DATA else StreamOpcode.END
+                }
+
+                val fullPacket = ByteArray(HEADER_SIZE + streamData.size)
+                ByteBuffer.wrap(fullPacket).order(ByteOrder.LITTLE_ENDIAN).apply {
+                    putInt(streamData.size + 2)
+                    put(Opcode.STREAM.value.toByte())
+                    put(streamOpcode.value.toByte())
+                    put(streamData)
+                }
+
+                sendPacket(fullPacket)
+                sendOffset += bytesToSend
+            }
+        } else {
+            val packet = ByteArray(HEADER_SIZE + actualCount)
+            ByteBuffer.wrap(packet).order(ByteOrder.LITTLE_ENDIAN).apply {
+                putInt(actualCount + 2)
+                put(opcode.toByte())
+                put(subOpcode.toByte())
+                if (actualCount > 0 && data != null) put(data.array(), data.position(), actualCount)
+            }
+            sendPacket(packet)
+        }
+    }
+
+    fun sendRequestTransport(requestId: Int, publicKey: String, pairingCode: String? = null) {
+        throwIfDisposed()
+
+        synchronized(sendLock) {
+            val channelMessage = ByteArray(1024)
+            val channelBytesWritten = handshakeState!!.writeMessage(channelMessage, 0, null, 0, 0)
+
+            val publicKeyBytes = Base64.getDecoder().decode(publicKey)
+            if (publicKeyBytes.size != 32) throw IllegalArgumentException("Public key must be 32 bytes")
+
+            val (pairingMessageLength, pairingMessage) = if (pairingCode != null) {
+                val pairingHandshake = HandshakeState(SyncSocketSession.nProtocolName, HandshakeState.INITIATOR).apply {
+                    remotePublicKey.setPublicKey(publicKeyBytes, 0)
+                    start()
+                }
+                val pairingCodeBytes = pairingCode.toByteArray(Charsets.UTF_8)
+                if (pairingCodeBytes.size > 32) throw IllegalArgumentException("Pairing code must not exceed 32 bytes")
+                val pairingMessageBuffer = ByteArray(1024)
+                val bytesWritten = pairingHandshake.writeMessage(pairingMessageBuffer, 0, pairingCodeBytes, 0, pairingCodeBytes.size)
+                bytesWritten to pairingMessageBuffer.copyOf(bytesWritten)
+            } else {
+                0 to ByteArray(0)
+            }
+
+            val packetSize = 4 + 32 + 4 + pairingMessageLength + 4 + channelBytesWritten
+            val packet = ByteArray(packetSize)
+            ByteBuffer.wrap(packet).order(ByteOrder.LITTLE_ENDIAN).apply {
+                putInt(requestId)
+                put(publicKeyBytes)
+                putInt(pairingMessageLength)
+                if (pairingMessageLength > 0) put(pairingMessage)
+                putInt(channelBytesWritten)
+                put(channelMessage, 0, channelBytesWritten)
+            }
+
+            session.send(Opcode.REQUEST.value, RequestOpcode.TRANSPORT.value, ByteBuffer.wrap(packet))
+        }
+    }
+
+    fun sendResponseTransport(remoteVersion: Int, requestId: Int, handshakeMessage: ByteArray) {
+        throwIfDisposed()
+
+        synchronized(sendLock) {
+            val message = ByteArray(1024)
+            val plaintext = ByteArray(1024)
+            handshakeState!!.readMessage(handshakeMessage, 0, handshakeMessage.size, plaintext, 0)
+            val bytesWritten = handshakeState!!.writeMessage(message, 0, null, 0, 0)
+            val transport = handshakeState!!.split()
+
+            val responsePacket = ByteArray(20 + bytesWritten)
+            ByteBuffer.wrap(responsePacket).order(ByteOrder.LITTLE_ENDIAN).apply {
+                putInt(0) // Status code
+                putLong(connectionId)
+                putInt(requestId)
+                putInt(bytesWritten)
+                put(message, 0, bytesWritten)
+            }
+
+            completeHandshake(remoteVersion, transport)
+            session.send(Opcode.RESPONSE.value, ResponseOpcode.TRANSPORT.value, ByteBuffer.wrap(responsePacket))
+        }
+    }
+
+    fun decrypt(encryptedPayload: ByteBuffer): ByteBuffer {
+        throwIfDisposed()
+
+        synchronized(decryptLock) {
+            val encryptedBytes = ByteArray(encryptedPayload.remaining()).also { encryptedPayload.get(it) }
+            val decryptedPayload = ByteArray(encryptedBytes.size - 16)
+            val plen = transport!!.receiver.decryptWithAd(null, encryptedBytes, 0, decryptedPayload, 0, encryptedBytes.size)
+            if (plen != decryptedPayload.size) throw IllegalStateException("Expected decrypted payload length to be $plen")
+            return ByteBuffer.wrap(decryptedPayload).order(ByteOrder.LITTLE_ENDIAN)
+        }
+    }
+
+    fun handleTransportRelayed(remoteVersion: Int, connectionId: Long, handshakeMessage: ByteArray) {
+        throwIfDisposed()
+
+        synchronized(decryptLock) {
+            this.connectionId = connectionId
+            val plaintext = ByteArray(1024)
+            val plen = handshakeState!!.readMessage(handshakeMessage, 0, handshakeMessage.size, plaintext, 0)
+            val transport = handshakeState!!.split()
+            completeHandshake(remoteVersion, transport)
+        }
+    }
+}

app/src/main/java/com/futo/platformplayer/sync/internal/LinkType.java

@@ -2,6 +2,6 @@ package com.futo.platformplayer.sync.internal;
 
 public enum LinkType {
     None,
-    Local,
+    Direct,
-    Proxied
+    Relayed
 }

app/src/main/java/com/futo/platformplayer/sync/internal/Opcode.kt

@@ -0,0 +1,60 @@
+package com.futo.platformplayer.sync.internal
+
+enum class Opcode(val value: UByte) {
+    PING(0u),
+    PONG(1u),
+    NOTIFY(2u),
+    STREAM(3u),
+    DATA(4u),
+    REQUEST(5u),
+    RESPONSE(6u),
+    RELAY(7u)
+}
+
+enum class NotifyOpcode(val value: UByte) {
+    AUTHORIZED(0u),
+    UNAUTHORIZED(1u),
+    CONNECTION_INFO(2u)
+}
+
+enum class StreamOpcode(val value: UByte) {
+    START(0u),
+    DATA(1u),
+    END(2u)
+}
+
+enum class RequestOpcode(val value: UByte) {
+    CONNECTION_INFO(0u),
+    TRANSPORT(1u),
+    TRANSPORT_RELAYED(2u),
+    PUBLISH_RECORD(3u),
+    DELETE_RECORD(4u),
+    LIST_RECORD_KEYS(5u),
+    GET_RECORD(6u),
+    BULK_PUBLISH_RECORD(7u),
+    BULK_GET_RECORD(8u),
+    BULK_CONNECTION_INFO(9u),
+    BULK_DELETE_RECORD(10u)
+}
+
+enum class ResponseOpcode(val value: UByte) {
+    CONNECTION_INFO(0u),
+    TRANSPORT(1u),
+    TRANSPORT_RELAYED(2u), //TODO: Server errors also included in this one, disentangle?
+    PUBLISH_RECORD(3u),
+    DELETE_RECORD(4u),
+    LIST_RECORD_KEYS(5u),
+    GET_RECORD(6u),
+    BULK_PUBLISH_RECORD(7u),
+    BULK_GET_RECORD(8u),
+    BULK_CONNECTION_INFO(9u),
+    BULK_DELETE_RECORD(10u)
+}
+
+enum class RelayOpcode(val value: UByte) {
+    DATA(0u),
+    RELAYED_DATA(1u),
+    ERROR(2u),
+    RELAYED_ERROR(3u),
+    RELAY_ERROR(4u)
+}

app/src/main/java/com/futo/platformplayer/sync/internal/SyncDeviceInfo.kt

@@ -5,10 +5,12 @@ class SyncDeviceInfo {
     var publicKey: String
     var addresses: Array<String>
     var port: Int
+    var pairingCode: String?
 
-    constructor(publicKey: String, addresses: Array<String>, port: Int) {
+    constructor(publicKey: String, addresses: Array<String>, port: Int, pairingCode: String?) {
         this.publicKey = publicKey
         this.addresses = addresses
         this.port = port
+        this.pairingCode = pairingCode
     }
 }

app/src/main/java/com/futo/platformplayer/sync/internal/SyncErrorCode.kt

@@ -0,0 +1,6 @@
+package com.futo.platformplayer.sync.internal
+
+enum class SyncErrorCode(val value: Int) {
+    ConnectionClosed(1),
+    NotFound(2)
+}

app/src/main/java/com/futo/platformplayer/sync/internal/SyncSession.kt

@@ -1,37 +1,13 @@
 package com.futo.platformplayer.sync.internal
 
 import com.futo.platformplayer.UIDialogs
-import com.futo.platformplayer.activities.MainActivity
-import com.futo.platformplayer.api.media.Serializer
 import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.models.HistoryVideo
 import com.futo.platformplayer.models.Subscription
-import com.futo.platformplayer.smartMerge
-import com.futo.platformplayer.states.StateApp
-import com.futo.platformplayer.states.StateBackup
-import com.futo.platformplayer.states.StateHistory
-import com.futo.platformplayer.states.StatePlaylists
-import com.futo.platformplayer.states.StateSubscriptionGroups
 import com.futo.platformplayer.states.StateSubscriptions
-import com.futo.platformplayer.states.StateSync
-import com.futo.platformplayer.sync.SyncSessionData
-import com.futo.platformplayer.sync.internal.SyncSocketSession.Opcode
-import com.futo.platformplayer.sync.models.SendToDevicePackage
-import com.futo.platformplayer.sync.models.SyncPlaylistsPackage
-import com.futo.platformplayer.sync.models.SyncSubscriptionGroupsPackage
 import com.futo.platformplayer.sync.models.SyncSubscriptionsPackage
-import com.futo.platformplayer.sync.models.SyncWatchLaterPackage
-import com.futo.platformplayer.toUtf8String
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import java.io.ByteArrayInputStream
 import java.nio.ByteBuffer
-import java.nio.ByteOrder
-import java.time.Instant
-import java.time.OffsetDateTime
-import java.time.ZoneOffset
 import java.util.UUID
 
 interface IAuthorizable {
@@ -39,13 +15,14 @@ interface IAuthorizable {
 }
 
 class SyncSession : IAuthorizable {
-    private val _socketSessions: MutableList<SyncSocketSession> = mutableListOf()
+    private val _channels: MutableList<IChannel> = mutableListOf()
     private var _authorized: Boolean = false
     private var _remoteAuthorized: Boolean = false
     private val _onAuthorized: (session: SyncSession, isNewlyAuthorized: Boolean, isNewSession: Boolean) -> Unit
     private val _onUnauthorized: (session: SyncSession) -> Unit
     private val _onClose: (session: SyncSession) -> Unit
     private val _onConnectedChanged: (session: SyncSession, connected: Boolean) -> Unit
+    private val _dataHandler: (session: SyncSession, opcode: UByte, subOpcode: UByte, data: ByteBuffer) -> Unit
     val remotePublicKey: String
     override val isAuthorized get() = _authorized && _remoteAuthorized
     private var _wasAuthorized = false
@@ -56,140 +33,143 @@ class SyncSession : IAuthorizable {
         private set
     val displayName: String get() = remoteDeviceName ?: remotePublicKey
 
-    var connected: Boolean = false
+    val linkType: LinkType get()
-        private set(v) {
+    {
-        if (field != v) {
+        var linkType = LinkType.None
-            field = v
+        synchronized(_channels)
-            this._onConnectedChanged(this, v)
+        {
+            for (channel in _channels)
+            {
+                if (channel.linkType == LinkType.Direct)
+                    return LinkType.Direct
+                if (channel.linkType == LinkType.Relayed)
+                    linkType = LinkType.Relayed
+            }
         }
+        return linkType
     }
 
-    constructor(remotePublicKey: String, onAuthorized: (session: SyncSession, isNewlyAuthorized: Boolean, isNewSession: Boolean) -> Unit, onUnauthorized: (session: SyncSession) -> Unit, onConnectedChanged: (session: SyncSession, connected: Boolean) -> Unit, onClose: (session: SyncSession) -> Unit, remoteDeviceName: String?) {
+    var connected: Boolean = false
+        private set(v) {
+            if (field != v) {
+                field = v
+                this._onConnectedChanged(this, v)
+            }
+        }
+
+    constructor(
+        remotePublicKey: String,
+        onAuthorized: (session: SyncSession, isNewlyAuthorized: Boolean, isNewSession: Boolean) -> Unit,
+        onUnauthorized: (session: SyncSession) -> Unit,
+        onConnectedChanged: (session: SyncSession, connected: Boolean) -> Unit,
+        onClose: (session: SyncSession) -> Unit,
+        dataHandler: (session: SyncSession, opcode: UByte, subOpcode: UByte, data: ByteBuffer) -> Unit,
+        remoteDeviceName: String? = null
+    ) {
         this.remotePublicKey = remotePublicKey
+        this.remoteDeviceName = remoteDeviceName
         _onAuthorized = onAuthorized
         _onUnauthorized = onUnauthorized
         _onConnectedChanged = onConnectedChanged
         _onClose = onClose
+        _dataHandler = dataHandler
     }
 
-    fun addSocketSession(socketSession: SyncSocketSession) {
+    fun addChannel(channel: IChannel) {
-        if (socketSession.remotePublicKey != remotePublicKey) {
+        if (channel.remotePublicKey != remotePublicKey) {
-            throw Exception("Public key of session must match public key of socket session")
+            throw Exception("Public key of session must match public key of channel")
         }
 
-        synchronized(_socketSessions) {
+        synchronized(_channels) {
-            _socketSessions.add(socketSession)
+            _channels.add(channel)
-            connected = _socketSessions.isNotEmpty()
+            connected = _channels.isNotEmpty()
         }
 
-        socketSession.authorizable = this
+        channel.authorizable = this
+        channel.syncSession = this
     }
 
-    fun authorize(socketSession: SyncSocketSession) {
+    fun authorize() {
         Logger.i(TAG, "Sent AUTHORIZED with session id $_id")
-
+        val idString = _id.toString()
-        if (socketSession.remoteVersion >= 3) {
+        val idBytes = idString.toByteArray(Charsets.UTF_8)
-            val idStringBytes = _id.toString().toByteArray()
+        val name = "${android.os.Build.MANUFACTURER}-${android.os.Build.MODEL}"
-            val nameBytes = "${android.os.Build.MANUFACTURER}-${android.os.Build.MODEL}".toByteArray()
+        val nameBytes = name.toByteArray(Charsets.UTF_8)
-            val buffer = ByteArray(1 + idStringBytes.size + 1 + nameBytes.size)
+        val buffer = ByteArray(1 + idBytes.size + 1 + nameBytes.size)
-            socketSession.send(Opcode.NOTIFY_AUTHORIZED.value, 0u, ByteBuffer.wrap(buffer).order(ByteOrder.LITTLE_ENDIAN).apply {
+        buffer[0] = idBytes.size.toByte()
-                put(idStringBytes.size.toByte())
+        System.arraycopy(idBytes, 0, buffer, 1, idBytes.size)
-                put(idStringBytes)
+        buffer[1 + idBytes.size] = nameBytes.size.toByte()
-                put(nameBytes.size.toByte())
+        System.arraycopy(nameBytes, 0, buffer, 2 + idBytes.size, nameBytes.size)
-                put(nameBytes)
+        send(Opcode.NOTIFY.value, NotifyOpcode.AUTHORIZED.value, ByteBuffer.wrap(buffer))
-            }.apply { flip() })
-        } else {
-            socketSession.send(Opcode.NOTIFY_AUTHORIZED.value, 0u, ByteBuffer.wrap(_id.toString().toByteArray()))
-        }
         _authorized = true
         checkAuthorized()
     }
 
-    fun unauthorize(socketSession: SyncSocketSession? = null) {
+    fun unauthorize() {
-        if (socketSession != null)
+        send(Opcode.NOTIFY.value, NotifyOpcode.UNAUTHORIZED.value)
-            socketSession.send(Opcode.NOTIFY_UNAUTHORIZED.value)
-        else {
-            val ss = synchronized(_socketSessions) {
-                _socketSessions.first()
-            }
-
-            ss.send(Opcode.NOTIFY_UNAUTHORIZED.value)
-        }
     }
 
     private fun checkAuthorized() {
         if (isAuthorized) {
-            val isNewlyAuthorized = !_wasAuthorized;
+            val isNewlyAuthorized = !_wasAuthorized
-            val isNewSession = _lastAuthorizedRemoteId != _remoteId;
+            val isNewSession = _lastAuthorizedRemoteId != _remoteId
-            Logger.i(TAG, "onAuthorized (isNewlyAuthorized = $isNewlyAuthorized, isNewSession = $isNewSession)");
+            Logger.i(TAG, "onAuthorized (isNewlyAuthorized = $isNewlyAuthorized, isNewSession = $isNewSession)")
-            _onAuthorized.invoke(this, !_wasAuthorized, _lastAuthorizedRemoteId != _remoteId)
+            _onAuthorized(this, isNewlyAuthorized, isNewSession)
             _wasAuthorized = true
             _lastAuthorizedRemoteId = _remoteId
         }
     }
 
-    fun removeSocketSession(socketSession: SyncSocketSession) {
+    fun removeChannel(channel: IChannel) {
-        synchronized(_socketSessions) {
+        synchronized(_channels) {
-            _socketSessions.remove(socketSession)
+            _channels.remove(channel)
-            connected = _socketSessions.isNotEmpty()
+            connected = _channels.isNotEmpty()
         }
     }
 
     fun close() {
-        synchronized(_socketSessions) {
+        synchronized(_channels) {
-            for (socketSession in _socketSessions) {
+            _channels.forEach { it.close() }
-                socketSession.stop()
+            _channels.clear()
-            }
-
-            _socketSessions.clear()
         }
-
+        _onClose(this)
-        _onClose.invoke(this)
     }
 
-    fun handlePacket(socketSession: SyncSocketSession, opcode: UByte, subOpcode: UByte, data: ByteBuffer) {
+    fun handlePacket(opcode: UByte, subOpcode: UByte, data: ByteBuffer) {
         try {
-            Logger.i(TAG, "Handle packet (opcode: ${opcode}, subOpcode: ${subOpcode}, data.length: ${data.remaining()})")
+            Logger.i(TAG, "Handle packet (opcode: $opcode, subOpcode: $subOpcode, data.length: ${data.remaining()})")
 
             when (opcode) {
-                Opcode.NOTIFY_AUTHORIZED.value -> {
+                Opcode.NOTIFY.value -> when (subOpcode) {
-                    if (socketSession.remoteVersion >= 3) {
+                    NotifyOpcode.AUTHORIZED.value -> {
                         val idByteCount = data.get().toInt()
                         if (idByteCount > 64)
                             throw Exception("Id should always be smaller than 64 bytes")
-
                         val idBytes = ByteArray(idByteCount)
                         data.get(idBytes)
 
                         val nameByteCount = data.get().toInt()
                         if (nameByteCount > 64)
                             throw Exception("Name should always be smaller than 64 bytes")
-
                         val nameBytes = ByteArray(nameByteCount)
                         data.get(nameBytes)
 
                         _remoteId = UUID.fromString(idBytes.toString(Charsets.UTF_8))
                         remoteDeviceName = nameBytes.toString(Charsets.UTF_8)
-                    } else {
+                        _remoteAuthorized = true
-                        val str = data.toUtf8String()
+                        Logger.i(TAG, "Received AUTHORIZED with session id $_remoteId (device name: '${remoteDeviceName ?: "not set"}')")
-                        _remoteId = if (data.remaining() >= 0) UUID.fromString(str) else UUID.fromString("00000000-0000-0000-0000-000000000000")
+                        checkAuthorized()
-                        remoteDeviceName = null
+                        return
+                    }
+                    NotifyOpcode.UNAUTHORIZED.value -> {
+                        _remoteAuthorized = false
+                        _remoteId = null
+                        remoteDeviceName = null
+                        _lastAuthorizedRemoteId = null
+                        _onUnauthorized(this)
+                        return
                     }
-
-                    _remoteAuthorized = true
-                    Logger.i(TAG, "Received AUTHORIZED with session id $_remoteId (device name: '${remoteDeviceName ?: "not set"}')")
-                    checkAuthorized()
-                    return
                 }
-                Opcode.NOTIFY_UNAUTHORIZED.value -> {
-                    _remoteId = null
-                    remoteDeviceName = null
-                    _lastAuthorizedRemoteId = null
-                    _remoteAuthorized = false
-                    _onUnauthorized(this)
-                    return
-                }
-                //TODO: Handle any kind of packet (that is not necessarily authorized)
             }
 
             if (!isAuthorized) {
@@ -197,282 +177,57 @@ class SyncSession : IAuthorizable {
             }
 
             if (opcode != Opcode.DATA.value) {
-                Logger.w(TAG, "Unknown opcode received: (opcode = ${opcode}, subOpcode = ${subOpcode})}")
+                Logger.w(TAG, "Unknown opcode received: (opcode = $opcode, subOpcode = $subOpcode)")
                 return
             }
 
-            Logger.i(TAG, "Received (opcode = ${opcode}, subOpcode = ${subOpcode}) (${data.remaining()} bytes)")
+            Logger.i(TAG, "Received (opcode = $opcode, subOpcode = $subOpcode) (${data.remaining()} bytes)")
-            //TODO: Abstract this out
+            _dataHandler.invoke(this, opcode, subOpcode, data)
-            when (subOpcode) {
+        } catch (ex: Exception) {
-                GJSyncOpcodes.sendToDevices -> {
+            Logger.w(TAG, "Failed to handle sync package $opcode: ${ex.message}", ex)
-                    StateApp.instance.scopeOrNull?.launch(Dispatchers.Main) {
-                        val context = StateApp.instance.contextOrNull;
-                        if (context != null && context is MainActivity) {
-                            val dataBody = ByteArray(data.remaining());
-                            val remainder = data.remaining();
-                            data.get(dataBody, 0, remainder);
-                            val json = String(dataBody, Charsets.UTF_8);
-                            val obj = Json.decodeFromString<SendToDevicePackage>(json);
-                            UIDialogs.appToast("Received url from device [${socketSession.remotePublicKey}]:\n{${obj.url}");
-                            context.handleUrl(obj.url, obj.position);
-                        }
-                    };
-                }
-
-                GJSyncOpcodes.syncStateExchange -> {
-                    val dataBody = ByteArray(data.remaining());
-                    data.get(dataBody);
-                    val json = String(dataBody, Charsets.UTF_8);
-                    val syncSessionData = Serializer.json.decodeFromString<SyncSessionData>(json);
-
-                    Logger.i(TAG, "Received SyncSessionData from " + remotePublicKey);
-
-
-                    sendData(GJSyncOpcodes.syncSubscriptions, StateSubscriptions.instance.getSyncSubscriptionsPackageString());
-                    sendData(GJSyncOpcodes.syncSubscriptionGroups, StateSubscriptionGroups.instance.getSyncSubscriptionGroupsPackageString());
-                    sendData(GJSyncOpcodes.syncPlaylists, StatePlaylists.instance.getSyncPlaylistsPackageString())
-
-                    sendData(GJSyncOpcodes.syncWatchLater, Json.encodeToString(StatePlaylists.instance.getWatchLaterSyncPacket(false)));
-
-                    val recentHistory = StateHistory.instance.getRecentHistory(syncSessionData.lastHistory);
-                    if(recentHistory.size > 0)
-                        sendJsonData(GJSyncOpcodes.syncHistory, recentHistory);
-                }
-
-                GJSyncOpcodes.syncExport -> {
-                    val dataBody = ByteArray(data.remaining());
-                    val bytesStr = ByteArrayInputStream(data.array(), data.position(), data.remaining());
-                    try {
-                        val exportStruct = StateBackup.ExportStructure.fromZipBytes(bytesStr);
-                        for (store in exportStruct.stores) {
-                            if (store.key.equals("subscriptions", true)) {
-                                val subStore =
-                                    StateSubscriptions.instance.getUnderlyingSubscriptionsStore();
-                                StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
-                                    val pack = SyncSubscriptionsPackage(
-                                        store.value.map {
-                                            subStore.fromReconstruction(it, exportStruct.cache)
-                                        },
-                                        StateSubscriptions.instance.getSubscriptionRemovals()
-                                    );
-                                    handleSyncSubscriptionPackage(this@SyncSession, pack);
-                                }
-                            }
-                        }
-                    } finally {
-                        bytesStr.close();
-                    }
-                }
-
-                GJSyncOpcodes.syncSubscriptions -> {
-                    val dataBody = ByteArray(data.remaining());
-                    data.get(dataBody);
-                    val json = String(dataBody, Charsets.UTF_8);
-                    val subPackage = Serializer.json.decodeFromString<SyncSubscriptionsPackage>(json);
-                    handleSyncSubscriptionPackage(this, subPackage);
-
-                    val newestSub = subPackage.subscriptions.maxOf { it.creationTime };
-
-                    val sesData = StateSync.instance.getSyncSessionData(remotePublicKey);
-                    if(newestSub > sesData.lastSubscription) {
-                        sesData.lastSubscription = newestSub;
-                        StateSync.instance.saveSyncSessionData(sesData);
-                    }
-                }
-
-                GJSyncOpcodes.syncSubscriptionGroups -> {
-                    val dataBody = ByteArray(data.remaining());
-                    data.get(dataBody);
-                    val json = String(dataBody, Charsets.UTF_8);
-                    val pack = Serializer.json.decodeFromString<SyncSubscriptionGroupsPackage>(json);
-
-                    var lastSubgroupChange = OffsetDateTime.MIN;
-                    for(group in pack.groups){
-                        if(group.lastChange > lastSubgroupChange)
-                            lastSubgroupChange = group.lastChange;
-
-                        val existing = StateSubscriptionGroups.instance.getSubscriptionGroup(group.id);
-
-                        if(existing == null)
-                            StateSubscriptionGroups.instance.updateSubscriptionGroup(group, false, true);
-                        else if(existing.lastChange < group.lastChange) {
-                            existing.name = group.name;
-                            existing.urls = group.urls;
-                            existing.image = group.image;
-                            existing.priority = group.priority;
-                            existing.lastChange = group.lastChange;
-                            StateSubscriptionGroups.instance.updateSubscriptionGroup(existing, false, true);
-                        }
-                    }
-                    for(removal in pack.groupRemovals) {
-                        val creation = StateSubscriptionGroups.instance.getSubscriptionGroup(removal.key);
-                        val removalTime = OffsetDateTime.ofInstant(Instant.ofEpochSecond(removal.value, 0), ZoneOffset.UTC);
-                        if(creation != null && creation.creationTime < removalTime)
-                            StateSubscriptionGroups.instance.deleteSubscriptionGroup(removal.key, false);
-                    }
-                }
-
-                GJSyncOpcodes.syncPlaylists -> {
-                    val dataBody = ByteArray(data.remaining());
-                    data.get(dataBody);
-                    val json = String(dataBody, Charsets.UTF_8);
-                    val pack = Serializer.json.decodeFromString<SyncPlaylistsPackage>(json);
-
-                    for(playlist in pack.playlists) {
-                        val existing = StatePlaylists.instance.getPlaylist(playlist.id);
-
-                        if(existing == null)
-                            StatePlaylists.instance.createOrUpdatePlaylist(playlist, false);
-                        else if(existing.dateUpdate.toLocalDateTime() < playlist.dateUpdate.toLocalDateTime()) {
-                            existing.dateUpdate = playlist.dateUpdate;
-                            existing.name = playlist.name;
-                            existing.videos = playlist.videos;
-                            existing.dateCreation = playlist.dateCreation;
-                            existing.datePlayed = playlist.datePlayed;
-                            StatePlaylists.instance.createOrUpdatePlaylist(existing, false);
-                        }
-                    }
-                    for(removal in pack.playlistRemovals) {
-                        val creation = StatePlaylists.instance.getPlaylist(removal.key);
-                        val removalTime = OffsetDateTime.ofInstant(Instant.ofEpochSecond(removal.value, 0), ZoneOffset.UTC);
-                        if(creation != null && creation.dateCreation < removalTime)
-                            StatePlaylists.instance.removePlaylist(creation, false);
-
-                    }
-                }
-
-                GJSyncOpcodes.syncWatchLater -> {
-                    val dataBody = ByteArray(data.remaining());
-                    data.get(dataBody);
-                    val json = String(dataBody, Charsets.UTF_8);
-                    val pack = Serializer.json.decodeFromString<SyncWatchLaterPackage>(json);
-
-                    Logger.i(TAG, "SyncWatchLater received ${pack.videos.size} (${pack.videoAdds?.size}, ${pack.videoRemovals?.size})");
-
-                    val allExisting = StatePlaylists.instance.getWatchLater();
-                    for(video in pack.videos) {
-                        val existing = allExisting.firstOrNull { it.url == video.url };
-                        val time = if(pack.videoAdds != null && pack.videoAdds.containsKey(video.url)) OffsetDateTime.ofInstant(Instant.ofEpochSecond(pack.videoAdds[video.url] ?: 0), ZoneOffset.UTC) else OffsetDateTime.MIN;
-
-                        if(existing == null) {
-                            StatePlaylists.instance.addToWatchLater(video, false);
-                            if(time > OffsetDateTime.MIN)
-                                StatePlaylists.instance.setWatchLaterAddTime(video.url, time);
-                        }
-                    }
-                    for(removal in pack.videoRemovals) {
-                        val watchLater = allExisting.firstOrNull { it.url == removal.key } ?: continue;
-                        val creation = StatePlaylists.instance.getWatchLaterRemovalTime(watchLater.url) ?: OffsetDateTime.MIN;
-                        val removalTime = OffsetDateTime.ofInstant(Instant.ofEpochSecond(removal.value), ZoneOffset.UTC);
-                        if(creation < removalTime)
-                            StatePlaylists.instance.removeFromWatchLater(watchLater, false, removalTime);
-                    }
-
-                    val packReorderTime = OffsetDateTime.ofInstant(Instant.ofEpochSecond(pack.reorderTime), ZoneOffset.UTC);
-                    val localReorderTime = StatePlaylists.instance.getWatchLaterLastReorderTime();
-                    if(localReorderTime < packReorderTime && pack.ordering != null) {
-                        StatePlaylists.instance.updateWatchLaterOrdering(smartMerge(pack.ordering!!, StatePlaylists.instance.getWatchLaterOrdering()), true);
-                    }
-                }
-
-                GJSyncOpcodes.syncHistory -> {
-                    val dataBody = ByteArray(data.remaining());
-                    data.get(dataBody);
-                    val json = String(dataBody, Charsets.UTF_8);
-                    val history = Serializer.json.decodeFromString<List<HistoryVideo>>(json);
-                    Logger.i(TAG, "SyncHistory received ${history.size} videos from ${remotePublicKey}");
-
-                    var lastHistory = OffsetDateTime.MIN;
-                    for(video in history){
-                        val hist = StateHistory.instance.getHistoryByVideo(video.video, true, video.date);
-                        if(hist != null)
-                            StateHistory.instance.updateHistoryPosition(video.video, hist, true, video.position, video.date)
-                        if(lastHistory < video.date)
-                            lastHistory = video.date;
-                    }
-
-                    if(lastHistory != OffsetDateTime.MIN && history.size > 1) {
-                        val sesData = StateSync.instance.getSyncSessionData(remotePublicKey);
-                        if (lastHistory > sesData.lastHistory) {
-                            sesData.lastHistory = lastHistory;
-                            StateSync.instance.saveSyncSessionData(sesData);
-                        }
-                    }
-                }
-            }
         }
         catch(ex: Exception) {
             Logger.w(TAG, "Failed to handle sync package ${opcode}: ${ex.message}", ex);
         }
     }
 
-    private fun handleSyncSubscriptionPackage(origin: SyncSession, pack: SyncSubscriptionsPackage) {
-        val added = mutableListOf<Subscription>()
-        for(sub in pack.subscriptions) {
-            if(!StateSubscriptions.instance.isSubscribed(sub.channel)) {
-                val removalTime = StateSubscriptions.instance.getSubscriptionRemovalTime(sub.channel.url);
-                if(sub.creationTime > removalTime) {
-                    val newSub = StateSubscriptions.instance.addSubscription(sub.channel, sub.creationTime);
-                    added.add(newSub);
-                }
-            }
-        }
-        if(added.size > 3)
-            UIDialogs.appToast("${added.size} Subscriptions from ${origin.remotePublicKey.substring(0, Math.min(8, origin.remotePublicKey.length))}");
-        else if(added.size > 0)
-            UIDialogs.appToast("Subscriptions from ${origin.remotePublicKey.substring(0, Math.min(8, origin.remotePublicKey.length))}:\n" +
-                added.map { it.channel.name }.joinToString("\n"));
-
-
-        if(pack.subscriptions != null && pack.subscriptions.size > 0) {
-            for (subRemoved in pack.subscriptionRemovals) {
-                val removed = StateSubscriptions.instance.applySubscriptionRemovals(pack.subscriptionRemovals);
-                if(removed.size > 3)
-                    UIDialogs.appToast("Removed ${removed.size} Subscriptions from ${origin.remotePublicKey.substring(0, Math.min(8, origin.remotePublicKey.length))}");
-                else if(removed.size > 0)
-                    UIDialogs.appToast("Subscriptions removed from ${origin.remotePublicKey.substring(0, Math.min(8, origin.remotePublicKey.length))}:\n" +
-                            removed.map { it.channel.name }.joinToString("\n"));
-
-            }
-        }
-    }
-
     inline fun <reified T> sendJsonData(subOpcode: UByte, data: T) {
-        send(Opcode.DATA.value, subOpcode, Json.encodeToString<T>(data));
+        send(Opcode.DATA.value, subOpcode, Json.encodeToString(data))
     }
-    fun sendData(subOpcode: UByte, data: String) {
-        send(Opcode.DATA.value, subOpcode, data.toByteArray(Charsets.UTF_8));
-    }
-    fun send(opcode: UByte, subOpcode: UByte, data: String) {
-        send(opcode, subOpcode, data.toByteArray(Charsets.UTF_8));
-    }
-    fun send(opcode: UByte, subOpcode: UByte, data: ByteArray) {
-        val socketSessions = synchronized(_socketSessions) {
-            _socketSessions.toList()
-        }
 
-        if (socketSessions.isEmpty()) {
+    fun sendData(subOpcode: UByte, data: String) {
-            Logger.v(TAG, "Packet was not sent (opcode = ${opcode}, subOpcode = ${subOpcode}) due to no connected sockets")
+        send(Opcode.DATA.value, subOpcode, ByteBuffer.wrap(data.toByteArray(Charsets.UTF_8)))
+    }
+
+    fun send(opcode: UByte, subOpcode: UByte, data: String) {
+        send(opcode, subOpcode, ByteBuffer.wrap(data.toByteArray(Charsets.UTF_8)))
+    }
+
+    fun send(opcode: UByte, subOpcode: UByte, data: ByteBuffer? = null) {
+        val channels = synchronized(_channels) { _channels.sortedBy { it.linkType.ordinal }.toList() }
+        if (channels.isEmpty()) {
+            //TODO: Should this throw?
+            Logger.v(TAG, "Packet was not sent (opcode = $opcode, subOpcode = $subOpcode) due to no connected sockets")
             return
         }
 
         var sent = false
-        for (socketSession in socketSessions) {
+        for (channel in channels) {
             try {
-                socketSession.send(opcode, subOpcode, ByteBuffer.wrap(data))
+                channel.send(opcode, subOpcode, data)
                 sent = true
                 break
             } catch (e: Throwable) {
-                Logger.w(TAG, "Packet failed to send (opcode = ${opcode}, subOpcode = ${subOpcode})", e)
+                Logger.w(TAG, "Packet failed to send (opcode = $opcode, subOpcode = $subOpcode)", e)
             }
         }
 
         if (!sent) {
-            throw Exception("Packet was not sent (opcode = ${opcode}, subOpcode = ${subOpcode}) due to send errors and no remaining candidates")
+            throw Exception("Packet was not sent (opcode = $opcode, subOpcode = $subOpcode) due to send errors and no remaining candidates")
         }
     }
 
-    private companion object {
+    companion object {
-        const val TAG = "SyncSession"
+        private const val TAG = "SyncSession"
     }
 }

app/src/main/java/com/futo/platformplayer/views/SearchView.kt

@@ -1,7 +1,9 @@
 package com.futo.platformplayer.views
 
 import android.content.Context
+import android.text.TextWatcher
 import android.util.AttributeSet
+import android.view.inputmethod.InputMethodManager
 import android.widget.FrameLayout
 import android.widget.ImageButton
 import android.widget.ImageView
@@ -18,6 +20,9 @@ class SearchView : FrameLayout {
     val buttonClear: ImageButton;
 
     var onSearchChanged = Event1<String>();
+    var onEnter = Event1<String>();
+
+    val text: String get() = textSearch.text.toString();
 
     constructor(context: Context, attrs: AttributeSet? = null) : super(context, attrs) {
         inflate(context, R.layout.view_search_bar, this);

app/src/main/java/com/futo/platformplayer/views/ToggleBar.kt

@@ -53,7 +53,7 @@ class ToggleBar : LinearLayout {
                     this.setInfo(button.iconVariable, button.name, button.isActive, button.isButton);
                 else
                     this.setInfo(button.name, button.isActive, button.isButton);
-                this.onClick.subscribe { button.action(it); };
+                this.onClick.subscribe({ view, enabled -> button.action(view, enabled); });
             });
         }
     }
@@ -62,27 +62,27 @@ class ToggleBar : LinearLayout {
         val name: String;
         val icon: Int;
         val iconVariable: ImageVariable?;
-        val action: (Boolean)->Unit;
+        val action: (ToggleTagView, Boolean)->Unit;
         val isActive: Boolean;
         var isButton: Boolean = false
             private set;
         var tag: String? = null;
 
-        constructor(name: String, icon: ImageVariable?, isActive: Boolean = false, action: (Boolean)->Unit) {
+        constructor(name: String, icon: ImageVariable?, isActive: Boolean = false, action: (ToggleTagView, Boolean)->Unit) {
             this.name = name;
             this.icon = 0;
             this.iconVariable = icon;
             this.action = action;
             this.isActive = isActive;
         }
-        constructor(name: String, icon: Int, isActive: Boolean = false, action: (Boolean)->Unit) {
+        constructor(name: String, icon: Int, isActive: Boolean = false, action: (ToggleTagView, Boolean)->Unit) {
             this.name = name;
             this.icon = icon;
             this.iconVariable = null;
             this.action = action;
             this.isActive = isActive;
         }
-        constructor(name: String, isActive: Boolean = false, action: (Boolean)->Unit) {
+        constructor(name: String, isActive: Boolean = false, action: (ToggleTagView, Boolean)->Unit) {
             this.name = name;
             this.icon = 0;
             this.iconVariable = null;

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

@@ -0,0 +1,88 @@
+package com.futo.platformplayer.views.adapters
+
+import android.content.Context
+import android.view.View
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.constraintlayout.widget.ConstraintLayout
+import com.futo.platformplayer.R
+import com.futo.platformplayer.api.media.models.IPlatformChannelContent
+import com.futo.platformplayer.api.media.models.PlatformAuthorLink
+import com.futo.platformplayer.api.media.models.contents.IPlatformContent
+import com.futo.platformplayer.constructs.Event1
+import com.futo.platformplayer.toHumanNumber
+import com.futo.platformplayer.views.FeedStyle
+import com.futo.platformplayer.views.others.CreatorThumbnail
+import com.futo.platformplayer.views.platform.PlatformIndicator
+import com.futo.platformplayer.views.subscriptions.SubscribeButton
+
+
+open class ChannelView : LinearLayout {
+    protected val _feedStyle : FeedStyle;
+    protected val _tiny: Boolean
+
+    private val _textName: TextView;
+    private val _creatorThumbnail: CreatorThumbnail;
+    private val _textMetadata: TextView;
+    private val _buttonSubscribe: SubscribeButton;
+    private val _platformIndicator: PlatformIndicator;
+
+    val onClick = Event1<IPlatformChannelContent>();
+
+    var currentChannel: IPlatformChannelContent? = null
+        private set
+
+    val content: IPlatformContent? get() = currentChannel;
+
+    constructor(context: Context, feedStyle: FeedStyle, tiny: Boolean) : super(context) {
+        inflate(feedStyle);
+        _feedStyle = feedStyle;
+        _tiny = tiny
+
+        _textName = findViewById(R.id.text_channel_name);
+        _creatorThumbnail = findViewById(R.id.creator_thumbnail);
+        _textMetadata = findViewById(R.id.text_channel_metadata);
+        _buttonSubscribe = findViewById(R.id.button_subscribe);
+        _platformIndicator = findViewById(R.id.platform_indicator);
+
+        if (_tiny) {
+            _buttonSubscribe.visibility = View.GONE;
+            _textMetadata.visibility = View.GONE;
+        }
+
+        findViewById<ConstraintLayout>(R.id.root).setOnClickListener {
+            val s = currentChannel ?: return@setOnClickListener;
+            onClick.emit(s);
+        }
+    }
+
+    protected open fun inflate(feedStyle: FeedStyle) {
+        inflate(context, when(feedStyle) {
+            FeedStyle.PREVIEW -> R.layout.list_creator
+            else -> R.layout.list_creator
+        }, this)
+    }
+
+    open fun bind(content: IPlatformContent) {
+        isClickable = true;
+
+        if(content !is IPlatformChannelContent)
+            return
+
+        _creatorThumbnail.setThumbnail(content.thumbnail, false);
+        _textName.text = content.name;
+
+        if(content.subscribers == null || (content.subscribers ?: 0) <= 0L)
+            _textMetadata.visibility = View.GONE;
+        else {
+            _textMetadata.text = if((content.subscribers ?: 0) > 0) content.subscribers!!.toHumanNumber() + " " + context.getString(R.string.subscribers) else "";
+            _textMetadata.visibility = View.VISIBLE;
+        }
+        _buttonSubscribe.setSubscribeChannel(content.url);
+        _platformIndicator.setPlatformFromClientID(content.id.pluginId);
+    }
+
+    companion object {
+        private val TAG = "ChannelView"
+    }
+}

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

@@ -0,0 +1,40 @@
+package com.futo.platformplayer.views.adapters.feedtypes
+
+import android.view.ViewGroup
+import com.futo.platformplayer.api.media.models.IPlatformChannelContent
+import com.futo.platformplayer.api.media.models.PlatformAuthorLink
+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.playlists.IPlatformPlaylist
+import com.futo.platformplayer.constructs.Event1
+import com.futo.platformplayer.fragment.mainactivity.main.CreatorFeedView
+import com.futo.platformplayer.views.FeedStyle
+import com.futo.platformplayer.views.adapters.ChannelView
+import com.futo.platformplayer.views.adapters.ContentPreviewViewHolder
+import com.futo.platformplayer.views.adapters.PlaylistView
+
+
+class PreviewChannelViewHolder : ContentPreviewViewHolder {
+    val onClick = Event1<IPlatformChannelContent>();
+
+    val currentChannel: IPlatformChannelContent? get() = view.currentChannel;
+
+    override val content: IPlatformContent? get() = currentChannel;
+
+    private val view: ChannelView get() = itemView as ChannelView;
+
+    constructor(viewGroup: ViewGroup, feedStyle: FeedStyle, tiny: Boolean): super(ChannelView(viewGroup.context, feedStyle, tiny)) {
+        view.onClick.subscribe(onClick::emit);
+    }
+
+    override fun bind(content: IPlatformContent) = view.bind(content);
+
+    override fun preview(details: IPlatformContentDetails?, paused: Boolean) = Unit;
+    override fun stopPreview() = Unit;
+    override fun pausePreview() = Unit;
+    override fun resumePreview() = Unit;
+
+    companion object {
+        private val TAG = "PreviewChannelViewHolder"
+    }
+}

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

@@ -23,6 +23,7 @@ import com.futo.platformplayer.views.FeedStyle
 import com.futo.platformplayer.views.adapters.ContentPreviewViewHolder
 import com.futo.platformplayer.views.adapters.EmptyPreviewViewHolder
 import com.futo.platformplayer.views.adapters.InsertedViewAdapterWithLoader
+import okhttp3.internal.platform.Platform
 
 class PreviewContentListAdapter : InsertedViewAdapterWithLoader<ContentPreviewViewHolder> {
     private var _initialPlay = true;
@@ -82,6 +83,7 @@ class PreviewContentListAdapter : InsertedViewAdapterWithLoader<ContentPreviewVi
             ContentType.PLAYLIST -> createPlaylistViewHolder(viewGroup);
             ContentType.NESTED_VIDEO -> createNestedViewHolder(viewGroup);
             ContentType.LOCKED -> createLockedViewHolder(viewGroup);
+            ContentType.CHANNEL -> createChannelViewHolder(viewGroup)
             else -> EmptyPreviewViewHolder(viewGroup)
         }
     }
@@ -115,6 +117,10 @@ class PreviewContentListAdapter : InsertedViewAdapterWithLoader<ContentPreviewVi
         this.onPlaylistClicked.subscribe { this@PreviewContentListAdapter.onContentClicked.emit(it, 0L) };
         this.onChannelClicked.subscribe(this@PreviewContentListAdapter.onChannelClicked::emit);
     };
+    private fun createChannelViewHolder(viewGroup: ViewGroup): PreviewChannelViewHolder = PreviewChannelViewHolder(viewGroup, _feedStyle, false).apply {
+        //TODO: Maybe PlatformAuthorLink as is needs to be phased out?
+        this.onClick.subscribe { this@PreviewContentListAdapter.onChannelClicked.emit(PlatformAuthorLink(it.id, it.name, it.url, it.thumbnail, it.subscribers)) };
+    };
 
     override fun bindChild(holder: ContentPreviewViewHolder, pos: Int) {
         val value = _dataSet[pos];

app/src/main/java/com/futo/platformplayer/views/others/CreatorThumbnail.kt

@@ -9,6 +9,7 @@ import android.view.View
 import android.widget.ImageView
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.bumptech.glide.Glide
+import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.futo.platformplayer.R
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.getDataLinkFromUrl
@@ -81,12 +82,14 @@ class CreatorThumbnail : ConstraintLayout {
             Glide.with(_imageChannelThumbnail)
                 .load(url)
                 .placeholder(R.drawable.placeholder_channel_thumbnail)
+                .diskCacheStrategy(DiskCacheStrategy.DATA)
                 .crossfade()
                 .into(_imageChannelThumbnail);
         } else {
             Glide.with(_imageChannelThumbnail)
                 .load(url)
                 .placeholder(R.drawable.placeholder_channel_thumbnail)
+                .diskCacheStrategy(DiskCacheStrategy.DATA)
                 .into(_imageChannelThumbnail);
         }
     }

app/src/main/java/com/futo/platformplayer/views/others/ToggleTagView.kt

@@ -12,8 +12,10 @@ import android.widget.TextView
 import com.bumptech.glide.Glide
 import com.futo.platformplayer.R
 import com.futo.platformplayer.constructs.Event1
+import com.futo.platformplayer.constructs.Event2
 import com.futo.platformplayer.images.GlideHelper
 import com.futo.platformplayer.models.ImageVariable
+import com.futo.platformplayer.views.ToggleBar
 
 class ToggleTagView : LinearLayout {
     private val _root: FrameLayout;
@@ -26,7 +28,7 @@ class ToggleTagView : LinearLayout {
     var isButton: Boolean = false
         private set;
 
-    var onClick = Event1<Boolean>();
+    var onClick = Event2<ToggleTagView, Boolean>();
 
     constructor(context: Context, attrs: AttributeSet? = null) : super(context, attrs) {
         LayoutInflater.from(context).inflate(R.layout.view_toggle_tag, this, true);
@@ -36,7 +38,7 @@ class ToggleTagView : LinearLayout {
         _root.setOnClickListener {
             if(!isButton)
                 setToggle(!isActive);
-            onClick.emit(isActive);
+            onClick.emit(this, isActive);
         }
     }
 
@@ -52,6 +54,24 @@ class ToggleTagView : LinearLayout {
         }
     }
 
+    fun setInfo(toggle: ToggleBar.Toggle){
+        _text = toggle.name;
+        _textTag.text = toggle.name;
+        setToggle(toggle.isActive);
+        if(toggle.iconVariable != null) {
+            toggle.iconVariable.setImageView(_image, R.drawable.ic_error_pred);
+            _image.visibility = View.GONE;
+        }
+        else if(toggle.icon > 0) {
+            _image.setImageResource(toggle.icon);
+            _image.visibility = View.GONE;
+        }
+        else
+            _image.visibility = View.VISIBLE;
+        _textTag.visibility = if(!toggle.name.isNullOrEmpty()) View.VISIBLE else View.GONE;
+        this.isButton = isButton;
+    }
+
     fun setInfo(imageResource: Int, text: String, isActive: Boolean, isButton: Boolean = false) {
         _text = text;
         _textTag.text = text;

app/src/main/java/com/futo/platformplayer/views/subscriptions/SubscriptionBar.kt

@@ -158,7 +158,7 @@ class SubscriptionBar : LinearLayout {
         for(button in buttons) {
             _tagsContainer.addView(ToggleTagView(context).apply {
                 this.setInfo(button.name, button.isActive);
-                this.onClick.subscribe { button.action(it); };
+                this.onClick.subscribe({ view, value -> button.action(view, value); });
             });
         }
     }
@@ -166,16 +166,16 @@ class SubscriptionBar : LinearLayout {
     class Toggle {
         val name: String;
         val icon: Int;
-        val action: (Boolean)->Unit;
+        val action: (ToggleTagView, Boolean)->Unit;
         val isActive: Boolean;
 
-        constructor(name: String, icon: Int, isActive: Boolean = false, action: (Boolean)->Unit) {
+        constructor(name: String, icon: Int, isActive: Boolean = false, action: (ToggleTagView, Boolean)->Unit) {
             this.name = name;
             this.icon = icon;
             this.action = action;
             this.isActive = isActive;
         }
-        constructor(name: String, isActive: Boolean = false, action: (Boolean)->Unit) {
+        constructor(name: String, isActive: Boolean = false, action: (ToggleTagView, Boolean)->Unit) {
             this.name = name;
             this.icon = 0;
             this.action = action;

app/src/main/java/com/futo/platformplayer/views/sync/SyncDeviceView.kt

@@ -43,13 +43,13 @@ class SyncDeviceView : ConstraintLayout {
 
         _layoutLinkType.visibility = View.VISIBLE
         _imageLinkType.setImageResource(when (linkType) {
-            LinkType.Proxied -> R.drawable.ic_internet
+            LinkType.Relayed -> R.drawable.ic_internet
-            LinkType.Local -> R.drawable.ic_lan
+            LinkType.Direct -> R.drawable.ic_lan
             else -> 0
         })
         _textLinkType.text = when(linkType) {
-            LinkType.Proxied -> "Proxied"
+            LinkType.Relayed -> "Relayed"
-            LinkType.Local -> "Local"
+            LinkType.Direct -> "Direct"
             else -> null
         }
 

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

@@ -144,6 +144,9 @@
                                 android:layout_marginTop="10dp"
                                 android:layout_marginLeft="15dp"
                                 android:layout_marginRight="15dp"
+                                android:inputType="text"
+                                android:imeOptions="actionDone"
+                                android:singleLine="true"
                                 android:background="@drawable/background_button_round"
                                 android:hint="Search.." />
 

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

@@ -1,14 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     tools:context=".fragment.mainactivity.main.SuggestionsFragment">
 
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/app_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/transparent"
+        app:elevation="0dp">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="0dp"
+            app:layout_scrollFlags="scroll"
+            app:contentInsetStart="0dp"
+            app:contentInsetEnd="0dp">
+
+            <LinearLayout
+                android:id="@+id/container_toolbar_content"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <com.futo.platformplayer.views.announcements.AnnouncementView
+                    android:id="@+id/announcement_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone" />
+
+                <com.futo.platformplayer.views.others.RadioGroupView
+                    android:id="@+id/radio_group"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="8dp"
+                    android:paddingBottom="8dp"
+                    android:paddingStart="8dp"
+                    android:paddingEnd="8dp" />
+            </LinearLayout>
+        </androidx.appcompat.widget.Toolbar>
+    </com.google.android.material.appbar.AppBarLayout>
+
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/list_suggestions"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical" />
+        android:orientation="vertical"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
-</FrameLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -72,6 +72,8 @@
     <string name="keep_screen_on_while_casting">Keep screen on while casting</string>
     <string name="always_proxy_requests">Always proxy requests</string>
     <string name="always_proxy_requests_description">Always proxy requests when casting data through the device.</string>
+    <string name="allow_ipv6">Allow IPV6</string>
+    <string name="allow_ipv6_description">If casting over IPV6 is allowed, can cause issues on some networks</string>
     <string name="discover">Discover</string>
     <string name="find_new_video_sources_to_add">Find new video sources to add</string>
     <string name="these_sources_have_been_disabled">These sources have been disabled</string>
@@ -370,6 +372,12 @@
     <string name="connect_discovered_description">Allow device to search for and initiate connection with known paired devices</string>
     <string name="connect_last">Try connect last</string>
     <string name="connect_last_description">Allow device to automatically connect to last known</string>
+    <string name="discover_through_relay">Discover through relay</string>
+    <string name="discover_through_relay_description">Allow paired devices to be discovered and connected to through the relay</string>
+    <string name="pair_through_relay">Pair through relay</string>
+    <string name="pair_through_relay_description">Allow devices to be paired through the relay</string>
+    <string name="connect_through_relay">Connection through relay</string>
+    <string name="connect_through_relay_description">Allow devices to be connected to through the relay</string>
     <string name="gesture_controls">Gesture controls</string>
     <string name="volume_slider">Volume slider</string>
     <string name="volume_slider_descr">Enable slide gesture to change volume</string>

app/src/stable/assets/sources/odysee

@@ -1 +1 @@
-Subproject commit f2f83344ebc905b36c0689bfef407bb95e6d9af0
+Subproject commit 215cd9bd70d3cc68e25441f7696dcbe5beee2709

app/src/stable/assets/sources/soundcloud

@@ -1 +1 @@
-Subproject commit bff981c3ce7abad363e79705214a4710fb347f7d
+Subproject commit f8234d6af8573414d07fd364bc136aa67ad0e379

app/src/stable/assets/sources/spotify

@@ -1 +1 @@
-Subproject commit 331dd929293614875af80e3ab4cb162dc6183410
+Subproject commit b61095ec200284a686edb8f3b2a595599ad8b5ed

app/src/stable/assets/sources/youtube

@@ -1 +1 @@
-Subproject commit ae7b62f4d85cf398d9566a6ed07a6afc193f6b48
+Subproject commit 6f1266a038d11998fef429ae0eac0798b3280d75

app/src/unstable/assets/sources/odysee

@@ -1 +1 @@
-Subproject commit f2f83344ebc905b36c0689bfef407bb95e6d9af0
+Subproject commit 215cd9bd70d3cc68e25441f7696dcbe5beee2709

app/src/unstable/assets/sources/soundcloud

@@ -1 +1 @@
-Subproject commit bff981c3ce7abad363e79705214a4710fb347f7d
+Subproject commit f8234d6af8573414d07fd364bc136aa67ad0e379

app/src/unstable/assets/sources/spotify

@@ -1 +1 @@
-Subproject commit 331dd929293614875af80e3ab4cb162dc6183410
+Subproject commit b61095ec200284a686edb8f3b2a595599ad8b5ed

app/src/unstable/assets/sources/youtube

@@ -1 +1 @@
-Subproject commit ae7b62f4d85cf398d9566a6ed07a6afc193f6b48
+Subproject commit 6f1266a038d11998fef429ae0eac0798b3280d75