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

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

@@ -0,0 +1,111 @@
+package com.futo.platformplayer
+
+import android.util.Base64
+import android.util.Log
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.futo.platformplayer.casting.FCastCastingDevice
+import com.futo.platformplayer.casting.Opcode
+import com.futo.platformplayer.casting.models.FCastDecryptedMessage
+import com.futo.platformplayer.casting.models.FCastEncryptedMessage
+import com.futo.platformplayer.casting.models.FCastKeyExchangeMessage
+import com.futo.platformplayer.casting.models.FCastPlayMessage
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+import org.junit.Assert.*
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.security.KeyFactory
+import java.security.spec.PKCS8EncodedKeySpec
+import javax.crypto.spec.SecretKeySpec
+
+@RunWith(AndroidJUnit4::class)
+class FCastEncryptionTests {
+    @Test
+    fun testDHEncryptionSelf() {
+        val keyPair1 = FCastCastingDevice.generateKeyPair()
+        val keyPair2 = FCastCastingDevice.generateKeyPair()
+        Log.i("testDHEncryptionSelf", "privates (1: ${Base64.encodeToString(keyPair1.private.encoded, Base64.NO_WRAP)}, 2: ${Base64.encodeToString(keyPair2.private.encoded, Base64.NO_WRAP)})")
+
+        val keyExchangeMessage1 = FCastCastingDevice.getKeyExchangeMessage(keyPair1)
+        val keyExchangeMessage2 = FCastCastingDevice.getKeyExchangeMessage(keyPair2)
+        Log.i("testDHEncryptionSelf", "publics (1: ${keyExchangeMessage1.publicKey}, 2: ${keyExchangeMessage2.publicKey})")
+
+        val aesKey1 = FCastCastingDevice.computeSharedSecret(keyPair1.private, keyExchangeMessage2)
+        val aesKey2 = FCastCastingDevice.computeSharedSecret(keyPair2.private, keyExchangeMessage1)
+
+        assertEquals(Base64.encodeToString(aesKey1.encoded, Base64.NO_WRAP), Base64.encodeToString(aesKey2.encoded, Base64.NO_WRAP))
+        Log.i("testDHEncryptionSelf", "aesKey ${Base64.encodeToString(aesKey1.encoded, Base64.NO_WRAP)}")
+
+        val message = FCastPlayMessage("text/html")
+        val serializedBody = Json.encodeToString(message)
+        val encryptedMessage = FCastCastingDevice.encryptMessage(aesKey1, FCastDecryptedMessage(Opcode.Play.value.toLong(), serializedBody))
+        Log.i("testDHEncryptionSelf", Json.encodeToString(encryptedMessage))
+
+        val decryptedMessage = FCastCastingDevice.decryptMessage(aesKey1, encryptedMessage)
+
+        assertEquals(Opcode.Play.value.toLong(), decryptedMessage.opcode)
+        assertEquals(serializedBody, decryptedMessage.message)
+    }
+
+    @Test
+    fun testAESKeyGeneration() {
+        val cases = listOf(
+            listOf(
+                //Public other
+                "MIIBHzCBlQYJKoZIhvcNAQMBMIGHAoGBAP//////////yQ/aoiFowjTExmKLgNwc0SkCTgiKZ8x0Agu+pjsTmyJRSgh5jjQE3e+VGbPNOkMbMCsKbfJfFDdP4TVtbVHCReSFtXZiXn7G9ExC6aY37WsL/1y29Aa37e44a/taiZ+lrp8kEXxLH+ZJKGZR7OZTgf//////////AgECA4GEAAKBgEnOS0oHteVA+3kND3u4yXe7GGRohy1LkR9Q5tL4c4ylC5n4iSwWSoIhcSIvUMWth6KAhPhu05sMcPY74rFMSS2AGTNCdT/5KilediipuUMdFVvjGqfNMNH1edzW5mquIw3iXKdfQmfY/qxLTI2wccyDj4hHFhLCZL3Y+shsm3KF",
+                //Private self
+                "MIIBIQIBADCBlQYJKoZIhvcNAQMBMIGHAoGBAP//////////yQ/aoiFowjTExmKLgNwc0SkCTgiKZ8x0Agu+pjsTmyJRSgh5jjQE3e+VGbPNOkMbMCsKbfJfFDdP4TVtbVHCReSFtXZiXn7G9ExC6aY37WsL/1y29Aa37e44a/taiZ+lrp8kEXxLH+ZJKGZR7OZTgf//////////AgECBIGDAoGAeo/ceIeH8Jt1ZRNKX5aTHkMi23GCV1LtcS2O6Tktn9k8DCv7gIoekysQUhMyWtR+MsZlq2mXjr1JFpAyxl89rqoEPU6QDsGe9q8R4O8eBZ2u+48mkUkGSh7xPGRQUBvmhH2yk4hIEA8aK4BcYi1OTsCZtmk7pQq+uaFkKovD/8M=",
+                //AES
+                "7dpl1/6KQTTooOrFf2VlUOSqgrFHi6IYxapX0IxFfwk="
+            ),
+            listOf(
+                //Public other
+                "MIIBHzCBlQYJKoZIhvcNAQMBMIGHAoGBAP//////////yQ/aoiFowjTExmKLgNwc0SkCTgiKZ8x0Agu+pjsTmyJRSgh5jjQE3e+VGbPNOkMbMCsKbfJfFDdP4TVtbVHCReSFtXZiXn7G9ExC6aY37WsL/1y29Aa37e44a/taiZ+lrp8kEXxLH+ZJKGZR7OZTgf//////////AgECA4GEAAKBgGvIlCP/S+xpAuNEHSn4cEDOL1esUf+uMuY2Kp5J10a7HGbwzNd+7eYsgEc4+adddgB7hJgTvjsGg7lXUhHQ7WbfbCGgt7dbkx8qkic6Rgq4f5eRYd1Cgidw4MhZt7mEIOKrHweqnV6B9rypbXjbqauc6nGgtwx+Gvl6iLpVATRK",
+                //Private self
+                "MIIBIQIBADCBlQYJKoZIhvcNAQMBMIGHAoGBAP//////////yQ/aoiFowjTExmKLgNwc0SkCTgiKZ8x0Agu+pjsTmyJRSgh5jjQE3e+VGbPNOkMbMCsKbfJfFDdP4TVtbVHCReSFtXZiXn7G9ExC6aY37WsL/1y29Aa37e44a/taiZ+lrp8kEXxLH+ZJKGZR7OZTgf//////////AgECBIGDAoGAMXmiIgWyutbaO+f4UiMAb09iVVSCI6Lb6xzNyD2MpUZyk4/JOT04Daj4JeCKFkF1Fq79yKhrnFlXCrF4WFX00xUOXb8BpUUUH35XG5ApvolQQLL6N0om8/MYP4FK/3PUxuZAJz45TUsI/v3u6UqJelVTNL83ltcFbZDIfEVftRA=",
+                //AES
+                "a2tUSxnXifKohfNocAQHkAlPffDv6ReihJ7OojBGt0Q="
+            )
+        )
+
+        for (case in cases) {
+            val decodedPrivateKey1 = Base64.decode(case[1], Base64.NO_WRAP)
+            val keyExchangeMessage2 = FCastKeyExchangeMessage(1, case[0])
+
+            val keyFactory = KeyFactory.getInstance("DH")
+            val privateKeySpec = PKCS8EncodedKeySpec(decodedPrivateKey1)
+            val privateKey = keyFactory.generatePrivate(privateKeySpec)
+            val aesKey1 = FCastCastingDevice.computeSharedSecret(privateKey, keyExchangeMessage2)
+            assertEquals(case[2], Base64.encodeToString(aesKey1.encoded, Base64.NO_WRAP))
+        }
+    }
+
+    @Test
+    fun testDHEncryptionKnown() {
+        val decodedPrivateKey1 = Base64.decode("MIIDJwIBADCCAhgGCSqGSIb3DQEDATCCAgkCggEBAJVHXPXZPllsP80dkCrdAvQn9fPHIQMTu0X7TVuy5f4cvWeM1LvdhMmDa+HzHAd3clrrbC/Di4X0gHb6drzYFGzImm+y9wbdcZiYwgg9yNiW+EBi4snJTRN7BUqNgJatuNUZUjmO7KhSoK8S34Pkdapl1OwMOKlWDVZhGG/5i5/J62Du6LAwN2sja8c746zb10/WHB0kdfowd7jwgEZ4gf9+HKVv7gZteVBq3lHtu1RDpWOSfbxLpSAIZ0YXXIiFkl68ZMYUeQZ3NJaZDLcU7GZzBOJh+u4zs8vfAI4MP6kGUNl9OQnJJ1v0rIb/yz0D5t/IraWTQkLdbTvMoqQGywsCggEAQt67naWz2IzJVuCHh+w/Ogm7pfSLiJp0qvUxdKoPvn48W4/NelO+9WOw6YVgMolgqVF/QBTTMl/Hlivx4Ek3DXbRMUp2E355Lz8NuFnQleSluTICTweezy7wnHl0UrB3DhNQeC7Vfd95SXnc7yPLlvGDBhllxOvJPJxxxWuSWVWnX5TMzxRJrEPVhtC+7kMlGwsihzSdaN4NFEQD8T6AL0FG2ILgV68ZtvYnXGZ2yPoOPKJxOjJX/Rsn0GOfaV40fY0c+ayBmibKmwTLDrm3sDWYjRW7rGUhKlUjnPx+WPrjjXJQq5mR/7yXE0Al/ozgTEOZrZZWm+kaVG9JeGk8egSCAQQCggEAECNvEczf0y6IoX/IwhrPeWZ5IxrHcpwjcdVAuyZQLLlOq0iqnYMFcSD8QjMF8NKObfZZCDQUJlzGzRsG0oXsWiWtmoRvUZ9tQK0j28hDylpbyP00Bt9NlMgeHXkAy54P7Z2v/BPCd3o23kzjgXzYaSRuCFY7zQo1g1IQG8mfjYjdE4jjRVdVrlh8FS8x4OLPeglc+cp2/kuyxaVEfXAG84z/M8019mRSfdczi4z1iidPX6HgDEEWsN42Ud60mNKy5jsQpQYkRdOLmxR3+iQEtGFjdzbVhVCUr7S5EORU9B1MOl5gyPJpjfU3baOqrg6WXVyTvMDaA05YEnAHQNOOfA==", Base64.NO_WRAP)
+        val keyExchangeMessage2 = FCastKeyExchangeMessage(1, "MIIDJTCCAhgGCSqGSIb3DQEDATCCAgkCggEBAJVHXPXZPllsP80dkCrdAvQn9fPHIQMTu0X7TVuy5f4cvWeM1LvdhMmDa+HzHAd3clrrbC/Di4X0gHb6drzYFGzImm+y9wbdcZiYwgg9yNiW+EBi4snJTRN7BUqNgJatuNUZUjmO7KhSoK8S34Pkdapl1OwMOKlWDVZhGG/5i5/J62Du6LAwN2sja8c746zb10/WHB0kdfowd7jwgEZ4gf9+HKVv7gZteVBq3lHtu1RDpWOSfbxLpSAIZ0YXXIiFkl68ZMYUeQZ3NJaZDLcU7GZzBOJh+u4zs8vfAI4MP6kGUNl9OQnJJ1v0rIb/yz0D5t/IraWTQkLdbTvMoqQGywsCggEAQt67naWz2IzJVuCHh+w/Ogm7pfSLiJp0qvUxdKoPvn48W4/NelO+9WOw6YVgMolgqVF/QBTTMl/Hlivx4Ek3DXbRMUp2E355Lz8NuFnQleSluTICTweezy7wnHl0UrB3DhNQeC7Vfd95SXnc7yPLlvGDBhllxOvJPJxxxWuSWVWnX5TMzxRJrEPVhtC+7kMlGwsihzSdaN4NFEQD8T6AL0FG2ILgV68ZtvYnXGZ2yPoOPKJxOjJX/Rsn0GOfaV40fY0c+ayBmibKmwTLDrm3sDWYjRW7rGUhKlUjnPx+WPrjjXJQq5mR/7yXE0Al/ozgTEOZrZZWm+kaVG9JeGk8egOCAQUAAoIBAGlL9EYsrFz3I83NdlwhM241M+M7PA9P5WXgtdvS+pcalIaqN2IYdfzzCUfye7lchVkT9A2Y9eWQYX0OUhmjf8PPKkRkATLXrqO5HTsxV96aYNxMjz5ipQ6CaErTQaPLr3OPoauIMPVVI9zM+WT0KOGp49YMyx+B5rafT066vOVbF/0z1crq0ZXxyYBUv135rwFkIHxBMj5bhRLXKsZ2G5aLAZg0DsVam104mgN/v75f7Spg/n5hO7qxbNgbvSrvQ7Ag/rMk5T3sk7KoM23Qsjl08IZKs2jjx21MiOtyLqGuCW6GOTNK4yEEDF5gA0K13eXGwL5lPS0ilRw+Lrw7cJU=")
+
+        val keyFactory = KeyFactory.getInstance("DH")
+        val privateKeySpec = PKCS8EncodedKeySpec(decodedPrivateKey1)
+        val privateKey = keyFactory.generatePrivate(privateKeySpec)
+        val aesKey1 = FCastCastingDevice.computeSharedSecret(privateKey, keyExchangeMessage2)
+        assertEquals("vI5LGE625zGEG350ggkyBsIAXm2y4sNohiPcED1oAEE=", Base64.encodeToString(aesKey1.encoded, Base64.NO_WRAP))
+
+        val message = FCastPlayMessage("text/html")
+        val serializedBody = Json.encodeToString(message)
+        val encryptedMessage = FCastCastingDevice.encryptMessage(aesKey1, FCastDecryptedMessage(Opcode.Play.value.toLong(), serializedBody))
+        val decryptedMessage = FCastCastingDevice.decryptMessage(aesKey1, encryptedMessage)
+
+        assertEquals(Opcode.Play.value.toLong(), decryptedMessage.opcode)
+        assertEquals(serializedBody, decryptedMessage.message)
+    }
+
+    @Test
+    fun testDecryptMessageKnown() {
+        val encryptedMessage = Json.decodeFromString<FCastEncryptedMessage>("{\"version\":1,\"iv\":\"C4H70VC5FWrNtkty9/cLIA==\",\"blob\":\"K6/N7JMyi1PFwKhU0mFj7ZJmd/tPp3NCOMldmQUtDaQ7hSmPoIMI5QNMOj+NFEiP4qTgtYp5QmBPoQum6O88pA==\"}")
+        val aesKey = SecretKeySpec(Base64.decode("+hr9Jg8yre7S9WGUohv2AUSzHNQN514JPh6MoFAcFNU=", Base64.NO_WRAP), "AES")
+        val decryptedMessage = FCastCastingDevice.decryptMessage(aesKey, encryptedMessage)
+        assertEquals(Opcode.Play.value.toLong(), decryptedMessage.opcode)
+        assertEquals("{\"container\":\"text/html\"}", decryptedMessage.message)
+    }
+}

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

@@ -321,7 +321,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         _fragDownloads.topBar = _fragTopBarGeneral;
         _fragImportSubscriptions.topBar = _fragTopBarImport;
         _fragImportPlaylists.topBar = _fragTopBarImport;
-        _fragSubGroup.topBar = _fragTopBarNavigation;
         _fragSubGroupList.topBar = _fragTopBarAdd;
 
         _fragBrowser.topBar = _fragTopBarNavigation;

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

@@ -50,6 +50,8 @@ class ChromecastCastingDevice : CastingDevice {
     private var _transportId: String? = null;
     private var _launching = false;
     private var _mediaSessionId: Int? = null;
+    private var _thread: Thread? = null;
+    private var _pingThread: Thread? = null;
 
     constructor(name: String, addresses: Array<InetAddress>, port: Int) : super() {
         this.name = name;
@@ -270,7 +272,6 @@ class ChromecastCastingDevice : CastingDevice {
     }
 
     override fun start() {
-        val adrs = addresses ?: return;
         if (_started) {
             return;
         }
@@ -283,152 +284,167 @@ class ChromecastCastingDevice : CastingDevice {
 
         _launching = true;
 
-        _scopeIO?.cancel();
-        Logger.i(TAG, "Cancelled previous scopeIO because a new one is starting.")
-        _scopeIO = CoroutineScope(Dispatchers.IO);
+        ensureThreadsStarted();
+        Logger.i(TAG, "Started.");
+    }
 
-        Thread {
-            connectionState = CastConnectionState.CONNECTING;
+    fun ensureThreadsStarted() {
+        val adrs = addresses ?: return;
 
-            while (_scopeIO?.isActive == true) {
-                try {
-                    val connectedSocket = getConnectedSocket(adrs.toList(), port);
-                    if (connectedSocket == null) {
+        val thread = _thread
+        val pingThread = _pingThread
+        if (thread == null || !thread.isAlive || pingThread == null || !pingThread.isAlive) {
+            Log.i(TAG, "Restarting threads because one of the threads has died")
+
+            _scopeIO?.cancel();
+            Logger.i(TAG, "Cancelled previous scopeIO because a new one is starting.")
+            _scopeIO = CoroutineScope(Dispatchers.IO);
+
+            _thread = Thread {
+                connectionState = CastConnectionState.CONNECTING;
+
+                while (_scopeIO?.isActive == true) {
+                    try {
+                        val connectedSocket = getConnectedSocket(adrs.toList(), port);
+                        if (connectedSocket == null) {
+                            Thread.sleep(3000);
+                            continue;
+                        }
+
+                        usedRemoteAddress = connectedSocket.inetAddress;
+                        localAddress = connectedSocket.localAddress;
+                        connectedSocket.close();
+                        break;
+                    } catch (e: Throwable) {
+                        Logger.w(TAG, "Failed to get setup initial connection to ChromeCast device.", e)
+                    }
+                }
+
+                val sslContext = SSLContext.getInstance("TLS");
+                sslContext.init(null, trustAllCerts, null);
+
+                val factory = sslContext.socketFactory;
+
+                //Connection loop
+                while (_scopeIO?.isActive == true) {
+                    Logger.i(TAG, "Connecting to Chromecast.");
+                    connectionState = CastConnectionState.CONNECTING;
+
+                    try {
+                        _socket?.close()
+                        _socket = factory.createSocket(usedRemoteAddress, port) as SSLSocket;
+                        _socket?.startHandshake();
+                        Logger.i(TAG, "Successfully connected to Chromecast at $usedRemoteAddress:$port");
+
+                        try {
+                            _outputStream = DataOutputStream(_socket?.outputStream);
+                            _inputStream = DataInputStream(_socket?.inputStream);
+                        } catch (e: Throwable) {
+                            Logger.i(TAG, "Failed to authenticate to Chromecast.", e);
+                        }
+                    } catch (e: Throwable) {
+                        _socket?.close();
+                        Logger.i(TAG, "Failed to connect to Chromecast.", e);
+
+                        connectionState = CastConnectionState.CONNECTING;
                         Thread.sleep(3000);
                         continue;
                     }
 
-                    usedRemoteAddress = connectedSocket.inetAddress;
-                    localAddress = connectedSocket.localAddress;
-                    connectedSocket.close();
-                    break;
-                } catch (e: Throwable) {
-                    Logger.w(TAG, "Failed to get setup initial connection to ChromeCast device.", e)
-                }
-            }
-
-            val sslContext = SSLContext.getInstance("TLS");
-            sslContext.init(null, trustAllCerts, null);
-
-            val factory = sslContext.socketFactory;
-
-            //Connection loop
-            while (_scopeIO?.isActive == true) {
-                Logger.i(TAG, "Connecting to Chromecast.");
-                connectionState = CastConnectionState.CONNECTING;
-
-                try {
-                    _socket?.close()
-                    _socket = factory.createSocket(usedRemoteAddress, port) as SSLSocket;
-                    _socket?.startHandshake();
-                    Logger.i(TAG, "Successfully connected to Chromecast at $usedRemoteAddress:$port");
+                    localAddress = _socket?.localAddress;
 
                     try {
-                        _outputStream = DataOutputStream(_socket?.outputStream);
-                        _inputStream = DataInputStream(_socket?.inputStream);
+                        val connectObject = JSONObject();
+                        connectObject.put("type", "CONNECT");
+                        connectObject.put("connType", 0);
+                        sendChannelMessage("sender-0", "receiver-0", "urn:x-cast:com.google.cast.tp.connection", connectObject.toString());
                     } catch (e: Throwable) {
-                        Logger.i(TAG, "Failed to authenticate to Chromecast.", e);
+                        Logger.i(TAG, "Failed to send connect message to Chromecast.", e);
+                        _socket?.close();
+
+                        connectionState = CastConnectionState.CONNECTING;
+                        Thread.sleep(3000);
+                        continue;
+                    }
+
+                    getStatus();
+
+                    val buffer = ByteArray(4096);
+
+                    Logger.i(TAG, "Started receiving.");
+                    while (_scopeIO?.isActive == true) {
+                        try {
+                            val inputStream = _inputStream ?: break;
+                            Log.d(TAG, "Receiving next packet...");
+                            val b1 = inputStream.readUnsignedByte();
+                            val b2 = inputStream.readUnsignedByte();
+                            val b3 = inputStream.readUnsignedByte();
+                            val b4 = inputStream.readUnsignedByte();
+                            val size = ((b1.toLong() shl 24) or (b2.toLong() shl 16) or (b3.toLong() shl 8) or b4.toLong()).toInt();
+                            if (size > buffer.size) {
+                                Logger.w(TAG, "Skipping packet that is too large $size bytes.")
+                                inputStream.skip(size.toLong());
+                                continue;
+                            }
+
+                            Log.d(TAG, "Received header indicating $size bytes. Waiting for message.");
+                            inputStream.read(buffer, 0, size);
+
+                            //TODO: In the future perhaps this size-1 will cause issues, why is there a 0 on the end?
+                            val messageBytes = buffer.sliceArray(IntRange(0, size - 1));
+                            Log.d(TAG, "Received $size bytes: ${messageBytes.toHexString()}.");
+                            val message = ChromeCast.CastMessage.parseFrom(messageBytes);
+                            if (message.namespace != "urn:x-cast:com.google.cast.tp.heartbeat") {
+                                Logger.i(TAG, "Received message: $message");
+                            }
+
+                            try {
+                                handleMessage(message);
+                            } catch (e:Throwable) {
+                                Logger.w(TAG, "Failed to handle message.", e);
+                            }
+                        } catch (e: java.net.SocketException) {
+                            Logger.e(TAG, "Socket exception while receiving.", e);
+                            break;
+                        } catch (e: Throwable) {
+                            Logger.e(TAG, "Exception while receiving.", e);
+                            break;
+                        }
                     }
-                } catch (e: Throwable) {
                     _socket?.close();
-                    Logger.i(TAG, "Failed to connect to Chromecast.", e);
+                    Logger.i(TAG, "Socket disconnected.");
 
                     connectionState = CastConnectionState.CONNECTING;
                     Thread.sleep(3000);
-                    continue;
                 }
 
-                localAddress = _socket?.localAddress;
+                Logger.i(TAG, "Stopped connection loop.");
+                connectionState = CastConnectionState.DISCONNECTED;
+                _thread = null;
+            }.apply { start() };
 
-                try {
-                    val connectObject = JSONObject();
-                    connectObject.put("type", "CONNECT");
-                    connectObject.put("connType", 0);
-                    sendChannelMessage("sender-0", "receiver-0", "urn:x-cast:com.google.cast.tp.connection", connectObject.toString());
-                } catch (e: Throwable) {
-                    Logger.i(TAG, "Failed to send connect message to Chromecast.", e);
-                    _socket?.close();
+            //Start ping loop
+            _pingThread = Thread {
+                Logger.i(TAG, "Started ping loop.")
 
-                    connectionState = CastConnectionState.CONNECTING;
-                    Thread.sleep(3000);
-                    continue;
-                }
+                val pingObject = JSONObject();
+                pingObject.put("type", "PING");
 
-                getStatus();
-
-                val buffer = ByteArray(4096);
-
-                Logger.i(TAG, "Started receiving.");
                 while (_scopeIO?.isActive == true) {
                     try {
-                        val inputStream = _inputStream ?: break;
-                        Log.d(TAG, "Receiving next packet...");
-                        val b1 = inputStream.readUnsignedByte();
-                        val b2 = inputStream.readUnsignedByte();
-                        val b3 = inputStream.readUnsignedByte();
-                        val b4 = inputStream.readUnsignedByte();
-                        val size = ((b1.toLong() shl 24) or (b2.toLong() shl 16) or (b3.toLong() shl 8) or b4.toLong()).toInt();
-                        if (size > buffer.size) {
-                            Logger.w(TAG, "Skipping packet that is too large $size bytes.")
-                            inputStream.skip(size.toLong());
-                            continue;
-                        }
-
-                        Log.d(TAG, "Received header indicating $size bytes. Waiting for message.");
-                        inputStream.read(buffer, 0, size);
-
-                        //TODO: In the future perhaps this size-1 will cause issues, why is there a 0 on the end?
-                        val messageBytes = buffer.sliceArray(IntRange(0, size - 1));
-                        Log.d(TAG, "Received $size bytes: ${messageBytes.toHexString()}.");
-                        val message = ChromeCast.CastMessage.parseFrom(messageBytes);
-                        if (message.namespace != "urn:x-cast:com.google.cast.tp.heartbeat") {
-                            Logger.i(TAG, "Received message: $message");
-                        }
-
-                        try {
-                            handleMessage(message);
-                        } catch (e:Throwable) {
-                            Logger.w(TAG, "Failed to handle message.", e);
-                        }
-                    } catch (e: java.net.SocketException) {
-                        Logger.e(TAG, "Socket exception while receiving.", e);
-                        break;
+                        sendChannelMessage("sender-0", "receiver-0", "urn:x-cast:com.google.cast.tp.heartbeat", pingObject.toString());
+                        Thread.sleep(5000);
                     } catch (e: Throwable) {
-                        Logger.e(TAG, "Exception while receiving.", e);
-                        break;
+                        Log.w(TAG, "Failed to send ping.");
                     }
                 }
-                _socket?.close();
-                Logger.i(TAG, "Socket disconnected.");
 
-                connectionState = CastConnectionState.CONNECTING;
-                Thread.sleep(3000);
-            }
-
-            Logger.i(TAG, "Stopped connection loop.");
-            connectionState = CastConnectionState.DISCONNECTED;
-        }.start();
-
-        //Start ping loop
-        Thread {
-            Logger.i(TAG, "Started ping loop.")
-
-            val pingObject = JSONObject();
-            pingObject.put("type", "PING");
-
-            while (_scopeIO?.isActive == true) {
-                try {
-                    sendChannelMessage("sender-0", "receiver-0", "urn:x-cast:com.google.cast.tp.heartbeat", pingObject.toString());
-                    Thread.sleep(5000);
-                } catch (e: Throwable) {
-
-                }
-            }
-
-            Logger.i(TAG, "Stopped ping loop.");
-        }.start();
-
-        Logger.i(TAG, "Started.");
+                Logger.i(TAG, "Stopped ping loop.");
+                _pingThread = null;
+            }.apply { start() };
+        } else {
+            Log.i(TAG, "Threads still alive, not restarted")
+        }
     }
 
     private fun sendChannelMessage(sourceId: String, destinationId: String, namespace: String, json: String) {
@@ -593,6 +609,8 @@ class ChromecastCastingDevice : CastingDevice {
             Logger.i(TAG, "Cancelled scopeIO without open socket.")
         }
 
+        _pingThread = null;
+        _thread = null;
         _scopeIO = null;
         _socket = null;
         _outputStream = null;

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

@@ -1,8 +1,12 @@
 package com.futo.platformplayer.casting
 
 import android.os.Looper
+import android.util.Base64
 import android.util.Log
 import com.futo.platformplayer.UIDialogs
+import com.futo.platformplayer.casting.models.FCastDecryptedMessage
+import com.futo.platformplayer.casting.models.FCastEncryptedMessage
+import com.futo.platformplayer.casting.models.FCastKeyExchangeMessage
 import com.futo.platformplayer.casting.models.FCastPlayMessage
 import com.futo.platformplayer.casting.models.FCastPlaybackErrorMessage
 import com.futo.platformplayer.casting.models.FCastPlaybackUpdateMessage
@@ -26,22 +30,44 @@ import kotlinx.serialization.json.Json
 import java.io.DataInputStream
 import java.io.DataOutputStream
 import java.io.IOException
+import java.math.BigInteger
 import java.net.InetAddress
 import java.net.Socket
+import java.security.KeyFactory
+import java.security.KeyPair
+import java.security.KeyPairGenerator
+import java.security.MessageDigest
+import java.security.PrivateKey
+import java.security.spec.X509EncodedKeySpec
+import javax.crypto.Cipher
+import javax.crypto.KeyAgreement
+import javax.crypto.spec.DHParameterSpec
+import javax.crypto.spec.IvParameterSpec
+import javax.crypto.spec.SecretKeySpec
 
 enum class Opcode(val value: Byte) {
-    NONE(0),
-    PLAY(1),
-    PAUSE(2),
-    RESUME(3),
-    STOP(4),
-    SEEK(5),
-    PLAYBACK_UPDATE(6),
-    VOLUME_UPDATE(7),
-    SET_VOLUME(8),
-    PLAYBACK_ERROR(9),
-    SET_SPEED(10),
-    VERSION(11)
+    None(0),
+    Play(1),
+    Pause(2),
+    Resume(3),
+    Stop(4),
+    Seek(5),
+    PlaybackUpdate(6),
+    VolumeUpdate(7),
+    SetVolume(8),
+    PlaybackError(9),
+    SetSpeed(10),
+    Version(11),
+    KeyExchange(12),
+    Encrypted(13),
+    Ping(14),
+    Pong(15),
+    StartEncryption(16);
+
+    companion object {
+        private val _map = entries.associateBy { it.value }
+        fun find(value: Byte): Opcode = _map[value] ?: Opcode.None
+    }
 }
 
 class FCastCastingDevice : CastingDevice {
@@ -63,17 +89,26 @@ class FCastCastingDevice : CastingDevice {
     private var _scopeIO: CoroutineScope? = null;
     private var _started: Boolean = false;
     private var _version: Long = 1;
+    private val _keyPair: KeyPair
+    private var _aesKey: SecretKeySpec? = null
+    private val _queuedEncryptedMessages = arrayListOf<FCastEncryptedMessage>()
+    private var _encryptionStarted = false
+    private var _thread: Thread? = null
 
     constructor(name: String, addresses: Array<InetAddress>, port: Int) : super() {
         this.name = name;
         this.addresses = addresses;
         this.port = port;
+
+        _keyPair = generateKeyPair()
     }
 
     constructor(deviceInfo: CastingDeviceInfo) : super() {
         this.name = deviceInfo.name;
         this.addresses = deviceInfo.addresses.map { a -> a.toInetAddress() }.filterNotNull().toTypedArray();
         this.port = deviceInfo.port;
+
+        _keyPair = generateKeyPair()
     }
 
     override fun getAddresses(): List<InetAddress> {
@@ -94,7 +129,7 @@ class FCastCastingDevice : CastingDevice {
 
         setTime(resumePosition);
         setDuration(duration);
-        sendMessage(Opcode.PLAY, FCastPlayMessage(
+        send(Opcode.Play, FCastPlayMessage(
             container = contentType,
             url = contentId,
             time = resumePosition,
@@ -118,7 +153,7 @@ class FCastCastingDevice : CastingDevice {
 
         setTime(resumePosition);
         setDuration(duration);
-        sendMessage(Opcode.PLAY, FCastPlayMessage(
+        send(Opcode.Play, FCastPlayMessage(
             container = contentType,
             content = content,
             time = resumePosition,
@@ -134,7 +169,7 @@ class FCastCastingDevice : CastingDevice {
         }
 
         setVolume(volume);
-        sendMessage(Opcode.SET_VOLUME, FCastSetVolumeMessage(volume))
+        send(Opcode.SetVolume, FCastSetVolumeMessage(volume))
     }
 
     override fun changeSpeed(speed: Double) {
@@ -143,7 +178,7 @@ class FCastCastingDevice : CastingDevice {
         }
 
         setSpeed(speed);
-        sendMessage(Opcode.SET_SPEED, FCastSetSpeedMessage(speed))
+        send(Opcode.SetSpeed, FCastSetSpeedMessage(speed))
     }
 
     override fun seekVideo(timeSeconds: Double) {
@@ -151,7 +186,7 @@ class FCastCastingDevice : CastingDevice {
             return;
         }
 
-        sendMessage(Opcode.SEEK, FCastSeekMessage(
+        send(Opcode.Seek, FCastSeekMessage(
             time = timeSeconds
         ));
     }
@@ -161,7 +196,7 @@ class FCastCastingDevice : CastingDevice {
             return;
         }
 
-        sendMessage(Opcode.RESUME);
+        send(Opcode.Resume);
     }
 
     override fun pauseVideo() {
@@ -169,7 +204,7 @@ class FCastCastingDevice : CastingDevice {
             return;
         }
 
-        sendMessage(Opcode.PAUSE);
+        send(Opcode.Pause);
     }
 
     override fun stopVideo() {
@@ -177,7 +212,7 @@ class FCastCastingDevice : CastingDevice {
             return;
         }
 
-        sendMessage(Opcode.STOP);
+        send(Opcode.Stop);
     }
 
     private fun invokeInIOScopeIfRequired(action: () -> Unit): Boolean {
@@ -201,7 +236,6 @@ class FCastCastingDevice : CastingDevice {
     }
 
     override fun start() {
-        val adrs = addresses ?: return;
         if (_started) {
             return;
         }
@@ -209,123 +243,137 @@ class FCastCastingDevice : CastingDevice {
         _started = true;
         Logger.i(TAG, "Starting...");
 
-        _scopeIO?.cancel();
-        Logger.i(TAG, "Cancelled previous scopeIO because a new one is starting.")
-        _scopeIO = CoroutineScope(Dispatchers.IO);
+        ensureThreadStarted();
+        Logger.i(TAG, "Started.");
+    }
 
-        Thread {
-            connectionState = CastConnectionState.CONNECTING;
+    fun ensureThreadStarted() {
+        val adrs = addresses ?: return;
 
-            while (_scopeIO?.isActive == true) {
-                try {
-                    val connectedSocket = getConnectedSocket(adrs.toList(), port);
-                    if (connectedSocket == null) {
+        val thread = _thread
+        if (thread == null || !thread.isAlive) {
+            Log.i(TAG, "Restarting thread because the thread has died")
+
+            _scopeIO?.cancel();
+            Logger.i(TAG, "Cancelled previous scopeIO because a new one is starting.")
+            _scopeIO = CoroutineScope(Dispatchers.IO);
+
+            _thread = Thread {
+                connectionState = CastConnectionState.CONNECTING;
+
+                while (_scopeIO?.isActive == true) {
+                    try {
+                        val connectedSocket = getConnectedSocket(adrs.toList(), port);
+                        if (connectedSocket == null) {
+                            Thread.sleep(3000);
+                            continue;
+                        }
+
+                        usedRemoteAddress = connectedSocket.inetAddress;
+                        localAddress = connectedSocket.localAddress;
+                        connectedSocket.close();
+                        break;
+                    } catch (e: Throwable) {
+                        Logger.w(ChromecastCastingDevice.TAG, "Failed to get setup initial connection to FastCast device.", e)
+                    }
+                }
+
+                //Connection loop
+                while (_scopeIO?.isActive == true) {
+                    Logger.i(TAG, "Connecting to FastCast.");
+                    connectionState = CastConnectionState.CONNECTING;
+
+                    try {
+                        _socket = Socket(usedRemoteAddress, port);
+                        Logger.i(TAG, "Successfully connected to FastCast at $usedRemoteAddress:$port");
+
+                        _outputStream = DataOutputStream(_socket?.outputStream);
+                        _inputStream = DataInputStream(_socket?.inputStream);
+                    } catch (e: IOException) {
+                        _socket?.close();
+                        Logger.i(TAG, "Failed to connect to FastCast.", e);
+
+                        connectionState = CastConnectionState.CONNECTING;
                         Thread.sleep(3000);
                         continue;
                     }
 
-                    usedRemoteAddress = connectedSocket.inetAddress;
-                    localAddress = connectedSocket.localAddress;
-                    connectedSocket.close();
-                    break;
-                } catch (e: Throwable) {
-                    Logger.w(ChromecastCastingDevice.TAG, "Failed to get setup initial connection to FastCast device.", e)
-                }
-            }
+                    localAddress = _socket?.localAddress;
+                    connectionState = CastConnectionState.CONNECTED;
 
-            //Connection loop
-            while (_scopeIO?.isActive == true) {
-                Logger.i(TAG, "Connecting to FastCast.");
-                connectionState = CastConnectionState.CONNECTING;
+                    Logger.i(TAG, "Sending KeyExchange.")
+                    send(Opcode.KeyExchange, getKeyExchangeMessage(_keyPair))
 
-                try {
-                    _socket = Socket(usedRemoteAddress, port);
-                    Logger.i(TAG, "Successfully connected to FastCast at $usedRemoteAddress:$port");
+                    val buffer = ByteArray(4096);
+
+                    Logger.i(TAG, "Started receiving.");
+                    var exceptionOccurred = false;
+                    while (_scopeIO?.isActive == true && !exceptionOccurred) {
+                        try {
+                            val inputStream = _inputStream ?: break;
+                            Log.d(TAG, "Receiving next packet...");
+                            val b1 = inputStream.readUnsignedByte();
+                            val b2 = inputStream.readUnsignedByte();
+                            val b3 = inputStream.readUnsignedByte();
+                            val b4 = inputStream.readUnsignedByte();
+                            val size = ((b4.toLong() shl 24) or (b3.toLong() shl 16) or (b2.toLong() shl 8) or b1.toLong()).toInt();
+                            if (size > buffer.size) {
+                                Logger.w(TAG, "Skipping packet that is too large $size bytes.")
+                                inputStream.skip(size.toLong());
+                                continue;
+                            }
+
+                            Log.d(TAG, "Received header indicating $size bytes. Waiting for message.");
+                            inputStream.read(buffer, 0, size);
+
+                            val messageBytes = buffer.sliceArray(IntRange(0, size));
+                            Log.d(TAG, "Received $size bytes: ${messageBytes.toHexString()}.");
+
+                            val opcode = messageBytes[0];
+                            var json: String? = null;
+                            if (size > 1) {
+                                json = messageBytes.sliceArray(IntRange(1, size - 1)).decodeToString();
+                            }
+
+                            try {
+                                handleMessage(Opcode.find(opcode), json);
+                            } catch (e: Throwable) {
+                                Logger.w(TAG, "Failed to handle message.", e);
+                            }
+                        } catch (e: java.net.SocketException) {
+                            Logger.e(TAG, "Socket exception while receiving.", e);
+                            exceptionOccurred = true;
+                        } catch (e: Throwable) {
+                            Logger.e(TAG, "Exception while receiving.", e);
+                            exceptionOccurred = true;
+                        }
+                    }
 
                     try {
-                        _outputStream = DataOutputStream(_socket?.outputStream);
-                        _inputStream = DataInputStream(_socket?.inputStream);
+                        _socket?.close();
+                        Logger.i(TAG, "Socket disconnected.");
                     } catch (e: Throwable) {
-                        Logger.i(TAG, "Failed to authenticate to FastCast.", e);
+                        Logger.e(TAG, "Failed to close socket.", e)
                     }
-                } catch (e: IOException) {
-                    _socket?.close();
-                    Logger.i(TAG, "Failed to connect to FastCast.", e);
 
                     connectionState = CastConnectionState.CONNECTING;
                     Thread.sleep(3000);
-                    continue;
                 }
 
-                localAddress = _socket?.localAddress;
-                connectionState = CastConnectionState.CONNECTED;
-
-                val buffer = ByteArray(4096);
-
-                Logger.i(TAG, "Started receiving.");
-                var exceptionOccurred = false;
-                while (_scopeIO?.isActive == true && !exceptionOccurred) {
-                    try {
-                        val inputStream = _inputStream ?: break;
-                        Log.d(TAG, "Receiving next packet...");
-                        val b1 = inputStream.readUnsignedByte();
-                        val b2 = inputStream.readUnsignedByte();
-                        val b3 = inputStream.readUnsignedByte();
-                        val b4 = inputStream.readUnsignedByte();
-                        val size = ((b4.toLong() shl 24) or (b3.toLong() shl 16) or (b2.toLong() shl 8) or b1.toLong()).toInt();
-                        if (size > buffer.size) {
-                            Logger.w(TAG, "Skipping packet that is too large $size bytes.")
-                            inputStream.skip(size.toLong());
-                            continue;
-                        }
-
-                        Log.d(TAG, "Received header indicating $size bytes. Waiting for message.");
-                        inputStream.read(buffer, 0, size);
-
-                        val messageBytes = buffer.sliceArray(IntRange(0, size));
-                        Log.d(TAG, "Received $size bytes: ${messageBytes.toHexString()}.");
-
-                        val opcode = messageBytes[0];
-                        var json: String? = null;
-                        if (size > 1) {
-                            json = messageBytes.sliceArray(IntRange(1, size - 1)).decodeToString();
-                        }
-
-                        try {
-                            handleMessage(Opcode.entries.first { it.value == opcode }, json);
-                        } catch (e:Throwable) {
-                            Logger.w(TAG, "Failed to handle message.", e);
-                        }
-                    } catch (e: java.net.SocketException) {
-                        Logger.e(TAG, "Socket exception while receiving.", e);
-                        exceptionOccurred = true;
-                    } catch (e: Throwable) {
-                        Logger.e(TAG, "Exception while receiving.", e);
-                        exceptionOccurred = true;
-                    }
-                }
-
-                try {
-                    _socket?.close();
-                    Logger.i(TAG, "Socket disconnected.");
-                } catch (e: Throwable) {
-                    Logger.e(TAG, "Failed to close socket.", e)
-                }
-
-                connectionState = CastConnectionState.CONNECTING;
-                Thread.sleep(3000);
-            }
-
-            Logger.i(TAG, "Stopped connection loop.");
-            connectionState = CastConnectionState.DISCONNECTED;
-        }.start();
-
-        Logger.i(TAG, "Started.");
+                Logger.i(TAG, "Stopped connection loop.");
+                connectionState = CastConnectionState.DISCONNECTED;
+                _thread = null;
+            }.apply { start() };
+        } else {
+            Log.i(TAG, "Thread was still alive, not restarted")
+        }
     }
 
     private fun handleMessage(opcode: Opcode, json: String? = null) {
+        Log.i(TAG, "Processing packet (opcode: $opcode, size: ${json?.length ?: 0})")
+
         when (opcode) {
-            Opcode.PLAYBACK_UPDATE -> {
+            Opcode.PlaybackUpdate -> {
                 if (json == null) {
                     Logger.w(TAG, "Got playback update without JSON, ignoring.");
                     return;
@@ -339,7 +387,7 @@ class FCastCastingDevice : CastingDevice {
                     else -> false
                 }
             }
-            Opcode.VOLUME_UPDATE -> {
+            Opcode.VolumeUpdate -> {
                 if (json == null) {
                     Logger.w(TAG, "Got volume update without JSON, ignoring.");
                     return;
@@ -348,7 +396,7 @@ class FCastCastingDevice : CastingDevice {
                 val volumeUpdate = FCastCastingDevice.json.decodeFromString<FCastVolumeUpdateMessage>(json);
                 setVolume(volumeUpdate.volume, volumeUpdate.generationTime);
             }
-            Opcode.PLAYBACK_ERROR -> {
+            Opcode.PlaybackError -> {
                 if (json == null) {
                     Logger.w(TAG, "Got playback error without JSON, ignoring.");
                     return;
@@ -357,7 +405,7 @@ class FCastCastingDevice : CastingDevice {
                 val playbackError = FCastCastingDevice.json.decodeFromString<FCastPlaybackErrorMessage>(json);
                 Logger.e(TAG, "Remote casting playback error received: $playbackError")
             }
-            Opcode.VERSION -> {
+            Opcode.Version -> {
                 if (json == null) {
                     Logger.w(TAG, "Got version without JSON, ignoring.");
                     return;
@@ -367,72 +415,100 @@ class FCastCastingDevice : CastingDevice {
                 _version = version.version;
                 Logger.i(TAG, "Remote version received: $version")
             }
+            Opcode.KeyExchange -> {
+                if (json == null) {
+                    Logger.w(TAG, "Got KeyExchange without JSON, ignoring.");
+                    return;
+                }
+
+                val keyExchangeMessage: FCastKeyExchangeMessage = FCastCastingDevice.json.decodeFromString(json)
+                Logger.i(TAG, "Received public key: ${keyExchangeMessage.publicKey}")
+                _aesKey = computeSharedSecret(_keyPair.private, keyExchangeMessage)
+
+                synchronized(_queuedEncryptedMessages) {
+                    for (queuedEncryptedMessages in _queuedEncryptedMessages) {
+                        val decryptedMessage = decryptMessage(_aesKey!!, queuedEncryptedMessages)
+                        val o = Opcode.find(decryptedMessage.opcode.toByte())
+                        handleMessage(o, decryptedMessage.message)
+                    }
+
+                    _queuedEncryptedMessages.clear()
+                }
+            }
+            Opcode.Ping -> send(Opcode.Pong)
+            Opcode.Encrypted -> {
+                if (json == null) {
+                    Logger.w(TAG, "Got Encrypted without JSON, ignoring.");
+                    return;
+                }
+
+                val encryptedMessage: FCastEncryptedMessage = FCastCastingDevice.json.decodeFromString(json)
+                if (_aesKey != null) {
+                    val decryptedMessage = decryptMessage(_aesKey!!, encryptedMessage)
+                    val o = Opcode.find(decryptedMessage.opcode.toByte())
+                    handleMessage(o, decryptedMessage.message)
+                } else {
+                    synchronized(_queuedEncryptedMessages) {
+                        if (_queuedEncryptedMessages.size == 15) {
+                            _queuedEncryptedMessages.removeAt(0)
+                        }
+
+                        _queuedEncryptedMessages.add(encryptedMessage)
+                    }
+                }
+            }
+            Opcode.StartEncryption -> {
+                _encryptionStarted = true
+                //TODO: Send decrypted messages waiting for encryption to be established
+            }
             else -> { }
         }
     }
 
-    private fun sendMessage(opcode: Opcode) {
+    private fun send(opcode: Opcode, message: String? = null) {
+        val aesKey = _aesKey
+        if (_encryptionStarted && aesKey != null && opcode != Opcode.Encrypted && opcode != Opcode.KeyExchange && opcode != Opcode.StartEncryption) {
+            send(Opcode.Encrypted, encryptMessage(aesKey, FCastDecryptedMessage(opcode.value.toLong(), message)))
+            return
+        }
+
         try {
-            val size = 1;
-            val outputStream = _outputStream;
+            val data: ByteArray = message?.encodeToByteArray() ?: ByteArray(0)
+            val size = 1 + data.size
+            val outputStream = _outputStream
             if (outputStream == null) {
-                Logger.w(TAG, "Failed to send $size bytes, output stream is null.");
-                return;
+                Log.w(TAG, "Failed to send $size bytes, output stream is null.")
+                return
             }
 
-            val serializedSizeLE = ByteArray(4);
-            serializedSizeLE[0] = (size and 0xff).toByte();
-            serializedSizeLE[1] = (size shr 8 and 0xff).toByte();
-            serializedSizeLE[2] = (size shr 16 and 0xff).toByte();
-            serializedSizeLE[3] = (size shr 24 and 0xff).toByte();
-            outputStream.write(serializedSizeLE);
+            val serializedSizeLE = ByteArray(4)
+            serializedSizeLE[0] = (size and 0xff).toByte()
+            serializedSizeLE[1] = (size shr 8 and 0xff).toByte()
+            serializedSizeLE[2] = (size shr 16 and 0xff).toByte()
+            serializedSizeLE[3] = (size shr 24 and 0xff).toByte()
+            outputStream.write(serializedSizeLE)
 
-            val opcodeBytes = ByteArray(1);
-            opcodeBytes[0] = opcode.value;
-            outputStream.write(opcodeBytes);
+            val opcodeBytes = ByteArray(1)
+            opcodeBytes[0] = opcode.value
+            outputStream.write(opcodeBytes)
 
-            Log.d(TAG, "Sent $size bytes.");
+            if (data.isNotEmpty()) {
+                outputStream.write(data)
+            }
+
+            Log.d(TAG, "Sent $size bytes: (opcode: $opcode, body: $message).")
         } catch (e: Throwable) {
-            Logger.i(TAG, "Failed to send message.", e);
+            Log.i(TAG, "Failed to send message.", e)
+            throw e
         }
     }
 
-    private inline fun <reified T> sendMessage(opcode: Opcode, message: T) {
+    private inline fun <reified T> send(opcode: Opcode, message: T) {
         try {
-            val data: ByteArray;
-            var jsonString: String? = null;
-            if (message != null) {
-                jsonString = json.encodeToString(message);
-                data = jsonString.encodeToByteArray();
-            } else {
-                data = ByteArray(0);
-            }
-
-            val size = 1 + data.size;
-            val outputStream = _outputStream;
-            if (outputStream == null) {
-                Logger.w(TAG, "Failed to send $size bytes, output stream is null.");
-                return;
-            }
-
-            val serializedSizeLE = ByteArray(4);
-            serializedSizeLE[0] = (size and 0xff).toByte();
-            serializedSizeLE[1] = (size shr 8 and 0xff).toByte();
-            serializedSizeLE[2] = (size shr 16 and 0xff).toByte();
-            serializedSizeLE[3] = (size shr 24 and 0xff).toByte();
-            outputStream.write(serializedSizeLE);
-
-            val opcodeBytes = ByteArray(1);
-            opcodeBytes[0] = opcode.value;
-            outputStream.write(opcodeBytes);
-
-            if (data.isNotEmpty()) {
-                outputStream.write(data);
-            }
-
-            Log.d(TAG, "Sent $size bytes: '$jsonString'.");
+            send(opcode, message?.let { Json.encodeToString(it) })
         } catch (e: Throwable) {
-            Logger.i(TAG, "Failed to send message.", e);
+            Log.i(TAG, "Failed to encode message to string.", e)
+            throw e
         }
     }
 
@@ -441,6 +517,8 @@ class FCastCastingDevice : CastingDevice {
         usedRemoteAddress = null;
         localAddress = null;
         _started = false;
+        //TODO: Kill and/or join thread?
+        _thread = null;
 
         val socket = _socket;
         val scopeIO = _scopeIO;
@@ -471,7 +549,65 @@ class FCastCastingDevice : CastingDevice {
     }
 
     companion object {
-        val TAG = "FastCastCastingDevice";
+        val TAG = "FCastCastingDevice";
         private val json = Json { ignoreUnknownKeys = true }
+
+        fun getKeyExchangeMessage(keyPair: KeyPair): FCastKeyExchangeMessage {
+            return FCastKeyExchangeMessage(1, Base64.encodeToString(keyPair.public.encoded, Base64.NO_WRAP))
+        }
+
+        fun generateKeyPair(): KeyPair {
+            //modp14
+            val p = BigInteger("ffffffffffffffffc90fdaa22168c234c4c6628b80dc1cd129024e088a67cc74020bbea63b139b22514a08798e3404ddef9519b3cd3a431b302b0a6df25f14374fe1356d6d51c245e485b576625e7ec6f44c42e9a637ed6b0bff5cb6f406b7edee386bfb5a899fa5ae9f24117c4b1fe649286651ece45b3dc2007cb8a163bf0598da48361c55d39a69163fa8fd24cf5f83655d23dca3ad961c62f356208552bb9ed529077096966d670c354e4abc9804f1746c08ca18217c32905e462e36ce3be39e772c180e86039b2783a2ec07a28fb5c55df06f4c52c9de2bcbf6955817183995497cea956ae515d2261898fa051015728e5a8aacaa68ffffffffffffffff", 16)
+            val g = BigInteger("2", 16)
+            val dhSpec = DHParameterSpec(p, g)
+
+            val keyGen = KeyPairGenerator.getInstance("DH")
+            keyGen.initialize(dhSpec)
+
+            return keyGen.generateKeyPair()
+        }
+
+        fun computeSharedSecret(privateKey: PrivateKey, keyExchangeMessage: FCastKeyExchangeMessage): SecretKeySpec {
+            val keyFactory = KeyFactory.getInstance("DH")
+            val receivedPublicKeyBytes = Base64.decode(keyExchangeMessage.publicKey, Base64.NO_WRAP)
+            val receivedPublicKeySpec = X509EncodedKeySpec(receivedPublicKeyBytes)
+            val receivedPublicKey = keyFactory.generatePublic(receivedPublicKeySpec)
+
+            val keyAgreement = KeyAgreement.getInstance("DH")
+            keyAgreement.init(privateKey)
+            keyAgreement.doPhase(receivedPublicKey, true)
+
+            val sharedSecret = keyAgreement.generateSecret()
+            Log.i(TAG, "sharedSecret ${Base64.encodeToString(sharedSecret, Base64.NO_WRAP)}")
+            val sha256 = MessageDigest.getInstance("SHA-256")
+            val hashedSecret = sha256.digest(sharedSecret)
+            Log.i(TAG, "hashedSecret ${Base64.encodeToString(hashedSecret, Base64.NO_WRAP)}")
+
+            return SecretKeySpec(hashedSecret, "AES")
+        }
+
+        fun encryptMessage(aesKey: SecretKeySpec, decryptedMessage: FCastDecryptedMessage): FCastEncryptedMessage {
+            val cipher = Cipher.getInstance("AES/CBC/PKCS5Padding")
+            cipher.init(Cipher.ENCRYPT_MODE, aesKey)
+            val iv = cipher.iv
+            val json = Json.encodeToString(decryptedMessage)
+            val encrypted = cipher.doFinal(json.toByteArray(Charsets.UTF_8))
+            return FCastEncryptedMessage(
+                version = 1,
+                iv = Base64.encodeToString(iv, Base64.NO_WRAP),
+                blob = Base64.encodeToString(encrypted, Base64.NO_WRAP)
+            )
+        }
+
+        fun decryptMessage(aesKey: SecretKeySpec, encryptedMessage: FCastEncryptedMessage): FCastDecryptedMessage {
+            val iv = Base64.decode(encryptedMessage.iv, Base64.NO_WRAP)
+            val encrypted = Base64.decode(encryptedMessage.blob, Base64.NO_WRAP)
+
+            val cipher = Cipher.getInstance("AES/CBC/PKCS5Padding")
+            cipher.init(Cipher.DECRYPT_MODE, aesKey, IvParameterSpec(iv))
+            val decryptedJson = cipher.doFinal(encrypted)
+            return Json.decodeFromString(String(decryptedJson, Charsets.UTF_8))
+        }
     }
 }

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

@@ -205,11 +205,20 @@ class StateCasting {
     }
 
     fun onResume() {
-        val resumeCastingDevice = _resumeCastingDevice
-        if (resumeCastingDevice != null) {
-            connectDevice(deviceFromCastingDeviceInfo(resumeCastingDevice))
-            _resumeCastingDevice = null
-            Log.i(TAG, "_resumeCastingDevice set to null onResume")
+        val ad = activeDevice
+        if (ad != null) {
+            if (ad is FCastCastingDevice) {
+                ad.ensureThreadStarted()
+            } else if (ad is ChromecastCastingDevice) {
+                ad.ensureThreadsStarted()
+            }
+        } else {
+            val resumeCastingDevice = _resumeCastingDevice
+            if (resumeCastingDevice != null) {
+                connectDevice(deviceFromCastingDeviceInfo(resumeCastingDevice))
+                _resumeCastingDevice = null
+                Log.i(TAG, "_resumeCastingDevice set to null onResume")
+            }
         }
     }
 

app/src/main/java/com/futo/platformplayer/casting/models/FCast.kt

@@ -50,4 +50,23 @@ data class FCastPlaybackErrorMessage(
 @Serializable
 data class FCastVersionMessage(
     val version: Long
+)
+
+@Serializable
+data class FCastKeyExchangeMessage(
+    val version: Long,
+    val publicKey: String
+)
+
+@Serializable
+data class FCastDecryptedMessage(
+    val opcode: Long,
+    val message: String?
+)
+
+@Serializable
+data class FCastEncryptedMessage(
+    val version: Long,
+    val iv: String?,
+    val blob: String
 )

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

@@ -9,6 +9,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
+import android.widget.Button
 import android.widget.FrameLayout
 import android.widget.ImageButton
 import android.widget.ImageView
@@ -20,6 +21,7 @@ import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.futo.platformplayer.R
+import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.UISlideOverlays
 import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
 import com.futo.platformplayer.dp
@@ -32,7 +34,9 @@ import com.futo.platformplayer.views.AnyAdapterView.Companion.asAny
 import com.futo.platformplayer.views.SearchView
 import com.futo.platformplayer.views.adapters.AnyAdapter
 import com.futo.platformplayer.views.adapters.viewholders.CreatorBarViewHolder
+import com.futo.platformplayer.views.overlays.CreatorSelectOverlay
 import com.futo.platformplayer.views.overlays.ImageVariableOverlay
+import com.futo.platformplayer.views.overlays.OverlayTopbar
 import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuTextInput
 import com.google.android.material.imageview.ShapeableImageView
 import com.google.android.material.shape.CornerFamily
@@ -69,6 +73,7 @@ class SubscriptionGroupFragment : MainFragment() {
     private class SubscriptionGroupView: ConstraintLayout {
         private val _fragment: SubscriptionGroupFragment;
 
+        private val _topbar: OverlayTopbar;
         private val _textGroupTitleContainer: LinearLayout;
         private val _textGroupTitle: TextView;
         private val _imageGroup: ShapeableImageView;
@@ -81,16 +86,12 @@ class SubscriptionGroupFragment : MainFragment() {
         private val _buttonSettings: ImageButton;
         private val _buttonDelete: ImageButton;
 
-        private val _enabledCreators: ArrayList<IPlatformChannel> = arrayListOf();
-        private val _disabledCreators: ArrayList<IPlatformChannel> = arrayListOf();
-        private val _enabledCreatorsFiltered: ArrayList<IPlatformChannel> = arrayListOf();
-        private val _disabledCreatorsFiltered: ArrayList<IPlatformChannel> = arrayListOf();
+        private val _buttonAddCreator: Button;
 
-        private val _containerEnabled: LinearLayout;
-        private val _containerDisabled: LinearLayout;
+        private val _enabledCreators: ArrayList<IPlatformChannel> = arrayListOf();
+        private val _enabledCreatorsFiltered: ArrayList<IPlatformChannel> = arrayListOf();
 
         private val _recyclerCreatorsEnabled: AnyAdapterView<IPlatformChannel, CreatorBarViewHolder>;
-        private val _recyclerCreatorsDisabled: AnyAdapterView<IPlatformChannel, CreatorBarViewHolder>;
 
         private val _overlay: FrameLayout;
 
@@ -101,6 +102,7 @@ class SubscriptionGroupFragment : MainFragment() {
             _fragment = fragment;
 
             _overlay = findViewById(R.id.overlay);
+            _topbar = findViewById(R.id.topbar);
             _searchBar = findViewById(R.id.search_bar);
             _textGroupTitleContainer = findViewById(R.id.text_group_title_container);
             _textGroupTitle = findViewById(R.id.text_group_title);
@@ -110,33 +112,50 @@ class SubscriptionGroupFragment : MainFragment() {
             _textGroupMeta = findViewById(R.id.text_group_meta);
             _buttonSettings = findViewById(R.id.button_settings);
             _buttonDelete = findViewById(R.id.button_delete);
+            _buttonAddCreator = findViewById(R.id.button_creator_add);
             _imageGroup.setBackgroundColor(Color.GRAY);
 
+            _topbar.onClose.subscribe {
+                fragment.close(true);
+            }
+
+            _buttonAddCreator.setOnClickListener {
+                addCreators();
+            }
+
             val dp6 = 6.dp(resources);
             _imageGroup.shapeAppearanceModel = ShapeAppearanceModel.builder()
                 .setAllCorners(CornerFamily.ROUNDED, dp6.toFloat())
                 .build()
 
-            _containerEnabled = findViewById(R.id.container_enabled);
-            _containerDisabled = findViewById(R.id.container_disabled);
             _recyclerCreatorsEnabled = findViewById<RecyclerView>(R.id.recycler_creators_enabled).asAny(_enabledCreatorsFiltered) {
                 it.itemView.setPadding(0, dp6, 0, dp6);
                 it.onClick.subscribe { channel ->
-                    disableCreator(channel);
+                    //disableCreator(channel);
+                    UIDialogs.showDialog(context, R.drawable.ic_trash, "Delete", "Are you sure you want to delete\n[${channel.name}]?", null, 0,
+                        UIDialogs.Action("Cancel", {}),
+                        UIDialogs.Action("Delete", {
+                            _group?.let {
+                                it.urls.remove(channel.url);
+                                reloadCreators(it);
+                            }
+                        }, UIDialogs.ActionStyle.DANGEROUS))
                 };
             }
+            /*
             _recyclerCreatorsDisabled = findViewById<RecyclerView>(R.id.recycler_creators_disabled).asAny(_disabledCreatorsFiltered) {
                 it.itemView.setPadding(0, dp6, 0, dp6);
                 it.onClick.subscribe { channel ->
                     enableCreator(channel);
                 };
-            }
+            }*/
             _recyclerCreatorsEnabled.view.layoutManager = GridLayoutManager(context, 5).apply {
                 this.orientation = LinearLayoutManager.VERTICAL;
             };
+            /*
             _recyclerCreatorsDisabled.view.layoutManager = GridLayoutManager(context, 5).apply {
                 this.orientation = LinearLayoutManager.VERTICAL;
-            };
+            };*/
 
             _textGroupTitleContainer.setOnClickListener {
                 _group?.let { editName(it) };
@@ -154,10 +173,14 @@ class SubscriptionGroupFragment : MainFragment() {
 
             }
             _buttonDelete.setOnClickListener {
-                _group?.let {
-                    StateSubscriptionGroups.instance.deleteSubscriptionGroup(it.id);
+                _group?.let { g ->
+                    UIDialogs.showDialog(context, R.drawable.ic_trash, "Delete Group", "Are you sure you want to this group?\n[${g.name}]?", null, 0,
+                        UIDialogs.Action("Cancel", {}),
+                        UIDialogs.Action("Delete", {
+                            StateSubscriptionGroups.instance.deleteSubscriptionGroup(g.id);
+                            fragment.close(true);
+                        }, UIDialogs.ActionStyle.DANGEROUS))
                 };
-                fragment.close(true);
             }
             _buttonSettings.visibility = View.GONE;
 
@@ -208,6 +231,28 @@ class SubscriptionGroupFragment : MainFragment() {
                 overlay.removeAllViews();
             }
         }
+        fun addCreators() {
+            val overlay = CreatorSelectOverlay(context, _enabledCreators.map { it.url });
+            _overlay.removeAllViews();
+            _overlay.addView(overlay);
+            _overlay.alpha = 0f
+            _overlay.visibility = View.VISIBLE;
+            _overlay.animate().alpha(1f).setDuration(300).start();
+            overlay.onSelected.subscribe {
+                _group?.let { g ->
+                    for(url in it) {
+                        if(!g.urls.contains(url))
+                            g.urls.add(url);
+                    }
+                    save();
+                    reloadCreators(g);
+                }
+            };
+            overlay.onClose.subscribe {
+                _overlay.visibility = View.GONE;
+                overlay.removeAllViews();
+            }
+        }
 
 
         fun setGroup(group: SubscriptionGroup?) {
@@ -230,73 +275,30 @@ class SubscriptionGroupFragment : MainFragment() {
         @SuppressLint("NotifyDataSetChanged")
         private fun reloadCreators(group: SubscriptionGroup?) {
             _enabledCreators.clear();
-            _disabledCreators.clear();
+            //_disabledCreators.clear();
 
             if(group != null) {
                 val urls = group.urls.toList();
                 val subs = StateSubscriptions.instance.getSubscriptions().map { it.channel }
                 _enabledCreators.addAll(subs.filter { urls.contains(it.url) });
-                _disabledCreators.addAll(subs.filter { !urls.contains(it.url) });
             }
+            updateMeta();
             filterCreators();
         }
 
         private fun filterCreators() {
             val query = _searchBar.textSearch.text.toString().lowercase();
             val filteredEnabled = _enabledCreators.filter { it.name.lowercase().contains(query) };
-            val filteredDisabled = _disabledCreators.filter { it.name.lowercase().contains(query) };
 
             //Optimize
             _enabledCreatorsFiltered.clear();
             _enabledCreatorsFiltered.addAll(filteredEnabled);
-            _disabledCreatorsFiltered.clear();
-            _disabledCreatorsFiltered.addAll(filteredDisabled);
 
             _recyclerCreatorsEnabled.notifyContentChanged();
-            _recyclerCreatorsDisabled.notifyContentChanged();
-        }
-
-        private fun enableCreator(channel: IPlatformChannel) {
-            val index = _disabledCreatorsFiltered.indexOf(channel);
-            if (index >= 0) {
-                _disabledCreators.remove(channel)
-                _disabledCreatorsFiltered.remove(channel);
-                _recyclerCreatorsDisabled.adapter.notifyItemRangeRemoved(index);
-
-                _enabledCreators.add(channel);
-                _enabledCreatorsFiltered.add(channel);
-                _recyclerCreatorsEnabled.adapter.notifyItemInserted(_enabledCreatorsFiltered.size - 1);
-
-                _group?.let {
-                    if(!it.urls.contains(channel.url)) {
-                        it.urls.add(channel.url);
-                        save();
-                    }
-                }
-                updateMeta();
-            }
-        }
-        private fun disableCreator(channel: IPlatformChannel) {
-            val index = _enabledCreatorsFiltered.indexOf(channel);
-            if (index >= 0) {
-                _enabledCreators.remove(channel)
-                _enabledCreatorsFiltered.removeAt(index);
-                _recyclerCreatorsEnabled.adapter.notifyItemRangeRemoved(index);
-
-                _disabledCreators.add(channel);
-                _disabledCreatorsFiltered.add(channel);
-                _recyclerCreatorsDisabled.adapter.notifyItemInserted(_disabledCreatorsFiltered.size - 1);
-
-                _group?.let {
-                    it.urls.remove(channel.url);
-                    save();
-                }
-                updateMeta();
-            }
         }
 
         private fun updateMeta() {
-            _textGroupMeta.text = "${_enabledCreators.size} creators";
+            _textGroupMeta.text = "${_group?.urls?.size} creators";
         }
     }
 }

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

@@ -104,7 +104,7 @@ class SubscriptionsFeedFragment : MainFragment() {
 
         constructor(fragment: SubscriptionsFeedFragment, inflater: LayoutInflater, cachedRecyclerData: RecyclerData<InsertedViewAdapterWithLoader<ContentPreviewViewHolder>, LinearLayoutManager, IPager<IPlatformContent>, IPlatformContent, IPlatformContent, InsertedViewHolder<ContentPreviewViewHolder>>? = null) : super(fragment, inflater, cachedRecyclerData) {
             Logger.i(TAG, "SubscriptionsFeedFragment constructor()");
-            StateSubscriptions.instance.onGlobalSubscriptionsUpdateProgress.subscribe(this) { progress, total ->
+            StateSubscriptions.instance.global.onUpdateProgress.subscribe(this) { progress, total ->
                 fragment.lifecycleScope.launch(Dispatchers.Main) {
                     try {
                         setProgress(progress, total);
@@ -162,14 +162,14 @@ class SubscriptionsFeedFragment : MainFragment() {
                 }
             }
 
-            if (!StateSubscriptions.instance.isGlobalUpdating) {
+            if (!StateSubscriptions.instance.global.isGlobalUpdating) {
                 finishRefreshLayoutLoader();
             }
         }
 
         override fun cleanup() {
             super.cleanup()
-            StateSubscriptions.instance.onGlobalSubscriptionsUpdateProgress.remove(this);
+            StateSubscriptions.instance.global.onUpdateProgress.remove(this);
             StateSubscriptions.instance.onSubscriptionsChanged.remove(this);
         }
 
@@ -194,8 +194,9 @@ class SubscriptionsFeedFragment : MainFragment() {
         private var _bypassRateLimit = false;
         private val _lastExceptions: List<Throwable>? = null;
         private val _taskGetPager = TaskHandler<Boolean, IPager<IPlatformContent>>({StateApp.instance.scope}, { withRefresh ->
+            val group = _subGroup;
             if(!_bypassRateLimit) {
-                val subRequestCounts = StateSubscriptions.instance.getSubscriptionRequestCount();
+                val subRequestCounts = StateSubscriptions.instance.getSubscriptionRequestCount(group);
                 val reqCountStr = subRequestCounts.map { "    ${it.key.config.name}: ${it.value}/${it.key.getSubscriptionRateLimit()}" }.joinToString("\n");
                 val rateLimitPlugins = subRequestCounts.filter { clientCount -> clientCount.key.getSubscriptionRateLimit()?.let { rateLimit -> clientCount.value > rateLimit } == true }
                 Logger.w(TAG, "Trying to refreshing subscriptions with requests:\n" + reqCountStr);
@@ -203,9 +204,10 @@ class SubscriptionsFeedFragment : MainFragment() {
                     throw RateLimitException(rateLimitPlugins.map { it.key.id });
             }
             _bypassRateLimit = false;
-            val resp = StateSubscriptions.instance.getGlobalSubscriptionFeed(StateApp.instance.scope, withRefresh);
+            val resp = StateSubscriptions.instance.getGlobalSubscriptionFeed(StateApp.instance.scope, withRefresh, group);
+            val feed = StateSubscriptions.instance.getFeed(group?.id);
 
-            val currentExs = StateSubscriptions.instance.globalSubscriptionExceptions;
+            val currentExs = feed?.exceptions ?: listOf();
             if(currentExs != _lastExceptions && currentExs.any())
                 handleExceptions(currentExs);
 

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

@@ -50,6 +50,7 @@ import com.futo.platformplayer.api.media.exceptions.ContentNotAvailableYetExcept
 import com.futo.platformplayer.api.media.exceptions.NoPlatformClientException
 import com.futo.platformplayer.api.media.models.PlatformAuthorMembershipLink
 import com.futo.platformplayer.api.media.models.chapters.ChapterType
+import com.futo.platformplayer.api.media.models.chapters.IChapter
 import com.futo.platformplayer.api.media.models.comments.PolycentricPlatformComment
 import com.futo.platformplayer.api.media.models.live.ILiveChatWindowDescriptor
 import com.futo.platformplayer.api.media.models.live.IPlatformLiveEvent
@@ -459,20 +460,29 @@ class VideoDetailView : ConstraintLayout {
         _cast.onSettingsClick.subscribe { showVideoSettings() };
         _player.onVideoSettings.subscribe { showVideoSettings() };
         _player.onToggleFullScreen.subscribe(::handleFullScreen);
-        _player.onChapterChanged.subscribe { chapter, isScrub ->
+
+        val onChapterChanged = { chapter: IChapter?, isScrub: Boolean ->
             if(_layoutSkip.visibility == VISIBLE && chapter?.type != ChapterType.SKIPPABLE)
                 _layoutSkip.visibility = GONE;
 
             if(!isScrub) {
                 if(chapter?.type == ChapterType.SKIPPABLE) {
                     _layoutSkip.visibility = VISIBLE;
-                }
-                else if(chapter?.type == ChapterType.SKIP) {
-                    _player.seekTo((chapter.timeEnd * 1000).toLong());
+                } else if(chapter?.type == ChapterType.SKIP) {
+                    val ad = StateCasting.instance.activeDevice
+                    if (ad != null) {
+                        ad.seekVideo(chapter.timeEnd)
+                    } else {
+                        _player.seekTo((chapter.timeEnd * 1000).toLong());
+                    }
+
                     UIDialogs.toast(context, "Skipped chapter [${chapter.name}]", false);
                 }
             }
-        }
+        };
+
+        _player.onChapterChanged.subscribe(onChapterChanged);
+        _cast.onChapterChanged.subscribe(onChapterChanged);
 
         _cast.onMinimizeClick.subscribe {
             _player.setFullScreen(false);
@@ -667,9 +677,17 @@ class VideoDetailView : ConstraintLayout {
         };
 
         _layoutSkip.setOnClickListener {
-            val currentChapter = _player.getCurrentChapter(_player.position);
-            if(currentChapter?.type == ChapterType.SKIPPABLE) {
-                _player.seekTo((currentChapter.timeEnd * 1000).toLong());
+            val ad = StateCasting.instance.activeDevice;
+            if (ad != null) {
+                val currentChapter = _cast.getCurrentChapter((ad.time * 1000).toLong());
+                if(currentChapter?.type == ChapterType.SKIPPABLE) {
+                    ad.seekVideo(currentChapter.timeEnd);
+                }
+            } else {
+                val currentChapter = _player.getCurrentChapter(_player.position);
+                if(currentChapter?.type == ChapterType.SKIPPABLE) {
+                    _player.seekTo((currentChapter.timeEnd * 1000).toLong());
+                }
             }
         }
     }
@@ -1145,10 +1163,12 @@ class VideoDetailView : ConstraintLayout {
                     //TODO: Implement video.getContentChapters()
                     val chapters = null ?: StatePlatform.instance.getContentChapters(video.url);
                     _player.setChapters(chapters);
+                    _cast.setChapters(chapters);
                 }
                 catch(ex: Throwable) {
                     Logger.e(TAG, "Failed to get chapters", ex);
                     _player.setChapters(null);
+                    _cast.setChapters(null);
 
                     /*withContext(Dispatchers.Main) {
                         UIDialogs.toast(context, "Failed to get chapters\n" + ex.message);

app/src/main/java/com/futo/platformplayer/functional/CentralizedFeed.kt

@@ -0,0 +1,23 @@
+package com.futo.platformplayer.functional
+
+import com.futo.platformplayer.api.media.models.contents.IPlatformContent
+import com.futo.platformplayer.api.media.structures.ReusablePager
+import com.futo.platformplayer.constructs.Event0
+import com.futo.platformplayer.constructs.Event1
+import com.futo.platformplayer.constructs.Event2
+
+//TODO: Integrate this better?
+class CentralizedFeed {
+    var lock = Object();
+    var feed: ReusablePager<IPlatformContent>? = null;
+    var isGlobalUpdating: Boolean = false;
+    var exceptions: List<Throwable> = listOf();
+
+
+    var lastProgress: Int = 0;
+    var lastTotal: Int = 0;
+    val onUpdateProgress = Event2<Int, Int>();
+    val onUpdated = Event0();
+    val onUpdatedOnce = Event1<Throwable?>();
+    val onException = Event1<List<Throwable>>();
+}

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

@@ -48,11 +48,16 @@ class Subscription {
     var playbackSeconds: Int = 0;
     var playbackViews: Int = 0;
 
+    var isOther = false;
 
     constructor(channel : SerializedChannel) {
         this.channel = channel;
     }
 
+    fun isChannel(url: String): Boolean {
+        return channel.url == url || channel.urlAlternatives.contains(url);
+    }
+
     fun shouldFetchVideos() = doFetchVideos &&
             (lastVideo.getNowDiffDays() < 30 || lastVideoUpdate.getNowDiffDays() >= 1) &&
             (lastVideo.getNowDiffDays() < 180 || lastVideoUpdate.getNowDiffDays() >= 3);
@@ -63,10 +68,16 @@ class Subscription {
     fun getClient() = StatePlatform.instance.getChannelClientOrNull(channel.url);
 
     fun save() {
-        StateSubscriptions.instance.saveSubscription(this);
+        if(isOther)
+            StateSubscriptions.instance.saveSubscriptionOther(this);
+        else
+            StateSubscriptions.instance.saveSubscription(this);
     }
     fun saveAsync() {
-        StateSubscriptions.instance.saveSubscription(this);
+        if(isOther)
+            StateSubscriptions.instance.saveSubscriptionOtherAsync(this);
+        else
+            StateSubscriptions.instance.saveSubscriptionAsync(this);
     }
 
     fun updateChannel(channel: IPlatformChannel) {

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

@@ -1,27 +1,18 @@
 package com.futo.platformplayer.states
 
 import com.futo.platformplayer.Settings
-import com.futo.platformplayer.UIDialogs
-import com.futo.platformplayer.api.media.models.ResultCapabilities
+import com.futo.platformplayer.api.media.PlatformID
 import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
 import com.futo.platformplayer.api.media.models.channels.SerializedChannel
 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
 import com.futo.platformplayer.api.media.structures.*
 import com.futo.platformplayer.api.media.structures.ReusablePager.Companion.asReusable
-import com.futo.platformplayer.constructs.Event0
-import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.constructs.Event2
-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.PolycentricProfile
-import com.futo.platformplayer.getNowDiffDays
+import com.futo.platformplayer.functional.CentralizedFeed
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.Subscription
+import com.futo.platformplayer.models.SubscriptionGroup
 import com.futo.platformplayer.polycentric.PolycentricCache
 import com.futo.platformplayer.resolveChannelUrl
 import com.futo.platformplayer.stores.FragmentedStorage
@@ -32,15 +23,10 @@ import com.futo.platformplayer.subscription.SubscriptionFetchAlgorithm
 import com.futo.platformplayer.subscription.SubscriptionFetchAlgorithms
 import kotlinx.coroutines.*
 import java.time.OffsetDateTime
-import java.util.concurrent.ExecutionException
 import java.util.concurrent.ForkJoinPool
-import java.util.concurrent.ForkJoinTask
-import kotlin.collections.ArrayList
 import kotlin.coroutines.resumeWithException
 import kotlin.coroutines.suspendCoroutine
 import kotlin.streams.asSequence
-import kotlin.streams.toList
-import kotlin.system.measureTimeMillis
 
 /***
  * Used to maintain subscriptions
@@ -54,25 +40,17 @@ class StateSubscriptions {
             override suspend fun toObject(id: String, backup: String, reconstructionBuilder: Builder): Subscription =
                 Subscription(SerializedChannel.fromChannel(StatePlatform.instance.getChannelLive(backup, false)));
         }).load();
+    private val _subscriptionOthers = FragmentedStorage.storeJson<Subscription>("subscriptions_others")
+        .withUnique { it.channel.url }
+        .load();
     private val _subscriptionsPool = ForkJoinPool(Settings.instance.subscriptions.getSubscriptionsConcurrency());
     private val _legacySubscriptions = FragmentedStorage.get<SubscriptionStorage>();
 
-
-    private var _globalSubscriptionsLock = Object();
-    private var _globalSubscriptionFeed: ReusablePager<IPlatformContent>? = null;
-    var isGlobalUpdating: Boolean = false
-        private set;
-    var globalSubscriptionExceptions: List<Throwable> = listOf()
-        private set;
-
     private val _algorithmSubscriptions = SubscriptionFetchAlgorithms.SMART;
 
-    private var _lastGlobalSubscriptionProgress: Int = 0;
-    private var _lastGlobalSubscriptionTotal: Int = 0;
-    val onGlobalSubscriptionsUpdateProgress = Event2<Int, Int>();
-    val onGlobalSubscriptionsUpdated = Event0();
-    val onGlobalSubscriptionsUpdatedOnce = Event1<Throwable?>();
-    val onGlobalSubscriptionsException = Event1<List<Throwable>>();
+    val global: CentralizedFeed = CentralizedFeed();
+    val feeds: HashMap<String, CentralizedFeed> = hashMapOf();
+
 
     val onSubscriptionsChanged = Event2<List<Subscription>, Boolean>();
 
@@ -83,75 +61,95 @@ class StateSubscriptions {
         else
             return subs.minOf { it.lastVideoUpdate };
     }
-    fun getGlobalSubscriptionProgress(): Pair<Int, Int> {
-        return Pair(_lastGlobalSubscriptionProgress, _lastGlobalSubscriptionTotal);
+
+    fun getFeed(id: String? = null, createIfNew: Boolean = false): CentralizedFeed? {
+        if(id == null)
+            return global;
+        else {
+            return synchronized(feeds) {
+                var f = feeds[id];
+                if(f == null && createIfNew) {
+                    f = CentralizedFeed();
+                    feeds[id] = f;
+                }
+                return@synchronized f;
+            }
+        }
     }
-    fun updateSubscriptionFeed(scope: CoroutineScope, onlyIfNull: Boolean = false, onProgress: ((Int, Int)->Unit)? = null) {
+
+    fun getGlobalSubscriptionProgress(id: String? = null): Pair<Int, Int> {
+        val feed = getFeed(id, false) ?: return Pair(0, 0);
+        return Pair(feed.lastProgress, feed.lastTotal);
+    }
+    fun updateSubscriptionFeed(scope: CoroutineScope, onlyIfNull: Boolean = false, onProgress: ((Int, Int)->Unit)? = null, group: SubscriptionGroup? = null) {
+        val feed = getFeed(group?.id, true) ?: return;
         Logger.v(TAG, "updateSubscriptionFeed");
         scope.launch(Dispatchers.IO) {
-            synchronized(_globalSubscriptionsLock) {
-                if (isGlobalUpdating || (onlyIfNull && _globalSubscriptionFeed != null)) {
+            synchronized(feed.lock) {
+                if (feed.isGlobalUpdating || (onlyIfNull && feed.feed != null)) {
                     Logger.i(TAG, "Already updating subscriptions or not required")
                     return@launch;
                 }
-                isGlobalUpdating = true;
+                feed.isGlobalUpdating = true;
             }
             try {
                 val subsResult = getSubscriptionsFeedWithExceptions(true, true, scope, { progress, total ->
-                    _lastGlobalSubscriptionProgress = progress;
-                    _lastGlobalSubscriptionTotal = total;
-                    onGlobalSubscriptionsUpdateProgress.emit(progress, total);
+                    feed.lastProgress = progress;
+                    feed.lastTotal = total;
+                    feed.onUpdateProgress.emit(progress, total);
                     onProgress?.invoke(progress, total);
-                });
+                }, null, group);
                 if (subsResult.second.any()) {
-                    globalSubscriptionExceptions = subsResult.second;
-                    onGlobalSubscriptionsException.emit(subsResult.second);
+                    feed.exceptions = subsResult.second;
+                    feed.onException.emit(subsResult.second);
                 }
-                _globalSubscriptionFeed = subsResult.first.asReusable();
-                synchronized(_globalSubscriptionsLock) {
-                    onGlobalSubscriptionsUpdated.emit();
-                    onGlobalSubscriptionsUpdatedOnce.emit(null);
-                    onGlobalSubscriptionsUpdatedOnce.clear();
+                feed.feed = subsResult.first.asReusable();
+                synchronized(feed.lock) {
+                    feed.onUpdated.emit();
+                    feed.onUpdatedOnce.emit(null);
+                    feed.onUpdatedOnce.clear();
                 }
             }
             catch (e: Throwable) {
-                synchronized(_globalSubscriptionsLock) {
-                    onGlobalSubscriptionsUpdatedOnce.emit(e);
-                    onGlobalSubscriptionsUpdatedOnce.clear();
+                synchronized(feed.lock) {
+                    feed.onUpdatedOnce.emit(e);
+                    feed.onUpdatedOnce.clear();
                 }
                 Logger.e(TAG, "Failed to update subscription feed.", e);
             }
             finally {
-                isGlobalUpdating = false;
+                feed.isGlobalUpdating = false;
             }
         };
     }
-    fun clearSubscriptionFeed() {
-        synchronized(_globalSubscriptionsLock) {
-            _globalSubscriptionFeed = null;
+    fun clearSubscriptionFeed(id: String? = null) {
+        val feed = getFeed(id) ?: return;
+        synchronized(feed.lock) {
+            feed.feed = null;
         }
     }
 
     private var loadIndex = 0;
-    suspend fun getGlobalSubscriptionFeed(scope: CoroutineScope, updated: Boolean): IPager<IPlatformContent> {
+    suspend fun getGlobalSubscriptionFeed(scope: CoroutineScope, updated: Boolean, group: SubscriptionGroup? = null): IPager<IPlatformContent> {
+        val feed = getFeed(group?.id, true) ?: return EmptyPager();
         //Get Subscriptions only if null
-        updateSubscriptionFeed(scope, !updated);
+        updateSubscriptionFeed(scope, !updated, null, group);
 
         val evRef = Object();
         val result = suspendCoroutine {
-            synchronized(_globalSubscriptionsLock) {
-                if (_globalSubscriptionFeed != null && !updated) {
+            synchronized(feed.lock) {
+                if (feed.feed != null && !updated) {
                     Logger.i(TAG, "Subscriptions got feed preloaded");
-                    it.resumeWith(Result.success(_globalSubscriptionFeed!!.getWindow()));
+                    it.resumeWith(Result.success(feed.feed!!.getWindow()));
                 } else {
                     val loadIndex = loadIndex++;
                     Logger.i(TAG, "[${loadIndex}] Starting await update");
-                    onGlobalSubscriptionsUpdatedOnce.subscribe(evRef) {ex ->
+                    feed.onUpdatedOnce.subscribe(evRef) { ex ->
                         Logger.i(TAG, "[${loadIndex}] Subscriptions got feed after update");
                         if(ex != null)
                             it.resumeWithException(ex);
-                        else if (_globalSubscriptionFeed != null)
-                            it.resumeWith(Result.success(_globalSubscriptionFeed!!.getWindow()));
+                        else if (feed.feed != null)
+                            it.resumeWith(Result.success(feed.feed!!.getWindow()));
                         else
                             it.resumeWithException(IllegalStateException("No subscription pager after change? Illegal null set on global subscriptions"))
                     }
@@ -176,12 +174,35 @@ class StateSubscriptions {
             return _subscriptions.findItem { it.channel.url == url || it.channel.urlAlternatives.contains(url) };
         }
     }
+    fun getSubscriptionOther(url: String) : Subscription? {
+        synchronized(_subscriptionOthers) {
+            return _subscriptionOthers.findItem { it.isChannel(url)};
+        }
+    }
+    fun getSubscriptionOtherOrCreate(url: String) : Subscription {
+        synchronized(_subscriptionOthers) {
+            val sub = getSubscriptionOther(url);
+            if(sub == null) {
+                val newSub = Subscription(SerializedChannel(PlatformID.NONE, url, null, null, 0, null, url, mapOf()));
+                newSub.isOther = true;
+                _subscriptions.save(newSub);
+                return newSub;
+            }
+            else return sub;
+        }
+    }
     fun saveSubscription(sub: Subscription) {
         _subscriptions.save(sub, false, true);
     }
     fun saveSubscriptionAsync(sub: Subscription) {
         _subscriptions.saveAsync(sub, false, true);
     }
+    fun saveSubscriptionOther(sub: Subscription) {
+        _subscriptionOthers.save(sub, false, true);
+    }
+    fun saveSubscriptionOtherAsync(sub: Subscription) {
+        _subscriptionOthers.saveAsync(sub, false, true);
+    }
     fun getSubscriptionCount(): Int {
         synchronized(_subscriptions) {
             return _subscriptions.getItems().size;
@@ -239,12 +260,19 @@ class StateSubscriptions {
         }
     }
 
-    fun getSubscriptionRequestCount(): Map<JSClient, Int> {
+    fun getSubscriptionRequestCount(subGroup: SubscriptionGroup? = null): Map<JSClient, Int> {
+        val subs = getSubscriptions();
+        val emulatedSubs = subGroup?.let {
+            it.urls.map {url ->
+                subs.find { it.channel.url == url }
+                    ?: getSubscriptionOtherOrCreate(url);
+            };
+        } ?: subs;
         return SubscriptionFetchAlgorithm.getAlgorithm(_algorithmSubscriptions, StateApp.instance.scope)
-            .countRequests(getSubscriptions().associateWith { StatePolycentric.instance.getChannelUrls(it.channel.url, it.channel.id, true) });
+            .countRequests(emulatedSubs.associateWith { StatePolycentric.instance.getChannelUrls(it.channel.url, it.channel.id, true) });
     }
 
-    fun getSubscriptionsFeedWithExceptions(allowFailure: Boolean = false, withCacheFallback: Boolean = false, cacheScope: CoroutineScope, onProgress: ((Int, Int)->Unit)? = null, onNewCacheHit: ((Subscription, IPlatformContent)->Unit)? = null): Pair<IPager<IPlatformContent>, List<Throwable>> {
+    fun getSubscriptionsFeedWithExceptions(allowFailure: Boolean = false, withCacheFallback: Boolean = false, cacheScope: CoroutineScope, onProgress: ((Int, Int)->Unit)? = null, onNewCacheHit: ((Subscription, IPlatformContent)->Unit)? = null, subGroup: SubscriptionGroup? = null): Pair<IPager<IPlatformContent>, List<Throwable>> {
         val algo = SubscriptionFetchAlgorithm.getAlgorithm(_algorithmSubscriptions, cacheScope, allowFailure, withCacheFallback, _subscriptionsPool);
         if(onNewCacheHit != null)
             algo.onNewCacheHit.subscribe(onNewCacheHit)
@@ -253,10 +281,19 @@ class StateSubscriptions {
             onProgress?.invoke(progress, total);
         }
 
+        val subs = getSubscriptions();
+        val emulatedSubs = subGroup?.let {
+            it.urls.map {url ->
+                subs.find { it.channel.url == url }
+                    ?: getSubscriptionOtherOrCreate(url);
+            };
+        } ?: subs;
+
+
         val usePolycentric = true;
         val lock = Object();
         var polycentricBudget: Int = 10;
-        val subUrls = getSubscriptions().parallelStream().map {
+        val subUrls = emulatedSubs.parallelStream().map {
             if(usePolycentric) {
                 val result = StatePolycentric.instance.getChannelUrlsWithUpdateResult(it.channel.url, it.channel.id, polycentricBudget <= 0, true);
                 if(result.first) {

app/src/main/java/com/futo/platformplayer/views/casting/CastView.kt

@@ -18,10 +18,12 @@ import androidx.media3.ui.DefaultTimeBar
 import androidx.media3.ui.TimeBar
 import com.bumptech.glide.Glide
 import com.futo.platformplayer.R
+import com.futo.platformplayer.api.media.models.chapters.IChapter
 import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
 import com.futo.platformplayer.casting.AirPlayCastingDevice
 import com.futo.platformplayer.casting.StateCasting
 import com.futo.platformplayer.constructs.Event0
+import com.futo.platformplayer.constructs.Event2
 import com.futo.platformplayer.states.StatePlayer
 import com.futo.platformplayer.toHumanTime
 import com.futo.platformplayer.views.behavior.GestureControlView
@@ -51,7 +53,10 @@ class CastView : ConstraintLayout {
     private var _scope: CoroutineScope = CoroutineScope(Dispatchers.Main);
     private var _updateTimeJob: Job? = null;
     private var _inPictureInPicture: Boolean = false;
+    private var _chapters: List<IChapter>? = null;
+    private var _currentChapter: IChapter? = null;
 
+    val onChapterChanged = Event2<IChapter?, Boolean>();
     val onMinimizeClick = Event0();
     val onSettingsClick = Event0();
     val onPrevious = Event0();
@@ -129,6 +134,36 @@ class CastView : ConstraintLayout {
         _buttonNext.setOnClickListener { onNext.emit() };
     }
 
+    private fun updateCurrentChapter(chaptPos: Long, isScrub: Boolean = false): Boolean {
+        val currentChapter = getCurrentChapter(chaptPos);
+        if(_currentChapter != currentChapter) {
+            _currentChapter = currentChapter;
+            /*runBlocking(Dispatchers.Main) {
+                if (currentChapter != null) {
+                    //TODO: Add chapter controls
+                    //_control_chapter.text = " • " + currentChapter.name;
+                    //_control_chapter_fullscreen.text = " • " + currentChapter.name;
+                } else {
+                    //TODO: Add chapter controls
+                    //_control_chapter.text = "";
+                    //_control_chapter_fullscreen.text = "";
+                }
+            }*/
+
+            onChapterChanged.emit(currentChapter, isScrub);
+            return true;
+        }
+        return false;
+    }
+
+    fun setChapters(chapters: List<IChapter>?) {
+        _chapters = chapters;
+    }
+
+    fun getCurrentChapter(pos: Long): IChapter? {
+        return _chapters?.let { chaps -> chaps.find { pos.toDouble() / 1000 > it.timeStart && pos.toDouble() / 1000 < it.timeEnd } };
+    }
+
     private fun updateNextPrevious() {
         val vidPrev = StatePlayer.instance.getPrevQueueItem(true);
         val vidNext = StatePlayer.instance.getNextQueueItem(true);
@@ -225,6 +260,7 @@ class CastView : ConstraintLayout {
 
     @OptIn(UnstableApi::class)
     fun setTime(ms: Long) {
+        updateCurrentChapter(ms);
         _textPosition.text = ms.toHumanTime(true);
         _timeBar.setPosition(ms / 1000);
         StatePlayer.instance.updateMediaSessionPlaybackState(getPlaybackStateCompat(), ms);

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

@@ -0,0 +1,122 @@
+package com.futo.platformplayer.views.overlays
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.graphics.Color
+import android.graphics.drawable.shapes.Shape
+import android.util.AttributeSet
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.ImageView
+import android.widget.LinearLayout
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.net.toFile
+import androidx.core.net.toUri
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.bumptech.glide.Glide
+import com.futo.platformplayer.PresetImages
+import com.futo.platformplayer.R
+import com.futo.platformplayer.UIDialogs
+import com.futo.platformplayer.activities.IWithResultLauncher
+import com.futo.platformplayer.activities.MainActivity
+import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
+import com.futo.platformplayer.constructs.Event0
+import com.futo.platformplayer.constructs.Event1
+import com.futo.platformplayer.dp
+import com.futo.platformplayer.models.ImageVariable
+import com.futo.platformplayer.states.StateApp
+import com.futo.platformplayer.states.StateSubscriptions
+import com.futo.platformplayer.views.AnyAdapterView
+import com.futo.platformplayer.views.AnyAdapterView.Companion.asAny
+import com.futo.platformplayer.views.adapters.AnyAdapter
+import com.futo.platformplayer.views.adapters.viewholders.CreatorBarViewHolder
+import com.futo.platformplayer.views.adapters.viewholders.SelectableCreatorBarViewHolder
+import com.futo.platformplayer.views.buttons.BigButton
+import com.github.dhaval2404.imagepicker.ImagePicker
+import com.google.android.flexbox.FlexboxLayout
+import com.google.android.material.imageview.ShapeableImageView
+import com.google.android.material.shape.CornerFamily
+import com.google.android.material.shape.ShapeAppearanceModel
+import java.io.File
+
+class CreatorSelectOverlay: ConstraintLayout {
+    private val _buttonSelect: Button;
+    private val _topbar: OverlayTopbar;
+    private val _recyclerCreators: AnyAdapterView<SelectableCreatorBarViewHolder.Selectable, SelectableCreatorBarViewHolder>;
+
+    private val _creators: ArrayList<SelectableCreatorBarViewHolder.Selectable> = arrayListOf();
+
+    private var _selected: MutableList<String> = mutableListOf();
+
+    val onSelected = Event1<List<String>>();
+    val onClose = Event0();
+
+    constructor(context: Context, hideSubscriptions: List<String>? = null): super(context) {
+        val subs = StateSubscriptions.instance.getSubscriptions();
+        if(hideSubscriptions != null) {
+            _creators.addAll(subs
+                .filter { !hideSubscriptions.contains(it.channel.url) }
+                .map { SelectableCreatorBarViewHolder.Selectable(it.channel, false) });
+        }
+        else
+            _creators.addAll(subs
+                .map { SelectableCreatorBarViewHolder.Selectable(it.channel, false) });
+        _recyclerCreators.notifyContentChanged();
+    }
+    constructor(context: Context, attrs: AttributeSet?): super(context, attrs) { }
+    init {
+        inflate(context, R.layout.overlay_creator_select, this);
+        _topbar = findViewById(R.id.topbar);
+        _buttonSelect = findViewById(R.id.button_select);
+        val dp6 = 6.dp(resources);
+        _recyclerCreators = findViewById<RecyclerView>(R.id.recycler_creators).asAny(_creators, RecyclerView.HORIZONTAL) { creatorView ->
+            creatorView.itemView.setPadding(0, dp6, 0, dp6);
+            creatorView.onClick.subscribe {
+                if(it.channel.thumbnail == null) {
+                    UIDialogs.toast(context, "No thumbnail found");
+                    return@subscribe;
+                }
+                if(_selected.contains(it.channel.url))
+                    _selected.remove(it.channel.url);
+                else
+                    _selected.add(it.channel.url);
+                updateSelected();
+            };
+        };
+        _recyclerCreators.view.layoutManager = GridLayoutManager(context, 5).apply {
+            this.orientation = LinearLayoutManager.VERTICAL;
+        };
+        _buttonSelect.setOnClickListener {
+            _selected?.let {
+                select();
+            }
+        };
+        _topbar.onClose.subscribe {
+            onClose.emit();
+        }
+        updateSelected();
+    }
+
+    fun updateSelected() {
+        _creators.forEach { p -> p.active = _selected.contains(p.channel.url) };
+        _recyclerCreators.notifyContentChanged();
+
+        if(_selected.isNotEmpty())
+            _buttonSelect.alpha = 1f;
+        else
+            _buttonSelect.alpha = 0.5f;
+    }
+
+
+    fun select() {
+        if(_creators.isEmpty())
+            return;
+        onSelected.emit(_selected.toList());
+        onClose.emit();
+    }
+}

app/src/main/java/com/futo/platformplayer/views/video/FutoVideoPlayer.kt

@@ -458,7 +458,8 @@ class FutoVideoPlayer : FutoVideoPlayerBase {
         val currentChapter = getCurrentChapter(chaptPos);
         if(_currentChapter != currentChapter) {
             _currentChapter = currentChapter;
-            runBlocking(Dispatchers.Main) {
+
+            StateApp.instance.scopeOrNull?.launch(Dispatchers.Main) {
                 if (currentChapter != null) {
                     _control_chapter.text = " • " + currentChapter.name;
                     _control_chapter_fullscreen.text = " • " + currentChapter.name;

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

@@ -8,9 +8,16 @@
     android:orientation="vertical"
     android:animateLayoutChanges="true">
     <LinearLayout
+        android:id="@+id/container_top"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:orientation="vertical">
+        <com.futo.platformplayer.views.overlays.OverlayTopbar
+            android:id="@+id/topbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/black"
+            app:title="Group" />
 
         <FrameLayout
             android:layout_width="match_parent"
@@ -137,99 +144,63 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
-        <ScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:paddingStart="0dp"
-                android:paddingEnd="0dp">
-                <LinearLayout
-                    android:id="@+id/container_enabled"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:layout_marginTop="10dp"
-                    android:layout_marginBottom="10dp">
+        <!--
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="16dp"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:textColor="@color/white"
+            android:fontFamily="@font/inter_light"
+            android:text="@string/enabled" />
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textSize="16dp"
-                        android:layout_marginLeft="20dp"
-                        android:layout_marginRight="20dp"
-                        android:textColor="@color/white"
-                        android:fontFamily="@font/inter_light"
-                        android:text="@string/enabled" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textSize="12dp"
-                        android:layout_marginLeft="20dp"
-                        android:layout_marginRight="20dp"
-                        android:textColor="@color/gray_ac"
-                        android:fontFamily="@font/inter_extra_light"
-                        android:text="@string/these_creators_in_group" />
-
-                    <androidx.recyclerview.widget.RecyclerView
-                        android:id="@+id/recycler_creators_enabled"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="10dp"
-                        android:layout_marginLeft="5dp"
-                        android:layout_marginRight="5dp"
-                        android:paddingTop="10dp"
-                        android:paddingBottom="10dp" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/container_disabled"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:layout_marginTop="10dp">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textSize="16dp"
-                        android:layout_marginLeft="20dp"
-                        android:layout_marginRight="20dp"
-                        android:textColor="@color/white"
-                        android:fontFamily="@font/inter_light"
-                        android:text="@string/disabled" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textSize="12dp"
-                        android:layout_marginLeft="20dp"
-                        android:layout_marginRight="20dp"
-                        android:textColor="@color/gray_ac"
-                        android:fontFamily="@font/inter_extra_light"
-                        android:text="@string/these_creators_not_in_group" />
-
-                    <androidx.recyclerview.widget.RecyclerView
-                        android:id="@+id/recycler_creators_disabled"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal"
-                        android:layout_marginTop="10dp"
-                        android:paddingTop="10dp"
-                        android:paddingBottom="10dp" />
-                </LinearLayout>
-
-            </LinearLayout>
-        </ScrollView>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="12dp"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:textColor="@color/gray_ac"
+            android:fontFamily="@font/inter_extra_light"
+            android:text="@string/these_creators_in_group" /> -->
     </LinearLayout>
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/container_top"
+
+        android:orientation="vertical">
+    </LinearLayout>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler_creators_enabled"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintTop_toBottomOf="@id/container_top"
+        app:layout_constraintBottom_toTopOf="@id/button_creator_add"
+        android:layout_marginTop="10dp"
+        android:layout_marginLeft="5dp"
+        android:layout_marginRight="5dp"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp" />
+
+    <Button
+        android:id="@+id/button_creator_add"
+        android:layout_width="match_parent"
+        android:background="@drawable/background_button_primary"
+        android:layout_height="50dp"
+        android:layout_margin="10dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:text="Add Creator" />
+
     <FrameLayout
         android:id="@+id/overlay"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:elevation="10dp"
         android:visibility="gone" />
 
+
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:background="@color/black"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <com.futo.platformplayer.views.overlays.OverlayTopbar
+        android:id="@+id/topbar"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        app:title="Select creators"
+        app:metadata=""
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler_creators"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintTop_toBottomOf="@id/topbar"
+        app:layout_constraintBottom_toTopOf="@id/container_select"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent">
+    </androidx.recyclerview.widget.RecyclerView>
+
+    <LinearLayout
+        android:id="@+id/container_select"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent">
+        <Button
+            android:id="@+id/button_select"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/colorPrimary"
+            android:text="Select" />
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -127,7 +127,8 @@
             android:id="@+id/button_select"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/colorPrimary"
+            android:layout_margin="10dp"
+            android:background="@drawable/background_button_primary"
             android:text="Select" />
     </LinearLayout>