Temp remove niconico

Video Cookie Support & Static Request Modifiers

See merge request videostreaming/grayjay!11

app/build.gradle

@@ -1,10 +1,11 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
-    id 'org.jetbrains.kotlin.plugin.serialization' version '1.6.10'
+    id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.21'
     id 'org.ajoberstar.grgit' version '1.7.2'
     id 'com.google.protobuf'
     id 'kotlin-parcelize'
+    id 'com.google.devtools.ksp'
 }
 
 ext {
@@ -23,7 +24,7 @@ if (keystorePropertiesFile.exists()) {
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.22.3'
+        artifact = 'com.google.protobuf:protoc:3.25.1'
     }
     generateProtoTasks {
         all().each { task ->
@@ -38,7 +39,7 @@ protobuf {
 
 android {
     namespace 'com.futo.platformplayer'
-    compileSdk 33
+    compileSdk 34
     flavorDimensions "buildType"
     productFlavors {
         stable {
@@ -96,11 +97,15 @@ android {
 
     defaultConfig {
         minSdk 28
-        targetSdk 33
+        targetSdk 34
         versionCode gitVersionCode
         versionName gitVersionName
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+        ksp {
+            arg("room.schemaLocation", "$projectDir/schemas")
+        }
     }
 
     signingConfigs {
@@ -136,43 +141,47 @@ android {
             universalApk true
         }
     }
+    buildFeatures {
+        buildConfig true
+    }
 }
 
 dependencies {
 
     //Core
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'com.google.android.material:material:1.5.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.10.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 
     //Images
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.15.1'
-    implementation 'com.github.bumptech.glide:glide:4.15.1'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.16.0'
+    implementation 'com.github.bumptech.glide:glide:4.16.0'
 
     //Async
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.2"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"
 
     //HTTP
-    implementation "com.squareup.okhttp3:okhttp:4.10.0"
+    implementation "com.squareup.okhttp3:okhttp:4.11.0"
 
     //JSON
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1" //Used for structured json
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2" //Used for structured json
     implementation 'com.google.code.gson:gson:2.10.1' //Used for complex/anonymous cases like during development conversions (eg. V8RemoteObject)
 
     //JS
     implementation("com.caoccao.javet:javet-android:2.2.1")
 
     //Exoplayer
-    implementation 'com.google.android.exoplayer:exoplayer-core:2.18.7'
-    implementation 'com.google.android.exoplayer:exoplayer-dash:2.18.7'
-    implementation 'com.google.android.exoplayer:exoplayer-ui:2.18.7'
-    implementation 'com.google.android.exoplayer:exoplayer-hls:2.18.7'
-    implementation 'com.google.android.exoplayer:exoplayer-rtsp:2.18.7'
-    implementation 'com.google.android.exoplayer:exoplayer-smoothstreaming:2.18.7'
-    implementation 'com.google.android.exoplayer:exoplayer-transformer:2.18.7'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.5.3'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.5.3'
+    implementation 'androidx.media3:media3-exoplayer:1.2.0'
+    implementation 'androidx.media3:media3-exoplayer-dash:1.2.0'
+    implementation 'androidx.media3:media3-ui:1.2.0'
+    implementation 'androidx.media3:media3-exoplayer-hls:1.2.0'
+    implementation 'androidx.media3:media3-exoplayer-rtsp:1.2.0'
+    implementation 'androidx.media3:media3-exoplayer-smoothstreaming:1.2.0'
+    implementation 'androidx.media3:media3-transformer:1.2.0'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.7.5'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.7.5'
+    implementation 'androidx.media:media:1.7.0'
 
     //Other
     implementation 'org.jmdns:jmdns:3.5.1'
@@ -180,28 +189,34 @@ dependencies {
     implementation 'com.google.android.flexbox:flexbox:3.0.0'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'com.arthenica:ffmpeg-kit-full:5.1'
-    implementation 'org.jetbrains.kotlin:kotlin-reflect:1.7.20'
+    implementation 'org.jetbrains.kotlin:kotlin-reflect:1.9.0'
     implementation 'com.github.dhaval2404:imagepicker:2.1'
     implementation 'com.google.zxing:core:3.4.1'
-    implementation 'com.journeyapps:zxing-android-embedded:4.2.0'
+    implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
     implementation 'com.caverock:androidsvg-aar:1.4'
 
     //Protobuf
-    implementation 'com.google.protobuf:protobuf-javalite:3.22.3'
+    implementation 'com.google.protobuf:protobuf-javalite:3.25.1'
 
     implementation 'com.polycentric.core:app:1.0'
     implementation 'com.futo.futopay:app:1.0'
-    implementation 'androidx.work:work-runtime-ktx:2.8.1'
+    implementation 'androidx.work:work-runtime-ktx:2.9.0'
     implementation 'androidx.concurrent:concurrent-futures-ktx:1.1.0'
 
+    //Database
+    implementation("androidx.room:room-runtime:2.6.1")
+    annotationProcessor("androidx.room:room-compiler:2.6.1")
+    ksp("androidx.room:room-compiler:2.6.1")
+    implementation("androidx.room:room-ktx:2.6.1")
+
     //Payment
-    implementation 'com.stripe:stripe-android:20.28.3'
+    implementation 'com.stripe:stripe-android:20.35.1'
 
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.2'
-    testImplementation "org.jetbrains.kotlin:kotlin-test:1.8.20"
+    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
+    testImplementation "org.jetbrains.kotlin:kotlin-test:1.8.22"
     testImplementation "org.xmlunit:xmlunit-core:2.9.1"
     testImplementation "org.mockito:mockito-core:5.4.0"
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-}
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+}

app/schemas/com.futo.platformplayer.stores.db.types.DBHistory.DB/3.json

@@ -0,0 +1,94 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 3,
+    "identityHash": "ffba56c2f572c25080ce8596e8bb8945",
+    "entities": [
+      {
+        "tableName": "history",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `url` TEXT NOT NULL, `position` INTEGER NOT NULL, `datetime` INTEGER NOT NULL, `name` TEXT NOT NULL, `serialized` BLOB)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datetime",
+            "columnName": "datetime",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "serialized",
+            "columnName": "serialized",
+            "affinity": "BLOB",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_history_url",
+            "unique": false,
+            "columnNames": [
+              "url"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_history_url` ON `${TABLE_NAME}` (`url`)"
+          },
+          {
+            "name": "index_history_name",
+            "unique": false,
+            "columnNames": [
+              "name"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_history_name` ON `${TABLE_NAME}` (`name`)"
+          },
+          {
+            "name": "index_history_datetime",
+            "unique": false,
+            "columnNames": [
+              "datetime"
+            ],
+            "orders": [
+              "DESC"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_history_datetime` ON `${TABLE_NAME}` (`datetime` DESC)"
+          }
+        ],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'ffba56c2f572c25080ce8596e8bb8945')"
+    ]
+  }
+}

app/schemas/com.futo.platformplayer.stores.db.types.DBSubscriptionCache.DB/5.json

@@ -0,0 +1,88 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 5,
+    "identityHash": "eb813d54b9c44d29f1d7bb198a16d4d1",
+    "entities": [
+      {
+        "tableName": "subscription_cache",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `url` TEXT, `channelUrl` TEXT, `datetime` INTEGER, `serialized` BLOB)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "channelUrl",
+            "columnName": "channelUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "datetime",
+            "columnName": "datetime",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "serialized",
+            "columnName": "serialized",
+            "affinity": "BLOB",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_subscription_cache_url",
+            "unique": false,
+            "columnNames": [
+              "url"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_subscription_cache_url` ON `${TABLE_NAME}` (`url`)"
+          },
+          {
+            "name": "index_subscription_cache_channelUrl",
+            "unique": false,
+            "columnNames": [
+              "channelUrl"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_subscription_cache_channelUrl` ON `${TABLE_NAME}` (`channelUrl`)"
+          },
+          {
+            "name": "index_subscription_cache_datetime",
+            "unique": false,
+            "columnNames": [
+              "datetime"
+            ],
+            "orders": [
+              "DESC"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_subscription_cache_datetime` ON `${TABLE_NAME}` (`datetime` DESC)"
+          }
+        ],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'eb813d54b9c44d29f1d7bb198a16d4d1')"
+    ]
+  }
+}

app/schemas/com.futo.platformplayer.testing.DBTOs.DB/3.json

@@ -0,0 +1,52 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 3,
+    "identityHash": "6e3b2d286325c4ea8a7a4c94c290daec",
+    "entities": [
+      {
+        "tableName": "testing",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`someString` TEXT NOT NULL, `someNum` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT, `serialized` BLOB)",
+        "fields": [
+          {
+            "fieldPath": "someString",
+            "columnName": "someString",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "someNum",
+            "columnName": "someNum",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "serialized",
+            "columnName": "serialized",
+            "affinity": "BLOB",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '6e3b2d286325c4ea8a7a4c94c290daec')"
+    ]
+  }
+}

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

@@ -0,0 +1,368 @@
+package com.futo.platformplayer
+
+import androidx.test.platform.app.InstrumentationRegistry
+import com.futo.platformplayer.api.media.models.contents.IPlatformContent
+import com.futo.platformplayer.stores.db.ManagedDBDescriptor
+import com.futo.platformplayer.stores.db.ManagedDBStore
+import com.futo.platformplayer.testing.DBTOs
+import org.junit.Assert
+import org.junit.Test
+import java.util.UUID
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.ConcurrentMap
+import kotlin.reflect.KClass
+
+class ManagedDBStoreTests {
+    val context = InstrumentationRegistry.getInstrumentation().targetContext;
+
+    @Test
+    fun startup() {
+        val store = ManagedDBStore.create("test", Descriptor())
+            .load(context, true);
+        store.deleteAll();
+
+        store.shutdown();
+    }
+
+    @Test
+    fun insert() {
+        val store = ManagedDBStore.create("test", Descriptor())
+            .load(context, true);
+        store.deleteAll();
+
+        val testObj = DBTOs.TestObject();
+        createAndAssert(store, testObj);
+
+        store.shutdown();
+    }
+    @Test
+    fun update() {
+        val store = ManagedDBStore.create("test", Descriptor())
+            .load(context, true);
+        store.deleteAll();
+
+        val testObj = DBTOs.TestObject();
+        val obj = createAndAssert(store, testObj);
+
+        testObj.someStr = "Testing";
+        store.update(obj.id!!, testObj);
+        val obj2 = store.get(obj.id!!);
+        assertIndexEquals(obj2, testObj);
+
+        store.shutdown();
+    }
+    @Test
+    fun delete() {
+        val store = ManagedDBStore.create("test", Descriptor())
+            .load(context, true);
+        store.deleteAll();
+
+        val testObj = DBTOs.TestObject();
+        val obj = createAndAssert(store, testObj);
+        store.delete(obj.id!!);
+
+        Assert.assertEquals(store.count(), 0);
+        Assert.assertNull(store.getOrNull(obj.id!!));
+
+        store.shutdown();
+    }
+
+    @Test
+    fun withIndex() {
+        val index = ConcurrentHashMap<Any, DBTOs.TestIndex>();
+        val store = ManagedDBStore.create("test", Descriptor())
+            .withIndex({it.someString}, index, true)
+            .load(context, true);
+        store.deleteAll();
+
+        val testObj1 = DBTOs.TestObject();
+        val testObj2 = DBTOs.TestObject();
+        val testObj3 = DBTOs.TestObject();
+        val obj1 = createAndAssert(store, testObj1);
+        val obj2 = createAndAssert(store, testObj2);
+        val obj3 = createAndAssert(store, testObj3);
+        Assert.assertEquals(store.count(), 3);
+
+        Assert.assertTrue(index.containsKey(testObj1.someStr));
+        Assert.assertTrue(index.containsKey(testObj2.someStr));
+        Assert.assertTrue(index.containsKey(testObj3.someStr));
+        Assert.assertEquals(index.size, 3);
+
+        val oldStr = testObj1.someStr;
+        testObj1.someStr = UUID.randomUUID().toString();
+        store.update(obj1.id!!, testObj1);
+
+        Assert.assertEquals(index.size, 3);
+        Assert.assertFalse(index.containsKey(oldStr));
+        Assert.assertTrue(index.containsKey(testObj1.someStr));
+        Assert.assertTrue(index.containsKey(testObj2.someStr));
+        Assert.assertTrue(index.containsKey(testObj3.someStr));
+
+        store.delete(obj2.id!!);
+        Assert.assertEquals(index.size, 2);
+
+        Assert.assertFalse(index.containsKey(oldStr));
+        Assert.assertTrue(index.containsKey(testObj1.someStr));
+        Assert.assertFalse(index.containsKey(testObj2.someStr));
+        Assert.assertTrue(index.containsKey(testObj3.someStr));
+        store.shutdown();
+    }
+
+    @Test
+    fun withUnique() {
+        val index = ConcurrentHashMap<Any, DBTOs.TestIndex>();
+        val store = ManagedDBStore.create("test", Descriptor())
+            .withIndex({it.someString}, index, false, true)
+            .load(context, true);
+        store.deleteAll();
+
+        val testObj1 = DBTOs.TestObject();
+        val testObj2 = DBTOs.TestObject();
+        val testObj3 = DBTOs.TestObject();
+        val obj1 = createAndAssert(store, testObj1);
+        val obj2 = createAndAssert(store, testObj2);
+
+        testObj3.someStr = testObj2.someStr;
+        Assert.assertEquals(store.insert(testObj3), obj2.id!!);
+        Assert.assertEquals(store.count(), 2);
+
+        store.shutdown();
+    }
+    @Test
+    fun getPage() {
+        val store = ManagedDBStore.create("test", Descriptor())
+            .load(context, true);
+        store.deleteAll();
+
+        val testObjs = createSequence(store, 25);
+
+        val page1 = store.getPage(0, 10);
+        val page2 = store.getPage(1, 10);
+        val page3 = store.getPage(2, 10);
+        Assert.assertEquals(10, page1.size);
+        Assert.assertEquals(10, page2.size);
+        Assert.assertEquals(5, page3.size);
+
+        store.shutdown();
+    }
+
+
+    @Test
+    fun query() {
+        val store = ManagedDBStore.create("test", Descriptor())
+            .load(context, true);
+        store.deleteAll();
+
+        val testStr = UUID.randomUUID().toString();
+
+        val testObj1 = DBTOs.TestObject();
+        val testObj2 = DBTOs.TestObject();
+        val testObj3 = DBTOs.TestObject();
+        val testObj4 = DBTOs.TestObject();
+        testObj3.someStr = testStr;
+        testObj4.someStr = testStr;
+        val obj1 = createAndAssert(store, testObj1);
+        val obj2 = createAndAssert(store, testObj2);
+        val obj3 = createAndAssert(store, testObj3);
+        val obj4 = createAndAssert(store, testObj4);
+
+        val results = store.query(DBTOs.TestIndex::someString, testStr);
+
+        Assert.assertEquals(2, results.size);
+        for(result in results) {
+            if(result.someNum == obj3.someNum)
+                assertIndexEquals(obj3, result);
+            else
+                assertIndexEquals(obj4, result);
+        }
+        store.shutdown();
+    }
+    @Test
+    fun queryPage() {
+        val index = ConcurrentHashMap<Any, DBTOs.TestIndex>();
+        val store = ManagedDBStore.create("test", Descriptor())
+            .withIndex({ it.someNum },  index)
+            .load(context, true);
+        store.deleteAll();
+
+        val testStr = UUID.randomUUID().toString();
+
+        val testResults = createSequence(store, 40, { i, testObject ->
+            if(i % 2 == 0)
+                testObject.someStr = testStr;
+        });
+        val page1 = store.queryPage(DBTOs.TestIndex::someString, testStr, 0,10);
+        val page2 = store.queryPage(DBTOs.TestIndex::someString, testStr, 1,10);
+        val page3 = store.queryPage(DBTOs.TestIndex::someString, testStr, 2,10);
+
+        Assert.assertEquals(10, page1.size);
+        Assert.assertEquals(10, page2.size);
+        Assert.assertEquals(0, page3.size);
+
+
+        store.shutdown();
+    }
+    @Test
+    fun queryPager() {
+        val testStr = UUID.randomUUID().toString();
+        testQuery(100, { i, testObject ->
+            if(i % 2 == 0)
+                testObject.someStr = testStr;
+        }) {
+            val pager = it.queryPager(DBTOs.TestIndex::someString, testStr, 10);
+
+            val items = pager.getResults().toMutableList();
+            while(pager.hasMorePages()) {
+                pager.nextPage();
+                items.addAll(pager.getResults());
+            }
+            Assert.assertEquals(50, items.size);
+            for(i in 0 until 50) {
+                val k = i * 2;
+                Assert.assertEquals(k, items[i].someNum);
+            }
+        }
+    }
+
+
+
+    @Test
+    fun queryLike() {
+        val testStr = UUID.randomUUID().toString();
+        val testStrLike = testStr.substring(0, 8) + "Testing" + testStr.substring(8, testStr.length);
+        testQuery(100, { i, testObject ->
+            if(i % 2 == 0)
+                testObject.someStr = testStrLike;
+        }) {
+            val results = it.queryLike(DBTOs.TestIndex::someString, "%Testing%");
+
+            Assert.assertEquals(50, results.size);
+        }
+    }
+    @Test
+    fun queryLikePager() {
+        val testStr = UUID.randomUUID().toString();
+        val testStrLike = testStr.substring(0, 8) + "Testing" + testStr.substring(8, testStr.length);
+        testQuery(100, { i, testObject ->
+            if(i % 2 == 0)
+                testObject.someStr = testStrLike;
+
+        }) {
+            val pager = it.queryLikePager(DBTOs.TestIndex::someString, "%Testing%", 10);
+            val items = pager.getResults().toMutableList();
+            while(pager.hasMorePages()) {
+                pager.nextPage();
+                items.addAll(pager.getResults());
+            }
+            Assert.assertEquals(50, items.size);
+            for(i in 0 until 50) {
+                val k = i * 2;
+                Assert.assertEquals(k, items[i].someNum);
+            }
+        }
+    }
+
+    @Test
+    fun queryGreater() {
+        testQuery(100, { i, testObject ->
+            testObject.someNum = i;
+        }) {
+            val results = it.queryGreater(DBTOs.TestIndex::someNum, 51);
+            Assert.assertEquals(48, results.size);
+        }
+    }
+    @Test
+    fun querySmaller() {
+        testQuery(100, { i, testObject ->
+            testObject.someNum = i;
+        }) {
+            val results = it.querySmaller(DBTOs.TestIndex::someNum, 30);
+            Assert.assertEquals(30, results.size);
+        }
+    }
+    @Test
+    fun queryBetween() {
+        testQuery(100, { i, testObject ->
+            testObject.someNum = i;
+        }) {
+            val results = it.queryBetween(DBTOs.TestIndex::someNum, 30, 65);
+            Assert.assertEquals(34, results.size);
+        }
+    }
+    @Test
+    fun queryIn() {
+        val ids = mutableListOf<String>()
+        testQuery(1100, { i, testObject ->
+            testObject.someNum = i;
+            ids.add(testObject.someStr);
+        }) {
+            val pager = it.queryInPager(DBTOs.TestIndex::someString, ids.take(1000), 65);
+            val list = mutableListOf<Any>();
+            list.addAll(pager.getResults());
+            while(pager.hasMorePages())
+            {
+                pager.nextPage();
+                list.addAll(pager.getResults());
+            }
+            Assert.assertEquals(1000, list.size);
+        }
+    }
+
+
+    private fun testQuery(items: Int, modifier: (Int, DBTOs.TestObject)->Unit, testing: (ManagedDBStore<DBTOs.TestIndex, DBTOs.TestObject, DBTOs.DB, DBTOs.DBDAO>)->Unit) {
+        val store = ManagedDBStore.create("test", Descriptor())
+            .load(context, true);
+        store.deleteAll();
+        createSequence(store, items, modifier);
+        try {
+            testing(store);
+        }
+        finally {
+            store.shutdown();
+        }
+    }
+
+
+    private fun createSequence(store: ManagedDBStore<DBTOs.TestIndex, DBTOs.TestObject, DBTOs.DB, DBTOs.DBDAO>, count: Int, modifier: ((Int, DBTOs.TestObject)->Unit)? = null): List<DBTOs.TestIndex> {
+        val list = mutableListOf<DBTOs.TestIndex>();
+        for(i in 0 until count) {
+            val obj = DBTOs.TestObject();
+            obj.someNum = i;
+            modifier?.invoke(i, obj);
+            list.add(createAndAssert(store, obj));
+        }
+        return list;
+    }
+
+    private fun createAndAssert(store: ManagedDBStore<DBTOs.TestIndex, DBTOs.TestObject, DBTOs.DB, DBTOs.DBDAO>, obj: DBTOs.TestObject): DBTOs.TestIndex {
+        val id = store.insert(obj);
+        Assert.assertTrue(id > 0);
+
+        val dbObj = store.get(id);
+        assertIndexEquals(dbObj, obj);
+        return dbObj;
+    }
+
+    private fun assertObjectEquals(obj1: DBTOs.TestObject, obj2: DBTOs.TestObject) {
+        Assert.assertEquals(obj1.someStr, obj2.someStr);
+        Assert.assertEquals(obj1.someNum, obj2.someNum);
+    }
+    private fun assertIndexEquals(obj1: DBTOs.TestIndex, obj2: DBTOs.TestObject) {
+        Assert.assertEquals(obj1.someString, obj2.someStr);
+        Assert.assertEquals(obj1.someNum, obj2.someNum);
+        assertObjectEquals(obj1.obj, obj2);
+    }
+    private fun assertIndexEquals(obj1: DBTOs.TestIndex, obj2: DBTOs.TestIndex) {
+        Assert.assertEquals(obj1.someString, obj2.someString);
+        Assert.assertEquals(obj1.someNum, obj2.someNum);
+        assertIndexEquals(obj1, obj2.obj);
+    }
+
+
+    class Descriptor: ManagedDBDescriptor<DBTOs.TestObject, DBTOs.TestIndex, DBTOs.DB, DBTOs.DBDAO>() {
+        override val table_name: String = "testing";
+        override fun indexClass(): KClass<DBTOs.TestIndex> = DBTOs.TestIndex::class;
+        override fun dbClass(): KClass<DBTOs.DB> = DBTOs.DB::class;
+        override fun create(obj: DBTOs.TestObject): DBTOs.TestIndex = DBTOs.TestIndex(obj);
+    }
+}

app/src/main/AndroidManifest.xml

@@ -7,8 +7,12 @@
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="32" tools:ignore="ScopedStorage" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
+    <uses-permission android:name="com.android.alarm.permission.SET_ALARM"/>
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"/>
 
     <application
         android:allowBackup="true"
@@ -33,12 +37,15 @@
             android:enabled="true"
             android:foregroundServiceType="mediaPlayback" />
         <service android:name=".services.DownloadService"
-            android:enabled="true" />
+            android:enabled="true"
+            android:foregroundServiceType="dataSync" />
         <service android:name=".services.ExportingService"
-            android:enabled="true" />
+            android:enabled="true"
+            android:foregroundServiceType="dataSync" />
 
         <receiver android:name=".receivers.MediaControlReceiver" />
         <receiver android:name=".receivers.AudioNoisyReceiver" />
+        <receiver android:name=".receivers.PlannedNotificationReceiver" />
 
         <activity
             android:name=".activities.MainActivity"
@@ -58,6 +65,14 @@
 
                 <data android:scheme="grayjay" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="fcast" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -207,5 +222,9 @@
             android:name=".activities.QRCaptureActivity"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.FutoVideo.NoActionBar" />
+        <activity
+            android:name=".activities.FCastGuideActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.FutoVideo.NoActionBar" />
     </application>
 </manifest>

app/src/main/assets/devportal/index.html

@@ -540,6 +540,8 @@
 	  <script>
 	  	IS_TESTING = true;
 	  	let lastScriptTag = null;
+	  	let shouldDevLog = true;
+	  	let shouldLoginCheck = true;
 		new Vue({
 		  el: '#app',
 		  data: {
@@ -603,7 +605,7 @@
 		  	};
 		  	setInterval(()=>{
 				try{
-					if(!this.Plugin.currentPlugin)
+					if(!this.Plugin.currentPlugin || !shouldDevLog)
 						return;
 
 					getDevLogs(this.Integration.lastLogIndex, (newLogs)=> {
@@ -638,7 +640,8 @@
 		  	}, 1000);
 		  	setInterval(()=>{
 		  		try{
-					this.isTestLoggedIn();
+		  			if(shouldLoginCheck)
+						this.isTestLoggedIn();
 				}catch(ex){}
 		  	}, 2500);
 		  },

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

@@ -10,7 +10,8 @@ let Type = {
         Videos: "VIDEOS",
         Streams: "STREAMS",
         Mixed: "MIXED",
-        Live: "LIVE"
+        Live: "LIVE",
+        Subscriptions: "SUBSCRIPTIONS"
     },
     Order: {
         Chronological: "CHRONOLOGICAL"
@@ -42,18 +43,19 @@ let Type = {
 
 let Language = {
     UNKNOWN: "Unknown",
-    ARABIC: "Arabic",
-    SPANISH: "Spanish",
-    FRENCH: "French",
-    HINDI: "Hindi",
-    INDONESIAN: "Indonesian",
-    KOREAN: "Korean",
-    PORTBRAZIL: "Portuguese Brazilian",
-    RUSSIAN: "Russian",
-    THAI: "Thai",
-    TURKISH: "Turkish",
-    VIETNAMESE: "Vietnamese",
-    ENGLISH: "English"
+    ARABIC: "ar",
+    SPANISH: "es",
+    FRENCH: "fr",
+    HINDI: "hi",
+    INDONESIAN: "id",
+    KOREAN: "ko",
+    PORTUGUESE: "pt",
+    PORTBRAZIL: "pt",
+    RUSSIAN: "ru",
+    THAI: "th",
+    TURKISH: "tr",
+    VIETNAMESE: "vi",
+    ENGLISH: "en"
 }
 
 class ScriptException extends Error {
@@ -70,6 +72,11 @@ class ScriptException extends Error {
         }
     }
 }
+class ScriptLoginRequiredException extends ScriptException {
+    constructor(msg) {
+        super("ScriptLoginRequiredException", msg);
+    }
+}
 class CaptchaRequiredException extends Error {
     constructor(url, body) {
         super(JSON.stringify({ 'plugin_type': 'CaptchaRequiredException', url, body }));
@@ -210,6 +217,16 @@ class PlatformNestedMediaContent extends PlatformContent {
         this.contentThumbnails = obj.contentThumbnails ?? new Thumbnails();
     }
 }
+class PlatformLockedContent extends PlatformContent {
+    constructor(obj) {
+        super(obj, 70);
+        obj = obj ?? {};
+        this.contentName = obj.contentName;
+        this.contentThumbnails = obj.contentThumbnails ?? new Thumbnails();
+        this.unlockUrl = obj.unlockUrl ?? "";
+        this.lockDescription = obj.lockDescription;
+    }
+}
 class PlatformVideo extends PlatformContent {
     constructor(obj) {
         super(obj, 1);

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

@@ -1,15 +1,28 @@
-package com.futo.platformplayer
-
+import androidx.annotation.OptIn
+import androidx.media3.common.util.UnstableApi
+import androidx.media3.datasource.DefaultHttpDataSource
+import androidx.media3.datasource.HttpDataSource
 import com.futo.platformplayer.api.media.models.streams.IVideoSourceDescriptor
 import com.futo.platformplayer.api.media.models.streams.VideoUnMuxedSourceDescriptor
 import com.futo.platformplayer.api.media.models.streams.sources.IAudioSource
 import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
 import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
+import com.futo.platformplayer.api.media.platforms.js.models.sources.JSSource
 import com.futo.platformplayer.helpers.VideoHelper
+import com.futo.platformplayer.views.video.datasources.JSHttpDataSource
 
 fun IPlatformVideoDetails.isDownloadable(): Boolean = VideoHelper.isDownloadable(this);
 fun IVideoSource.isDownloadable(): Boolean = VideoHelper.isDownloadable(this);
 fun IAudioSource.isDownloadable(): Boolean = VideoHelper.isDownloadable(this);
 
+@UnstableApi
+fun JSSource.getHttpDataSourceFactory(): HttpDataSource.Factory {
+    val requestModifier = getRequestModifier();
+    return if (requestModifier != null) {
+        JSHttpDataSource.Factory().setRequestModifier(requestModifier);
+    } else {
+        DefaultHttpDataSource.Factory();
+    }
+}
 
 fun IVideoSourceDescriptor.hasAnySource(): Boolean = this.videoSources.any() || (this is VideoUnMuxedSourceDescriptor && this.audioSources.any());

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

@@ -13,7 +13,6 @@ import java.text.DecimalFormat
 import java.time.OffsetDateTime
 import java.time.temporal.ChronoUnit
 import kotlin.math.abs
-import kotlin.time.toDuration
 
 
 //Long
@@ -228,6 +227,14 @@ fun String.fixHtmlWhitespace(): Spanned {
     return Html.fromHtml(replace("\n", "<br />"), HtmlCompat.FROM_HTML_MODE_LEGACY);
 }
 
+fun Long.formatDuration(): String {
+    val hours = this / 3600000
+    val minutes = (this % 3600000) / 60000
+    val seconds = (this % 60000) / 1000
+
+    return String.format("%02d:%02d:%02d", hours, minutes, seconds)
+}
+
 fun String.fixHtmlLinks(): Spanned {
     //TODO: Properly fix whitespace handling.
     val doc = Jsoup.parse(replace("\n", "<br />"));

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

@@ -1,11 +1,15 @@
 package com.futo.platformplayer
 
 import com.google.common.base.CharMatcher
+import java.io.ByteArrayOutputStream
+import java.io.IOException
+import java.io.InputStream
 import java.net.Inet4Address
 import java.net.InetAddress
 import java.net.InetSocketAddress
 import java.net.Socket
 import java.nio.ByteBuffer
+import java.nio.charset.Charset
 
 
 private const val IPV4_PART_COUNT = 4;
@@ -165,7 +169,7 @@ private fun parseHextet(ipString: String, start: Int, end: Int): Short {
     var hextet = 0
     for (i in start until end) {
         hextet = hextet shl 4
-        hextet = hextet or ipString[i].digitToIntOrNull(16)!! ?: -1
+        hextet = hextet or ipString[i].digitToIntOrNull(16)!!
     }
     return hextet.toShort()
 }
@@ -273,3 +277,46 @@ fun getConnectedSocket(addresses: List<InetAddress>, port: Int): Socket? {
 
     return connectedSocket;
 }
+
+fun InputStream.readHttpHeaderBytes() : ByteArray {
+    val headerBytes = ByteArrayOutputStream()
+    var crlfCount = 0
+
+    while (crlfCount < 4) {
+        val b = read()
+        if (b == -1) {
+            throw IOException("Unexpected end of stream while reading headers")
+        }
+
+        if (b == 0x0D || b == 0x0A) { // CR or LF
+            crlfCount++
+        } else {
+            crlfCount = 0
+        }
+
+        headerBytes.write(b)
+    }
+
+    return headerBytes.toByteArray()
+}
+
+fun InputStream.readLine() : String? {
+    val line = ByteArrayOutputStream()
+    var crlfCount = 0
+
+    while (crlfCount < 2) {
+        val b = read()
+        if (b == -1) {
+            return null
+        }
+
+        if (b == 0x0D || b == 0x0A) { // CR or LF
+            crlfCount++
+        } else {
+            crlfCount = 0
+            line.write(b)
+        }
+    }
+
+    return String(line.toByteArray(), Charsets.UTF_8)
+}

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

@@ -1,6 +1,11 @@
 package com.futo.platformplayer
 
+import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.states.AnnouncementType
+import com.futo.platformplayer.states.StateAnnouncement
 import com.futo.platformplayer.states.StatePlatform
+import com.futo.platformplayer.views.adapters.CommentViewHolder
+import com.futo.polycentric.core.ProcessHandle
 import userpackage.Protocol
 import kotlin.math.abs
 import kotlin.math.min
@@ -39,4 +44,21 @@ fun Protocol.Claim.resolveChannelUrl(): String? {
 
 fun Protocol.Claim.resolveChannelUrls(): List<String> {
     return StatePlatform.instance.resolveChannelUrlsByClaimTemplates(this.claimType.toInt(), this.claimFieldsList.associate { Pair(it.key.toInt(), it.value) })
+}
+
+suspend fun ProcessHandle.fullyBackfillServersAnnounceExceptions() {
+    val exceptions = fullyBackfillServers()
+    for (pair in exceptions) {
+        val server = pair.key
+        val exception = pair.value
+
+        StateAnnouncement.instance.registerAnnouncement(
+            "backfill-failed",
+            "Backfill failed",
+            "Failed to backfill server $server. $exception",
+            AnnouncementType.SESSION_RECURRING
+        );
+
+        Logger.e("Backfill", "Failed to backfill server $server.", exception)
+    }
 }

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

@@ -1,5 +1,10 @@
 package com.futo.platformplayer
 
+import android.net.Uri
+import java.net.URI
+import java.net.URISyntaxException
+import java.net.URLEncoder
+
 //Syntax sugaring
 inline fun <reified T> Any.assume(): T?{
     if(this is T)
@@ -12,4 +17,12 @@ inline fun <reified T, R> Any.assume(cb: (T) -> R): R? {
     if(result != null)
         return cb(result);
     return null;
+}
+
+fun String?.yesNoToBoolean(): Boolean {
+    return this?.uppercase() == "YES"
+}
+
+fun Boolean?.toYesNo(): String {
+    return if (this == true) "YES" else "NO"
 }

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

@@ -27,7 +27,7 @@ fun <R> V8Value?.orDefault(default: R, handler: (V8Value)->R): R {
 inline fun <reified T> V8Value.expectOrThrow(config: IV8PluginConfig, contextName: String): T  {
     if(this !is T)
         throw ScriptImplementationException(config, "Expected ${contextName} to be of type ${T::class.simpleName}, but found ${this::class.simpleName}");
-    return this as T;
+    return this;
 }
 
 //Singles
@@ -109,11 +109,29 @@ inline fun <reified T> V8Value.expectV8Variant(config: IV8PluginConfig, contextN
             else
                 return this.expectOrThrow<V8ValueLong>(config, contextName).value.toLong() as T
         };
+        Float::class -> {
+            if(this is V8ValueDouble)
+                return this.value.toFloat() as T;
+            else if(this is V8ValueInteger)
+                return this.value.toFloat() as T;
+            else if(this is V8ValueLong)
+                return this.value.toFloat() as T;
+            else
+                return this.expectOrThrow<V8ValueDouble>(config, contextName).value.toDouble() as T
+        };
+        Double::class -> {
+            if(this is V8ValueDouble)
+                return this.value.toDouble() as T;
+            else if(this is V8ValueInteger)
+                return this.value.toDouble() as T;
+            else if(this is V8ValueLong)
+                return this.value.toDouble() as T;
+            else
+                return this.expectOrThrow<V8ValueDouble>(config, contextName).value.toDouble() as T
+        };
         V8ValueObject::class -> this.expectOrThrow<V8ValueObject>(config, contextName) as T
         V8ValueArray::class -> this.expectOrThrow<V8ValueArray>(config, contextName) as T;
         Boolean::class -> this.expectOrThrow<V8ValueBoolean>(config, contextName).value as T;
-        Float::class -> this.expectOrThrow<V8ValueDouble>(config, contextName).value.toFloat() as T;
-        Double::class -> this.expectOrThrow<V8ValueDouble>(config, contextName).value as T;
         HashMap::class -> this.expectOrThrow<V8ValueObject>(config, contextName).let { V8ObjectToHashMap(it) } as T;
         Map::class -> this.expectOrThrow<V8ValueObject>(config, contextName).let { V8ObjectToHashMap(it) } as T;
         List::class -> this.expectOrThrow<V8ValueArray>(config, contextName).let { V8ArrayToStringList(it) } as T;

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

@@ -0,0 +1,20 @@
+package com.futo.platformplayer
+
+class PresetImages {
+    companion object {
+        val images = mapOf<String, Int>(
+            Pair("xp_book", R.drawable.xp_book),
+            Pair("xp_forest", R.drawable.xp_forest),
+            Pair("xp_code", R.drawable.xp_code),
+            Pair("xp_controller", R.drawable.xp_controller),
+            Pair("xp_laptop", R.drawable.xp_laptop)
+        );
+
+        fun getPresetResIdByName(name: String): Int {
+            return images[name] ?: -1;
+        }
+        fun getPresetNameByResId(id: Int): String? {
+            return images.entries.find { it.value == id }?.key;
+        }
+    }
+}

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

@@ -6,29 +6,43 @@ import android.content.Intent
 import android.net.Uri
 import android.webkit.CookieManager
 import androidx.lifecycle.lifecycleScope
-import com.futo.platformplayer.activities.*
+import com.futo.platformplayer.activities.MainActivity
+import com.futo.platformplayer.activities.ManageTabsActivity
+import com.futo.platformplayer.activities.PolycentricHomeActivity
+import com.futo.platformplayer.activities.PolycentricProfileActivity
+import com.futo.platformplayer.activities.SettingsActivity
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.constructs.Event0
 import com.futo.platformplayer.fragment.mainactivity.bottombar.MenuBottomBarFragment
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.serializers.FlexibleBooleanSerializer
 import com.futo.platformplayer.serializers.OffsetDateTimeSerializer
-import com.futo.platformplayer.states.*
+import com.futo.platformplayer.states.StateAnnouncement
+import com.futo.platformplayer.states.StateApp
+import com.futo.platformplayer.states.StateBackup
+import com.futo.platformplayer.states.StateCache
+import com.futo.platformplayer.states.StateMeta
+import com.futo.platformplayer.states.StatePayment
+import com.futo.platformplayer.states.StatePolycentric
+import com.futo.platformplayer.states.StateUpdate
 import com.futo.platformplayer.stores.FragmentedStorage
 import com.futo.platformplayer.stores.FragmentedStorageFileJson
 import com.futo.platformplayer.views.FeedStyle
 import com.futo.platformplayer.views.fields.DropdownFieldOptionsId
-import com.futo.platformplayer.views.fields.FormField
 import com.futo.platformplayer.views.fields.FieldForm
+import com.futo.platformplayer.views.fields.FormField
 import com.futo.platformplayer.views.fields.FormFieldButton
+import com.futo.platformplayer.views.fields.FormFieldWarning
+import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuItem
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import kotlinx.serialization.*
-import kotlinx.serialization.json.*
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
 import java.io.File
 import java.time.OffsetDateTime
-import java.util.Locale
 
 @Serializable
 data class MenuBottomBarSetting(val id: Int, var enabled: Boolean);
@@ -43,25 +57,23 @@ class Settings : FragmentedStorageFileJson() {
     @Transient
     val onTabsChanged = Event0();
 
-    @FormField(
-        R.string.manage_polycentric_identity, FieldForm.BUTTON,
-        R.string.manage_your_polycentric_identity, -5
-    )
+    @FormField(R.string.manage_polycentric_identity, FieldForm.BUTTON, R.string.manage_your_polycentric_identity, -6)
     @FormFieldButton(R.drawable.ic_person)
     fun managePolycentricIdentity() {
         SettingsActivity.getActivity()?.let {
-            if (StatePolycentric.instance.processHandle != null) {
-                it.startActivity(Intent(it, PolycentricProfileActivity::class.java));
+            if (StatePolycentric.instance.enabled) {
+                if (StatePolycentric.instance.processHandle != null) {
+                    it.startActivity(Intent(it, PolycentricProfileActivity::class.java));
+                } else {
+                    it.startActivity(Intent(it, PolycentricHomeActivity::class.java));
+                }
             } else {
-                it.startActivity(Intent(it, PolycentricHomeActivity::class.java));
+                UIDialogs.toast(it, "Polycentric is disabled")
             }
         }
     }
 
-    @FormField(
-        R.string.show_faq, FieldForm.BUTTON,
-        R.string.get_answers_to_common_questions, -4
-    )
+    @FormField(R.string.show_faq, FieldForm.BUTTON, R.string.get_answers_to_common_questions, -5)
     @FormFieldButton(R.drawable.ic_quiz)
     fun openFAQ() {
         try {
@@ -71,10 +83,7 @@ class Settings : FragmentedStorageFileJson() {
             //Ignored
         }
     }
-    @FormField(
-        R.string.show_issues, FieldForm.BUTTON,
-        R.string.a_list_of_user_reported_and_self_reported_issues, -3
-    )
+    @FormField(R.string.show_issues, FieldForm.BUTTON, R.string.a_list_of_user_reported_and_self_reported_issues, -4)
     @FormFieldButton(R.drawable.ic_data_alert)
     fun openIssues() {
         try {
@@ -106,10 +115,7 @@ class Settings : FragmentedStorageFileJson() {
         }
     }*/
 
-    @FormField(
-        R.string.manage_tabs, FieldForm.BUTTON,
-        R.string.change_tabs_visible_on_the_home_screen, -2
-    )
+    @FormField(R.string.manage_tabs, FieldForm.BUTTON, R.string.change_tabs_visible_on_the_home_screen, -3)
     @FormFieldButton(R.drawable.ic_tabs)
     fun manageTabs() {
         try {
@@ -123,6 +129,25 @@ class Settings : FragmentedStorageFileJson() {
 
 
 
+    @FormField(R.string.import_data, FieldForm.BUTTON, R.string.import_data_description, -2)
+    @FormFieldButton(R.drawable.ic_move_up)
+    fun import() {
+        val act = SettingsActivity.getActivity() ?: return;
+        val intent = MainActivity.getImportOptionsIntent(act);
+        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK;
+        act.startActivity(intent);
+    }
+
+    @FormField(R.string.link_handling, FieldForm.BUTTON, R.string.allow_grayjay_to_handle_links, -1)
+    @FormFieldButton(R.drawable.ic_link)
+    fun manageLinks() {
+        try {
+            SettingsActivity.getActivity()?.let { UIDialogs.showUrlHandlingPrompt(it) }
+        } catch (e: Throwable) {
+            Logger.e(TAG, "Failed to show url handling prompt", e)
+        }
+    }
+
     @FormField(R.string.language, "group", -1, 0)
     var language = LanguageSettings();
     @Serializable
@@ -168,7 +193,11 @@ class Settings : FragmentedStorageFileJson() {
         var previewFeedItems: Boolean = true;
 
 
-        @FormField(R.string.clear_hidden, FieldForm.BUTTON, R.string.clear_hidden_description, 7)
+        @FormField(R.string.progress_bar, FieldForm.TOGGLE, R.string.progress_bar_description, 6)
+        var progressBar: Boolean = true;
+
+
+        @FormField(R.string.clear_hidden, FieldForm.BUTTON, R.string.clear_hidden_description, 8)
         @FormFieldButton(R.drawable.ic_visibility_off)
         fun clearHidden() {
             StateMeta.instance.removeAllHiddenCreators();
@@ -195,6 +224,8 @@ class Settings : FragmentedStorageFileJson() {
         @FormField(R.string.preview_feed_items, FieldForm.TOGGLE, R.string.preview_feed_items_description, 5)
         var previewFeedItems: Boolean = true;
 
+        @FormField(R.string.progress_bar, FieldForm.TOGGLE, R.string.progress_bar_description, 6)
+        var progressBar: Boolean = true;
 
 
         fun getSearchFeedStyle(): FeedStyle {
@@ -205,7 +236,17 @@ class Settings : FragmentedStorageFileJson() {
         }
     }
 
-    @FormField(R.string.subscriptions, "group", R.string.configure_how_your_subscriptions_works_and_feels, 3)
+
+    @FormField(R.string.channel, "group", -1, 3)
+    var channel = ChannelSettings();
+    @Serializable
+    class ChannelSettings {
+
+        @FormField(R.string.progress_bar, FieldForm.TOGGLE, R.string.progress_bar_description, 6)
+        var progressBar: Boolean = true;
+    }
+
+    @FormField(R.string.subscriptions, "group", R.string.configure_how_your_subscriptions_works_and_feels, 4)
     var subscriptions = SubscriptionsSettings();
     @Serializable
     class SubscriptionsSettings {
@@ -220,17 +261,23 @@ class Settings : FragmentedStorageFileJson() {
                 return FeedStyle.THUMBNAIL;
         }
 
-        @FormField(R.string.preview_feed_items, FieldForm.TOGGLE, R.string.preview_feed_items_description, 5)
+        @FormField(R.string.show_subscription_group, FieldForm.TOGGLE, R.string.show_subscription_group_description, 5)
+        var showSubscriptionGroups: Boolean = true;
+
+        @FormField(R.string.preview_feed_items, FieldForm.TOGGLE, R.string.preview_feed_items_description, 6)
         var previewFeedItems: Boolean = true;
 
-        @FormField(R.string.fetch_on_app_boot, FieldForm.TOGGLE, R.string.shortly_after_opening_the_app_start_fetching_subscriptions, 6)
+        @FormField(R.string.progress_bar, FieldForm.TOGGLE, R.string.progress_bar_description, 7)
+        var progressBar: Boolean = true;
+
+        @FormField(R.string.fetch_on_app_boot, FieldForm.TOGGLE, R.string.shortly_after_opening_the_app_start_fetching_subscriptions, 8)
         @Serializable(with = FlexibleBooleanSerializer::class)
         var fetchOnAppBoot: Boolean = true;
 
-        @FormField(R.string.fetch_on_tab_opened, FieldForm.TOGGLE, R.string.fetch_on_tab_opened_description, 6)
+        @FormField(R.string.fetch_on_tab_opened, FieldForm.TOGGLE, R.string.fetch_on_tab_opened_description, 9)
         var fetchOnTabOpen: Boolean = true;
 
-        @FormField(R.string.background_update, FieldForm.DROPDOWN, R.string.experimental_background_update_for_subscriptions_cache, 7)
+        @FormField(R.string.background_update, FieldForm.DROPDOWN, R.string.experimental_background_update_for_subscriptions_cache, 10)
         @DropdownFieldOptionsId(R.array.background_interval)
         var subscriptionsBackgroundUpdateInterval: Int = 0;
 
@@ -246,7 +293,7 @@ class Settings : FragmentedStorageFileJson() {
         };
 
 
-        @FormField(R.string.subscription_concurrency, FieldForm.DROPDOWN, R.string.specify_how_many_threads_are_used_to_fetch_channels, 8)
+        @FormField(R.string.subscription_concurrency, FieldForm.DROPDOWN, R.string.specify_how_many_threads_are_used_to_fetch_channels, 11)
         @DropdownFieldOptionsId(R.array.thread_count)
         var subscriptionConcurrency: Int = 3;
 
@@ -254,18 +301,25 @@ class Settings : FragmentedStorageFileJson() {
             return threadIndexToCount(subscriptionConcurrency);
         }
 
-        @FormField(R.string.show_watch_metrics, FieldForm.TOGGLE, R.string.show_watch_metrics_description, 9)
+        @FormField(R.string.show_watch_metrics, FieldForm.TOGGLE, R.string.show_watch_metrics_description, 12)
         var showWatchMetrics: Boolean = false;
 
-        @FormField(R.string.track_playtime_locally, FieldForm.TOGGLE, R.string.track_playtime_locally_description, 10)
+        @FormField(R.string.track_playtime_locally, FieldForm.TOGGLE, R.string.track_playtime_locally_description, 13)
         var allowPlaytimeTracking: Boolean = true;
 
 
-        @FormField(R.string.always_reload_from_cache, FieldForm.TOGGLE, R.string.always_reload_from_cache_description, 11)
+        @FormField(R.string.always_reload_from_cache, FieldForm.TOGGLE, R.string.always_reload_from_cache_description, 14)
         var alwaysReloadFromCache: Boolean = false;
+
+        @FormField(R.string.clear_channel_cache, FieldForm.BUTTON, R.string.clear_channel_cache_description, 15)
+        fun clearChannelCache() {
+            UIDialogs.toast(SettingsActivity.getActivity()!!, "Started clearing..");
+            StateCache.instance.clear();
+            UIDialogs.toast(SettingsActivity.getActivity()!!, "Finished clearing");
+        }
     }
 
-    @FormField(R.string.player, "group", R.string.change_behavior_of_the_player, 4)
+    @FormField(R.string.player, "group", R.string.change_behavior_of_the_player, 5)
     var playback = PlaybackSettings();
     @Serializable
     class PlaybackSettings {
@@ -273,7 +327,28 @@ class Settings : FragmentedStorageFileJson() {
         @DropdownFieldOptionsId(R.array.audio_languages)
         var primaryLanguage: Int = 0;
 
-        fun getPrimaryLanguage(context: Context) = context.resources.getStringArray(R.array.audio_languages)[primaryLanguage];
+        fun getPrimaryLanguage(context: Context): String? {
+            return when(primaryLanguage) {
+                0 -> "en";
+                1 -> "es";
+                2 -> "de";
+                3 -> "fr";
+                4 -> "ja";
+                5 -> "ko";
+                6 -> "th";
+                7 -> "vi";
+                8 -> "id";
+                9 -> "hi";
+                10 -> "ar";
+                11 -> "tu";
+                12 -> "ru";
+                13 -> "pt";
+                14 -> "zh";
+                else -> null
+            }
+        }
+
+        //= context.resources.getStringArray(R.array.audio_languages)[primaryLanguage];
 
         @FormField(R.string.default_playback_speed, FieldForm.DROPDOWN, -1, 1)
         @DropdownFieldOptionsId(R.array.playback_speeds)
@@ -291,29 +366,29 @@ class Settings : FragmentedStorageFileJson() {
             else -> 1.0f;
         };
 
-        @FormField(R.string.preferred_quality, FieldForm.DROPDOWN, -1, 2)
+        @FormField(R.string.preferred_quality, FieldForm.DROPDOWN, R.string.preferred_quality_description, 2)
         @DropdownFieldOptionsId(R.array.preferred_quality_array)
         var preferredQuality: Int = 0;
 
-        @FormField(R.string.preferred_metered_quality, FieldForm.DROPDOWN, -1, 2)
+        @FormField(R.string.preferred_metered_quality, FieldForm.DROPDOWN, R.string.preferred_metered_quality_description, 3)
         @DropdownFieldOptionsId(R.array.preferred_quality_array)
         var preferredMeteredQuality: Int = 0;
         fun getPreferredQualityPixelCount(): Int = preferedQualityToPixels(preferredQuality);
         fun getPreferredMeteredQualityPixelCount(): Int = preferedQualityToPixels(preferredMeteredQuality);
         fun getCurrentPreferredQualityPixelCount(): Int = if(!StateApp.instance.isCurrentMetered()) getPreferredQualityPixelCount() else getPreferredMeteredQualityPixelCount();
 
-        @FormField(R.string.preferred_preview_quality, FieldForm.DROPDOWN, -1, 3)
+        @FormField(R.string.preferred_preview_quality, FieldForm.DROPDOWN, R.string.preferred_preview_quality_description, 4)
         @DropdownFieldOptionsId(R.array.preferred_quality_array)
         var preferredPreviewQuality: Int = 5;
         fun getPreferredPreviewQualityPixelCount(): Int = preferedQualityToPixels(preferredPreviewQuality);
 
-        @FormField(R.string.auto_rotate, FieldForm.DROPDOWN, -1, 4)
+        @FormField(R.string.auto_rotate, FieldForm.DROPDOWN, -1, 5)
         @DropdownFieldOptionsId(R.array.system_enabled_disabled_array)
         var autoRotate: Int = 2;
 
         fun isAutoRotate() = autoRotate == 1 || (autoRotate == 2 && StateApp.instance.getCurrentSystemAutoRotate());
 
-        @FormField(R.string.auto_rotate_dead_zone, FieldForm.DROPDOWN, R.string.this_prevents_the_device_from_rotating_within_the_given_amount_of_degrees, 5)
+        @FormField(R.string.auto_rotate_dead_zone, FieldForm.DROPDOWN, R.string.this_prevents_the_device_from_rotating_within_the_given_amount_of_degrees, 6)
         @DropdownFieldOptionsId(R.array.auto_rotate_dead_zone)
         var autoRotateDeadZone: Int = 0;
 
@@ -321,7 +396,7 @@ class Settings : FragmentedStorageFileJson() {
             return autoRotateDeadZone * 5;
         }
 
-        @FormField(R.string.background_behavior, FieldForm.DROPDOWN, -1, 6)
+        @FormField(R.string.background_behavior, FieldForm.DROPDOWN, -1, 7)
         @DropdownFieldOptionsId(R.array.player_background_behavior)
         var backgroundPlay: Int = 2;
 
@@ -340,16 +415,53 @@ class Settings : FragmentedStorageFileJson() {
             return false;
         }
 
-        @FormField(R.string.live_chat_webview, FieldForm.TOGGLE, R.string.use_the_live_chat_web_window_when_available_over_native_implementation, 8)
+        @FormField(R.string.chapter_update_fps_title, FieldForm.DROPDOWN, R.string.chapter_update_fps_description, 8)
+        @DropdownFieldOptionsId(R.array.chapter_fps)
+        var chapterUpdateFPS: Int = 0;
+
+        fun getChapterUpdateFrames(): Int {
+            return when(chapterUpdateFPS) {
+                0 -> 24
+                1 -> 30
+                2 -> 60
+                3 -> 120
+                else -> 1
+            };
+        }
+
+        @FormField(R.string.live_chat_webview, FieldForm.TOGGLE, R.string.use_the_live_chat_web_window_when_available_over_native_implementation, 9)
         var useLiveChatWindow: Boolean = true;
 
 
 
-        @FormField(R.string.background_switch_audio, FieldForm.TOGGLE, R.string.background_switch_audio_description, 8)
+        @FormField(R.string.background_switch_audio, FieldForm.TOGGLE, R.string.background_switch_audio_description, 10)
         var backgroundSwitchToAudio: Boolean = true;
+
+        @FormField(R.string.restart_after_audio_focus_loss, FieldForm.DROPDOWN, R.string.restart_playback_when_gaining_audio_focus_after_a_loss, 11)
+        @DropdownFieldOptionsId(R.array.restart_playback_after_loss)
+        var restartPlaybackAfterLoss: Int = 1;
+
+        @FormField(R.string.restart_after_connectivity_loss, FieldForm.DROPDOWN, R.string.restart_playback_when_gaining_connectivity_after_a_loss, 12)
+        @DropdownFieldOptionsId(R.array.restart_playback_after_loss)
+        var restartPlaybackAfterConnectivityLoss: Int = 1;
+
+        @FormField(R.string.full_screen_portrait, FieldForm.TOGGLE, R.string.allow_full_screen_portrait, 13)
+        var fullscreenPortrait: Boolean = false;
     }
 
-    @FormField(R.string.downloads, "group", R.string.configure_downloading_of_videos, 5)
+    @FormField(R.string.comments, "group", R.string.comments_description, 6)
+    var comments = CommentSettings();
+    @Serializable
+    class CommentSettings {
+        @FormField(R.string.default_comment_section, FieldForm.DROPDOWN, -1, 0)
+        @DropdownFieldOptionsId(R.array.comment_sections)
+        var defaultCommentSection: Int = 0;
+
+        @FormField(R.string.bad_reputation_comments_fading, FieldForm.TOGGLE, R.string.bad_reputation_comments_fading_description, 0)
+        var badReputationCommentsFading: Boolean = true;
+    }
+
+    @FormField(R.string.downloads, "group", R.string.configure_downloading_of_videos, 7)
     var downloads = Downloads();
     @Serializable
     class Downloads {
@@ -389,7 +501,7 @@ class Settings : FragmentedStorageFileJson() {
         }
     }
 
-    @FormField(R.string.browsing, "group", R.string.configure_browsing_behavior, 6)
+    @FormField(R.string.browsing, "group", R.string.configure_browsing_behavior, 8)
     var browsing = Browsing();
     @Serializable
     class Browsing {
@@ -398,7 +510,7 @@ class Settings : FragmentedStorageFileJson() {
         var videoCache: Boolean = true;
     }
 
-    @FormField(R.string.casting, "group", R.string.configure_casting, 7)
+    @FormField(R.string.casting, "group", R.string.configure_casting, 9)
     var casting = Casting();
     @Serializable
     class Casting {
@@ -406,6 +518,9 @@ class Settings : FragmentedStorageFileJson() {
         @Serializable(with = FlexibleBooleanSerializer::class)
         var enabled: Boolean = true;
 
+        @FormField(R.string.keep_screen_on, FieldForm.TOGGLE, R.string.keep_screen_on_while_casting, 1)
+        @Serializable(with = FlexibleBooleanSerializer::class)
+        var keepScreenOn: Boolean = true;
 
         /*TODO: Should we have a different casting quality?
         @FormField("Preferred Casting Quality", FieldForm.DROPDOWN, "", 3)
@@ -423,8 +538,7 @@ class Settings : FragmentedStorageFileJson() {
         }*/
     }
 
-
-    @FormField(R.string.logging, FieldForm.GROUP, -1, 8)
+    @FormField(R.string.logging, FieldForm.GROUP, -1, 10)
     var logging = Logging();
     @Serializable
     class Logging {
@@ -432,10 +546,7 @@ class Settings : FragmentedStorageFileJson() {
         @DropdownFieldOptionsId(R.array.log_levels)
         var logLevel: Int = 0;
 
-        @FormField(
-            R.string.submit_logs, FieldForm.BUTTON,
-            R.string.submit_logs_to_help_us_narrow_down_issues, 1
-        )
+        @FormField(R.string.submit_logs, FieldForm.BUTTON, R.string.submit_logs_to_help_us_narrow_down_issues, 1)
         fun submitLogs() {
             StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
                 try {
@@ -451,23 +562,26 @@ class Settings : FragmentedStorageFileJson() {
         }
     }
 
-
-
-    @FormField(R.string.announcement, FieldForm.GROUP, -1, 10)
+    @FormField(R.string.announcement, FieldForm.GROUP, -1, 11)
     var announcementSettings = AnnouncementSettings();
     @Serializable
     class AnnouncementSettings {
-        @FormField(
-            R.string.reset_announcements, FieldForm.BUTTON,
-            R.string.reset_hidden_announcements, 1
-        )
+        @FormField(R.string.reset_announcements, FieldForm.BUTTON, R.string.reset_hidden_announcements, 1)
         fun resetAnnouncements() {
             StateAnnouncement.instance.resetAnnouncements();
             SettingsActivity.getActivity()?.let { UIDialogs.toast(it, it.getString(R.string.announcements_reset)); };
         }
     }
 
-    @FormField(R.string.plugins, FieldForm.GROUP, -1, 11)
+    @FormField(R.string.notifications, FieldForm.GROUP, -1, 12)
+    var notifications = NotificationSettings();
+    @Serializable
+    class NotificationSettings {
+        @FormField(R.string.planned_content_notifications, FieldForm.TOGGLE, R.string.planned_content_notifications_description, 1)
+        var plannedContentNotification: Boolean = true;
+    }
+
+    @FormField(R.string.plugins, FieldForm.GROUP, -1, 13)
     @Transient
     var plugins = Plugins();
     @Serializable
@@ -476,18 +590,12 @@ class Settings : FragmentedStorageFileJson() {
         @FormField(R.string.clear_cookies_on_logout, FieldForm.TOGGLE, R.string.clears_cookies_when_you_log_out, 0)
         var clearCookiesOnLogout: Boolean = true;
 
-        @FormField(
-            R.string.clear_cookies, FieldForm.BUTTON,
-            R.string.clears_in_app_browser_cookies, 1
-        )
+        @FormField(R.string.clear_cookies, FieldForm.BUTTON, R.string.clears_in_app_browser_cookies, 1)
         fun clearCookies() {
             val cookieManager: CookieManager = CookieManager.getInstance();
             cookieManager.removeAllCookies(null);
         }
-        @FormField(
-            R.string.reinstall_embedded_plugins, FieldForm.BUTTON,
-            R.string.also_removes_any_data_related_plugin_like_login_or_settings, 1
-        )
+        /*@FormField(R.string.reinstall_embedded_plugins, FieldForm.BUTTON, R.string.also_removes_any_data_related_plugin_like_login_or_settings, 1)
         fun reinstallEmbedded() {
             StateApp.instance.scopeOrNull!!.launch(Dispatchers.IO) {
                 try {
@@ -506,11 +614,11 @@ class Settings : FragmentedStorageFileJson() {
                     }
                 }
             }
-        }
+        }*/
     }
 
 
-    @FormField(R.string.external_storage, FieldForm.GROUP, -1, 12)
+    @FormField(R.string.external_storage, FieldForm.GROUP, -1, 14)
     var storage = Storage();
     @Serializable
     class Storage {
@@ -534,10 +642,17 @@ class Settings : FragmentedStorageFileJson() {
                 StateApp.instance.changeExternalDownloadDirectory(it);
             }
         }
+
+        @FormField(R.string.clear_external_downloads_directory, FieldForm.BUTTON, R.string.clear_the_external_storage_for_download_files, 5)
+        fun clearStorageDownload() {
+            Settings.instance.storage.storage_download = null;
+            Settings.instance.save();
+            SettingsActivity.getActivity()?.let { UIDialogs.toast(it, "Cleared download storage directory") };
+        }
     }
 
 
-    @FormField(R.string.auto_update, "group", R.string.configure_the_auto_updater, 12)
+    @FormField(R.string.auto_update, "group", R.string.configure_the_auto_updater, 15)
     var autoUpdate = AutoUpdate();
     @Serializable
     class AutoUpdate {
@@ -566,10 +681,7 @@ class Settings : FragmentedStorageFileJson() {
             return check == 0 && !BuildConfig.IS_PLAYSTORE_BUILD;
         }
 
-        @FormField(
-            R.string.manual_check, FieldForm.BUTTON,
-            R.string.manually_check_for_updates, 3
-        )
+        @FormField(R.string.manual_check, FieldForm.BUTTON, R.string.manually_check_for_updates, 3)
         fun manualCheck() {
             if (!BuildConfig.IS_PLAYSTORE_BUILD) {
                 SettingsActivity.getActivity()?.let {
@@ -586,10 +698,7 @@ class Settings : FragmentedStorageFileJson() {
             }
         }
 
-        @FormField(
-            R.string.view_changelog, FieldForm.BUTTON,
-            R.string.review_the_current_and_past_changelogs, 4
-        )
+        @FormField(R.string.view_changelog, FieldForm.BUTTON, R.string.review_the_current_and_past_changelogs, 4)
         fun viewChangelog() {
             SettingsActivity.getActivity()?.let {
                 UIDialogs.toast(it.getString(R.string.retrieving_changelog));
@@ -609,10 +718,7 @@ class Settings : FragmentedStorageFileJson() {
             };
         }
 
-        @FormField(
-            R.string.remove_cached_version, FieldForm.BUTTON,
-            R.string.remove_the_last_downloaded_version, 5
-        )
+        @FormField(R.string.remove_cached_version, FieldForm.BUTTON, R.string.remove_the_last_downloaded_version, 5)
         fun removeCachedVersion() {
             StateApp.withContext {
                 val outputDirectory = File(it.filesDir, "autoupdate");
@@ -628,7 +734,7 @@ class Settings : FragmentedStorageFileJson() {
         }
     }
 
-    @FormField(R.string.backup, FieldForm.GROUP, -1, 13)
+    @FormField(R.string.backup, FieldForm.GROUP, -1, 16)
     var backup = Backup();
     @Serializable
     class Backup {
@@ -660,28 +766,19 @@ class Settings : FragmentedStorageFileJson() {
 
         @FormField(R.string.export_data, FieldForm.BUTTON, R.string.creates_a_zip_file_with_your_data_which_can_be_imported_by_opening_it_with_grayjay, 3)
         fun export() {
-            StateBackup.startExternalBackup();
+            val activity = SettingsActivity.getActivity() ?: return;
+            UISlideOverlays.showOverlay(activity.overlay, "Select export type", null, {},
+                SlideUpMenuItem(activity, R.drawable.ic_share, "Share", "", null, {
+                    StateBackup.shareExternalBackup();
+                }),
+                SlideUpMenuItem(activity, R.drawable.ic_download, "File", "", null, {
+                    StateBackup.saveExternalBackup(activity);
+                })
+            )
         }
-
-
-        /*
-        @FormField(R.string.import_data, FieldForm.BUTTON, R.string.import_data_description, 4)
-        fun import() {
-            val act = SettingsActivity.getActivity() ?: return;
-            StateApp.instance.requestFileReadAccess(act, null) {
-                if(it != null && it.exists()) {
-                    val name = it.name;
-                    val contents = it.readBytes(act);
-                    if(contents != null) {
-                        if(name != null && name.endsWith(".zip", true))
-                            StateBackup.importZipBytes(act, act.lifecycleScope, contents);
-                    }
-                }
-            }
-        }*/
     }
 
-    @FormField(R.string.payment, FieldForm.GROUP, -1, 14)
+    @FormField(R.string.payment, FieldForm.GROUP, -1, 17)
     var payment = Payment();
     @Serializable
     class Payment {
@@ -698,7 +795,19 @@ class Settings : FragmentedStorageFileJson() {
         }
     }
 
-    @FormField(R.string.info, FieldForm.GROUP, -1, 15)
+    @FormField(R.string.other, FieldForm.GROUP, -1, 18)
+    var other = Other();
+    @Serializable
+    class Other {
+        @FormField(R.string.bypass_rotation_prevention, FieldForm.TOGGLE, R.string.bypass_rotation_prevention_description, 1)
+        @FormFieldWarning(R.string.bypass_rotation_prevention_warning)
+        var bypassRotationPrevention: Boolean = false;
+
+        @FormField(R.string.enable_polycentric, FieldForm.TOGGLE, R.string.can_be_disabled_when_you_are_experiencing_issues, 1)
+        var polycentricEnabled: Boolean = true;
+    }
+
+    @FormField(R.string.info, FieldForm.GROUP, -1, 19)
     var info = Info();
     @Serializable
     class Info {

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

@@ -2,19 +2,16 @@ package com.futo.platformplayer
 
 import android.content.Context
 import android.webkit.CookieManager
-import androidx.work.Constraints
 import androidx.work.Data
-import androidx.work.ExistingPeriodicWorkPolicy
-import androidx.work.NetworkType
 import androidx.work.OneTimeWorkRequestBuilder
-import androidx.work.PeriodicWorkRequest
 import androidx.work.WorkManager
-import androidx.work.WorkerParameters
 import com.caoccao.javet.values.primitive.V8ValueInteger
 import com.caoccao.javet.values.primitive.V8ValueString
+import com.futo.platformplayer.activities.DeveloperActivity
 import com.futo.platformplayer.activities.SettingsActivity
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
+import com.futo.platformplayer.api.media.models.video.IPlatformVideo
 import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginDescriptor
@@ -25,21 +22,27 @@ import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.serializers.FlexibleBooleanSerializer
 import com.futo.platformplayer.states.StateAnnouncement
 import com.futo.platformplayer.states.StateApp
+import com.futo.platformplayer.states.StateCache
 import com.futo.platformplayer.states.StateDeveloper
 import com.futo.platformplayer.states.StateDownloads
+import com.futo.platformplayer.states.StateHistory
+import com.futo.platformplayer.states.StatePlatform
 import com.futo.platformplayer.states.StateSubscriptions
 import com.futo.platformplayer.stores.FragmentedStorage
 import com.futo.platformplayer.stores.FragmentedStorageFileJson
+import com.futo.platformplayer.views.fields.ButtonField
 import com.futo.platformplayer.views.fields.FieldForm
 import com.futo.platformplayer.views.fields.FormField
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import kotlinx.serialization.*
-import kotlinx.serialization.json.*
-import java.util.UUID
-import java.util.concurrent.TimeUnit
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+import java.time.OffsetDateTime
 import java.util.stream.IntStream.range
 import kotlin.system.measureTimeMillis
 
@@ -81,26 +84,153 @@ class SettingsDev : FragmentedStorageFileJson() {
         var backgroundSubscriptionFetching: Boolean = false;
     }
 
+
+    @FormField(R.string.cache, FieldForm.GROUP, -1, 3)
+    val cache: Cache = Cache();
+    @Serializable
+    class Cache {
+
+        @FormField(R.string.subscriptions_cache_5000, FieldForm.BUTTON, -1, 1, "subscription_cache_button")
+        fun subscriptionsCache5000() {
+            Logger.i("SettingsDev", "Started caching 5000 sub items");
+            UIDialogs.toast(
+                SettingsActivity.getActivity()!!,
+                "Started caching 5000 sub items"
+            );
+            val button = DeveloperActivity.getActivity()?.getField("subscription_cache_button");
+            if(button is ButtonField)
+                button.setButtonEnabled(false);
+            StateApp.instance.scope.launch(Dispatchers.IO) {
+                try {
+                    val subsCache =
+                        StateSubscriptions.instance.getSubscriptionsFeedWithExceptions(cacheScope = this).first;
+
+                    var total = 0;
+                    var page = 0;
+                    var lastToast = System.currentTimeMillis();
+                    while(subsCache.hasMorePages() && total < 5000) {
+                        subsCache.nextPage();
+                        total += subsCache.getResults().size;
+                        page++;
+
+                        if(page % 10 == 0)
+                            withContext(Dispatchers.Main) {
+                                val diff = System.currentTimeMillis() - lastToast;
+                                lastToast = System.currentTimeMillis();
+                                UIDialogs.toast(
+                                    SettingsActivity.getActivity()!!,
+                                    "Page: ${page}, Total: ${total}, Speed: ${diff}ms"
+                                );
+                            }
+                        Thread.sleep(250);
+                    }
+
+                    withContext(Dispatchers.Main) {
+                        UIDialogs.toast(
+                            SettingsActivity.getActivity()!!,
+                            "FINISHED Page: ${page}, Total: ${total}"
+                        );
+                    }
+                }
+                catch(ex: Throwable) {
+                    Logger.e("SettingsDev", ex.message, ex);
+                    Logger.i("SettingsDev", "Failed: ${ex.message}");
+                }
+                finally {
+                    withContext(Dispatchers.Main) {
+                        if(button is ButtonField)
+                            button.setButtonEnabled(true);
+                    }
+                }
+            }
+        }
+
+        @FormField(R.string.history_cache_100, FieldForm.BUTTON, -1, 1, "history_cache_button")
+        fun historyCache100() {
+            Logger.i("SettingsDev", "Started caching 100 history items (from home)");
+            UIDialogs.toast(
+                SettingsActivity.getActivity()!!,
+                "Started caching 100 history items (from home)"
+            );
+            val button = DeveloperActivity.getActivity()?.getField("history_cache_button");
+            if(button is ButtonField)
+                button.setButtonEnabled(false);
+            StateApp.instance.scope.launch(Dispatchers.IO) {
+                try {
+                    val subsCache = StatePlatform.instance.getHome();
+
+                    var num = 0;
+                    for(item in subsCache.getResults().filterIsInstance<IPlatformVideo>()) {
+                        StateHistory.instance.getHistoryByVideo(item, true, OffsetDateTime.now().minusHours(num.toLong() * 4))
+                        num++;
+                    }
+
+                    var total = 0;
+                    var page = 0;
+                    var lastToast = System.currentTimeMillis();
+                    while(subsCache.hasMorePages() && total < 5000) {
+                        subsCache.nextPage();
+                        total += subsCache.getResults().size;
+                        page++;
+
+                        for(item in subsCache.getResults().filterIsInstance<IPlatformVideo>()) {
+                            StateHistory.instance.getHistoryByVideo(item, true, OffsetDateTime.now().minusHours(num.toLong() * 4))
+                            num++;
+                        }
+
+                        if(page % 4 == 0)
+                            withContext(Dispatchers.Main) {
+                                val diff = System.currentTimeMillis() - lastToast;
+                                lastToast = System.currentTimeMillis();
+                                UIDialogs.toast(
+                                    SettingsActivity.getActivity()!!,
+                                    "Page: ${page}, Total: ${total}, Speed: ${diff}ms"
+                                );
+                            }
+                        Thread.sleep(500);
+                    }
+
+                    withContext(Dispatchers.Main) {
+                        UIDialogs.toast(
+                            SettingsActivity.getActivity()!!,
+                            "FINISHED Page: ${page}, Total: ${total}"
+                        );
+                    }
+                }
+                catch(ex: Throwable) {
+                    Logger.e("SettingsDev", ex.message, ex);
+                    Logger.i("SettingsDev", "Failed: ${ex.message}");
+                }
+                finally {
+                    withContext(Dispatchers.Main) {
+                        if(button is ButtonField)
+                            button.setButtonEnabled(true);
+                    }
+                }
+            }
+        }
+    }
+
     @FormField(R.string.crash_me, FieldForm.BUTTON,
-        R.string.crashes_the_application_on_purpose, 2)
+        R.string.crashes_the_application_on_purpose, 3)
     fun crashMe() {
         throw java.lang.IllegalStateException("This is an uncaught exception triggered on purpose!");
     }
 
     @FormField(R.string.delete_announcements, FieldForm.BUTTON,
-        R.string.delete_all_announcements, 2)
+        R.string.delete_all_announcements, 3)
     fun deleteAnnouncements() {
         StateAnnouncement.instance.deleteAllAnnouncements();
     }
 
     @FormField(R.string.clear_cookies, FieldForm.BUTTON,
-        R.string.clear_all_cookies_from_the_cookieManager, 2)
+        R.string.clear_all_cookies_from_the_cookieManager, 3)
     fun clearCookies() {
         val cookieManager: CookieManager = CookieManager.getInstance()
         cookieManager.removeAllCookies(null);
     }
     @FormField(R.string.test_background_worker, FieldForm.BUTTON,
-        R.string.test_background_worker_description, 3)
+        R.string.test_background_worker_description, 4)
     fun triggerBackgroundUpdate() {
         val act = SettingsActivity.getActivity()!!;
         UIDialogs.toast(SettingsActivity.getActivity()!!, "Starting test background worker");
@@ -111,6 +241,14 @@ class SettingsDev : FragmentedStorageFileJson() {
             .build();
         wm.enqueue(req);
     }
+    @FormField(R.string.clear_channel_cache, FieldForm.BUTTON,
+        R.string.test_background_worker_description, 4)
+    fun clearChannelContentCache() {
+        UIDialogs.toast(SettingsActivity.getActivity()!!, "Clearing cache");
+        StateCache.instance.clearToday();
+        UIDialogs.toast(SettingsActivity.getActivity()!!, "Cleared");
+    }
+
 
     @Contextual
     @Transient
@@ -231,9 +369,9 @@ class SettingsDev : FragmentedStorageFileJson() {
         @FormField(R.string.getHome, FieldForm.BUTTON, R.string.attempts_to_fetch_2_pages_from_getHome, 2)
         fun testV8Home() {
             runTestPlugin(_currentPlugin) {
-                var home: IPager<IPlatformContent>? = null;
-                var resultPage1: String = "";
-                var resultPage2: String = "";
+                var home: IPager<IPlatformContent>?;
+                val resultPage1: String;
+                val resultPage2: String;
                 val page1Time = measureTimeMillis {
                     home = it.getHome();
                     val results = home!!.getResults();
@@ -354,6 +492,17 @@ class SettingsDev : FragmentedStorageFileJson() {
         }
     }
 
+
+    @Contextual
+    @Transient
+    @FormField(R.string.info, FieldForm.GROUP, -1, 19)
+    var info = Info();
+    @Serializable
+    class Info {
+        @FormField(R.string.dev_info_channel_cache_size, FieldForm.READONLYTEXT, -1, 1, "channelCacheSize")
+        var channelCacheStartupCount = StateCache.instance.channelCacheStartupCount;
+    }
+
     //region BOILERPLATE
     override fun encode(): String {
         return Json.encodeToString(this);

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

@@ -1,21 +1,39 @@
 package com.futo.platformplayer
 
+import android.app.Activity
 import android.app.AlertDialog
 import android.content.Context
+import android.content.Intent
 import android.graphics.Color
+import android.net.Uri
 import android.util.TypedValue
 import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
-import android.widget.*
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
+import android.widget.Toast
 import androidx.core.content.ContextCompat
+import com.futo.platformplayer.activities.MainActivity
 import com.futo.platformplayer.api.media.models.comments.IPlatformComment
 import com.futo.platformplayer.casting.StateCasting
-import com.futo.platformplayer.dialogs.*
+import com.futo.platformplayer.dialogs.AutoUpdateDialog
+import com.futo.platformplayer.dialogs.AutomaticBackupDialog
+import com.futo.platformplayer.dialogs.AutomaticRestoreDialog
+import com.futo.platformplayer.dialogs.CastingAddDialog
+import com.futo.platformplayer.dialogs.CastingHelpDialog
+import com.futo.platformplayer.dialogs.ChangelogDialog
+import com.futo.platformplayer.dialogs.CommentDialog
+import com.futo.platformplayer.dialogs.ConnectCastingDialog
+import com.futo.platformplayer.dialogs.ConnectedCastingDialog
+import com.futo.platformplayer.dialogs.ImportDialog
+import com.futo.platformplayer.dialogs.ImportOptionsDialog
+import com.futo.platformplayer.dialogs.MigrateDialog
+import com.futo.platformplayer.dialogs.ProgressDialog
 import com.futo.platformplayer.engine.exceptions.PluginException
 import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.states.StateAnnouncement
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StateBackup
 import com.futo.platformplayer.stores.v2.ManagedStore
@@ -91,6 +109,50 @@ class UIDialogs {
                 }.toTypedArray());
         }
 
+        fun showUrlHandlingPrompt(context: Context, onYes: (() -> Unit)? = null) {
+            val builder = AlertDialog.Builder(context)
+            val view = LayoutInflater.from(context).inflate(R.layout.dialog_url_handling, null)
+            builder.setView(view)
+
+            val dialog = builder.create()
+            registerDialogOpened(dialog)
+
+            view.findViewById<TextView>(R.id.button_no).apply {
+                this.setOnClickListener {
+                    dialog.dismiss()
+                }
+            }
+
+            view.findViewById<LinearLayout>(R.id.button_yes).apply {
+                this.setOnClickListener {
+                    if (BuildConfig.IS_PLAYSTORE_BUILD) {
+                        dialog.dismiss()
+                        showDialogOk(context, R.drawable.ic_error_pred, context.getString(R.string.play_store_version_does_not_support_default_url_handling)) {
+                            onYes?.invoke()
+                        }
+                    } else {
+                        try {
+                            val intent =
+                                Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
+                            val uri = Uri.fromParts("package", context.packageName, null)
+                            intent.data = uri
+                            context.startActivity(intent)
+                        } catch (e: Throwable) {
+                            toast(context, context.getString(R.string.failed_to_show_settings))
+                        }
+
+                        onYes?.invoke()
+                        dialog.dismiss()
+                    }
+                }
+            }
+
+            dialog.setOnDismissListener {
+                registerDialogClosed(dialog)
+            }
+
+            dialog.show()
+        }
 
         fun showAutomaticBackupDialog(context: Context, skipRestoreCheck: Boolean = false, onClosed: (()->Unit)? = null) {
             val dialogAction: ()->Unit = {
@@ -107,7 +169,8 @@ class UIDialogs {
                     }, UIDialogs.ActionStyle.DANGEROUS),
                     UIDialogs.Action(context.getString(R.string.restore), {
                         UIDialogs.showAutomaticRestoreDialog(context, StateApp.instance.scope);
-                    }, UIDialogs.ActionStyle.PRIMARY));
+                    }, UIDialogs.ActionStyle.PRIMARY)
+                );
             else {
                 dialogAction();
             }
@@ -142,8 +205,10 @@ class UIDialogs {
             view.findViewById<TextView>(R.id.dialog_text_code).apply {
                 if(code == null)
                     this.visibility = View.GONE;
-                else
+                else {
                     this.text = code;
+                    this.visibility = View.VISIBLE;
+                }
             };
             view.findViewById<LinearLayout>(R.id.dialog_buttons).apply {
                 val buttons = actions.map<Action, TextView> { act ->
@@ -279,23 +344,46 @@ class UIDialogs {
             dialog.setOnDismissListener { registerDialogClosed(dialog) };
             dialog.show();
         }
+        fun showImportOptionsDialog(context: MainActivity) {
+            val dialog = ImportOptionsDialog(context);
+            registerDialogOpened(dialog);
+            dialog.setOnDismissListener { registerDialogClosed(dialog) };
+            dialog.show();
+        }
 
 
         fun showCastingDialog(context: Context) {
             val d = StateCasting.instance.activeDevice;
             if (d != null) {
                 val dialog = ConnectedCastingDialog(context);
+                if (context is Activity) {
+                    dialog.setOwnerActivity(context)
+                }
                 registerDialogOpened(dialog);
                 dialog.setOnDismissListener { registerDialogClosed(dialog) };
                 dialog.show();
             } else {
                 val dialog = ConnectCastingDialog(context);
+                if (context is Activity) {
+                    dialog.setOwnerActivity(context)
+                }
                 registerDialogOpened(dialog);
+                val c = context
+                if (c is Activity) {
+                    dialog.setOwnerActivity(c);
+                }
                 dialog.setOnDismissListener { registerDialogClosed(dialog) };
                 dialog.show();
             }
         }
 
+        fun showCastingTutorialDialog(context: Context) {
+            val dialog = CastingHelpDialog(context);
+            registerDialogOpened(dialog);
+            dialog.setOnDismissListener { registerDialogClosed(dialog) };
+            dialog.show();
+        }
+
         fun showCastingAddDialog(context: Context) {
             val dialog = CastingAddDialog(context);
             registerDialogOpened(dialog);

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

@@ -1,46 +1,58 @@
 package com.futo.platformplayer
 
 import android.content.ContentResolver
-import android.graphics.Color
-import android.util.TypedValue
 import android.view.View
 import android.view.ViewGroup
-import android.widget.LinearLayout
-import android.widget.TextView
+import com.futo.platformplayer.activities.MainActivity
 import com.futo.platformplayer.api.http.ManagedHttpClient
+import com.futo.platformplayer.api.media.models.ResultCapabilities
+import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
 import com.futo.platformplayer.api.media.models.streams.VideoUnMuxedSourceDescriptor
+import com.futo.platformplayer.api.media.models.streams.sources.HLSVariantAudioUrlSource
+import com.futo.platformplayer.api.media.models.streams.sources.HLSVariantVideoUrlSource
 import com.futo.platformplayer.api.media.models.streams.sources.IAudioUrlSource
+import com.futo.platformplayer.api.media.models.streams.sources.IHLSManifestAudioSource
+import com.futo.platformplayer.api.media.models.streams.sources.IHLSManifestSource
 import com.futo.platformplayer.api.media.models.streams.sources.IVideoUrlSource
-import com.futo.platformplayer.api.media.models.streams.sources.SubtitleRawSource
 import com.futo.platformplayer.api.media.models.subtitles.ISubtitleSource
 import com.futo.platformplayer.api.media.models.video.IPlatformVideo
 import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
 import com.futo.platformplayer.api.media.models.video.SerializedPlatformVideo
 import com.futo.platformplayer.downloads.VideoLocal
+import com.futo.platformplayer.fragment.mainactivity.main.SubscriptionGroupFragment
 import com.futo.platformplayer.helpers.VideoHelper
 import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.models.ImageVariable
 import com.futo.platformplayer.models.Playlist
 import com.futo.platformplayer.models.Subscription
-import com.futo.platformplayer.states.*
-import com.futo.platformplayer.views.Loader
+import com.futo.platformplayer.models.SubscriptionGroup
+import com.futo.platformplayer.parsers.HLS
+import com.futo.platformplayer.states.StateApp
+import com.futo.platformplayer.states.StateDownloads
+import com.futo.platformplayer.states.StateMeta
+import com.futo.platformplayer.states.StatePlatform
+import com.futo.platformplayer.states.StatePlayer
+import com.futo.platformplayer.states.StatePlaylists
+import com.futo.platformplayer.views.LoaderView
+import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuFilters
 import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuGroup
 import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuItem
 import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuOverlay
+import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuTextInput
 import com.futo.platformplayer.views.pills.RoundButton
 import com.futo.platformplayer.views.pills.RoundButtonGroup
-import com.futo.platformplayer.views.overlays.slideup.*
 import com.futo.platformplayer.views.video.FutoVideoPlayerBase
+import isDownloadable
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import java.lang.IllegalStateException
 
 class UISlideOverlays {
     companion object {
         private const val TAG = "UISlideOverlays";
 
-        fun showOverlay(container: ViewGroup, title: String, okButton: String?, onOk: ()->Unit,  vararg views: View) {
+        fun showOverlay(container: ViewGroup, title: String, okButton: String?, onOk: ()->Unit,  vararg views: View): SlideUpMenuOverlay {
             var menu = SlideUpMenuOverlay(container.context, container, title, okButton, true, *views);
 
             menu.onOK.subscribe {
@@ -48,11 +60,11 @@ class UISlideOverlays {
                 onOk.invoke();
             };
             menu.show();
+            return menu;
         }
 
         fun showSubscriptionOptionsOverlay(subscription: Subscription, container: ViewGroup) {
             val items = arrayListOf<View>();
-            var menu: SlideUpMenuOverlay? = null;
 
             val originalNotif = subscription.doNotifications;
             val originalLive = subscription.doFetchLive;
@@ -60,54 +72,181 @@ class UISlideOverlays {
             val originalVideo = subscription.doFetchVideos;
             val originalPosts = subscription.doFetchPosts;
 
-            items.addAll(listOf(
-                SlideUpMenuItem(container.context, R.drawable.ic_notifications, "Notifications", "", "notifications", {
-                    subscription.doNotifications = menu?.selectOption(null, "notifications", true, true) ?: subscription.doNotifications;
-                }, false),
-                SlideUpMenuGroup(container.context, "Fetch Settings",
-                    "Depending on the platform you might not need to enable a type for it to be available.",
-                    -1, listOf()),
-                SlideUpMenuItem(container.context, R.drawable.ic_live_tv, "Livestreams", "Check for livestreams", "fetchLive", {
-                    subscription.doFetchLive = menu?.selectOption(null, "fetchLive", true, true) ?: subscription.doFetchLive;
-                }, false),
-                SlideUpMenuItem(container.context, R.drawable.ic_play, "Streams", "Check for finished streams", "fetchStreams", {
-                    subscription.doFetchStreams = menu?.selectOption(null, "fetchStreams", true, true) ?: subscription.doFetchLive;
-                }, false),
-                SlideUpMenuItem(container.context, R.drawable.ic_play, "Videos", "Check for videos", "fetchVideos", {
-                    subscription.doFetchVideos = menu?.selectOption(null, "fetchVideos", true, true) ?: subscription.doFetchLive;
-                }, false),
-                SlideUpMenuItem(container.context, R.drawable.ic_chat, "Posts", "Check for posts", "fetchPosts", {
-                    subscription.doFetchPosts = menu?.selectOption(null, "fetchPosts", true, true) ?: subscription.doFetchLive;
-                }, false)));
+            StateApp.instance.scopeOrNull?.launch(Dispatchers.IO){
+                val plugin = StatePlatform.instance.getChannelClient(subscription.channel.url);
+                val capabilities = plugin.getChannelCapabilities();
 
-            menu = SlideUpMenuOverlay(container.context, container, "Subscription Settings", null, true, items);
+                withContext(Dispatchers.Main) {
 
-            if(subscription.doNotifications)
-                menu.selectOption(null, "notifications", true, true);
-            if(subscription.doFetchLive)
-                menu.selectOption(null, "fetchLive", true, true);
-            if(subscription.doFetchStreams)
-                menu.selectOption(null, "fetchStreams", true, true);
-            if(subscription.doFetchVideos)
-                menu.selectOption(null, "fetchVideos", true, true);
-            if(subscription.doFetchPosts)
-                menu.selectOption(null, "fetchPosts", true, true);
+                    var menu: SlideUpMenuOverlay? = null;
 
-            menu.onOK.subscribe {
-                subscription.save();
-                menu.hide(true);
-            };
-            menu.onCancel.subscribe {
-                subscription.doNotifications = originalNotif;
-                subscription.doFetchLive = originalLive;
-                subscription.doFetchStreams = originalStream;
-                subscription.doFetchVideos = originalVideo;
-                subscription.doFetchPosts = originalPosts;
-            };
 
-            menu.setOk("Save");
+                    items.addAll(listOf(
+                        SlideUpMenuItem(container.context, R.drawable.ic_notifications, "Notifications", "", "notifications", {
+                            subscription.doNotifications = menu?.selectOption(null, "notifications", true, true) ?: subscription.doNotifications;
+                        }, false),
+
+                        SlideUpMenuGroup(container.context, "Fetch Settings",
+                            "Depending on the platform you might not need to enable a type for it to be available.",
+                            -1, listOf()),
+                        if(capabilities.hasType(ResultCapabilities.TYPE_LIVE)) SlideUpMenuItem(container.context, R.drawable.ic_live_tv, "Livestreams", "Check for livestreams", "fetchLive", {
+                            subscription.doFetchLive = menu?.selectOption(null, "fetchLive", true, true) ?: subscription.doFetchLive;
+                        }, false) else null,
+                        if(capabilities.hasType(ResultCapabilities.TYPE_STREAMS)) SlideUpMenuItem(container.context, R.drawable.ic_play, "Streams", "Check for streams", "fetchStreams", {
+                            subscription.doFetchStreams = menu?.selectOption(null, "fetchStreams", true, true) ?: subscription.doFetchStreams;
+                        }, false) else null,
+                        if(capabilities.hasType(ResultCapabilities.TYPE_VIDEOS))
+                            SlideUpMenuItem(container.context, R.drawable.ic_play, "Videos", "Check for videos", "fetchVideos", {
+                            subscription.doFetchVideos = menu?.selectOption(null, "fetchVideos", true, true) ?: subscription.doFetchVideos;
+                        }, false) else if(capabilities.hasType(ResultCapabilities.TYPE_MIXED) || capabilities.types.isEmpty())
+                            SlideUpMenuItem(container.context, R.drawable.ic_play, "Content", "Check for content", "fetchVideos", {
+                                subscription.doFetchVideos = menu?.selectOption(null, "fetchVideos", true, true) ?: subscription.doFetchVideos;
+                            }, false) else null,
+                        if(capabilities.hasType(ResultCapabilities.TYPE_POSTS)) SlideUpMenuItem(container.context, R.drawable.ic_chat, "Posts", "Check for posts", "fetchPosts", {
+                            subscription.doFetchPosts = menu?.selectOption(null, "fetchPosts", true, true) ?: subscription.doFetchPosts;
+                        }, false) else null/*,,
+
+                        SlideUpMenuGroup(container.context, "Actions",
+                            "Various things you can do with this subscription",
+                            -1, listOf())
+                        SlideUpMenuItem(container.context, R.drawable.ic_list, "Add to Group", "", "btnAddToGroup", {
+                            showCreateSubscriptionGroup(container, subscription.channel);
+                        }, false)*/
+                        ).filterNotNull());
+
+                    menu = SlideUpMenuOverlay(container.context, container, "Subscription Settings", null, true, items);
+
+                    if(subscription.doNotifications)
+                        menu.selectOption(null, "notifications", true, true);
+                    if(subscription.doFetchLive)
+                        menu.selectOption(null, "fetchLive", true, true);
+                    if(subscription.doFetchStreams)
+                        menu.selectOption(null, "fetchStreams", true, true);
+                    if(subscription.doFetchVideos)
+                        menu.selectOption(null, "fetchVideos", true, true);
+                    if(subscription.doFetchPosts)
+                        menu.selectOption(null, "fetchPosts", true, true);
+
+                    menu.onOK.subscribe {
+                        subscription.save();
+                        menu.hide(true);
+
+                        if(subscription.doNotifications && !originalNotif && Settings.instance.subscriptions.subscriptionsBackgroundUpdateInterval == 0) {
+                            UIDialogs.toast(container.context, "Enable 'Background Update' in settings for notifications to work");
+                        }
+                    };
+                    menu.onCancel.subscribe {
+                        subscription.doNotifications = originalNotif;
+                        subscription.doFetchLive = originalLive;
+                        subscription.doFetchStreams = originalStream;
+                        subscription.doFetchVideos = originalVideo;
+                        subscription.doFetchPosts = originalPosts;
+                    };
+
+                    menu.setOk("Save");
+
+                    menu.show();
+                }
+            }
+        }
+
+        fun showAddToGroupOverlay(channel: IPlatformVideo, container: ViewGroup) {
+
+        }
+
+        fun showHlsPicker(video: IPlatformVideoDetails, source: Any, sourceUrl: String, container: ViewGroup): SlideUpMenuOverlay {
+            val items = arrayListOf<View>(LoaderView(container.context))
+            val slideUpMenuOverlay = SlideUpMenuOverlay(container.context, container, container.context.getString(R.string.download_video), null, true, items)
+
+            StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
+                val masterPlaylistResponse = ManagedHttpClient().get(sourceUrl)
+                check(masterPlaylistResponse.isOk) { "Failed to get master playlist: ${masterPlaylistResponse.code}" }
+
+                val masterPlaylistContent = masterPlaylistResponse.body?.string()
+                    ?: throw Exception("Master playlist content is empty")
+
+                val videoButtons = arrayListOf<SlideUpMenuItem>()
+                val audioButtons = arrayListOf<SlideUpMenuItem>()
+                //TODO: Implement subtitles
+                //val subtitleButtons = arrayListOf<SlideUpMenuItem>()
+
+                var selectedVideoVariant: HLSVariantVideoUrlSource? = null
+                var selectedAudioVariant: HLSVariantAudioUrlSource? = null
+                //TODO: Implement subtitles
+                //var selectedSubtitleVariant: HLSVariantSubtitleUrlSource? = null
+
+                val masterPlaylist: HLS.MasterPlaylist
+                try {
+                    masterPlaylist = HLS.parseMasterPlaylist(masterPlaylistContent, sourceUrl)
+
+                    masterPlaylist.getAudioSources().forEach { it ->
+                        audioButtons.add(SlideUpMenuItem(container.context, R.drawable.ic_music, it.name, listOf(it.language, it.codec).mapNotNull { x -> x.ifEmpty { null } }.joinToString(", "), it, {
+                            selectedAudioVariant = it
+                            slideUpMenuOverlay.selectOption(audioButtons, it)
+                            slideUpMenuOverlay.setOk(container.context.getString(R.string.download))
+                        }, false))
+                    }
+
+                    /*masterPlaylist.getSubtitleSources().forEach { it ->
+                        subtitleButtons.add(SlideUpMenuItem(container.context, R.drawable.ic_music, it.name, listOf(it.format).mapNotNull { x -> x.ifEmpty { null } }.joinToString(", "), it, {
+                            selectedSubtitleVariant = it
+                            slideUpMenuOverlay.selectOption(subtitleButtons, it)
+                            slideUpMenuOverlay.setOk(container.context.getString(R.string.download))
+                        }, false))
+                    }*/
+
+                    masterPlaylist.getVideoSources().forEach {
+                        videoButtons.add(SlideUpMenuItem(container.context, R.drawable.ic_movie, it.name, "${it.width}x${it.height}", it, {
+                            selectedVideoVariant = it
+                            slideUpMenuOverlay.selectOption(videoButtons, it)
+                            slideUpMenuOverlay.setOk(container.context.getString(R.string.download))
+                        }, false))
+                    }
+
+                    val newItems = arrayListOf<View>()
+                    if (videoButtons.isNotEmpty()) {
+                        newItems.add(SlideUpMenuGroup(container.context, container.context.getString(R.string.video), videoButtons, videoButtons))
+                    }
+                    if (audioButtons.isNotEmpty()) {
+                        newItems.add(SlideUpMenuGroup(container.context, container.context.getString(R.string.audio), audioButtons, audioButtons))
+                    }
+                    //TODO: Implement subtitles
+                    /*if (subtitleButtons.isNotEmpty()) {
+                        newItems.add(SlideUpMenuGroup(container.context, container.context.getString(R.string.subtitles), subtitleButtons, subtitleButtons))
+                    }*/
+
+                    slideUpMenuOverlay.onOK.subscribe {
+                        //TODO: Fix SubtitleRawSource issue
+                        StateDownloads.instance.download(video, selectedVideoVariant, selectedAudioVariant, null);
+                        slideUpMenuOverlay.hide()
+                    }
+
+                    withContext(Dispatchers.Main) {
+                        slideUpMenuOverlay.setItems(newItems)
+                    }
+                } catch (e: Throwable) {
+                    if (masterPlaylistContent.lines().any { it.startsWith("#EXTINF:") }) {
+                        withContext(Dispatchers.Main) {
+                            if (source is IHLSManifestSource) {
+                                StateDownloads.instance.download(video, HLSVariantVideoUrlSource("variant", 0, 0, "application/vnd.apple.mpegurl", "", null, 0, false, sourceUrl), null, null)
+                                UIDialogs.toast(container.context, "Variant video HLS playlist download started")
+                                slideUpMenuOverlay.hide()
+                            } else if (source is IHLSManifestAudioSource) {
+                                StateDownloads.instance.download(video, null, HLSVariantAudioUrlSource("variant", 0, "application/vnd.apple.mpegurl", "", "", null, false, sourceUrl), null)
+                                UIDialogs.toast(container.context, "Variant audio HLS playlist download started")
+                                slideUpMenuOverlay.hide()
+                            } else {
+                                throw NotImplementedError()
+                            }
+                        }
+                    } else {
+                        throw e
+                    }
+                }
+            }
+
+            return slideUpMenuOverlay.apply { show() }
 
-            menu.show();
         }
 
         fun showDownloadVideoOverlay(video: IPlatformVideoDetails, container: ViewGroup, contentResolver: ContentResolver? = null): SlideUpMenuOverlay? {
@@ -128,7 +267,7 @@ class UISlideOverlays {
             val audioSources = if(descriptor is VideoUnMuxedSourceDescriptor) descriptor.audioSources else null;
             val subtitleSources = video.subtitles;
 
-            if(videoSources.size == 0 && (audioSources?.size ?: 0) == 0) {
+            if(videoSources.isEmpty() && (audioSources?.size ?: 0) == 0) {
                 UIDialogs.toast(container.context.getString(R.string.no_downloads_available), false);
                 return null;
             }
@@ -149,49 +288,72 @@ class UISlideOverlays {
                 videoSources
                 .filter { it.isDownloadable() }
                 .map {
-                    SlideUpMenuItem(container.context, R.drawable.ic_movie, it.name, "${it.width}x${it.height}", it, {
-                        selectedVideo = it as IVideoUrlSource;
-                        menu?.selectOption(videoSources, it);
-                        if(selectedAudio != null || !requiresAudio)
-                            menu?.setOk(container.context.getString(R.string.download));
-                    }, false)
+                    when (it) {
+                        is IVideoUrlSource -> {
+                            SlideUpMenuItem(container.context, R.drawable.ic_movie, it.name, "${it.width}x${it.height}", it, {
+                                selectedVideo = it
+                                menu?.selectOption(videoSources, it);
+                                if(selectedAudio != null || !requiresAudio)
+                                    menu?.setOk(container.context.getString(R.string.download));
+                            }, false)
+                        }
+
+                        is IHLSManifestSource -> {
+                            SlideUpMenuItem(container.context, R.drawable.ic_movie, it.name, "HLS", it, {
+                                showHlsPicker(video, it, it.url, container)
+                            }, false)
+                        }
+
+                        else -> {
+                            throw Exception("Unhandled source type")
+                        }
+                    }
                 }).flatten().toList()
             ));
 
-            if(Settings.instance.downloads.getDefaultVideoQualityPixels() > 0 && videoSources.size > 0)
-                selectedVideo = VideoHelper.selectBestVideoSource(videoSources.filter { it.isDownloadable() }.asIterable(),
+            if(Settings.instance.downloads.getDefaultVideoQualityPixels() > 0 && videoSources.isNotEmpty()) {
+                //TODO: Add HLS support here
+                selectedVideo = VideoHelper.selectBestVideoSource(
+                    videoSources.filter { it is IVideoUrlSource && it.isDownloadable() }.asIterable(),
                     Settings.instance.downloads.getDefaultVideoQualityPixels(),
-                    FutoVideoPlayerBase.PREFERED_VIDEO_CONTAINERS) as IVideoUrlSource;
+                    FutoVideoPlayerBase.PREFERED_VIDEO_CONTAINERS
+                ) as IVideoUrlSource;
+            }
 
-
-            audioSources?.let { audioSources ->
+            if (audioSources != null) {
                 items.add(SlideUpMenuGroup(container.context, container.context.getString(R.string.audio), audioSources, audioSources
                     .filter { VideoHelper.isDownloadable(it) }
                     .map {
-                        SlideUpMenuItem(container.context, R.drawable.ic_music, it.name, "${it.bitrate}", it, {
-                            selectedAudio = it as IAudioUrlSource;
-                            menu?.selectOption(audioSources, it);
-                            menu?.setOk(container.context.getString(R.string.download));
-                        }, false);
+                        when (it) {
+                            is IAudioUrlSource -> {
+                                SlideUpMenuItem(container.context, R.drawable.ic_music, it.name, "${it.bitrate}", it, {
+                                    selectedAudio = it
+                                    menu?.selectOption(audioSources, it);
+                                    menu?.setOk(container.context.getString(R.string.download));
+                                }, false);
+                            }
+
+                            is IHLSManifestAudioSource -> {
+                                SlideUpMenuItem(container.context, R.drawable.ic_movie, it.name, "HLS Audio", it, {
+                                    showHlsPicker(video, it, it.url, container)
+                                }, false)
+                            }
+
+                            else -> {
+                                throw Exception("Unhandled source type")
+                            }
+                        }
                     }));
-                val asources = audioSources;
-                val preferredAudioSource = VideoHelper.selectBestAudioSource(asources.asIterable(),
-                    FutoVideoPlayerBase.PREFERED_AUDIO_CONTAINERS,
-                    Settings.instance.playback.getPrimaryLanguage(container.context),
-                    if(Settings.instance.downloads.isHighBitrateDefault()) 99999999 else 1);
-                menu?.selectOption(asources, preferredAudioSource);
 
-
-                selectedAudio = VideoHelper.selectBestAudioSource(audioSources.filter { it.isDownloadable() }.asIterable(),
+                //TODO: Add HLS support here
+                selectedAudio = VideoHelper.selectBestAudioSource(audioSources.filter { it is IAudioUrlSource && it.isDownloadable() }.asIterable(),
                     FutoVideoPlayerBase.PREFERED_AUDIO_CONTAINERS,
                     Settings.instance.playback.getPrimaryLanguage(container.context),
                     if(Settings.instance.downloads.isHighBitrateDefault()) 9999999 else 1) as IAudioUrlSource?;
             }
 
-            //ContentResolver is required for subtitles..
-            if(contentResolver != null) {
-                items.add(SlideUpMenuGroup(container.context, container.context.getString(R.string.subtitles), subtitleSources, subtitleSources
-                    .map {
+            if(contentResolver != null && subtitleSources.isNotEmpty()) {
+                items.add(SlideUpMenuGroup(container.context, container.context.getString(R.string.subtitles), subtitleSources, subtitleSources.map {
                         SlideUpMenuItem(container.context, R.drawable.ic_edit, it.name, "", it, {
                             if (selectedSubtitle == it) {
                                 selectedSubtitle = null;
@@ -201,7 +363,8 @@ class UISlideOverlays {
                                 menu?.selectOption(subtitleSources, it);
                             }
                         }, false);
-                    }));
+                    })
+                );
             }
 
             menu = SlideUpMenuOverlay(container.context, container, container.context.getString(R.string.download_video), null, true, items);
@@ -361,7 +524,7 @@ class UISlideOverlays {
             val dp70 = 70.dp(container.context.resources);
             val dp15 = 15.dp(container.context.resources);
             val overlay = SlideUpMenuOverlay(container.context, container, text, null, true, listOf(
-                Loader(container.context, true, dp70).apply {
+                LoaderView(container.context, true, dp70).apply {
                     this.setPadding(0, dp15, 0, dp15);
                 }
             ), true);
@@ -369,6 +532,75 @@ class UISlideOverlays {
             return overlay;
         }
 
+        fun showCreateSubscriptionGroup(container: ViewGroup, initialChannel: IPlatformChannel? = null, onCreate: ((String) -> Unit)? = null): SlideUpMenuOverlay {
+            val nameInput = SlideUpMenuTextInput(container.context, container.context.getString(R.string.name));
+            val addSubGroupOverlay = SlideUpMenuOverlay(container.context, container, container.context.getString(R.string.create_new_subgroup), container.context.getString(R.string.ok), false, nameInput);
+
+            addSubGroupOverlay.onOK.subscribe {
+                val text = nameInput.text;
+                if (text.isBlank()) {
+                    return@subscribe;
+                }
+
+                addSubGroupOverlay.hide();
+                nameInput.deactivate();
+                nameInput.clear();
+                if(onCreate == null)
+                {
+                    //TODO: Do this better, temp
+                    StateApp.instance.contextOrNull?.let {
+                        if(it is MainActivity) {
+                            val subGroup = SubscriptionGroup(text);
+                            if(initialChannel != null) {
+                                subGroup.urls.add(initialChannel.url);
+                                if(initialChannel.thumbnail != null)
+                                    subGroup.image = ImageVariable(initialChannel.thumbnail);
+                            }
+                            it.navigate(it.getFragment<SubscriptionGroupFragment>(), subGroup);
+                        }
+                    }
+                }
+                else
+                    onCreate(text)
+            };
+
+            addSubGroupOverlay.onCancel.subscribe {
+                nameInput.deactivate();
+                nameInput.clear();
+            };
+
+            addSubGroupOverlay.show();
+            nameInput.activate();
+
+            return addSubGroupOverlay
+        }
+        fun showCreatePlaylistOverlay(container: ViewGroup, onCreate: (String) -> Unit): SlideUpMenuOverlay {
+            val nameInput = SlideUpMenuTextInput(container.context, container.context.getString(R.string.name));
+            val addPlaylistOverlay = SlideUpMenuOverlay(container.context, container, container.context.getString(R.string.create_new_playlist), container.context.getString(R.string.ok), false, nameInput);
+
+            addPlaylistOverlay.onOK.subscribe {
+                val text = nameInput.text;
+                if (text.isBlank()) {
+                    return@subscribe;
+                }
+
+                addPlaylistOverlay.hide();
+                nameInput.deactivate();
+                nameInput.clear();
+                onCreate(text)
+            };
+
+            addPlaylistOverlay.onCancel.subscribe {
+                nameInput.deactivate();
+                nameInput.clear();
+            };
+
+            addPlaylistOverlay.show();
+            nameInput.activate();
+
+            return addPlaylistOverlay
+        }
+
         fun showVideoOptionsOverlay(video: IPlatformVideo, container: ViewGroup, vararg actions: SlideUpMenuItem): SlideUpMenuOverlay {
             val items = arrayListOf<View>();
             val lastUpdated = StatePlaylists.instance.getLastUpdatedPlaylist();
@@ -407,6 +639,13 @@ class UISlideOverlays {
             ));
 
             val playlistItems = arrayListOf<SlideUpMenuItem>();
+            playlistItems.add(SlideUpMenuItem(container.context, R.drawable.ic_playlist_add, container.context.getString(R.string.new_playlist), container.context.getString(R.string.add_to_new_playlist), "add_to_new_playlist", {
+                showCreatePlaylistOverlay(container) {
+                    val playlist = Playlist(it, arrayListOf(SerializedPlatformVideo.fromVideo(video)));
+                    StatePlaylists.instance.createOrUpdatePlaylist(playlist);
+                };
+            }, false))
+
             for (playlist in allPlaylists) {
                 playlistItems.add(SlideUpMenuItem(container.context, R.drawable.ic_playlist_add, "${container.context.getString(R.string.add_to)} " + playlist.name + "", "${playlist.videos.size} " + container.context.getString(R.string.videos), "",
                     {
@@ -478,10 +717,11 @@ class UISlideOverlays {
             val visible = buttonGroup.getVisibleButtons().filter { !ignoreTags.contains(it.tagRef) };
             val hidden = buttonGroup.getInvisibleButtons().filter { !ignoreTags.contains(it.tagRef) };
 
-            val views = arrayOf(hidden
-                .map { btn -> SlideUpMenuItem(container.context, btn.iconResource, btn.text.text.toString(), "", "", {
-                    btn.handler?.invoke(btn);
-                }, true) as View  }.toTypedArray() ?: arrayOf(),
+            val views = arrayOf(
+                hidden
+                    .map { btn -> SlideUpMenuItem(container.context, btn.iconResource, btn.text.text.toString(), "", "", {
+                        btn.handler?.invoke(btn);
+                    }, true) as View  }.toTypedArray(),
                 arrayOf(SlideUpMenuItem(container.context, R.drawable.ic_pin, container.context.getString(R.string.change_pins), container.context.getString(R.string.decide_which_buttons_should_be_pinned), "", {
                     showOrderOverlay(container, container.context.getString(R.string.select_your_pins_in_order),  (visible + hidden).map { Pair(it.text.text.toString(), it.tagRef!!) }) {
                         val selected = it

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

@@ -143,6 +143,7 @@ fun InputStream.copyToOutputStream(inputStreamLength: Long, outputStream: Output
     }
 }
 
+@Suppress("DEPRECATION")
 fun Activity.setNavigationBarColorAndIcons() {
     window.navigationBarColor = ContextCompat.getColor(this, android.R.color.black);
 
@@ -164,9 +165,7 @@ fun Int.sp(resources: Resources): Int {
     return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, this.toFloat(), resources.displayMetrics).toInt()
 }
 
-fun File.share(context: Context) {
-    val uri = FileProvider.getUriForFile(context, context.resources.getString(R.string.authority), this);
-
+fun DocumentFile.share(context: Context) {
     val shareIntent = Intent();
     shareIntent.action = Intent.ACTION_SEND;
     shareIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);

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

@@ -1,16 +1,24 @@
 package com.futo.platformplayer.activities
 
+import android.content.Context
 import android.content.Intent
 import android.graphics.drawable.Animatable
 import android.os.Bundle
 import android.view.View
-import android.widget.*
+import android.widget.ImageButton
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.ScrollView
+import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
 import androidx.lifecycle.lifecycleScope
-import com.futo.platformplayer.*
+import com.futo.platformplayer.R
+import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.setNavigationBarColorAndIcons
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StatePlatform
 import com.futo.platformplayer.states.StatePlugins
@@ -45,6 +53,10 @@ class AddSourceActivity : AppCompatActivity() {
     private var _config: SourcePluginConfig? = null;
     private var _script: String? = null;
 
+    override fun attachBaseContext(newBase: Context?) {
+        super.attachBaseContext(StateApp.instance.getLocaleContext(newBase))
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState);
 
@@ -189,7 +201,7 @@ class AddSourceActivity : AppCompatActivity() {
                 config.allowUrls, true)
             )
 
-        val pastelRed = resources.getColor(R.color.pastel_red);
+        val pastelRed = ContextCompat.getColor(this, R.color.pastel_red);
 
         for(warning in config.getWarnings(script))
             _sourceWarnings.addView(

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

@@ -1,5 +1,6 @@
 package com.futo.platformplayer.activities
 
+import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
@@ -7,9 +8,9 @@ import android.widget.*
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import com.futo.platformplayer.*
+import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.views.buttons.BigButton
 import com.google.zxing.integration.android.IntentIntegrator
-import com.journeyapps.barcodescanner.CaptureActivity
 
 class AddSourceOptionsActivity : AppCompatActivity() {
     lateinit var _buttonBack: ImageButton;
@@ -43,6 +44,10 @@ class AddSourceOptionsActivity : AppCompatActivity() {
         }
     }
 
+    override fun attachBaseContext(newBase: Context?) {
+        super.attachBaseContext(StateApp.instance.getLocaleContext(newBase))
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_add_source_options);

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

@@ -18,6 +18,7 @@ import com.futo.platformplayer.engine.IV8PluginConfig
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.others.CaptchaWebViewClient
 import com.futo.platformplayer.others.LoginWebViewClient
+import com.futo.platformplayer.states.StateApp
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.serialization.decodeFromString
@@ -31,6 +32,10 @@ class CaptchaActivity : AppCompatActivity() {
     private lateinit var _webView: WebView;
     private lateinit var _buttonClose: Button;
 
+    override fun attachBaseContext(newBase: Context?) {
+        super.attachBaseContext(StateApp.instance.getLocaleContext(newBase))
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_captcha);

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

@@ -1,17 +1,24 @@
 package com.futo.platformplayer.activities
 
+import android.annotation.SuppressLint
 import android.os.Bundle
 import android.widget.ImageButton
 import androidx.appcompat.app.AppCompatActivity
 import com.futo.platformplayer.*
 import com.futo.platformplayer.views.fields.FieldForm
+import com.futo.platformplayer.views.fields.IField
 
 class DeveloperActivity : AppCompatActivity() {
     private lateinit var _form: FieldForm;
     private lateinit var _buttonBack: ImageButton;
 
+    fun getField(id: String): IField? {
+        return _form.findField(id);
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState);
+        DeveloperActivity._lastActivity = this;
         setContentView(R.layout.activity_dev);
         setNavigationBarColorAndIcons();
 
@@ -19,7 +26,7 @@ class DeveloperActivity : AppCompatActivity() {
         _form = findViewById(R.id.settings_form);
 
         _form.fromObject(SettingsDev.instance);
-        _form.onChanged.subscribe { field, value ->
+        _form.onChanged.subscribe { _, _ ->
             _form.setObjectValues();
             SettingsDev.instance.save();
         };
@@ -33,4 +40,19 @@ class DeveloperActivity : AppCompatActivity() {
         super.finish()
         overridePendingTransition(R.anim.slide_lighten, R.anim.slide_out_up)
     }
+
+
+
+    companion object {
+        //TODO: Temporary for solving Settings issues
+        @SuppressLint("StaticFieldLeak")
+        private var _lastActivity: DeveloperActivity? = null;
+
+        fun getActivity(): DeveloperActivity? {
+            val act = _lastActivity;
+            if(act != null)
+                return act;
+            return null;
+        }
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.futo.platformplayer.activities
 
+import android.content.Context
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
@@ -11,6 +12,7 @@ import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.*
 import com.futo.platformplayer.logging.LogLevel
 import com.futo.platformplayer.logging.Logging
+import com.futo.platformplayer.states.StateApp
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -27,6 +29,10 @@ class ExceptionActivity : AppCompatActivity() {
     private var _file: File? = null;
     private var _submitted = false;
 
+    override fun attachBaseContext(newBase: Context?) {
+        super.attachBaseContext(StateApp.instance.getLocaleContext(newBase))
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_exception);

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

@@ -0,0 +1,108 @@
+package com.futo.platformplayer.activities
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Build
+import android.os.Bundle
+import android.text.Html
+import android.widget.ImageButton
+import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
+import com.futo.platformplayer.R
+import com.futo.platformplayer.UIDialogs
+import com.futo.platformplayer.dialogs.CastingHelpDialog
+import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.setNavigationBarColorAndIcons
+import com.futo.platformplayer.states.StateApp
+import com.futo.platformplayer.views.buttons.BigButton
+
+class FCastGuideActivity : AppCompatActivity() {
+    override fun attachBaseContext(newBase: Context?) {
+        super.attachBaseContext(StateApp.instance.getLocaleContext(newBase))
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_fcast_guide);
+        setNavigationBarColorAndIcons();
+
+        findViewById<TextView>(R.id.text_explanation).apply {
+            val guideText = """
+                <h3>1. Install FCast Receiver:</h3>
+                <p>- Open Play Store, FireStore, or FCast website on your TV/desktop.<br>
+                - Search for "FCast Receiver", install and open it.</p>
+                <br>
+                
+                <h3>2. Prepare the Grayjay App:</h3>
+                <p>- Ensure it's connected to the same network as the FCast Receiver.</p>
+                <br>
+                
+                <h3>3. Initiate Casting from Grayjay:</h3>
+                <p>- Click the cast button in Grayjay.</p>
+                <br>
+                
+                <h3>4. Connect to FCast Receiver:</h3>
+                <p>- Wait for your device to show in the list or add it manually with its IP address.</p>
+                <br>
+                
+                <h3>5. Confirm Connection:</h3>
+                <p>- Click "OK" to confirm your device selection.</p>
+                <br>
+                
+                <h3>6. Start Casting:</h3>
+                <p>- Press "start" next to the device you've added.</p>
+                <br>
+                
+                <h3>7. Play Your Video:</h3>
+                <p>- Start any video in Grayjay to cast.</p>
+                <br>
+                
+                <h3>Finding Your IP Address:</h3>
+                <p><b>On FCast Receiver (Android):</b> Displayed on the main screen.<br>
+                <b>On Windows:</b> Use 'ipconfig' in Command Prompt.<br>
+                <b>On Linux:</b> Use 'hostname -I' or 'ip addr' in Terminal.<br>
+                <b>On MacOS:</b> System Preferences > Network.</p>
+            """.trimIndent()
+
+            text = Html.fromHtml(guideText, Html.FROM_HTML_MODE_COMPACT)
+        }
+
+        findViewById<ImageButton>(R.id.button_back).setOnClickListener {
+            UIDialogs.showCastingTutorialDialog(this)
+            finish()
+        }
+
+        findViewById<BigButton>(R.id.button_close).onClick.subscribe {
+            UIDialogs.showCastingTutorialDialog(this)
+            finish()
+        }
+
+        findViewById<BigButton>(R.id.button_website).onClick.subscribe {
+            try {
+                val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse("https://fcast.org/"))
+                startActivity(browserIntent);
+            } catch (e: Throwable) {
+                Logger.i(TAG, "Failed to open browser.", e)
+            }
+        }
+
+        findViewById<BigButton>(R.id.button_technical).onClick.subscribe {
+            try {
+                val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse("https://gitlab.com/futo-org/fcast/-/wikis/Protocol-version-1"))
+                startActivity(browserIntent);
+            } catch (e: Throwable) {
+                Logger.i(TAG, "Failed to open browser.", e)
+            }
+        }
+    }
+
+    override fun onBackPressed() {
+        UIDialogs.showCastingTutorialDialog(this)
+        finish()
+    }
+
+    companion object {
+        private const val TAG = "FCastGuideActivity";
+    }
+}

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

@@ -2,7 +2,6 @@ package com.futo.platformplayer.activities
 
 import android.content.Intent
 import androidx.activity.result.ActivityResult
-import androidx.activity.result.ActivityResultLauncher
 
 interface IWithResultLauncher {
     fun launchForResult(intent: Intent, code: Int, handler: (ActivityResult)->Unit);

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

@@ -3,23 +3,22 @@ package com.futo.platformplayer.activities
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.webkit.ConsoleMessage
 import android.webkit.CookieManager
-import android.webkit.WebChromeClient
 import android.webkit.WebView
 import android.widget.ImageButton
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
-import com.futo.platformplayer.*
+import com.futo.platformplayer.R
 import com.futo.platformplayer.api.media.platforms.js.SourceAuth
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginAuthConfig
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.others.LoginWebViewClient
+import com.futo.platformplayer.setNavigationBarColorAndIcons
+import com.futo.platformplayer.states.StateApp
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 
@@ -28,6 +27,9 @@ class LoginActivity : AppCompatActivity() {
     private lateinit var _textUrl: TextView;
     private lateinit var _buttonClose: ImageButton;
 
+    override fun attachBaseContext(newBase: Context?) {
+        super.attachBaseContext(StateApp.instance.getLocaleContext(newBase))
+    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState);
@@ -98,7 +100,7 @@ class LoginActivity : AppCompatActivity() {
 
     override fun finish() {
         lifecycleScope.launch(Dispatchers.Main) {
-            _webView?.loadUrl("about:blank");
+            _webView.loadUrl("about:blank");
         }
         _callback?.let {
             _callback = null;

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

@@ -1,5 +1,6 @@
 package com.futo.platformplayer.activities
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
@@ -7,7 +8,7 @@ import android.content.pm.ActivityInfo
 import android.content.res.Configuration
 import android.net.Uri
 import android.os.Bundle
-import android.preference.PreferenceManager
+import android.util.Log
 import android.util.TypedValue
 import android.view.View
 import android.widget.FrameLayout
@@ -24,11 +25,8 @@ import androidx.fragment.app.FragmentContainerView
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.*
-import com.futo.platformplayer.api.media.PlatformID
-import com.futo.platformplayer.api.media.models.channels.SerializedChannel
 import com.futo.platformplayer.casting.StateCasting
 import com.futo.platformplayer.constructs.Event1
-import com.futo.platformplayer.constructs.Event3
 import com.futo.platformplayer.fragment.mainactivity.bottombar.MenuBottomBarFragment
 import com.futo.platformplayer.fragment.mainactivity.main.*
 import com.futo.platformplayer.fragment.mainactivity.topbar.AddTopBarFragment
@@ -38,14 +36,15 @@ import com.futo.platformplayer.fragment.mainactivity.topbar.NavigationTopBarFrag
 import com.futo.platformplayer.fragment.mainactivity.topbar.SearchTopBarFragment
 import com.futo.platformplayer.listeners.OrientationManager
 import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.models.SubscriptionGroup
 import com.futo.platformplayer.models.UrlVideoWithTime
 import com.futo.platformplayer.states.*
 import com.futo.platformplayer.stores.FragmentedStorage
 import com.futo.platformplayer.stores.SubscriptionStorage
 import com.futo.platformplayer.stores.v2.ManagedStore
 import com.google.gson.JsonParser
+import com.google.zxing.integration.android.IntentIntegrator
 import kotlinx.coroutines.*
-import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import java.io.File
 import java.io.PrintWriter
@@ -89,6 +88,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
     lateinit var _fragMainPlaylistSearchResults: PlaylistSearchResultsFragment;
     lateinit var _fragMainSuggestions: SuggestionsFragment;
     lateinit var _fragMainSubscriptions: CreatorsFragment;
+    lateinit var _fragMainComments: CommentsFragment;
     lateinit var _fragMainSubscriptionsFeed: SubscriptionsFeedFragment;
     lateinit var _fragMainChannel: ChannelFragment;
     lateinit var _fragMainSources: SourcesFragment;
@@ -101,6 +101,8 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
     lateinit var _fragImportSubscriptions: ImportSubscriptionsFragment;
     lateinit var _fragImportPlaylists: ImportPlaylistsFragment;
     lateinit var _fragBuy: BuyFragment;
+    lateinit var _fragSubGroup: SubscriptionGroupFragment;
+    lateinit var _fragSubGroupList: SubscriptionGroupListFragment;
 
     lateinit var _fragBrowser: BrowserFragment;
 
@@ -122,6 +124,24 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
     private var _isVisible = true;
     private var _wasStopped = false;
 
+    private val _urlQrCodeResultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+        val scanResult = IntentIntegrator.parseActivityResult(result.resultCode, result.data)
+        scanResult?.let {
+            val content = it.contents
+            if (content == null) {
+                UIDialogs.toast(this, getString(R.string.failed_to_scan_qr_code))
+                return@let
+            }
+
+            try {
+                handleUrlAll(content)
+            } catch (e: Throwable) {
+                Logger.i(TAG, "Failed to handle URL.", e)
+                UIDialogs.toast(this, "Failed to handle URL: ${e.message}")
+            }
+        }
+    }
+
     constructor() : super() {
         Thread.setDefaultUncaughtExceptionHandler { _, throwable ->
             val writer = StringWriter();
@@ -204,6 +224,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         _fragMainCreatorSearchResults = CreatorSearchResultsFragment.newInstance();
         _fragMainPlaylistSearchResults = PlaylistSearchResultsFragment.newInstance();
         _fragMainSubscriptions = CreatorsFragment.newInstance();
+        _fragMainComments = CommentsFragment.newInstance();
         _fragMainChannel = ChannelFragment.newInstance();
         _fragMainSubscriptionsFeed = SubscriptionsFeedFragment.newInstance();
         _fragMainSources = SourcesFragment.newInstance();
@@ -217,6 +238,8 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         _fragImportSubscriptions = ImportSubscriptionsFragment.newInstance();
         _fragImportPlaylists = ImportPlaylistsFragment.newInstance();
         _fragBuy = BuyFragment.newInstance();
+        _fragSubGroup = SubscriptionGroupFragment.newInstance();
+        _fragSubGroupList = SubscriptionGroupListFragment.newInstance();
 
         _fragBrowser = BrowserFragment.newInstance();
 
@@ -281,6 +304,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         //Set top bars
         _fragMainHome.topBar = _fragTopBarGeneral;
         _fragMainSubscriptions.topBar = _fragTopBarGeneral;
+        _fragMainComments.topBar = _fragTopBarGeneral;
         _fragMainSuggestions.topBar = _fragTopBarSearch;
         _fragMainVideoSearchResults.topBar = _fragTopBarSearch;
         _fragMainCreatorSearchResults.topBar = _fragTopBarSearch;
@@ -297,6 +321,8 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         _fragDownloads.topBar = _fragTopBarGeneral;
         _fragImportSubscriptions.topBar = _fragTopBarImport;
         _fragImportPlaylists.topBar = _fragTopBarImport;
+        _fragSubGroup.topBar = _fragTopBarNavigation;
+        _fragSubGroupList.topBar = _fragTopBarAdd;
 
         _fragBrowser.topBar = _fragTopBarNavigation;
 
@@ -327,6 +353,15 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             fragCurrent.onOrientationChanged(it);
             if(_fragVideoDetail.state == VideoDetailFragment.State.MAXIMIZED)
                 _fragVideoDetail.onOrientationChanged(it);
+            else if(Settings.instance.other.bypassRotationPrevention)
+            {
+                requestedOrientation = when(orientation) {
+                    OrientationManager.Orientation.PORTRAIT -> ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+                    OrientationManager.Orientation.LANDSCAPE -> ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+                    OrientationManager.Orientation.REVERSED_PORTRAIT -> ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT
+                    OrientationManager.Orientation.REVERSED_LANDSCAPE -> ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE
+                }
+            }
         };
         _orientationManager.enable();
 
@@ -396,6 +431,23 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             UIDialogs.toast(this, "No external file permissions\nExporting and auto backups will not work");
     }*/
 
+    fun showUrlQrCodeScanner() {
+        try {
+            val integrator = IntentIntegrator(this)
+            integrator.setDesiredBarcodeFormats(IntentIntegrator.QR_CODE)
+            integrator.setPrompt(getString(R.string.scan_a_qr_code))
+            integrator.setOrientationLocked(true);
+            integrator.setCameraId(0)
+            integrator.setBeepEnabled(false)
+            integrator.setBarcodeImageEnabled(true)
+            integrator.captureActivity = QRCaptureActivity::class.java
+            _urlQrCodeResultLauncher.launch(integrator.createScanIntent())
+        } catch (e: Throwable) {
+            Logger.i(TAG, "Failed to handle show QR scanner.", e)
+            UIDialogs.toast(this, "Failed to show QR scanner: ${e.message}")
+        }
+    }
+
     override fun onResume() {
         super.onResume();
         Logger.v(TAG, "onResume")
@@ -469,6 +521,9 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
                 val url = intent.getStringExtra("VIDEO");
                 navigate(_fragVideoDetail, url);
             }
+            "IMPORT_OPTIONS" -> {
+                UIDialogs.showImportOptionsDialog(this);
+            }
             "TAB" -> {
                 when(intent.getStringExtra("TAB")){
                     "Sources" -> {
@@ -483,76 +538,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
 
         try {
             if (targetData != null) {
-                when(intent.scheme) {
-                    "grayjay" -> {
-                        if(targetData.startsWith("grayjay://license/")) {
-                            if(StatePayment.instance.setPaymentLicenseUrl(targetData))
-                            {
-                                UIDialogs.showDialogOk(this, R.drawable.ic_check, getString(R.string.your_license_key_has_been_set_an_app_restart_might_be_required));
-
-                                if(fragCurrent is BuyFragment)
-                                    closeSegment(fragCurrent);
-                            }
-                            else
-                                UIDialogs.toast(getString(R.string.invalid_license_format));
-
-                        }
-                        else if(targetData.startsWith("grayjay://plugin/")) {
-                            val intent = Intent(this, AddSourceActivity::class.java).apply {
-                                data = Uri.parse(targetData.substring("grayjay://plugin/".length));
-                            };
-                            startActivity(intent);
-                        }
-                        else if(targetData.startsWith("grayjay://video/")) {
-                            val videoUrl = targetData.substring("grayjay://video/".length);
-                            navigate(_fragVideoDetail, videoUrl);
-                        }
-                        else if(targetData.startsWith("grayjay://channel/")) {
-                            val channelUrl = targetData.substring("grayjay://channel/".length);
-                            navigate(_fragMainChannel, channelUrl);
-                        }
-                    }
-                    "content" -> {
-                        if(!handleContent(targetData, intent.type)) {
-                            UIDialogs.showSingleButtonDialog(
-                                this,
-                                R.drawable.ic_play,
-                                getString(R.string.unknown_content_format) + " [${targetData}]",
-                                "Ok",
-                                { });
-                        }
-                    }
-                    "file" -> {
-                        if(!handleFile(targetData)) {
-                            UIDialogs.showSingleButtonDialog(
-                                this,
-                                R.drawable.ic_play,
-                                getString(R.string.unknown_file_format) + " [${targetData}]",
-                                "Ok",
-                                { });
-                        }
-                    }
-                    "polycentric" -> {
-                        if(!handlePolycentric(targetData)) {
-                            UIDialogs.showSingleButtonDialog(
-                                this,
-                                R.drawable.ic_play,
-                                getString(R.string.unknown_polycentric_format) + " [${targetData}]",
-                                "Ok",
-                                { });
-                        }
-                    }
-                    else -> {
-                        if (!handleUrl(targetData)) {
-                            UIDialogs.showSingleButtonDialog(
-                                this,
-                                R.drawable.ic_play,
-                                getString(R.string.unknown_url_format) + " [${targetData}]",
-                                "Ok",
-                                { });
-                        }
-                    }
-                }
+                handleUrlAll(targetData)
             }
         }
         catch(ex: Throwable) {
@@ -560,6 +546,90 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         }
     }
 
+    fun handleUrlAll(url: String) {
+        val uri = Uri.parse(url)
+        when (uri.scheme) {
+            "grayjay" -> {
+                if(url.startsWith("grayjay://license/")) {
+                    if(StatePayment.instance.setPaymentLicenseUrl(url))
+                    {
+                        UIDialogs.showDialogOk(this, R.drawable.ic_check, getString(R.string.your_license_key_has_been_set_an_app_restart_might_be_required));
+
+                        if(fragCurrent is BuyFragment)
+                            closeSegment(fragCurrent);
+                    }
+                    else
+                        UIDialogs.toast(getString(R.string.invalid_license_format));
+
+                }
+                else if(url.startsWith("grayjay://plugin/")) {
+                    val intent = Intent(this, AddSourceActivity::class.java).apply {
+                        data = Uri.parse(url.substring("grayjay://plugin/".length));
+                    };
+                    startActivity(intent);
+                }
+                else if(url.startsWith("grayjay://video/")) {
+                    val videoUrl = url.substring("grayjay://video/".length);
+                    navigate(_fragVideoDetail, videoUrl);
+                }
+                else if(url.startsWith("grayjay://channel/")) {
+                    val channelUrl = url.substring("grayjay://channel/".length);
+                    navigate(_fragMainChannel, channelUrl);
+                }
+            }
+            "content" -> {
+                if(!handleContent(url, intent.type)) {
+                    UIDialogs.showSingleButtonDialog(
+                        this,
+                        R.drawable.ic_play,
+                        getString(R.string.unknown_content_format) + " [${url}]",
+                        "Ok",
+                        { });
+                }
+            }
+            "file" -> {
+                if(!handleFile(url)) {
+                    UIDialogs.showSingleButtonDialog(
+                        this,
+                        R.drawable.ic_play,
+                        getString(R.string.unknown_file_format) + " [${url}]",
+                        "Ok",
+                        { });
+                }
+            }
+            "polycentric" -> {
+                if(!handlePolycentric(url)) {
+                    UIDialogs.showSingleButtonDialog(
+                        this,
+                        R.drawable.ic_play,
+                        getString(R.string.unknown_polycentric_format) + " [${url}]",
+                        "Ok",
+                        { });
+                }
+            }
+            "fcast" -> {
+                if(!handleFCast(url)) {
+                    UIDialogs.showSingleButtonDialog(
+                        this,
+                        R.drawable.ic_cast,
+                        "Unknown FCast format [${url}]",
+                        "Ok",
+                        { });
+                }
+            }
+            else -> {
+                if (!handleUrl(url)) {
+                    UIDialogs.showSingleButtonDialog(
+                        this,
+                        R.drawable.ic_play,
+                        getString(R.string.unknown_url_format) + " [${url}]",
+                        "Ok",
+                        { });
+                }
+            }
+        }
+    }
+
     fun handleUrl(url: String): Boolean {
         Logger.i(TAG, "handleUrl(url=$url)")
 
@@ -585,7 +655,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         if(file.lowercase().endsWith(".json") || mime == "application/json") {
             var recon = String(data);
             if(!recon.trim().startsWith("["))
-                return handleUnknownJson(file, recon);
+                return handleUnknownJson(recon);
 
             val reconLines = Json.decodeFromString<List<String>>(recon);
             recon = reconLines.joinToString("\n");
@@ -607,7 +677,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         if(file.lowercase().endsWith(".json")) {
             val recon = String(readSharedFile(file));
             if(!recon.startsWith("["))
-                return handleUnknownJson(file, recon);
+                return handleUnknownJson(recon);
 
             Logger.i(TAG, "Opened shared playlist reconstruction\n${recon}");
             handleReconstruction(recon);
@@ -659,7 +729,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         }
         return false;
     }
-    fun handleUnknownJson(name: String?, json: String): Boolean {
+    fun handleUnknownJson(json: String): Boolean {
 
         val context = this;
 
@@ -669,18 +739,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             if (!newPipeSubsParsed.has("subscriptions") || !newPipeSubsParsed["subscriptions"].isJsonArray)
                 return false;//throw IllegalArgumentException("Invalid NewPipe json structure found");
 
-            val jsonSubs = newPipeSubsParsed["subscriptions"]
-            val jsonSubsArray = jsonSubs.asJsonArray;
-            val jsonSubsArrayItt = jsonSubsArray.iterator();
-            val subs = mutableListOf<String>()
-            while(jsonSubsArrayItt.hasNext()) {
-                val jsonSubObj = jsonSubsArrayItt.next().asJsonObject;
-
-                if(jsonSubObj.has("url"))
-                    subs.add(jsonSubObj["url"].asString);
-            }
-
-            navigate(_fragImportSubscriptions, subs);
+            StateBackup.importNewPipeSubs(this, newPipeSubsParsed);
         }
         catch(ex: Exception) {
             Logger.e(TAG, ex.message, ex);
@@ -706,6 +765,20 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         startActivity(Intent(this, PolycentricImportProfileActivity::class.java).apply { putExtra("url", url) })
         return true;
     }
+
+    fun handleFCast(url: String): Boolean {
+        Logger.i(TAG, "handleFCast");
+
+        try {
+            StateCasting.instance.handleUrl(this, url)
+            return true;
+        } catch (e: Throwable) {
+            Log.e(TAG, "Failed to parse FCast URL '${url}'.", e)
+        }
+
+        return false
+    }
+
     private fun readSharedContent(contentPath: String): ByteArray {
         return contentResolver.openInputStream(Uri.parse(contentPath))?.use {
             return it.readBytes();
@@ -765,7 +838,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
 
         val isStop: Boolean = lifecycle.currentState == Lifecycle.State.CREATED;
         Logger.v(TAG, "onPictureInPictureModeChanged isInPictureInPictureMode=$isInPictureInPictureMode isStop=$isStop")
-        _fragVideoDetail?.onPictureInPictureModeChanged(isInPictureInPictureMode, isStop, newConfig);
+        _fragVideoDetail.onPictureInPictureModeChanged(isInPictureInPictureMode, isStop, newConfig);
         Logger.v(TAG, "onPictureInPictureModeChanged Ready");
     }
 
@@ -787,6 +860,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
      * Navigate takes a MainFragment, and makes them the current main visible view
      * A parameter can be provided which becomes available in the onShow of said fragment
      */
+    @SuppressLint("CommitTransaction")
     fun navigate(segment: MainFragment, parameter: Any? = null, withHistory: Boolean = true, isBack: Boolean = false) {
         Logger.i(TAG, "Navigate to $segment (parameter=$parameter, withHistory=$withHistory, isBack=$isBack)")
 
@@ -822,7 +896,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
 
                 transaction = transaction.replace(R.id.fragment_main, segment);
 
-                val extraBottomDP = if(_fragVideoDetail.state == VideoDetailFragment.State.MINIMIZED) HEIGHT_VIDEO_MINIMIZED_DP else 0f
                 if (segment.hasBottomBar) {
                     if (!fragCurrent.hasBottomBar)
                         transaction = transaction.show(_fragBotBarMenu);
@@ -832,13 +905,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
                         transaction = transaction.hide(_fragBotBarMenu);
                 }
                 transaction.commitNow();
-            }
-            else {
-                //Special cases
-                if(segment is VideoDetailFragment) {
-                    _fragContainerVideoDetail.visibility = View.VISIBLE;
-                    _fragVideoDetail.maximizeVideoDetail();
-                }
+            } else {
 
                 if(!segment.hasBottomBar) {
                     supportFragmentManager.beginTransaction()
@@ -875,15 +942,20 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
 
         if((fragment?.isOverlay ?: false) && fragBeforeOverlay != null) {
             navigate(fragBeforeOverlay!!, null, false, true);
-
-        }
-        else {
+        } else {
             val last = _queue.lastOrNull();
             if (last != null) {
                 _queue.remove(last);
                 navigate(last.first, last.second, false, true);
-            } else
-                finish();
+            } else {
+                if (_fragVideoDetail.state == VideoDetailFragment.State.CLOSED) {
+                    finish();
+                } else {
+                    UIDialogs.showConfirmationDialog(this, "There is a video playing, are you sure you want to exit the app?", {
+                        finish();
+                    })
+                }
+            }
         }
     }
 
@@ -901,6 +973,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             GeneralTopBarFragment::class -> _fragTopBarGeneral as T;
             SearchTopBarFragment::class -> _fragTopBarSearch as T;
             CreatorsFragment::class -> _fragMainSubscriptions as T;
+            CommentsFragment::class -> _fragMainComments as T;
             SubscriptionsFeedFragment::class -> _fragMainSubscriptionsFeed as T;
             PlaylistSearchResultsFragment::class -> _fragMainPlaylistSearchResults as T;
             ChannelFragment::class -> _fragMainChannel as T;
@@ -916,6 +989,8 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             ImportPlaylistsFragment::class -> _fragImportPlaylists as T;
             BrowserFragment::class -> _fragBrowser as T;
             BuyFragment::class -> _fragBuy as T;
+            SubscriptionGroupFragment::class -> _fragSubGroup as T;
+            SubscriptionGroupListFragment::class -> _fragSubGroupList as T;
             else -> throw IllegalArgumentException("Fragment type ${T::class.java.name} is not available in MainActivity");
         }
     }
@@ -973,5 +1048,12 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             sourcesIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
             return sourcesIntent;
         }
+
+        fun getImportOptionsIntent(context: Context): Intent {
+            val sourcesIntent = Intent(context, MainActivity::class.java);
+            sourcesIntent.action = "IMPORT_OPTIONS";
+            sourcesIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+            return sourcesIntent;
+        }
     }
 }

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

@@ -1,5 +1,6 @@
 package com.futo.platformplayer.activities
 
+import android.content.Context
 import android.os.Bundle
 import android.widget.ImageButton
 import androidx.appcompat.app.AppCompatActivity
@@ -10,6 +11,7 @@ import com.futo.platformplayer.R
 import com.futo.platformplayer.Settings
 import com.futo.platformplayer.fragment.mainactivity.bottombar.MenuBottomBarFragment
 import com.futo.platformplayer.setNavigationBarColorAndIcons
+import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.views.AnyAdapterView
 import com.futo.platformplayer.views.AnyAdapterView.Companion.asAny
 import com.futo.platformplayer.views.adapters.ItemMoveCallback
@@ -23,6 +25,10 @@ class ManageTabsActivity : AppCompatActivity() {
     private lateinit var _recyclerTabs: RecyclerView;
     private lateinit var _touchHelper: ItemTouchHelper;
 
+    override fun attachBaseContext(newBase: Context?) {
+        super.attachBaseContext(StateApp.instance.getLocaleContext(newBase))
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_manage_tabs);
@@ -49,10 +55,10 @@ class ManageTabsActivity : AppCompatActivity() {
             Settings.instance.save()
         }
 
-        val items = Settings.instance.tabs.mapNotNull {
+        val items = ArrayList(Settings.instance.tabs.mapNotNull {
             val buttonDefinition = MenuBottomBarFragment.buttonDefinitions.find { d -> it.id == d.id } ?: return@mapNotNull null
             TabViewHolderData(buttonDefinition, it.enabled)
-        };
+        });
 
         _listTabs = _recyclerTabs.asAny(items) {
             it.onDragDrop.subscribe { vh ->

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

@@ -16,6 +16,7 @@ import androidx.appcompat.app.AppCompatActivity
 import com.futo.platformplayer.R
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.setNavigationBarColorAndIcons
+import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StatePolycentric
 import com.futo.platformplayer.views.buttons.BigButton
 import com.futo.polycentric.core.*
@@ -33,6 +34,10 @@ class PolycentricBackupActivity : AppCompatActivity() {
     private lateinit var _exportBundle: String;
     private lateinit var _textQR: TextView;
 
+    override fun attachBaseContext(newBase: Context?) {
+        super.attachBaseContext(StateApp.instance.getLocaleContext(newBase))
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_polycentric_backup);

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

@@ -1,5 +1,6 @@
 package com.futo.platformplayer.activities
 
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.widget.EditText
@@ -9,8 +10,10 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.R
 import com.futo.platformplayer.UIDialogs
+import com.futo.platformplayer.fullyBackfillServersAnnounceExceptions
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.setNavigationBarColorAndIcons
+import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StatePolycentric
 import com.futo.polycentric.core.ProcessHandle
 import com.futo.polycentric.core.Store
@@ -28,6 +31,10 @@ class PolycentricCreateProfileActivity : AppCompatActivity() {
 
     private var _creating = false;
 
+    override fun attachBaseContext(newBase: Context?) {
+        super.attachBaseContext(StateApp.instance.getLocaleContext(newBase))
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_polycentric_create_profile);
@@ -76,7 +83,7 @@ class PolycentricCreateProfileActivity : AppCompatActivity() {
 
                     try {
                         Logger.i(TAG, "Started backfill");
-                        processHandle.fullyBackfillServers();
+                        processHandle.fullyBackfillServersAnnounceExceptions();
                         Logger.i(TAG, "Finished backfill");
                     } catch (e: Throwable) {
                         Logger.e(TAG, getString(R.string.failed_to_fully_backfill_servers), e);

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

@@ -1,5 +1,6 @@
 package com.futo.platformplayer.activities
 
+import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.drawable.Drawable
@@ -15,6 +16,7 @@ import com.futo.platformplayer.R
 import com.futo.platformplayer.dp
 import com.futo.platformplayer.selectBestImage
 import com.futo.platformplayer.setNavigationBarColorAndIcons
+import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StatePolycentric
 import com.futo.platformplayer.views.buttons.BigButton
 import com.futo.polycentric.core.Store
@@ -27,6 +29,10 @@ class PolycentricHomeActivity : AppCompatActivity() {
     private lateinit var _buttonImportProfile: BigButton;
     private lateinit var _layoutButtons: LinearLayout;
 
+    override fun attachBaseContext(newBase: Context?) {
+        super.attachBaseContext(StateApp.instance.getLocaleContext(newBase))
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_polycentric_home);

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

@@ -1,5 +1,6 @@
 package com.futo.platformplayer.activities
 
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.widget.EditText
@@ -7,19 +8,19 @@ import android.widget.ImageButton
 import android.widget.LinearLayout
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
-import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.R
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.setNavigationBarColorAndIcons
+import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StatePolycentric
-import com.futo.polycentric.core.*
+import com.futo.polycentric.core.KeyPair
+import com.futo.polycentric.core.Process
+import com.futo.polycentric.core.ProcessSecret
+import com.futo.polycentric.core.SignedEvent
+import com.futo.polycentric.core.Store
+import com.futo.polycentric.core.base64UrlToByteArray
 import com.google.zxing.integration.android.IntentIntegrator
-import com.journeyapps.barcodescanner.CaptureActivity
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import userpackage.Protocol
 import userpackage.Protocol.ExportBundle
 
@@ -39,6 +40,10 @@ class PolycentricImportProfileActivity : AppCompatActivity() {
         }
     }
 
+    override fun attachBaseContext(newBase: Context?) {
+        super.attachBaseContext(StateApp.instance.getLocaleContext(newBase))
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_polycentric_import_profile);

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

@@ -2,6 +2,7 @@ package com.futo.platformplayer.activities
 
 import android.app.Activity
 import android.content.ContentResolver
+import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
@@ -16,8 +17,8 @@ import androidx.lifecycle.lifecycleScope
 import com.bumptech.glide.Glide
 import com.futo.platformplayer.R
 import com.futo.platformplayer.UIDialogs
-import com.futo.platformplayer.dialogs.CommentDialog
 import com.futo.platformplayer.dp
+import com.futo.platformplayer.fullyBackfillServersAnnounceExceptions
 import com.futo.platformplayer.images.GlideHelper.Companion.crossfade
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.selectBestImage
@@ -28,7 +29,6 @@ import com.futo.platformplayer.views.buttons.BigButton
 import com.futo.polycentric.core.Store
 import com.futo.polycentric.core.Synchronization
 import com.futo.polycentric.core.SystemState
-import com.futo.polycentric.core.toURLInfoDataLink
 import com.futo.polycentric.core.toURLInfoSystemLinkUrl
 import com.github.dhaval2404.imagepicker.ImagePicker
 import kotlinx.coroutines.Dispatchers
@@ -48,6 +48,10 @@ class PolycentricProfileActivity : AppCompatActivity() {
     private lateinit var _imagePolycentric: ImageView;
     private var _avatarUri: Uri? = null;
 
+    override fun attachBaseContext(newBase: Context?) {
+        super.attachBaseContext(StateApp.instance.getLocaleContext(newBase))
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_polycentric_profile);
@@ -189,7 +193,7 @@ class PolycentricProfileActivity : AppCompatActivity() {
                 if (hasChanges) {
                     try {
                         Logger.i(TAG, "Started backfill");
-                        processHandle.fullyBackfillServers();
+                        processHandle.fullyBackfillServersAnnounceExceptions();
                         Logger.i(TAG, "Finished backfill");
                         withContext(Dispatchers.Main) {
                             UIDialogs.toast(this@PolycentricProfileActivity, getString(R.string.changes_have_been_saved));
@@ -244,7 +248,7 @@ class PolycentricProfileActivity : AppCompatActivity() {
     }
 
     private fun getMimeType(contentResolver: ContentResolver, uri: Uri): String? {
-        var mimeType: String? = null;
+        var mimeType: String?;
 
         // Try to get MIME type from the content URI
         mimeType = contentResolver.getType(uri);

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

@@ -1,5 +1,6 @@
 package com.futo.platformplayer.activities
 
+import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
@@ -7,12 +8,17 @@ import android.widget.ImageButton
 import androidx.appcompat.app.AppCompatActivity
 import com.futo.platformplayer.R
 import com.futo.platformplayer.setNavigationBarColorAndIcons
+import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.views.buttons.BigButton
 
 class PolycentricWhyActivity : AppCompatActivity() {
     private lateinit var _buttonVideo: BigButton;
     private lateinit var _buttonTechnical: BigButton;
 
+    override fun attachBaseContext(newBase: Context?) {
+        super.attachBaseContext(StateApp.instance.getLocaleContext(newBase))
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_polycentric_why);

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

@@ -5,6 +5,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
+import android.widget.FrameLayout
 import android.widget.ImageButton
 import android.widget.LinearLayout
 import androidx.activity.result.ActivityResult
@@ -15,7 +16,7 @@ import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.*
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateApp
-import com.futo.platformplayer.views.Loader
+import com.futo.platformplayer.views.LoaderView
 import com.futo.platformplayer.views.fields.FieldForm
 import com.futo.platformplayer.views.fields.ReadOnlyTextField
 import com.google.android.material.button.MaterialButton
@@ -23,13 +24,15 @@ import com.google.android.material.button.MaterialButton
 class SettingsActivity : AppCompatActivity(), IWithResultLauncher {
     private lateinit var _form: FieldForm;
     private lateinit var _buttonBack: ImageButton;
-    private lateinit var _loader: Loader;
+    private lateinit var _loaderView: LoaderView;
 
     private lateinit var _devSets: LinearLayout;
     private lateinit var _buttonDev: MaterialButton;
 
     private var _isFinished = false;
 
+    lateinit var overlay: FrameLayout;
+
     override fun attachBaseContext(newBase: Context?) {
         Logger.i("SettingsActivity", "SettingsActivity.attachBaseContext")
         super.attachBaseContext(StateApp.instance.getLocaleContext(newBase))
@@ -43,9 +46,10 @@ class SettingsActivity : AppCompatActivity(), IWithResultLauncher {
         _buttonBack = findViewById(R.id.button_back);
         _buttonDev = findViewById(R.id.button_dev);
         _devSets = findViewById(R.id.dev_settings);
-        _loader = findViewById(R.id.loader);
+        _loaderView = findViewById(R.id.loader);
+        overlay = findViewById(R.id.overlay_container);
 
-        _form.onChanged.subscribe { field, value ->
+        _form.onChanged.subscribe { field, _ ->
             Logger.i("SettingsActivity", "Setting [${field.field?.name}] changed, saving");
             _form.setObjectValues();
             Settings.instance.save();
@@ -69,9 +73,11 @@ class SettingsActivity : AppCompatActivity(), IWithResultLauncher {
     }
 
     fun reloadSettings() {
-        _loader.start();
+        _form.setSearchVisible(false);
+        _loaderView.start();
         _form.fromObject(lifecycleScope, Settings.instance) {
-            _loader.stop();
+            _loaderView.stop();
+            _form.setSearchVisible(true);
 
             var devCounter = 0;
             _form.findField("code")?.assume<ReadOnlyTextField>()?.setOnClickListener {

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

@@ -13,8 +13,6 @@ import okhttp3.Response
 import okhttp3.ResponseBody
 import okhttp3.WebSocket
 import okhttp3.WebSocketListener
-import java.util.Dictionary
-import java.util.concurrent.TimeUnit
 import kotlin.system.measureTimeMillis
 
 open class ManagedHttpClient {
@@ -60,7 +58,7 @@ open class ManagedHttpClient {
 
         val requestBuilder: okhttp3.Request.Builder = okhttp3.Request.Builder()
             .url(url);
-        if(user_agent != null && !user_agent.isEmpty() && !headers.any { it.key.lowercase() == "user-agent" })
+        if(user_agent.isNotEmpty() && !headers.any { it.key.lowercase() == "user-agent" })
             requestBuilder.addHeader("User-Agent", user_agent)
 
         for (pair in headers.entries)
@@ -137,7 +135,7 @@ open class ManagedHttpClient {
         val requestBuilder: okhttp3.Request.Builder = okhttp3.Request.Builder()
             .method(request.method, requestBody)
             .url(request.url);
-        if(user_agent != null && !user_agent.isEmpty() && !request.headers.any { it.key.lowercase() == "user-agent" })
+        if(user_agent.isNotEmpty() && !request.headers.any { it.key.lowercase() == "user-agent" })
             requestBuilder.addHeader("User-Agent", user_agent)
 
         for (pair in request.headers.entries)
@@ -148,7 +146,7 @@ open class ManagedHttpClient {
 
         val time = measureTimeMillis {
             val call = client.newCall(requestBuilder.build());
-            request.onCallCreated?.emit(call);
+            request.onCallCreated.emit(call);
             response = call.execute()
             resp = Response(
                 response.code,

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

@@ -8,16 +8,20 @@ import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import java.io.BufferedReader
+import java.io.ByteArrayInputStream
+import java.io.ByteArrayOutputStream
+import java.io.IOException
+import java.io.InputStream
 import java.io.OutputStream
 import java.io.StringWriter
 import java.net.SocketTimeoutException
 
 class HttpContext : AutoCloseable {
-    private val _stream: BufferedReader;
+    private val _inputStream: InputStream;
     private var _responseStream: OutputStream? = null;
-    
+
     var id: String? = null;
-    
+
     var head: String = "";
     var headers: HttpHeaders = HttpHeaders();
 
@@ -39,76 +43,130 @@ class HttpContext : AutoCloseable {
     private val _responseHeaders: HttpHeaders = HttpHeaders();
 
 
-    constructor(stream: BufferedReader, responseStream: OutputStream? = null, requestId: String? = null, timeout: Int? = null) {
-        _stream = stream;
+    constructor(inputStream: InputStream, responseStream: OutputStream? = null, requestId: String? = null, timeout: Int? = null) {
+        _inputStream = inputStream;
         _responseStream = responseStream;
         this.id = requestId;
 
-        try {
-            head = stream.readLine() ?: throw EmptyRequestException("No head found");
-        }
-        catch(ex: SocketTimeoutException) {
-            if((timeout ?: 0) > 0)
-                throw KeepAliveTimeoutException("Keep-Alive timedout", ex);
-            throw ex;
-        }
-
-        val methodEndIndex = head.indexOf(' ');
-        val urlEndIndex = head.indexOf(' ', methodEndIndex + 1);
-        if (methodEndIndex == -1 || urlEndIndex == -1) {
-            Logger.w(TAG, "Skipped request, wrong format.");
-            throw IllegalStateException("Invalid request");
-        }
-
-        method = head.substring(0, methodEndIndex);
-        path = head.substring(methodEndIndex + 1, urlEndIndex);
-
-        if (path.contains("?")) {
-            val queryPartIndex = path.indexOf("?");
-            val queryParts = path.substring(queryPartIndex + 1).split("&");
-            path = path.substring(0, queryPartIndex);
-
-            for(queryPart in queryParts) {
-                val eqIndex = queryPart.indexOf("=");
-                if(eqIndex > 0)
-                    query.put(queryPart.substring(0, eqIndex), queryPart.substring(eqIndex + 1));
-                else
-                    query.put(queryPart, "");
+        val headerBytes = readHeaderBytes()
+        ByteArrayInputStream(headerBytes).use {
+            val reader = it.bufferedReader(Charsets.UTF_8)
+            try {
+                head = reader.readLine() ?: throw EmptyRequestException("No head found");
+            }
+            catch(ex: SocketTimeoutException) {
+                if((timeout ?: 0) > 0)
+                    throw KeepAliveTimeoutException("Keep-Alive timedout", ex);
+                throw ex;
             }
-        }
 
-        while (true) {
-            val line = stream.readLine();
-            val headerEndIndex = line.indexOf(":");
-            if (headerEndIndex == -1)
-                break;
+            val methodEndIndex = head.indexOf(' ');
+            val urlEndIndex = head.indexOf(' ', methodEndIndex + 1);
+            if (methodEndIndex == -1 || urlEndIndex == -1) {
+                Logger.w(TAG, "Skipped request, wrong format.");
+                throw IllegalStateException("Invalid request");
+            }
 
-            val headerKey = line.substring(0, headerEndIndex).lowercase()
-            val headerValue = line.substring(headerEndIndex + 1).trim();
-            headers[headerKey] = headerValue;
+            method = head.substring(0, methodEndIndex);
+            path = head.substring(methodEndIndex + 1, urlEndIndex);
 
-            when(headerKey) {
-                "content-length" -> contentLength = headerValue.toLong();
-                "content-type" -> contentType = headerValue;
-                "connection" -> keepAlive = headerValue.lowercase() == "keep-alive";
-                "keep-alive" -> {
-                    val keepAliveParams = headerValue.split(",");
-                    for(keepAliveParam in keepAliveParams) {
-                        val eqIndex = keepAliveParam.indexOf("=");
-                        if(eqIndex > 0){
-                            when(keepAliveParam.substring(0, eqIndex)) {
-                                "timeout" -> keepAliveTimeout = keepAliveParam.substring(eqIndex+1).toInt();
-                                "max" -> keepAliveTimeout = keepAliveParam.substring(eqIndex+1).toInt();
+            if (path.contains("?")) {
+                val queryPartIndex = path.indexOf("?");
+                val queryParts = path.substring(queryPartIndex + 1).split("&");
+                path = path.substring(0, queryPartIndex);
+
+                for(queryPart in queryParts) {
+                    val eqIndex = queryPart.indexOf("=");
+                    if(eqIndex > 0)
+                        query.put(queryPart.substring(0, eqIndex), queryPart.substring(eqIndex + 1));
+                    else
+                        query.put(queryPart, "");
+                }
+            }
+
+            while (true) {
+                val line = reader.readLine();
+                val headerEndIndex = line.indexOf(":");
+                if (headerEndIndex == -1)
+                    break;
+
+                val headerKey = line.substring(0, headerEndIndex).lowercase()
+                val headerValue = line.substring(headerEndIndex + 1).trim();
+                headers[headerKey] = headerValue;
+
+                when(headerKey) {
+                    "content-length" -> contentLength = headerValue.toLong();
+                    "content-type" -> contentType = headerValue;
+                    "connection" -> keepAlive = headerValue.lowercase() == "keep-alive";
+                    "keep-alive" -> {
+                        val keepAliveParams = headerValue.split(",");
+                        for(keepAliveParam in keepAliveParams) {
+                            val eqIndex = keepAliveParam.indexOf("=");
+                            if(eqIndex > 0){
+                                when(keepAliveParam.substring(0, eqIndex)) {
+                                    "timeout" -> keepAliveTimeout = keepAliveParam.substring(eqIndex+1).toInt();
+                                    "max" -> keepAliveTimeout = keepAliveParam.substring(eqIndex+1).toInt();
+                                }
                             }
                         }
                     }
                 }
+                if(line.isNullOrEmpty())
+                    break;
             }
-            if(line.isNullOrEmpty())
-                break;
         }
     }
 
+    private fun readHeaderBytes(): ByteArray {
+        val headerBytes = ByteArrayOutputStream()
+        var crlfCount = 0
+
+        while (crlfCount < 4) {
+            val b = _inputStream.read()
+            if (b == -1) {
+                throw IOException("Unexpected end of stream while reading headers")
+            }
+
+            if (b == 0x0D || b == 0x0A) { // CR or LF
+                crlfCount++
+            } else {
+                crlfCount = 0
+            }
+
+            headerBytes.write(b)
+        }
+
+        return headerBytes.toByteArray()
+    }
+
+    fun readContentBytes(buffer: ByteArray, length: Int): Int {
+        val remainingBytes = (contentLength - _totalRead).coerceAtMost(length.toLong()).toInt()
+        val read = _inputStream.read(buffer, 0, remainingBytes);
+        if (read > 0) {
+            _totalRead += read
+        }
+
+        return read;
+    }
+    fun readContentString(): String {
+        val byteArrayOutputStream = ByteArrayOutputStream()
+        val buffer = ByteArray(4096)
+        var read: Int
+        while (true) {
+            read = readContentBytes(buffer, buffer.size)
+            if (read <= 0) break
+            byteArrayOutputStream.write(buffer, 0, read)
+        }
+        return byteArrayOutputStream.toString(Charsets.UTF_8.name())
+    }
+    inline fun <reified T> readContentJson() : T {
+        return Serializer.json.decodeFromString(readContentString());
+    }
+    fun skipBody() {
+        if (contentLength > 0)
+            _inputStream.skip(contentLength - _totalRead)
+    }
+
     fun getHttpHeaderString(): String {
         val writer = StringWriter();
         writer.write(head + "\r\n");
@@ -139,8 +197,13 @@ class HttpContext : AutoCloseable {
     }
     fun respondCode(status: Int, headers: HttpHeaders, body: String? = null) {
         val bytes = body?.toByteArray(Charsets.UTF_8);
-        if(body != null && headers.get("content-length").isNullOrEmpty())
-            headers.put("content-length", bytes!!.size.toString());
+        if(headers.get("content-length").isNullOrEmpty()) {
+            if (body != null) {
+                headers.put("content-length", bytes!!.size.toString());
+            } else {
+                headers.put("content-length", "0")
+            }
+        }
         respond(status, headers) { responseStream ->
             if(body != null) {
                 responseStream.write(bytes!!);
@@ -161,8 +224,7 @@ class HttpContext : AutoCloseable {
             headersToRespond.put("keep-alive", "timeout=5, max=1000");
         }
 
-        val responseHeader = HttpResponse(status, headers);
-
+        val responseHeader = HttpResponse(status, headersToRespond);
         responseStream.write(responseHeader.getHttpHeaderBytes());
 
         if(method != "HEAD") {
@@ -172,38 +234,9 @@ class HttpContext : AutoCloseable {
         statusCode = status;
     }
 
-    fun readContentBytes(buffer: CharArray, length: Int) : Int {
-        val reading = Math.min(length, (contentLength - _totalRead).toInt());
-        val read = _stream.read(buffer, 0, reading);
-        _totalRead += read;
-
-        //TODO: Fix this properly
-        if(contentLength - _totalRead < 400 && read < length) {
-            _totalRead = contentLength;
-        }
-        return read;
-    }
-    fun readContentString() : String{
-        val writer = StringWriter();
-        var read = 0;
-        val buffer = CharArray(4096);
-        do {
-            read = readContentBytes(buffer, buffer.size);
-            writer.write(buffer, 0, read);
-        } while(read > 0);
-        return writer.toString();
-    }
-    inline fun <reified T> readContentJson() : T {
-        return Serializer.json.decodeFromString(readContentString());
-    }
-    fun skipBody() {
-        if(contentLength > 0)
-            _stream.skip(contentLength - _totalRead);
-    }
-
     override fun close() {
         if(!keepAlive) {
-            _stream?.close();
+            _inputStream.close();
             _responseStream?.close();
         }
     }

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

@@ -1,12 +1,12 @@
 package com.futo.platformplayer.api.http.server
 
-import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.http.server.exceptions.EmptyRequestException
 import com.futo.platformplayer.api.http.server.handlers.HttpFuntionHandler
 import com.futo.platformplayer.api.http.server.handlers.HttpHandler
-import java.io.BufferedReader
-import java.io.InputStreamReader
+import com.futo.platformplayer.api.http.server.handlers.HttpOptionsAllowHandler
+import com.futo.platformplayer.logging.Logger
+import java.io.BufferedInputStream
 import java.io.OutputStream
 import java.lang.reflect.Field
 import java.lang.reflect.Method
@@ -14,7 +14,7 @@ import java.net.InetAddress
 import java.net.NetworkInterface
 import java.net.ServerSocket
 import java.net.Socket
-import java.util.*
+import java.util.UUID
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
 import java.util.stream.IntStream.range
@@ -29,7 +29,8 @@ class ManagedHttpServer(private val _requestedPort: Int = 0) {
     var port = 0
             private set;
 
-    private val _handlers = mutableListOf<HttpHandler>();
+    private val _handlers = hashMapOf<String, HashMap<String, HttpHandler>>()
+    private val _headHandlers = hashMapOf<String, HttpHandler>()
     private var _workerPool: ExecutorService? = null;
 
     @Synchronized
@@ -76,12 +77,12 @@ class ManagedHttpServer(private val _requestedPort: Int = 0) {
 
     private fun handleClientRequest(socket: Socket) {
         _workerPool?.submit {
-            val requestReader = BufferedReader(InputStreamReader(socket.getInputStream()))
+            val requestStream = BufferedInputStream(socket.getInputStream());
             val responseStream = socket.getOutputStream();
 
             val requestId = UUID.randomUUID().toString().substring(0, 5);
             try {
-                keepAliveLoop(requestReader, responseStream, requestId) { req ->
+                keepAliveLoop(requestStream, responseStream, requestId) { req ->
                     req.use { httpContext ->
                         if(!httpContext.path.startsWith("/plugin/"))
                             Logger.i(TAG, "[${req.id}] ${httpContext.method}: ${httpContext.path}")
@@ -107,7 +108,7 @@ class ManagedHttpServer(private val _requestedPort: Int = 0) {
                 Logger.e(TAG, "Failed to handle client request.", e);
             }
             finally {
-                requestReader.close();
+                requestStream.close();
                 responseStream.close();
             }
         };
@@ -115,36 +116,82 @@ class ManagedHttpServer(private val _requestedPort: Int = 0) {
 
     fun getHandler(method: String, path: String) : HttpHandler? {
         synchronized(_handlers) {
-            //TODO: Support regex paths?
-            if(method == "HEAD")
-                return _handlers.firstOrNull { it.path == path && (it.allowHEAD || it.method == "HEAD") }
-            return _handlers.firstOrNull { it.method == method && it.path == path };
+            if (method == "HEAD") {
+                return _headHandlers[path]
+            }
+
+            val handlerMap = _handlers[method] ?: return null
+            return handlerMap[path]
         }
     }
     fun addHandler(handler: HttpHandler, withHEAD: Boolean = false) : HttpHandler {
         synchronized(_handlers) {
-            _handlers.add(handler);
             handler.allowHEAD = withHEAD;
+
+            var handlerMap: HashMap<String, HttpHandler>? = _handlers[handler.method];
+            if (handlerMap == null) {
+                handlerMap = hashMapOf()
+                _handlers[handler.method] = handlerMap
+            }
+
+            handlerMap[handler.path] = handler;
+            if (handler.allowHEAD || handler.method == "HEAD") {
+                _headHandlers[handler.path] = handler
+            }
         }
         return handler;
     }
+
+    fun addHandlerWithAllowAllOptions(handler: HttpHandler, withHEAD: Boolean = false) : HttpHandler {
+        val allowedMethods = arrayListOf(handler.method, "OPTIONS")
+        if (withHEAD) {
+            allowedMethods.add("HEAD")
+        }
+
+        val tag = handler.tag
+        if (tag != null) {
+            addHandler(HttpOptionsAllowHandler(handler.path, allowedMethods).withTag(tag))
+        } else {
+            addHandler(HttpOptionsAllowHandler(handler.path, allowedMethods))
+        }
+
+        return addHandler(handler, withHEAD)
+    }
+
     fun removeHandler(method: String, path: String) {
         synchronized(_handlers) {
-            val handler = getHandler(method, path);
-            if(handler != null)
-                _handlers.remove(handler);
+            val handlerMap = _handlers[method] ?: return
+            val handler = handlerMap.remove(path) ?: return
+            if (method == "HEAD" || handler.allowHEAD) {
+                _headHandlers.remove(path)
+            }
         }
     }
     fun removeAllHandlers(tag: String? = null) {
         synchronized(_handlers) {
             if(tag == null)
                 _handlers.clear();
-            else
-                _handlers.removeIf { it.tag == tag };
+            else {
+                for (pair in _handlers) {
+                    val toRemove = ArrayList<String>()
+                    for (innerPair in pair.value) {
+                        if (innerPair.value.tag == tag) {
+                            toRemove.add(innerPair.key)
+
+                            if (pair.key == "HEAD" || innerPair.value.allowHEAD) {
+                                _headHandlers.remove(innerPair.key)
+                            }
+                        }
+                    }
+
+                    for (x in toRemove)
+                        pair.value.remove(x)
+                }
+            }
         }
     }
     fun addBridgeHandlers(obj: Any, tag: String? = null) {
-        val tagToUse = tag ?: obj.javaClass.name;
+        //val tagToUse = tag ?: obj.javaClass.name;
         val getMethods = obj::class.java.declaredMethods
             .filter { it.getAnnotation(HttpGET::class.java) != null }
             .map { Pair<Method, HttpGET>(it, it.getAnnotation(HttpGET::class.java)!!) }
@@ -164,13 +211,13 @@ class ManagedHttpServer(private val _requestedPort: Int = 0) {
                 addHandler(HttpFuntionHandler("GET", getMethod.second.path) { getMethod.first.invoke(obj, it) }).apply {
                     if(!getMethod.second.contentType.isEmpty())
                         this.withContentType(getMethod.second.contentType);
-                }.withContentType(getMethod.second.contentType ?: "");
+                }.withContentType(getMethod.second.contentType);
         for(postMethod in postMethods)
             if(postMethod.first.parameterTypes.firstOrNull() == HttpContext::class.java && postMethod.first.parameterCount == 1)
                 addHandler(HttpFuntionHandler("POST", postMethod.second.path) { postMethod.first.invoke(obj, it) }).apply {
                     if(!postMethod.second.contentType.isEmpty())
                         this.withContentType(postMethod.second.contentType);
-                }.withContentType(postMethod.second.contentType ?: "");
+                }.withContentType(postMethod.second.contentType);
 
         for(getField in getFields) {
             getField.first.isAccessible = true;
@@ -184,13 +231,13 @@ class ManagedHttpServer(private val _requestedPort: Int = 0) {
                 }
                 else
                     it.respondCode(204);
-            }).withContentType(getField.second.contentType ?: "");
+            }).withContentType(getField.second.contentType);
         }
     }
 
-    private fun keepAliveLoop(requestReader: BufferedReader, responseStream: OutputStream, requestId: String, handler: (HttpContext)->Unit) {
+    private fun keepAliveLoop(requestReader: BufferedInputStream, responseStream: OutputStream, requestId: String, handler: (HttpContext)->Unit) {
         val stopCount = _stopCount;
-        var keepAlive = false;
+        var keepAlive: Boolean;
         var requestsMax = 0;
         var requestsTotal = 0;
         do {
@@ -240,11 +287,13 @@ class ManagedHttpServer(private val _requestedPort: Int = 0) {
             for (intf in NetworkInterface.getNetworkInterfaces()) {
                 for (addr in intf.inetAddresses) {
                     if (!addr.isLoopbackAddress) {
-                        val ipString: String = addr.hostAddress;
-                        val isIPv4 = ipString.indexOf(':') < 0;
-                        if (!isIPv4)
-                            continue;
-                        addresses.add(addr);
+                        val ipString: String = addr.hostAddress ?: continue
+                        val isIPv4 = ipString.indexOf(':') < 0
+                        if (!isIPv4) {
+                            continue
+                        }
+
+                        addresses.add(addr)
                     }
                 }
             }

app/src/main/java/com/futo/platformplayer/api/http/server/exceptions/EmptyRequestException.kt

@@ -1,6 +1,3 @@
 package com.futo.platformplayer.api.http.server.exceptions
 
-import java.net.SocketTimeoutException
-import java.util.concurrent.TimeoutException
-
 class EmptyRequestException(msg: String) : Exception(msg) {}

app/src/main/java/com/futo/platformplayer/api/http/server/handlers/HttpConstantHandler.kt

@@ -7,7 +7,6 @@ class HttpConstantHandler(method: String, path: String, val content: String, val
         val headers = this.headers.clone();
         if(contentType != null)
             headers["Content-Type"] = contentType;
-        headers["Content-Length"] = content.length.toString();
 
         httpContext.respondCode(200, headers, content);
     }

app/src/main/java/com/futo/platformplayer/api/http/server/handlers/HttpFileHandler.kt

@@ -1,14 +1,16 @@
 package com.futo.platformplayer.api.http.server.handlers
 
 import com.futo.platformplayer.api.http.server.HttpContext
+import com.futo.platformplayer.api.http.server.HttpHeaders
 import com.futo.platformplayer.logging.Logger
+import java.io.ByteArrayOutputStream
 import java.io.File
 import java.nio.file.Files
 import java.text.SimpleDateFormat
 import java.util.*
 import java.util.zip.GZIPOutputStream
 
-class HttpFileHandler(method: String, path: String, private val contentType: String, private val filePath: String, private val closeAfterRequest: Boolean = false): HttpHandler(method, path) {
+class HttpFileHandler(method: String, path: String, private val contentType: String, private val filePath: String): HttpHandler(method, path) {
     override fun handle(httpContext: HttpContext) {
         val requestHeaders = httpContext.headers;
         val responseHeaders = this.headers.clone();
@@ -30,19 +32,13 @@ class HttpFileHandler(method: String, path: String, private val contentType: Str
 
         responseHeaders["Content-Disposition"] = "attachment; filename=\"${file.name.replace("\"", "\\\"")}\""
 
-        val acceptEncoding = requestHeaders["Accept-Encoding"]
-        val shouldGzip = acceptEncoding != null && acceptEncoding.split(',').any { it.trim().equals("gzip", ignoreCase = true) || it == "*" }
-        if (shouldGzip) {
-            responseHeaders["Content-Encoding"] = "gzip"
-        }
-
         val range = requestHeaders["Range"]
-        var start: Long
+        val start: Long
         val end: Long
         if (range != null && range.startsWith("bytes=")) {
             val parts = range.substring(6).split("-")
             start = parts[0].toLong()
-            end = parts.getOrNull(1)?.toLong() ?: (file.length() - 1)
+            end = parts.getOrNull(1)?.toLongOrNull() ?: (file.length() - 1)
             responseHeaders["Content-Range"] = "bytes $start-$end/${file.length()}"
         } else {
             start = 0
@@ -51,18 +47,19 @@ class HttpFileHandler(method: String, path: String, private val contentType: Str
 
         var totalBytesSent = 0
         val contentLength = end - start + 1
-        Logger.i(TAG, "Sending $contentLength bytes (start: $start, end: $end, shouldGzip: $shouldGzip)")
         responseHeaders["Content-Length"] = contentLength.toString()
+        Logger.i(TAG, "Sending $contentLength bytes (start: $start, end: $end)")
 
         file.inputStream().use { inputStream ->
-            httpContext.respond(if (range == null) 200 else 206, responseHeaders) { responseStream ->
+            httpContext.respond(if (range != null) 206 else 200, responseHeaders) { responseStream ->
                 try {
                     val buffer = ByteArray(8192)
                     inputStream.skip(start)
+                    var current = start
 
-                    val outputStream = if (shouldGzip) GZIPOutputStream(responseStream) else responseStream
+                    val outputStream = responseStream
                     while (true) {
-                        val expectedBytesRead = (end - start + 1).coerceAtMost(buffer.size.toLong());
+                        val expectedBytesRead = (end - current + 1).coerceAtMost(buffer.size.toLong());
                         val bytesRead = inputStream.read(buffer);
                         if (bytesRead < 0) {
                             Logger.i(TAG, "End of file reached")
@@ -73,27 +70,21 @@ class HttpFileHandler(method: String, path: String, private val contentType: Str
                         outputStream.write(buffer, 0, bytesToSend)
 
                         totalBytesSent += bytesToSend
-                        Logger.v(TAG, "Sent bytes $start-${start + bytesToSend}, totalBytesSent=$totalBytesSent")
+                        Logger.v(TAG, "Sent bytes $current-${current + bytesToSend}, totalBytesSent=$totalBytesSent")
 
-                        start += bytesToSend.toLong()
-                        if (start >= end) {
+                        current += bytesToSend.toLong()
+                        if (current >= end) {
                             Logger.i(TAG, "Expected amount of bytes sent")
                             break
                         }
                     }
 
                     Logger.i(TAG, "Finished sending file (segment)")
-
-                    if (shouldGzip) (outputStream as GZIPOutputStream).finish()
                     outputStream.flush()
                 } catch (e: Exception) {
                     httpContext.respondCode(500, headers)
                 }
             }
-
-            if (closeAfterRequest) {
-                httpContext.keepAlive = false;
-            }
         }
     }
 

app/src/main/java/com/futo/platformplayer/api/http/server/handlers/HttpHandler.kt

@@ -15,6 +15,7 @@ abstract class HttpHandler(val method: String, val path: String) {
         headers.put(key, value);
         return this;
     }
+
     fun withContentType(contentType: String) = withHeader("Content-Type", contentType);
 
     fun withTag(tag: String) : HttpHandler {

app/src/main/java/com/futo/platformplayer/api/http/server/handlers/HttpOptionsAllowHandler.kt

@@ -2,19 +2,18 @@ package com.futo.platformplayer.api.http.server.handlers
 
 import com.futo.platformplayer.api.http.server.HttpContext
 
-class HttpOptionsAllowHandler(path: String) : HttpHandler("OPTIONS", path) {
+class HttpOptionsAllowHandler(path: String, val allowedMethods: List<String> = listOf()) : HttpHandler("OPTIONS", path) {
     override fun handle(httpContext: HttpContext) {
-        //Just allow whatever is requested
+        val newHeaders = headers.clone()
+        newHeaders.put("Access-Control-Allow-Origin", "*")
 
-        val requestedOrigin = httpContext.headers.getOrDefault("Access-Control-Request-Origin", "");
-        val requestedMethods = httpContext.headers.getOrDefault("Access-Control-Request-Method", "");
-        val requestedHeaders = httpContext.headers.getOrDefault("Access-Control-Request-Headers", "");
-
-        val newHeaders = headers.clone();
-        newHeaders.put("Allow", requestedMethods);
-        newHeaders.put("Access-Control-Allow-Methods", requestedMethods);
-        newHeaders.put("Access-Control-Allow-Headers", "*");
+        if (allowedMethods.isNotEmpty()) {
+            newHeaders.put("Access-Control-Allow-Methods", allowedMethods.map { it.uppercase() }.joinToString(", "))
+        } else {
+            newHeaders.put("Access-Control-Allow-Methods", "*")
+        }
 
+        newHeaders.put("Access-Control-Allow-Headers", "*")
         httpContext.respondCode(200, newHeaders);
     }
 }

app/src/main/java/com/futo/platformplayer/api/http/server/handlers/HttpProxyHandler.kt

@@ -1,11 +1,20 @@
 package com.futo.platformplayer.api.http.server.handlers
 
 import android.net.Uri
+import android.util.Log
 import com.futo.platformplayer.api.http.server.HttpContext
 import com.futo.platformplayer.api.http.server.HttpHeaders
 import com.futo.platformplayer.api.http.ManagedHttpClient
+import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.parsers.HttpResponseParser
+import com.futo.platformplayer.readLine
+import java.io.InputStream
+import java.io.OutputStream
+import java.lang.Exception
+import java.net.Socket
+import javax.net.ssl.SSLSocketFactory
 
-class HttpProxyHandler(method: String, path: String, val targetUrl: String): HttpHandler(method, path) {
+class HttpProxyHandler(method: String, path: String, val targetUrl: String, private val useTcp: Boolean = false): HttpHandler(method, path) {
     var content: String? = null;
     var contentType: String? = null;
 
@@ -17,10 +26,17 @@ class HttpProxyHandler(method: String, path: String, val targetUrl: String): Htt
     private var _injectHost = false;
     private var _injectReferer = false;
 
-
     private val _client = ManagedHttpClient();
 
     override fun handle(context: HttpContext) {
+        if (useTcp) {
+            handleWithTcp(context)
+        } else {
+            handleWithOkHttp(context)
+        }
+    }
+
+    private fun handleWithOkHttp(context: HttpContext) {
         val proxyHeaders = HashMap<String, String>();
         for (header in context.headers.filter { !_ignoreRequestHeaders.contains(it.key.lowercase()) })
             proxyHeaders[header.key] = header.value;
@@ -34,8 +50,8 @@ class HttpProxyHandler(method: String, path: String, val targetUrl: String): Htt
             proxyHeaders.put("Referer", targetUrl);
 
         val useMethod = if (method == "inherit") context.method else method;
-        //Logger.i(TAG, "Proxied Request ${useMethod}: ${targetUrl}");
-        //Logger.i(TAG, "Headers:" + proxyHeaders.map { "${it.key}: ${it.value}" }.joinToString("\n"));
+        Logger.i(TAG, "handleWithOkHttp Proxied Request ${useMethod}: ${targetUrl}");
+        Logger.i(TAG, "handleWithOkHttp Headers:" + proxyHeaders.map { "${it.key}: ${it.value}" }.joinToString("\n"));
 
         val resp = when (useMethod) {
             "GET" -> _client.get(targetUrl, proxyHeaders);
@@ -44,8 +60,8 @@ class HttpProxyHandler(method: String, path: String, val targetUrl: String): Htt
             else -> _client.requestMethod(useMethod, targetUrl, proxyHeaders);
         };
 
-        //Logger.i(TAG, "Proxied Response [${resp.code}]");
-        val headersFiltered = HttpHeaders(resp.getHeadersFlat().filter { !_ignoreRequestHeaders.contains(it.key.lowercase()) });
+        Logger.i(TAG, "Proxied Response [${resp.code}]");
+        val headersFiltered = HttpHeaders(resp.getHeadersFlat().filter { !_ignoreResponseHeaders.contains(it.key.lowercase()) });
         for(newHeader in headers)
             headersFiltered.put(newHeader.key, newHeader.value);
 
@@ -65,6 +81,140 @@ class HttpProxyHandler(method: String, path: String, val targetUrl: String): Htt
         }
     }
 
+    private fun handleWithTcp(context: HttpContext) {
+        if (content != null)
+            throw NotImplementedError("Content body is not supported")
+
+        val proxyHeaders = HashMap<String, String>();
+        for (header in context.headers.filter { !_ignoreRequestHeaders.contains(it.key.lowercase()) })
+            proxyHeaders[header.key] = header.value;
+        for (injectHeader in _injectRequestHeader)
+            proxyHeaders[injectHeader.first] = injectHeader.second;
+
+        val parsed = Uri.parse(targetUrl);
+        if(_injectHost)
+            proxyHeaders.put("Host", parsed.host!!);
+        if(_injectReferer)
+            proxyHeaders.put("Referer", targetUrl);
+
+        val useMethod = if (method == "inherit") context.method else method;
+        Logger.i(TAG, "handleWithTcp Proxied Request ${useMethod}: ${parsed}");
+        Logger.i(TAG, "handleWithTcp Headers:" + proxyHeaders.map { "${it.key}: ${it.value}" }.joinToString("\n"));
+
+        makeTcpRequest(proxyHeaders, useMethod, parsed, context)
+    }
+
+    private fun makeTcpRequest(proxyHeaders: HashMap<String, String>, useMethod: String, parsed: Uri, context: HttpContext) {
+        val requestBuilder = StringBuilder()
+        requestBuilder.append("$useMethod $parsed HTTP/1.1\r\n")
+        proxyHeaders.forEach { (key, value) -> requestBuilder.append("$key: $value\r\n") }
+        requestBuilder.append("\r\n")
+
+        val port = if (parsed.port == -1) {
+            when (parsed.scheme) {
+                "https" -> 443
+                "http" -> 80
+                else -> throw Exception("Unhandled scheme")
+            }
+        } else {
+            parsed.port
+        }
+
+        val socket = if (parsed.scheme == "https") {
+            val sslSocketFactory = SSLSocketFactory.getDefault() as SSLSocketFactory
+            sslSocketFactory.createSocket(parsed.host, port)
+        } else {
+            Socket(parsed.host, port)
+        }
+
+        socket.use { s ->
+            s.getOutputStream().write(requestBuilder.toString().encodeToByteArray())
+
+            val inputStream = s.getInputStream()
+            val resp = HttpResponseParser(inputStream)
+            if (resp.statusCode == 302) {
+                val location = resp.location!!
+                Logger.i(TAG, "handleWithTcp Proxied ${resp.statusCode} following redirect to $location");
+                makeTcpRequest(proxyHeaders, useMethod, Uri.parse(location)!!, context)
+            } else {
+                val isChunked = resp.transferEncoding.equals("chunked", ignoreCase = true)
+                val contentLength = resp.contentLength.toInt()
+
+                val headersFiltered = HttpHeaders(resp.headers.filter { !_ignoreResponseHeaders.contains(it.key.lowercase()) });
+                for (newHeader in headers)
+                    headersFiltered.put(newHeader.key, newHeader.value);
+
+                context.respond(resp.statusCode, headersFiltered) { responseStream ->
+                    if (isChunked) {
+                        Logger.i(TAG, "handleWithTcp handleChunkedTransfer");
+                        handleChunkedTransfer(inputStream, responseStream)
+                    } else if (contentLength > 0) {
+                        Logger.i(TAG, "handleWithTcp transferFixedLengthContent $contentLength");
+                        transferFixedLengthContent(inputStream, responseStream, contentLength)
+                    } else if (contentLength == -1) {
+                        Logger.i(TAG, "handleWithTcp transferUntilEndOfStream");
+                        transferUntilEndOfStream(inputStream, responseStream)
+                    } else {
+                        Logger.i(TAG, "handleWithTcp no content");
+                    }
+                }
+            }
+        }
+    }
+
+    private fun handleChunkedTransfer(inputStream: InputStream, responseStream: OutputStream) {
+        var line: String?
+        val buffer = ByteArray(8192)
+
+        while (inputStream.readLine().also { line = it } != null) {
+            val size = line!!.trim().toInt(16)
+
+            responseStream.write(line!!.encodeToByteArray())
+            responseStream.write("\r\n".encodeToByteArray())
+
+            if (size == 0) {
+                inputStream.skip(2)
+                responseStream.write("\r\n".encodeToByteArray())
+                break
+            }
+
+            var totalRead = 0
+            while (totalRead < size) {
+                val read = inputStream.read(buffer, 0, minOf(buffer.size, size - totalRead))
+                if (read == -1) break
+                responseStream.write(buffer, 0, read)
+                totalRead += read
+            }
+
+            inputStream.skip(2)
+            responseStream.write("\r\n".encodeToByteArray())
+            responseStream.flush()
+        }
+    }
+
+    private fun transferFixedLengthContent(inputStream: InputStream, responseStream: OutputStream, contentLength: Int) {
+        val buffer = ByteArray(8192)
+        var totalRead = 0
+        while (totalRead < contentLength) {
+            val read = inputStream.read(buffer, 0, minOf(buffer.size, contentLength - totalRead))
+            if (read == -1) break
+            responseStream.write(buffer, 0, read)
+            totalRead += read
+        }
+
+        responseStream.flush()
+    }
+
+    private fun transferUntilEndOfStream(inputStream: InputStream, responseStream: OutputStream) {
+        val buffer = ByteArray(8192)
+        var read: Int
+        while (inputStream.read(buffer).also { read = it } >= 0) {
+            responseStream.write(buffer, 0, read)
+        }
+
+        responseStream.flush()
+    }
+
     fun withContent(body: String) : HttpProxyHandler {
         this.content = body;
         return this;
@@ -92,4 +242,8 @@ class HttpProxyHandler(method: String, path: String, val targetUrl: String): Htt
         _ignoreRequestHeaders.add("referer");
         return this;
     }
+
+    companion object {
+        private const val TAG = "HttpProxyHandler"
+    }
 }

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

@@ -10,12 +10,9 @@ import com.futo.platformplayer.api.media.models.contents.IPlatformContentDetails
 import com.futo.platformplayer.api.media.models.live.ILiveChatWindowDescriptor
 import com.futo.platformplayer.api.media.models.live.IPlatformLiveEvent
 import com.futo.platformplayer.api.media.models.playback.IPlaybackTracker
-import com.futo.platformplayer.api.media.models.playlists.IPlatformPlaylist
 import com.futo.platformplayer.api.media.models.playlists.IPlatformPlaylistDetails
-import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.models.ImageVariable
-import com.futo.platformplayer.models.Playlist
 
 /**
  * A temporary class that caches video results
@@ -44,8 +41,7 @@ class CachedPlatformClient : IPlatformClient {
         var result = _cache.get(url);
         if(result == null) {
             result = _client.getContentDetails(url);
-            if (result != null)
-                _cache.put(url, result);
+            _cache.put(url, result);
         }
         return result;
     }

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

@@ -10,11 +10,9 @@ import com.futo.platformplayer.api.media.models.contents.IPlatformContentDetails
 import com.futo.platformplayer.api.media.models.live.ILiveChatWindowDescriptor
 import com.futo.platformplayer.api.media.models.live.IPlatformLiveEvent
 import com.futo.platformplayer.api.media.models.playback.IPlaybackTracker
-import com.futo.platformplayer.api.media.models.playlists.IPlatformPlaylist
 import com.futo.platformplayer.api.media.models.playlists.IPlatformPlaylistDetails
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.models.ImageVariable
-import com.futo.platformplayer.models.Playlist
 
 /**
  * A client for a specific platform

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

@@ -9,7 +9,6 @@ import com.caverock.androidsvg.SVG
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.media.models.live.IPlatformLiveEvent
 import com.futo.platformplayer.api.media.models.live.LiveEventComment
-import com.futo.platformplayer.api.media.models.live.LiveEventDonation
 import com.futo.platformplayer.api.media.models.live.LiveEventEmojis
 import com.futo.platformplayer.api.media.platforms.js.models.JSLiveEventPager
 import com.futo.platformplayer.api.media.structures.IPager
@@ -195,7 +194,7 @@ class LiveChatManager {
 
         fun getEmojiDrawable(emoji: String, cb: (drawable: Drawable?)->Unit) {
             var drawable: Drawable? = null;
-            var url: String? = null;
+            var url: String?;
             synchronized(_cache_lock) {
                 url = _cache_urls[emoji];
                 if(url != null)

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

@@ -20,7 +20,7 @@ class PlatformMultiClientPool {
         val pool = synchronized(_clientPools) {
             if(!_clientPools.containsKey(parentClient))
                 _clientPools[parentClient] = PlatformClientPool(parentClient, _name).apply {
-                    this.onDead.subscribe { client, pool ->
+                    this.onDead.subscribe { _, pool ->
                         synchronized(_clientPools) {
                             if(_clientPools[parentClient] == pool)
                                 _clientPools.remove(parentClient);

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

@@ -29,6 +29,7 @@ class ResultCapabilities(
         const val TYPE_LIVE = "LIVE";
         const val TYPE_POSTS = "POSTS";
         const val TYPE_MIXED = "MIXED";
+        const val TYPE_SUBSCRIPTIONS = "SUBSCRIPTIONS";
 
         const val ORDER_CHONOLOGICAL = "CHRONOLOGICAL";
 
@@ -63,7 +64,6 @@ class FilterGroup(
     val isMultiSelect: Boolean,
     val id: String? = null
 ) {
-    @kotlinx.serialization.Transient
     val idOrName: String get() = id ?: name;
 
     companion object {

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

@@ -6,8 +6,8 @@ import com.futo.platformplayer.api.media.models.contents.ContentType
 interface IChapter {
     val name: String;
     val type: ChapterType;
-    val timeStart: Int;
-    val timeEnd: Int;
+    val timeStart: Double;
+    val timeEnd: Double;
 }
 
 enum class ChapterType(val value: Int) {

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

@@ -4,10 +4,7 @@ import com.futo.platformplayer.api.media.IPlatformClient
 import com.futo.platformplayer.api.media.models.PlatformAuthorLink
 import com.futo.platformplayer.api.media.models.ratings.IRating
 import com.futo.platformplayer.api.media.structures.IPager
-import com.futo.platformplayer.polycentric.PolycentricCache
-import com.futo.platformplayer.states.StatePolycentric
 import com.futo.polycentric.core.Pointer
-import com.futo.polycentric.core.SignedEvent
 import userpackage.Protocol.Reference
 import java.time.OffsetDateTime
 
@@ -20,16 +17,18 @@ class PolycentricPlatformComment : IPlatformComment {
 
     override val replyCount: Int?;
 
+    val eventPointer: Pointer;
     val reference: Reference;
 
-    constructor(contextUrl: String, author: PlatformAuthorLink, msg: String, rating: IRating, date: OffsetDateTime, reference: Reference, replyCount: Int? = null) {
+    constructor(contextUrl: String, author: PlatformAuthorLink, msg: String, rating: IRating, date: OffsetDateTime, eventPointer: Pointer, replyCount: Int? = null) {
         this.contextUrl = contextUrl;
         this.author = author;
         this.message = msg;
         this.rating = rating;
         this.date = date;
         this.replyCount = replyCount;
-        this.reference = reference;
+        this.eventPointer = eventPointer;
+        this.reference = eventPointer.toReference();
     }
 
     override fun getReplies(client: IPlatformClient): IPager<IPlatformComment> {
@@ -37,7 +36,7 @@ class PolycentricPlatformComment : IPlatformComment {
     }
 
     fun cloneWithUpdatedReplyCount(replyCount: Int?): PolycentricPlatformComment {
-        return PolycentricPlatformComment(contextUrl, author, message, rating, date, reference, replyCount);
+        return PolycentricPlatformComment(contextUrl, author, message, rating, date, eventPointer, replyCount);
     }
 
     companion object {

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

@@ -13,6 +13,7 @@ enum class ContentType(val value: Int) {
 
     NESTED_VIDEO(11),
 
+    LOCKED(70),
 
     PLACEHOLDER(90),
     DEFERRED(91);

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

@@ -1,31 +1,23 @@
 package com.futo.platformplayer.api.media.models.live
 
-import com.caoccao.javet.values.V8Value
 import com.caoccao.javet.values.reference.V8ValueObject
-import com.futo.platformplayer.api.media.models.ratings.IRating
-import com.futo.platformplayer.api.media.models.ratings.RatingLikeDislikes
-import com.futo.platformplayer.api.media.models.ratings.RatingLikes
-import com.futo.platformplayer.api.media.models.ratings.RatingScaler
-import com.futo.platformplayer.api.media.models.ratings.RatingType
 import com.futo.platformplayer.engine.IV8PluginConfig
 import com.futo.platformplayer.getOrThrow
-import com.futo.platformplayer.orDefault
 
 interface IPlatformLiveEvent {
     val type : LiveEventType;
 
 
     companion object {
-        fun fromV8(config: IV8PluginConfig, obj: V8ValueObject, contextName: String = "Unknown") : IPlatformLiveEvent {
-            val contextName = "LiveEvent";
-            val type = LiveEventType.fromInt(obj.getOrThrow<Int>(config, "type", contextName));
-            return when(type) {
+        fun fromV8(config: IV8PluginConfig, obj: V8ValueObject, contextName: String = "LiveEvent") : IPlatformLiveEvent {
+            val t = LiveEventType.fromInt(obj.getOrThrow<Int>(config, "type", contextName));
+            return when(t) {
                 LiveEventType.COMMENT -> LiveEventComment.fromV8(config, obj);
                 LiveEventType.EMOJIS -> LiveEventEmojis.fromV8(config, obj);
                 LiveEventType.DONATION -> LiveEventDonation.fromV8(config, obj);
                 LiveEventType.VIEWCOUNT -> LiveEventViewCount.fromV8(config, obj);
                 LiveEventType.RAID -> LiveEventRaid.fromV8(config, obj);
-                else -> throw NotImplementedError("Unknown type ${type}");
+                else -> throw NotImplementedError("Unknown type $t");
             }
         }
     }

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

@@ -0,0 +1,13 @@
+package com.futo.platformplayer.api.media.models.locked
+
+import com.futo.platformplayer.api.media.models.Thumbnails
+import com.futo.platformplayer.api.media.models.contents.ContentType
+import com.futo.platformplayer.api.media.models.contents.IPlatformContent
+
+interface IPlatformLockedContent: IPlatformContent {
+    val lockContentType: ContentType;
+    val lockDescription: String?;
+    val unlockUrl: String?;
+    val contentName: String?;
+    val contentThumbnails: Thumbnails;
+}

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

@@ -0,0 +1,14 @@
+package com.futo.platformplayer.api.media.models.modifier
+
+class AdhocRequestModifier: IRequestModifier {
+    val _handler: (String, Map<String,String>)->IRequest;
+    override var allowByteSkip: Boolean = false;
+
+    constructor(modifyReq: (String, Map<String,String>)->IRequest) {
+        _handler = modifyReq;
+    }
+
+    override fun modifyRequest(url: String, headers: Map<String, String>): IRequest {
+        return _handler(url, headers);
+    }
+}

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

@@ -0,0 +1,6 @@
+package com.futo.platformplayer.api.media.models.modifier
+
+interface IModifierOptions {
+    val applyAuthClient: String?;
+    val applyCookieClient: String?;
+}

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

@@ -0,0 +1,6 @@
+package com.futo.platformplayer.api.media.models.modifier
+
+interface IRequest {
+    val url: String?;
+    val headers: Map<String, String>;
+}

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

@@ -0,0 +1,7 @@
+package com.futo.platformplayer.api.media.models.modifier
+
+
+interface IRequestModifier {
+    var allowByteSkip: Boolean;
+    fun modifyRequest(url: String, headers: Map<String, String>): IRequest
+}

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

@@ -1,9 +1,6 @@
 package com.futo.platformplayer.api.media.models.playlists
 
-import com.futo.platformplayer.api.media.models.Thumbnails
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
-import com.futo.platformplayer.api.media.models.video.IPlatformVideo
-import com.futo.platformplayer.api.media.structures.IPager
 
 interface IPlatformPlaylist : IPlatformContent {
     val thumbnail: String?;

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

@@ -2,10 +2,6 @@ package com.futo.platformplayer.api.media.models.post
 
 import com.futo.platformplayer.api.media.models.contents.IPlatformContentDetails
 import com.futo.platformplayer.api.media.models.ratings.IRating
-import com.futo.platformplayer.api.media.models.streams.IVideoSourceDescriptor
-import com.futo.platformplayer.api.media.models.streams.sources.*
-import com.futo.platformplayer.api.media.models.subtitles.ISubtitleSource
-import com.futo.platformplayer.api.media.models.video.IPlatformVideo
 
 /**
  * A detailed video model with data including video/audio sources

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

@@ -14,14 +14,13 @@ interface IRating {
 
     companion object {
         fun fromV8OrDefault(config: IV8PluginConfig, obj: V8Value?, default: IRating) = obj.orDefault(default) { fromV8(config, it as V8ValueObject) };
-        fun fromV8(config: IV8PluginConfig, obj: V8ValueObject, contextName: String = "Unknown") : IRating {
-            val contextName = "Rating";
-            val type = RatingType.fromInt(obj.getOrThrow<Int>(config, "type", contextName));
-            return when(type) {
+        fun fromV8(config: IV8PluginConfig, obj: V8ValueObject, contextName: String = "Rating") : IRating {
+            val t = RatingType.fromInt(obj.getOrThrow<Int>(config, "type", contextName));
+            return when(t) {
                 RatingType.LIKES -> RatingLikes.fromV8(config, obj);
                 RatingType.LIKEDISLIKES -> RatingLikeDislikes.fromV8(config, obj);
                 RatingType.SCALE -> RatingScaler.fromV8(config, obj);
-                else -> throw NotImplementedError("Unknown type ${type}");
+                else -> throw NotImplementedError("Unknown type $t");
             }
         }
     }

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

@@ -0,0 +1,51 @@
+package com.futo.platformplayer.api.media.models.streams.sources
+
+import android.net.Uri
+import com.futo.platformplayer.api.media.models.subtitles.ISubtitleSource
+
+class HLSVariantVideoUrlSource(
+    override val name: String,
+    override val width: Int,
+    override val height: Int,
+    override val container: String,
+    override val codec: String,
+    override val bitrate: Int?,
+    override val duration: Long,
+    override val priority: Boolean,
+    val url: String
+) : IVideoUrlSource {
+    override fun getVideoUrl(): String {
+        return url
+    }
+}
+
+class HLSVariantAudioUrlSource(
+    override val name: String,
+    override val bitrate: Int,
+    override val container: String,
+    override val codec: String,
+    override val language: String,
+    override val duration: Long?,
+    override val priority: Boolean,
+    val url: String
+) : IAudioUrlSource {
+    override fun getAudioUrl(): String {
+        return url
+    }
+}
+
+class HLSVariantSubtitleUrlSource(
+    override val name: String,
+    override val url: String,
+    override val format: String,
+) : ISubtitleSource {
+    override val hasFetch: Boolean = false
+
+    override fun getSubtitles(): String? {
+        return null
+    }
+
+    override suspend fun getSubtitlesURI(): Uri? {
+        return Uri.parse(url)
+    }
+}

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

@@ -1,8 +1,6 @@
 package com.futo.platformplayer.api.media.models.subtitles
 
 import android.net.Uri
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Deferred
 
 interface ISubtitleSource {
     val name: String;

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

@@ -1,13 +1,12 @@
 package com.futo.platformplayer.api.media.models.video
 
-import com.futo.platformplayer.api.media.IPlatformClient
-import com.futo.platformplayer.api.media.models.comments.IPlatformComment
 import com.futo.platformplayer.api.media.models.contents.IPlatformContentDetails
 import com.futo.platformplayer.api.media.models.ratings.IRating
 import com.futo.platformplayer.api.media.models.streams.IVideoSourceDescriptor
-import com.futo.platformplayer.api.media.models.streams.sources.*
+import com.futo.platformplayer.api.media.models.streams.sources.IDashManifestSource
+import com.futo.platformplayer.api.media.models.streams.sources.IHLSManifestSource
+import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
 import com.futo.platformplayer.api.media.models.subtitles.ISubtitleSource
-import com.futo.platformplayer.api.media.structures.IPager
 
 /**
  * A detailed video model with data including video/audio sources

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

@@ -2,12 +2,17 @@ package com.futo.platformplayer.api.media.models.video
 
 import com.futo.platformplayer.api.media.models.contents.ContentType
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
+import com.futo.platformplayer.api.media.models.locked.IPlatformLockedContent
 import com.futo.platformplayer.api.media.models.nested.IPlatformNestedContent
 import com.futo.platformplayer.api.media.models.post.IPlatformPost
 import com.futo.platformplayer.serializers.PlatformContentSerializer
+import kotlinx.serialization.EncodeDefault
+import kotlinx.serialization.SerialName
 
 @kotlinx.serialization.Serializable(with = PlatformContentSerializer::class)
 interface SerializedPlatformContent: IPlatformContent {
+    override val contentType: ContentType;
+
     fun toJson() : String;
     fun fromJson(str : String) : SerializedPlatformContent;
     fun fromJsonArray(str : String) : Array<SerializedPlatformContent>;
@@ -18,6 +23,7 @@ interface SerializedPlatformContent: IPlatformContent {
                 ContentType.MEDIA -> SerializedPlatformVideo.fromVideo(content as IPlatformVideo);
                 ContentType.NESTED_VIDEO -> SerializedPlatformNestedContent.fromNested(content as IPlatformNestedContent);
                 ContentType.POST -> SerializedPlatformPost.fromPost(content as IPlatformPost);
+                ContentType.LOCKED -> SerializedPlatformLockedContent.fromLocked(content as IPlatformLockedContent);
                 else -> throw NotImplementedError("Content type ${content.contentType} not implemented");
             };
         }

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

@@ -0,0 +1,62 @@
+package com.futo.platformplayer.api.media.models.video
+
+import com.futo.platformplayer.api.media.PlatformID
+import com.futo.platformplayer.api.media.Serializer
+import com.futo.platformplayer.api.media.models.PlatformAuthorLink
+import com.futo.platformplayer.api.media.models.Thumbnails
+import com.futo.platformplayer.api.media.models.contents.ContentType
+import com.futo.platformplayer.api.media.models.locked.IPlatformLockedContent
+import com.futo.platformplayer.api.media.models.nested.IPlatformNestedContent
+import com.futo.platformplayer.serializers.OffsetDateTimeNullableSerializer
+import com.futo.platformplayer.states.StatePlatform
+import com.futo.polycentric.core.combineHashCodes
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+import java.time.OffsetDateTime
+
+@kotlinx.serialization.Serializable
+open class SerializedPlatformLockedContent(
+    override val id: PlatformID,
+    override val name: String,
+    override val author: PlatformAuthorLink,
+    @kotlinx.serialization.Serializable(with = OffsetDateTimeNullableSerializer::class)
+    override val datetime: OffsetDateTime?,
+    override val url: String,
+    override val shareUrl: String,
+    override val lockContentType: ContentType,
+    override val contentName: String?,
+    override val lockDescription: String? = null,
+    override val unlockUrl: String? = null,
+    override val contentThumbnails: Thumbnails
+) : IPlatformLockedContent, SerializedPlatformContent {
+    override val contentType: ContentType = ContentType.LOCKED;
+
+    override fun toJson() : String {
+        return Json.encodeToString(this);
+    }
+    override fun fromJson(str : String) : SerializedPlatformLockedContent {
+        return Serializer.json.decodeFromString<SerializedPlatformLockedContent>(str);
+    }
+    override fun fromJsonArray(str : String) : Array<SerializedPlatformContent> {
+        return Serializer.json.decodeFromString<Array<SerializedPlatformContent>>(str);
+    }
+
+    companion object {
+        fun fromLocked(content: IPlatformLockedContent) : SerializedPlatformLockedContent {
+            return SerializedPlatformLockedContent(
+                content.id,
+                content.name,
+                content.author,
+                content.datetime,
+                content.url,
+                content.shareUrl,
+                content.lockContentType,
+                content.contentName,
+                content.lockDescription,
+                content.unlockUrl,
+                content.contentThumbnails
+            );
+        }
+    }
+}

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

@@ -30,7 +30,7 @@ open class SerializedPlatformNestedContent(
     override val contentProvider: String?,
     override val contentThumbnails: Thumbnails
 ) : IPlatformNestedContent, SerializedPlatformContent {
-    final override val contentType: ContentType get() = ContentType.NESTED_VIDEO;
+    final override val contentType: ContentType = ContentType.NESTED_VIDEO;
 
     override val contentPlugin: String? = StatePlatform.instance.getContentClientOrNull(contentUrl)?.id;
     override val contentSupported: Boolean get() = contentPlugin != null;

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

@@ -8,6 +8,7 @@ import com.futo.platformplayer.api.media.models.contents.ContentType
 import com.futo.platformplayer.api.media.models.post.IPlatformPost
 import com.futo.platformplayer.serializers.OffsetDateTimeNullableSerializer
 import com.futo.polycentric.core.combineHashCodes
+import kotlinx.serialization.EncodeDefault
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
@@ -26,7 +27,7 @@ open class SerializedPlatformPost(
     override val thumbnails: List<Thumbnails?>,
     override val images: List<String>
 ) : IPlatformPost, SerializedPlatformContent {
-    final override val contentType: ContentType get() = ContentType.POST;
+    override val contentType: ContentType = ContentType.POST;
 
     override fun toJson() : String {
         return Json.encodeToString(this);

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

@@ -26,7 +26,7 @@ open class SerializedPlatformVideo(
     override val duration: Long,
     override val viewCount: Long,
 ) : IPlatformVideo, SerializedPlatformContent {
-    final override val contentType: ContentType get() = ContentType.MEDIA;
+    override val contentType: ContentType = ContentType.MEDIA;
 
     override val isLive: Boolean = false;
 

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

@@ -8,6 +8,5 @@ import com.futo.platformplayer.api.media.models.streams.sources.VideoUrlSource
 class SerializedVideoMuxedSourceDescriptor(
     val _videoSources: Array<VideoUrlSource>
 ): VideoMuxedSourceDescriptor(), ISerializedVideoSourceDescriptor {
-    @kotlinx.serialization.Transient
     override val videoSources: Array<IVideoSource> get() = _videoSources.map { it }.toTypedArray();
 };

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

@@ -1,15 +1,16 @@
 package com.futo.platformplayer.api.media.models.video
 
 import com.futo.platformplayer.api.media.models.streams.VideoUnMuxedSourceDescriptor
-import com.futo.platformplayer.api.media.models.streams.sources.*
+import com.futo.platformplayer.api.media.models.streams.sources.AudioUrlSource
+import com.futo.platformplayer.api.media.models.streams.sources.IAudioSource
+import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
+import com.futo.platformplayer.api.media.models.streams.sources.VideoUrlSource
 
 @kotlinx.serialization.Serializable
 class SerializedVideoNonMuxedSourceDescriptor(
     val _videoSources: Array<VideoUrlSource>,
     val _audioSources: Array<AudioUrlSource>
 ): VideoUnMuxedSourceDescriptor(), ISerializedVideoSourceDescriptor {
-    @kotlinx.serialization.Transient
     override val videoSources: Array<IVideoSource> get() = _videoSources.map { it }.toTypedArray();
-    @kotlinx.serialization.Transient
     override val audioSources: Array<IAudioSource> get() = _audioSources.map { it }.toTypedArray();
 };

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

@@ -1,14 +1,14 @@
 package com.futo.platformplayer.api.media.platforms.js
 
 import android.content.Context
-import com.futo.platformplayer.states.StateDeveloper
 import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
 import com.futo.platformplayer.api.media.models.comments.IPlatformComment
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
 import com.futo.platformplayer.api.media.models.contents.IPlatformContentDetails
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.states.StateApp
-import java.util.*
+import com.futo.platformplayer.states.StateDeveloper
+import java.util.UUID
 
 class DevJSClient : JSClient {
     override val id: String
@@ -20,14 +20,14 @@ class DevJSClient : JSClient {
 
     val devID: String;
 
-    constructor(context: Context, config: SourcePluginConfig, script: String, auth: SourceAuth? = null, captcha: SourceCaptchaData? = null, devID: String? = null): super(context, SourcePluginDescriptor(config, auth?.toEncrypted(), captcha?.toEncrypted(), listOf("DEV")), null, script) {
+    constructor(context: Context, config: SourcePluginConfig, script: String, auth: SourceAuth? = null, captcha: SourceCaptchaData? = null, devID: String? = null, settings: HashMap<String, String?>? = null): super(context, SourcePluginDescriptor(config, auth?.toEncrypted(), captcha?.toEncrypted(), listOf("DEV"), settings), null, script) {
         _devScript = script;
         _auth = auth;
         _captcha = captcha;
         this.devID = devID ?: UUID.randomUUID().toString().substring(0, 5);
 
-        onCaptchaException.subscribe { client, captcha ->
-            StateApp.instance.handleCaptchaException(client, captcha);
+        onCaptchaException.subscribe { client, c ->
+            StateApp.instance.handleCaptchaException(client, c);
         }
     }
     //TODO: Misisng auth/captcha pass on purpose?
@@ -37,8 +37,8 @@ class DevJSClient : JSClient {
         _captcha = captcha;
         this.devID = devID ?: UUID.randomUUID().toString().substring(0, 5);
 
-        onCaptchaException.subscribe { client, captcha ->
-            StateApp.instance.handleCaptchaException(client, captcha);
+        onCaptchaException.subscribe { client, c ->
+            StateApp.instance.handleCaptchaException(client, c);
         }
     }
 
@@ -49,7 +49,7 @@ class DevJSClient : JSClient {
         _auth = auth;
     }
     fun recreate(context: Context): DevJSClient {
-        return DevJSClient(context, config, _devScript, _auth, _captcha, devID);
+        return DevJSClient(context, config, _devScript, _auth, _captcha, devID, descriptor.settings);
     }
 
     override fun getCopy(): JSClient {

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

@@ -4,12 +4,10 @@ import android.content.Context
 import com.caoccao.javet.values.V8Value
 import com.caoccao.javet.values.primitive.V8ValueBoolean
 import com.caoccao.javet.values.primitive.V8ValueInteger
-import com.caoccao.javet.values.primitive.V8ValueNull
 import com.caoccao.javet.values.primitive.V8ValueString
 import com.caoccao.javet.values.reference.V8ValueArray
 import com.caoccao.javet.values.reference.V8ValueObject
-import com.futo.platformplayer.states.StatePlatform
-import com.futo.platformplayer.states.StatePlugins
+import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.media.IPlatformClient
 import com.futo.platformplayer.api.media.PlatformClientCapabilities
 import com.futo.platformplayer.api.media.models.PlatformAuthorLink
@@ -23,15 +21,29 @@ import com.futo.platformplayer.api.media.models.live.ILiveChatWindowDescriptor
 import com.futo.platformplayer.api.media.models.live.IPlatformLiveEvent
 import com.futo.platformplayer.api.media.models.playback.IPlaybackTracker
 import com.futo.platformplayer.api.media.models.playlists.IPlatformPlaylistDetails
-import com.futo.platformplayer.api.media.platforms.js.internal.*
-import com.futo.platformplayer.api.media.platforms.js.models.*
+import com.futo.platformplayer.api.media.platforms.js.internal.JSCallDocs
+import com.futo.platformplayer.api.media.platforms.js.internal.JSDocs
+import com.futo.platformplayer.api.media.platforms.js.internal.JSDocsParameter
+import com.futo.platformplayer.api.media.platforms.js.internal.JSHttpClient
+import com.futo.platformplayer.api.media.platforms.js.internal.JSOptional
+import com.futo.platformplayer.api.media.platforms.js.internal.JSParameterDocs
+import com.futo.platformplayer.api.media.platforms.js.models.IJSContentDetails
+import com.futo.platformplayer.api.media.platforms.js.models.JSChannel
+import com.futo.platformplayer.api.media.platforms.js.models.JSChannelPager
+import com.futo.platformplayer.api.media.platforms.js.models.JSChapter
+import com.futo.platformplayer.api.media.platforms.js.models.JSComment
+import com.futo.platformplayer.api.media.platforms.js.models.JSCommentPager
+import com.futo.platformplayer.api.media.platforms.js.models.JSContentPager
+import com.futo.platformplayer.api.media.platforms.js.models.JSLiveChatWindowDescriptor
+import com.futo.platformplayer.api.media.platforms.js.models.JSLiveEventPager
+import com.futo.platformplayer.api.media.platforms.js.models.JSPlaybackTracker
+import com.futo.platformplayer.api.media.platforms.js.models.JSPlaylistDetails
 import com.futo.platformplayer.api.media.structures.EmptyPager
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.constructs.Event2
 import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.engine.exceptions.PluginEngineException
-import com.futo.platformplayer.engine.exceptions.PluginEngineStoppedException
 import com.futo.platformplayer.engine.exceptions.ScriptCaptchaRequiredException
 import com.futo.platformplayer.engine.exceptions.ScriptImplementationException
 import com.futo.platformplayer.engine.exceptions.ScriptValidationException
@@ -39,6 +51,8 @@ import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.ImageVariable
 import com.futo.platformplayer.states.AnnouncementType
 import com.futo.platformplayer.states.StateAnnouncement
+import com.futo.platformplayer.states.StatePlatform
+import com.futo.platformplayer.states.StatePlugins
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import java.time.OffsetDateTime
@@ -49,13 +63,13 @@ open class JSClient : IPlatformClient {
     val config: SourcePluginConfig;
     protected val _context: Context;
     private val _plugin: V8Plugin;
-    private val plugin: V8Plugin get() = _plugin ?: throw IllegalStateException("Client not enabled");
+    private val plugin: V8Plugin get() = _plugin
 
     var descriptor: SourcePluginDescriptor
         private set;
 
-    private val _client: JSHttpClient;
-    private val _clientAuth: JSHttpClient?;
+    private val _httpClient: JSHttpClient;
+    private val _httpClientAuth: JSHttpClient?;
     private var _searchCapabilities: ResultCapabilities? = null;
     private var _searchChannelContentsCapabilities: ResultCapabilities? = null;
     private var _channelCapabilities: ResultCapabilities? = null;
@@ -118,9 +132,9 @@ open class JSClient : IPlatformClient {
         _captcha = descriptor.getCaptchaData();
         flags = descriptor.flags.toTypedArray();
 
-        _client = JSHttpClient(this, null, _captcha);
-        _clientAuth = JSHttpClient(this, _auth, _captcha);
-        _plugin = V8Plugin(context, descriptor.config, null, _client, _clientAuth);
+        _httpClient = JSHttpClient(this, null, _captcha);
+        _httpClientAuth = JSHttpClient(this, _auth, _captcha);
+        _plugin = V8Plugin(context, descriptor.config, null, _httpClient, _httpClientAuth);
         _plugin.withDependency(context, "scripts/polyfil.js");
         _plugin.withDependency(context, "scripts/source.js");
 
@@ -147,9 +161,9 @@ open class JSClient : IPlatformClient {
         _captcha = descriptor.getCaptchaData();
         flags = descriptor.flags.toTypedArray();
 
-        _client = JSHttpClient(this, null, _captcha);
-        _clientAuth = JSHttpClient(this, _auth, _captcha);
-        _plugin = V8Plugin(context, descriptor.config, script, _client, _clientAuth);
+        _httpClient = JSHttpClient(this, null, _captcha);
+        _httpClientAuth = JSHttpClient(this, _auth, _captcha);
+        _plugin = V8Plugin(context, descriptor.config, script, _httpClient, _httpClientAuth);
         _plugin.withDependency(context, "scripts/polyfil.js");
         _plugin.withDependency(context, "scripts/source.js");
         _plugin.withScript(script);
@@ -168,6 +182,13 @@ open class JSClient : IPlatformClient {
     fun getUnderlyingPlugin(): V8Plugin {
         return _plugin;
     }
+    fun getHttpClientById(id: String): JSHttpClient? {
+        if(_httpClient.clientId == id)
+            return _httpClient;
+        if(_httpClientAuth?.clientId == id)
+            return _httpClientAuth;
+        return plugin.httpClientOthers[id];
+    }
 
     override fun initialize() {
         Logger.i(TAG, "Plugin [${config.name}] initializing");
@@ -241,7 +262,7 @@ open class JSClient : IPlatformClient {
     @JSDocs(2, "source.getHome()", "Gets the HomeFeed of the platform")
     override fun getHome(): IPager<IPlatformContent> = isBusyWith {
         ensureEnabled();
-        return@isBusyWith JSContentPager(config, plugin,
+        return@isBusyWith JSContentPager(config, this,
             plugin.executeTyped("source.getHome()"));
     }
 
@@ -279,7 +300,7 @@ open class JSClient : IPlatformClient {
     @JSDocsParameter("channelId", "(optional) Channel id to search in")
     override fun search(query: String, type: String?, order: String?, filters: Map<String, List<String>>?): IPager<IPlatformContent> = isBusyWith {
         ensureEnabled();
-        return@isBusyWith JSContentPager(config, plugin,
+        return@isBusyWith JSContentPager(config, this,
             plugin.executeTyped("source.search(${Json.encodeToString(query)}, ${Json.encodeToString(type)}, ${Json.encodeToString(order)}, ${Json.encodeToString(filters)})"));
     }
 
@@ -303,7 +324,7 @@ open class JSClient : IPlatformClient {
         if(!capabilities.hasSearchChannelContents)
             throw IllegalStateException("This plugin does not support channel search");
 
-        return@isBusyWith JSContentPager(config, plugin,
+        return@isBusyWith JSContentPager(config, this,
             plugin.executeTyped("source.searchChannelContents(${Json.encodeToString(channelUrl)}, ${Json.encodeToString(query)}, ${Json.encodeToString(type)}, ${Json.encodeToString(order)}, ${Json.encodeToString(filters)})"));
     }
 
@@ -312,7 +333,7 @@ open class JSClient : IPlatformClient {
     @JSDocsParameter("query", "Query that channels should match")
     override fun searchChannels(query: String): IPager<PlatformAuthorLink> = isBusyWith {
         ensureEnabled();
-        return@isBusyWith JSChannelPager(config, plugin,
+        return@isBusyWith JSChannelPager(config, this,
             plugin.executeTyped("source.searchChannels(${Json.encodeToString(query)})"));
     }
 
@@ -359,7 +380,7 @@ open class JSClient : IPlatformClient {
     @JSDocsParameter("filters", "(optional) Filters to apply on contents")
     override fun getChannelContents(channelUrl: String, type: String?, order: String?, filters: Map<String, List<String>>?): IPager<IPlatformContent> = isBusyWith {
         ensureEnabled();
-        return@isBusyWith JSContentPager(config, plugin,
+        return@isBusyWith JSContentPager(config, this,
             plugin.executeTyped("source.getChannelContents(${Json.encodeToString(channelUrl)}, ${Json.encodeToString(type)}, ${Json.encodeToString(order)}, ${Json.encodeToString(filters)})"));
     }
 
@@ -425,7 +446,7 @@ open class JSClient : IPlatformClient {
     @JSDocsParameter("url", "A content url (this platform)")
     override fun getContentDetails(url: String): IPlatformContentDetails = isBusyWith {
         ensureEnabled();
-        return@isBusyWith IJSContentDetails.fromV8(config,
+        return@isBusyWith IJSContentDetails.fromV8(this,
             plugin.executeTyped("source.getContentDetails(${Json.encodeToString(url)})"));
     }
 
@@ -463,13 +484,13 @@ open class JSClient : IPlatformClient {
         if (pager !is V8ValueObject) { //TODO: Maybe solve this better
             return@isBusyWith EmptyPager<IPlatformComment>();
         }
-        return@isBusyWith JSCommentPager(config, plugin, pager);
+        return@isBusyWith JSCommentPager(config, this, pager);
     }
     @JSDocs(17, "source.getSubComments(comment)", "Gets replies for a given comment")
     @JSDocsParameter("comment", "Comment object that was returned by getComments")
     override fun getSubComments(comment: IPlatformComment): IPager<IPlatformComment> {
         ensureEnabled();
-        return comment.getReplies(this) ?: JSCommentPager(config, plugin,
+        return comment.getReplies(this) ?: JSCommentPager(config, this,
                 plugin.executeTyped("source.getSubComments(${Json.encodeToString(comment as JSComment)})"));
     }
 
@@ -488,7 +509,7 @@ open class JSClient : IPlatformClient {
         if(!capabilities.hasGetLiveEvents)
             return@isBusyWith null;
         ensureEnabled();
-        return@isBusyWith JSLiveEventPager(config, plugin,
+        return@isBusyWith JSLiveEventPager(config, this,
             plugin.executeTyped("source.getLiveEvents(${Json.encodeToString(url)})"));
     }
     @JSDocs(19, "source.searchPlaylists(query)", "Searches for playlists on the platform")
@@ -501,7 +522,7 @@ open class JSClient : IPlatformClient {
         ensureEnabled();
         if(!capabilities.hasSearchPlaylists)
             throw IllegalStateException("This plugin does not support playlist search");
-        return@isBusyWith JSContentPager(config, plugin, plugin.executeTyped("source.searchPlaylists(${Json.encodeToString(query)}, ${Json.encodeToString(type)}, ${Json.encodeToString(order)}, ${Json.encodeToString(filters)})"));
+        return@isBusyWith JSContentPager(config, this, plugin.executeTyped("source.searchPlaylists(${Json.encodeToString(query)}, ${Json.encodeToString(type)}, ${Json.encodeToString(order)}, ${Json.encodeToString(filters)})"));
     }
     @JSOptional
     @JSDocs(20, "source.isPlaylistUrl(url)", "Validates if a playlist url is for this platform")
@@ -517,7 +538,7 @@ open class JSClient : IPlatformClient {
     @JSDocsParameter("url", "Url of playlist")
     override fun getPlaylist(url: String): IPlatformPlaylistDetails = isBusyWith {
         ensureEnabled();
-        return@isBusyWith JSPlaylistDetails(plugin, plugin.config as SourcePluginConfig, plugin.executeTyped("source.getPlaylist(${Json.encodeToString(url)})"));
+        return@isBusyWith JSPlaylistDetails(this, plugin.config as SourcePluginConfig, plugin.executeTyped("source.getPlaylist(${Json.encodeToString(url)})"));
     }
 
     @JSOptional

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

@@ -5,9 +5,8 @@ import com.futo.platformplayer.SignatureProvider
 import com.futo.platformplayer.api.media.Serializer
 import com.futo.platformplayer.engine.IV8PluginConfig
 import com.futo.platformplayer.states.StatePlugins
-import kotlinx.serialization.decodeFromString
 import java.net.URL
-import java.util.*
+import java.util.UUID
 
 @kotlinx.serialization.Serializable
 class SourcePluginConfig(
@@ -149,7 +148,6 @@ class SourcePluginConfig(
         val warningDialog: String? = null,
         val options: List<String>? = null
     ) {
-        @kotlinx.serialization.Transient
         val variableOrName: String get() = variable ?: name;
     }
 }

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

@@ -2,7 +2,6 @@ package com.futo.platformplayer.api.media.platforms.js
 
 import com.futo.platformplayer.R
 import com.futo.platformplayer.constructs.Event0
-import com.futo.platformplayer.serializers.FlexibleBooleanSerializer
 import com.futo.platformplayer.views.fields.DropdownFieldOptions
 import com.futo.platformplayer.views.fields.FieldForm
 import com.futo.platformplayer.views.fields.FormField
@@ -27,17 +26,19 @@ class SourcePluginDescriptor {
     @kotlinx.serialization.Transient
     val onCaptchaChanged = Event0();
 
-    constructor(config :SourcePluginConfig, authEncrypted: String? = null, captchaEncrypted: String? = null) {
+    constructor(config :SourcePluginConfig, authEncrypted: String? = null, captchaEncrypted: String? = null, settings: HashMap<String, String?>? = null) {
         this.config = config;
         this.authEncrypted = authEncrypted;
         this.captchaEncrypted = captchaEncrypted;
         this.flags = listOf();
+        this.settings = settings ?: hashMapOf();
     }
-    constructor(config :SourcePluginConfig, authEncrypted: String? = null, captchaEncrypted: String? = null, flags: List<String>) {
+    constructor(config :SourcePluginConfig, authEncrypted: String? = null, captchaEncrypted: String? = null, flags: List<String>,  settings: HashMap<String, String?>? = null) {
         this.config = config;
         this.authEncrypted = authEncrypted;
         this.captchaEncrypted = captchaEncrypted;
         this.flags = flags;
+        this.settings = settings ?: hashMapOf();
     }
 
     fun getSettingsWithDefaults(): HashMap<String, String?> {
@@ -107,9 +108,9 @@ class SourcePluginDescriptor {
 
         fun loadDefaults(config: SourcePluginConfig) {
             if(tabEnabled.enableHome == null)
-                tabEnabled.enableHome = config.enableInHome ?: true;
+                tabEnabled.enableHome = config.enableInHome
             if(tabEnabled.enableSearch == null)
-                tabEnabled.enableSearch = config.enableInSearch ?: true;
+                tabEnabled.enableSearch = config.enableInSearch
         }
     }
 

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

@@ -1,31 +1,41 @@
 package com.futo.platformplayer.api.media.platforms.js.internal
 
 import android.net.Uri
-import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.platforms.js.SourceAuth
 import com.futo.platformplayer.api.media.platforms.js.SourceCaptchaData
+import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
+import com.futo.platformplayer.api.media.platforms.js.models.JSRequest
+import com.futo.platformplayer.api.media.platforms.js.models.JSRequestModifier
+import com.futo.platformplayer.engine.exceptions.ScriptImplementationException
 import com.futo.platformplayer.matchesDomain
+import java.util.UUID
 
 class JSHttpClient : ManagedHttpClient {
     private val _jsClient: JSClient?;
+    private val _jsConfig: SourcePluginConfig?;
     private val _auth: SourceAuth?;
     private val _captcha: SourceCaptchaData?;
 
+    val clientId = UUID.randomUUID().toString();
+
     var doUpdateCookies: Boolean = true;
     var doApplyCookies: Boolean = true;
     var doAllowNewCookies: Boolean = true;
     val isLoggedIn: Boolean get() = _auth != null;
 
     private var _currentCookieMap: HashMap<String, HashMap<String, String>>;
+    private var _otherCookieMap: HashMap<String, HashMap<String, String>>;
 
-    constructor(jsClient: JSClient?, auth: SourceAuth? = null, captcha: SourceCaptchaData? = null) : super() {
+    constructor(jsClient: JSClient?, auth: SourceAuth? = null, captcha: SourceCaptchaData? = null, config: SourcePluginConfig? = null) : super() {
         _jsClient = jsClient;
+        _jsConfig = config;
         _auth = auth;
         _captcha = captcha;
 
         _currentCookieMap = hashMapOf();
+        _otherCookieMap = hashMapOf();
         if(!auth?.cookieMap.isNullOrEmpty()) {
             for(domainCookies in auth!!.cookieMap!!)
                 _currentCookieMap.put(domainCookies.key, HashMap(domainCookies.value));
@@ -43,13 +53,49 @@ class JSHttpClient : ManagedHttpClient {
 
     override fun clone(): ManagedHttpClient {
         val newClient = JSHttpClient(_jsClient, _auth);
-        newClient._currentCookieMap = if(_currentCookieMap != null)
-            HashMap(_currentCookieMap.toList().associate { Pair(it.first, HashMap(it.second)) })
-        else
-            hashMapOf();
+        newClient._currentCookieMap = HashMap(_currentCookieMap.toList().associate { Pair(it.first, HashMap(it.second)) })
         return newClient;
     }
 
+    //TODO: Use this in beforeRequest to remove dup code
+    fun applyHeaders(url: Uri, headers: MutableMap<String, String>, applyAuth: Boolean = false, applyOtherCookies: Boolean = false) {
+        val domain = url.host!!.lowercase();
+        val auth = _auth;
+        if (applyAuth && auth != null) {
+            //TODO: Possibly add doApplyHeaders
+            for (header in auth.headers.filter { domain.matchesDomain(it.key) }.flatMap { it.value.entries })
+                headers.put(header.key, header.value);
+        }
+
+        if(doApplyCookies && (applyAuth || applyOtherCookies)) {
+            val cookiesToApply = hashMapOf<String, String>();
+            if(applyOtherCookies)
+                synchronized(_otherCookieMap) {
+                    for(cookie in _otherCookieMap
+                        .filter { domain.matchesDomain(it.key) }
+                        .flatMap { it.value.toList() })
+                        cookiesToApply[cookie.first] = cookie.second;
+                }
+            if(applyAuth)
+                synchronized(_currentCookieMap) {
+                    for(cookie in _currentCookieMap
+                        .filter { domain.matchesDomain(it.key) }
+                        .flatMap { it.value.toList() })
+                        cookiesToApply[cookie.first] = cookie.second;
+                };
+
+            if(cookiesToApply.size > 0) {
+                val cookieString = cookiesToApply.map { it.key + "=" + it.value }.joinToString("; ");
+
+                val existingCookies = headers["Cookie"];
+                if(!existingCookies.isNullOrEmpty())
+                    headers.put("Cookie", existingCookies.trim(';') + "; " + cookieString);
+                else
+                    headers.put("Cookie", cookieString);
+            }
+        }
+    }
+
     override fun beforeRequest(request: okhttp3.Request): okhttp3.Request {
         val domain = request.url.host.lowercase();
         val auth = _auth;
@@ -65,10 +111,10 @@ class JSHttpClient : ManagedHttpClient {
         }
 
         if(doApplyCookies) {
-            if (!_currentCookieMap.isNullOrEmpty()) {
+            if (_currentCookieMap.isNotEmpty()) {
                 val cookiesToApply = hashMapOf<String, String>();
-                synchronized(_currentCookieMap!!) {
-                    for(cookie in _currentCookieMap!!
+                synchronized(_currentCookieMap) {
+                    for(cookie in _currentCookieMap
                         .filter { domain.matchesDomain(it.key) }
                         .flatMap { it.value.toList() })
                         cookiesToApply[cookie.first] = cookie.second;
@@ -87,8 +133,12 @@ class JSHttpClient : ManagedHttpClient {
             }
         }
 
-        _jsClient?.validateUrlOrThrow(request.url.toString());
-        return newBuilder?.let { it.build() } ?: request;
+        if(_jsClient != null)
+            _jsClient.validateUrlOrThrow(request.url.toString());
+        else if (_jsConfig != null && !_jsConfig.isUrlAllowed(request.url.toString()))
+            throw ScriptImplementationException(_jsConfig, "Attempted to access non-whitelisted url: ${request.url.toString()}\nAdd it to your config");
+
+        return newBuilder?.build() ?: request;
     }
 
     override fun afterRequest(resp: okhttp3.Response): okhttp3.Response {
@@ -98,85 +148,65 @@ class JSHttpClient : ManagedHttpClient {
             val defaultCookieDomain =
                 "." + domainParts.drop(domainParts.size - 2).joinToString(".");
             for (header in resp.headers) {
-                if ((_auth != null || _currentCookieMap.isNotEmpty()) && header.first.lowercase() == "set-cookie") {
-                    //val newCookies = cookieStringToMap(header.second.split("; "));
+                if(header.first.lowercase() == "set-cookie") {
+                    var domainToUse = domain;
                     val cookie = cookieStringToPair(header.second);
-                    //for (cookie in newCookies) {
-                        var cookieValue = cookie.second;
-                        var domainToUse = domain;
+                    var cookieValue = cookie.second;
 
-                        if (!cookie.first.isNullOrEmpty() && !cookie.second.isNullOrEmpty()) {
-                            val cookieParts = cookie.second.split(";");
-                            if (cookieParts.size == 0)
-                                continue;
-                            cookieValue = cookieParts[0].trim();
+                    if (cookie.first.isNotEmpty() && cookie.second.isNotEmpty()) {
+                        val cookieParts = cookie.second.split(";");
+                        if (cookieParts.size == 0)
+                            continue;
+                        cookieValue = cookieParts[0].trim();
 
-                            val cookieVariables = cookieParts.drop(1).map {
-                                val splitIndex = it.indexOf("=");
-                                if (splitIndex < 0)
-                                    return@map Pair(it.trim().lowercase(), "");
-                                return@map Pair<String, String>(
-                                    it.substring(0, splitIndex).lowercase().trim(),
-                                    it.substring(splitIndex + 1).trim()
-                                );
-                            }.toMap();
-                            domainToUse = if (cookieVariables.containsKey("domain"))
-                                cookieVariables["domain"]!!.lowercase();
-                            else defaultCookieDomain;
-                        }
+                        val cookieVariables = cookieParts.drop(1).map {
+                            val splitIndex = it.indexOf("=");
+                            if (splitIndex < 0)
+                                return@map Pair(it.trim().lowercase(), "");
+                            return@map Pair<String, String>(
+                                it.substring(0, splitIndex).lowercase().trim(),
+                                it.substring(splitIndex + 1).trim()
+                            );
+                        }.toMap();
+                        domainToUse = if (cookieVariables.containsKey("domain"))
+                            cookieVariables["domain"]!!.lowercase();
+                        else defaultCookieDomain;
+                        //TODO: Make sure this has no negative effect besides apply cookies to root domain
+                        if(!domainToUse.startsWith("."))
+                            domainToUse = ".${domainToUse}";
+                    }
 
-                        val cookieMap = if (_currentCookieMap!!.containsKey(domainToUse))
-                            _currentCookieMap!![domainToUse]!!;
+                    if ((_auth != null || _currentCookieMap.isNotEmpty())) {
+                        val cookieMap = if (_currentCookieMap.containsKey(domainToUse))
+                            _currentCookieMap[domainToUse]!!;
                         else {
                             val newMap = hashMapOf<String, String>();
-                            _currentCookieMap!!.put(domainToUse, newMap)
+                            _currentCookieMap[domainToUse] = newMap
                             newMap;
                         }
-                        if(cookieMap.containsKey(cookie.first) || doAllowNewCookies)
-                            cookieMap.put(cookie.first, cookieValue);
-                    //}
+                        if (cookieMap.containsKey(cookie.first) || doAllowNewCookies)
+                            cookieMap[cookie.first] = cookieValue;
+                    }
+                    else {
+                        val cookieMap = if (_otherCookieMap.containsKey(domainToUse))
+                            _otherCookieMap[domainToUse]!!;
+                        else {
+                            val newMap = hashMapOf<String, String>();
+                            _otherCookieMap[domainToUse] = newMap
+                            newMap;
+                        }
+                        if (cookieMap.containsKey(cookie.first) || doAllowNewCookies)
+                            cookieMap[cookie.first] = cookieValue;
+                    }
                 }
             }
         }
         return resp;
     }
 
-
-    private fun cookieStringToMap(parts: List<String>): Map<String, String> {
-        val map = hashMapOf<String, String>();
-        for(cookie in parts) {
-            val pair = cookieStringToPair(cookie)
-            map.put(pair.first, pair.second);
-        }
-        return map;
-    }
     private fun cookieStringToPair(cookie: String): Pair<String, String> {
         val cookieKey = cookie.substring(0, cookie.indexOf("="));
         val cookieVal = cookie.substring(cookie.indexOf("=") + 1);
         return Pair(cookieKey.trim(), cookieVal.trim());
     }
-
-    //Prints out code for test reproduction..
-    fun printTestCode(url: String, body: ByteArray?, headers: Map<String, String>, cookieString: String, allHeaders: Map<String, String>? = null) {
-        var code = "Code: \n";
-        code += "\nurl = \"${url}\";";
-        if(body != null)
-            code += "\nbody = \"${String(body).replace("\"", "\\\"")}\";";
-        if(headers != null)
-            for(header in headers) {
-                code += "\nclient.Headers.Add(\"${header.key}\", \"${header.value}\");";
-            }
-        if(cookieString != null)
-            code +=  "\nclient.Headers.Add(\"Cookie\", \"${cookieString}\");";
-
-        if(allHeaders != null) {
-            code += "\n//OTHER HEADERS:"
-            for (header in allHeaders) {
-                code += "\nclient.Headers.Add(\"${header.key}\", \"${header.value}\");";
-            }
-        }
-
-        Logger.i("Testing", code);
-    }
-
 }

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

@@ -3,6 +3,7 @@ package com.futo.platformplayer.api.media.platforms.js.models
 import com.caoccao.javet.values.reference.V8ValueObject
 import com.futo.platformplayer.api.media.models.contents.ContentType
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
+import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.getOrDefault
 import com.futo.platformplayer.getOrThrow
@@ -10,19 +11,21 @@ import com.futo.platformplayer.getOrThrow
 interface IJSContent: IPlatformContent  {
 
     companion object {
-        fun fromV8(config: SourcePluginConfig, obj: V8ValueObject): IPlatformContent {
+        fun fromV8(plugin: JSClient, obj: V8ValueObject): IPlatformContent {
+            val config = plugin.config;
             val type: Int = obj.getOrThrow(config, "contentType", "ContentItem");
             val pluginType: String? = obj.getOrDefault(config, "plugin_type", "ContentItem", null);
 
             //TODO: Temporary workaround for intercepting details in lists
             if(pluginType != null && pluginType.endsWith("Details"))
-                return IJSContentDetails.fromV8(config, obj);
+                return IJSContentDetails.fromV8(plugin, obj);
 
             return when(ContentType.fromInt(type)) {
                 ContentType.MEDIA -> JSVideo(config, obj);
                 ContentType.POST -> JSPost(config, obj);
                 ContentType.NESTED_VIDEO -> JSNestedMediaContent(config, obj);
                 ContentType.PLAYLIST -> JSPlaylist(config, obj);
+                ContentType.LOCKED -> JSLockedContent(config, obj);
                 else -> throw NotImplementedError("Unknown content type ${type}");
             }
         }

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

@@ -4,17 +4,18 @@ import com.caoccao.javet.values.reference.V8ValueObject
 import com.futo.platformplayer.api.media.models.contents.ContentType
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
 import com.futo.platformplayer.api.media.models.contents.IPlatformContentDetails
+import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.getOrThrow
 
 interface IJSContentDetails: IPlatformContent  {
 
     companion object {
-        fun fromV8(config: SourcePluginConfig, obj: V8ValueObject): IPlatformContentDetails {
-            val type: Int = obj.getOrThrow(config, "contentType", "ContentDetails");
+        fun fromV8(plugin: JSClient, obj: V8ValueObject): IPlatformContentDetails {
+            val type: Int = obj.getOrThrow(plugin.config, "contentType", "ContentDetails");
             return when(ContentType.fromInt(type)) {
-                ContentType.MEDIA -> JSVideoDetails(config, obj);
-                ContentType.POST -> JSPostDetails(config, obj);
+                ContentType.MEDIA -> JSVideoDetails(plugin, obj);
+                ContentType.POST -> JSPostDetails(plugin.config, obj);
                 else -> throw NotImplementedError("Unknown content type ${type}");
             }
         }

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

@@ -2,13 +2,14 @@ package com.futo.platformplayer.api.media.platforms.js.models
 
 import com.caoccao.javet.values.reference.V8ValueObject
 import com.futo.platformplayer.api.media.models.PlatformAuthorLink
+import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.engine.V8Plugin
 
 class JSChannelPager : JSPager<PlatformAuthorLink>, IPager<PlatformAuthorLink> {
 
-    constructor(config: SourcePluginConfig, plugin: V8Plugin, pager: V8ValueObject) : super(config, plugin, pager) {}
+    constructor(config: SourcePluginConfig, plugin: JSClient, pager: V8ValueObject) : super(config, plugin, pager) {}
 
     override fun convertResult(obj: V8ValueObject): PlatformAuthorLink {
         return PlatformAuthorLink.fromV8(config, obj);

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

@@ -12,10 +12,10 @@ import com.futo.platformplayer.getOrThrow
 class JSChapter : IChapter {
     override val name: String;
     override val type: ChapterType;
-    override val timeStart: Int;
-    override val timeEnd: Int;
+    override val timeStart: Double;
+    override val timeEnd: Double;
 
-    constructor(name: String, timeStart: Int, timeEnd: Int, type: ChapterType = ChapterType.NORMAL) {
+    constructor(name: String, timeStart: Double, timeEnd: Double, type: ChapterType = ChapterType.NORMAL) {
         this.name = name;
         this.timeStart = timeStart;
         this.timeEnd = timeEnd;
@@ -29,8 +29,8 @@ class JSChapter : IChapter {
 
             val name = obj.getOrThrow<String>(config,"name", context);
             val type = ChapterType.fromInt(obj.getOrDefault<Int>(config, "type", context, ChapterType.NORMAL.value) ?: ChapterType.NORMAL.value);
-            val timeStart = obj.getOrThrow<Int>(config, "timeStart", context);
-            val timeEnd = obj.getOrThrow<Int>(config, "timeEnd", context);
+            val timeStart = obj.getOrThrow<Double>(config, "timeStart", context);
+            val timeEnd = obj.getOrThrow<Double>(config, "timeEnd", context);
 
             return JSChapter(name, timeStart, timeEnd, type);
         }

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

@@ -5,6 +5,7 @@ import com.futo.platformplayer.api.media.IPlatformClient
 import com.futo.platformplayer.api.media.models.PlatformAuthorLink
 import com.futo.platformplayer.api.media.models.comments.IPlatformComment
 import com.futo.platformplayer.api.media.models.ratings.IRating
+import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.engine.V8Plugin
@@ -60,6 +61,7 @@ class JSComment : IPlatformComment {
             return null;
 
         val obj = _comment!!.invoke<V8ValueObject>("getReplies", arrayOf<Any>());
-        return JSCommentPager(_config!!, _plugin!!, obj);
+        val plugin = if(client is JSClient) client else throw NotImplementedError("Only implemented for JSClient");
+        return JSCommentPager(_config!!, plugin, obj);
     }
 }

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

@@ -2,15 +2,16 @@ package com.futo.platformplayer.api.media.platforms.js.models
 
 import com.caoccao.javet.values.reference.V8ValueObject
 import com.futo.platformplayer.api.media.models.comments.IPlatformComment
+import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.engine.V8Plugin
 
 class JSCommentPager : JSPager<IPlatformComment>, IPager<IPlatformComment> {
 
-    constructor(config: SourcePluginConfig, plugin: V8Plugin, pager: V8ValueObject) : super(config, plugin, pager) { }
+    constructor(config: SourcePluginConfig, plugin: JSClient, pager: V8ValueObject) : super(config, plugin, pager) { }
 
     override fun convertResult(obj: V8ValueObject): IPlatformComment {
-        return JSComment(config, plugin, obj);
+        return JSComment(config, plugin.getUnderlyingPlugin(), obj);
     }
 }

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

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

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

@@ -2,6 +2,7 @@ package com.futo.platformplayer.api.media.platforms.js.models
 
 import com.caoccao.javet.values.reference.V8ValueObject
 import com.futo.platformplayer.api.media.models.live.IPlatformLiveEvent
+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.IPlatformLiveEventPager
 import com.futo.platformplayer.engine.V8Plugin
@@ -10,7 +11,7 @@ import com.futo.platformplayer.getOrThrow
 class JSLiveEventPager : JSPager<IPlatformLiveEvent>, IPlatformLiveEventPager {
     override var nextRequest: Int;
 
-    constructor(config: SourcePluginConfig, plugin: V8Plugin, pager: V8ValueObject) : super(config, plugin, pager) {
+    constructor(config: SourcePluginConfig, plugin: JSClient, pager: V8ValueObject) : super(config, plugin, pager) {
         nextRequest = pager.getOrThrow(config, "nextRequest", "LiveEventPager");
     }
 

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

@@ -0,0 +1,36 @@
+package com.futo.platformplayer.api.media.platforms.js.models
+
+import com.caoccao.javet.values.reference.V8ValueObject
+import com.futo.platformplayer.api.media.models.Thumbnails
+import com.futo.platformplayer.api.media.models.contents.ContentType
+import com.futo.platformplayer.api.media.models.locked.IPlatformLockedContent
+import com.futo.platformplayer.api.media.models.nested.IPlatformNestedContent
+import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
+import com.futo.platformplayer.getOrDefault
+import com.futo.platformplayer.getOrThrow
+import com.futo.platformplayer.states.StatePlatform
+
+//TODO: Refactor into video-only
+class JSLockedContent: IPlatformLockedContent, JSContent {
+
+    override val contentType: ContentType get() = ContentType.LOCKED;
+    override val lockContentType: ContentType get() = ContentType.MEDIA;
+
+    override val lockDescription: String?;
+    override val unlockUrl: String?;
+
+    override val contentName: String?;
+    override val contentThumbnails: Thumbnails;
+
+    constructor(config: SourcePluginConfig, obj: V8ValueObject): super(config, obj) {
+        val contextName = "PlatformLockedContent";
+
+        this.contentName = obj.getOrDefault(config, "contentName", contextName, null);
+        this.contentThumbnails = obj.getOrDefault<V8ValueObject?>(config, "contentThumbnails", contextName, null)?.let {
+            return@let Thumbnails.fromV8(config, it);
+        } ?: Thumbnails();
+
+        lockDescription = obj.getOrDefault(config, "lockDescription", contextName, null);
+        unlockUrl = obj.getOrDefault(config, "unlockUrl", contextName, null);
+    }
+}

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

@@ -4,6 +4,7 @@ import android.os.Looper
 import com.caoccao.javet.values.reference.V8ValueArray
 import com.caoccao.javet.values.reference.V8ValueObject
 import com.futo.platformplayer.BuildConfig
+import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.engine.V8Plugin
@@ -12,7 +13,7 @@ import com.futo.platformplayer.getOrThrow
 import com.futo.platformplayer.warnIfMainThread
 
 abstract class JSPager<T> : IPager<T> {
-    protected val plugin: V8Plugin;
+    protected val plugin: JSClient;
     protected val config: SourcePluginConfig;
     protected var pager: V8ValueObject;
 
@@ -21,9 +22,9 @@ abstract class JSPager<T> : IPager<T> {
     private var _hasMorePages: Boolean = false;
     //private var _morePagesWasFalse: Boolean = false;
 
-    val isAvailable get() = plugin._runtime?.let { !it.isClosed && !it.isDead } ?: false;
+    val isAvailable get() = plugin.getUnderlyingPlugin()._runtime?.let { !it.isClosed && !it.isDead } ?: false;
 
-    constructor(config: SourcePluginConfig, plugin: V8Plugin, pager: V8ValueObject) {
+    constructor(config: SourcePluginConfig, plugin: JSClient, pager: V8ValueObject) {
         this.plugin = plugin;
         this.pager = pager;
         this.config = config;
@@ -43,7 +44,7 @@ abstract class JSPager<T> : IPager<T> {
     override fun nextPage() {
         warnIfMainThread("JSPager.nextPage");
 
-        pager = plugin.catchScriptErrors("[${plugin.config.name}] JSPager", "pager.nextPage()") {
+        pager = plugin.getUnderlyingPlugin().catchScriptErrors("[${plugin.config.name}] JSPager", "pager.nextPage()") {
             pager.invoke("nextPage", arrayOf<Any>());
         };
         _hasMorePages = pager.getOrDefault(config, "hasMore", "Pager", false) ?: false;
@@ -59,8 +60,6 @@ abstract class JSPager<T> : IPager<T> {
     }
 
     override fun getResults(): List<T> {
-        warnIfMainThread("JSPager.getResults");
-
         val previousResults = _lastResults?.let {
             if(!_resultChanged)
                 return@let it;
@@ -70,6 +69,7 @@ abstract class JSPager<T> : IPager<T> {
         if(previousResults != null)
             return previousResults;
 
+        warnIfMainThread("JSPager.getResults");
         val items = pager.getOrThrow<V8ValueArray>(config, "results", "JSPager");
         val newResults = items.toArray()
             .map { convertResult(it as V8ValueObject) }

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

@@ -4,6 +4,7 @@ import com.caoccao.javet.values.reference.V8ValueObject
 import com.futo.platformplayer.api.media.models.playlists.IPlatformPlaylistDetails
 import com.futo.platformplayer.api.media.models.video.IPlatformVideo
 import com.futo.platformplayer.api.media.models.video.SerializedPlatformVideo
+import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.engine.V8Plugin
@@ -13,7 +14,7 @@ import com.futo.platformplayer.models.Playlist
 class JSPlaylistDetails: JSPlaylist, IPlatformPlaylistDetails {
     override val contents: IPager<IPlatformVideo>;
 
-    constructor(plugin: V8Plugin, config: SourcePluginConfig, obj: V8ValueObject): super(config, obj) {
+    constructor(plugin: JSClient, config: SourcePluginConfig, obj: V8ValueObject): super(config, obj) {
         contents = JSVideoPager(config, plugin, obj.getOrThrow(config, "contents", "PlaylistDetails"));
     }
 

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

@@ -2,13 +2,14 @@ package com.futo.platformplayer.api.media.platforms.js.models
 
 import com.caoccao.javet.values.reference.V8ValueObject
 import com.futo.platformplayer.api.media.models.playlists.IPlatformPlaylist
+import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.engine.V8Plugin
 
 class JSPlaylistPager : JSPager<IPlatformPlaylist>, IPager<IPlatformPlaylist> {
 
-    constructor(config: SourcePluginConfig, plugin: V8Plugin, pager: V8ValueObject) : super(config, plugin, pager) {}
+    constructor(config: SourcePluginConfig, plugin: JSClient, pager: V8ValueObject) : super(config, plugin, pager) {}
 
     override fun convertResult(obj: V8ValueObject): IPlatformPlaylist {
         return JSPlaylist(config, obj);

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

@@ -54,6 +54,6 @@ class JSPostDetails : JSPost, IPlatformPost, IPlatformPostDetails {
 
     private fun getCommentsJS(client: JSClient): JSCommentPager {
         val commentPager = _content.invoke<V8ValueObject>("getComments", arrayOf<Any>());
-        return JSCommentPager(_pluginConfig, client.getUnderlyingPlugin(), commentPager);
+        return JSCommentPager(_pluginConfig, client, commentPager);
     }
 }

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

@@ -1,18 +1,81 @@
 package com.futo.platformplayer.api.media.platforms.js.models
 
+import android.net.Uri
 import com.caoccao.javet.values.reference.V8ValueObject
+import com.futo.platformplayer.api.media.models.modifier.IModifierOptions
+import com.futo.platformplayer.api.media.models.modifier.IRequest
+import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.engine.IV8PluginConfig
-import com.futo.platformplayer.getOrThrow
-import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.getOrDefault
 
 @kotlinx.serialization.Serializable
-class JSRequest : JSRequestModifier.IRequest {
-    override val url: String;
-    override val headers: Map<String, String>;
+class JSRequest : IRequest {
+    private val _v8Url: String?;
+    private val _v8Headers: Map<String, String>?;
+    private val _v8Options: Options?;
 
-    constructor(config: IV8PluginConfig, obj: V8ValueObject) {
+    override var url: String? = null;
+    override lateinit var headers: Map<String, String>;
+
+    constructor(plugin: JSClient, url: String?, headers: Map<String, String>?, options: Options?, originalUrl: String?, originalHeaders: Map<String, String>?) {
+        _v8Url = url;
+        _v8Headers = headers;
+        _v8Options = options;
+        initialize(plugin, originalUrl, originalHeaders);
+    }
+    constructor(plugin: JSClient, obj: V8ValueObject, originalUrl: String?, originalHeaders: Map<String, String>?) {
         val contextName = "ModifyRequestResponse";
-        url = obj.getOrThrow(config, "url", contextName);
-        headers = obj.getOrThrow(config, "headers", contextName);
+        val config = plugin.config;
+        _v8Url = obj.getOrDefault<String>(config, "url", contextName, null);
+        _v8Headers = obj.getOrDefault<Map<String, String>>(config, "headers", contextName, null);
+        _v8Options = obj.getOrDefault<V8ValueObject>(config, "options", "JSRequestModifier.options", null)?.let {
+            Options(config, it);
+        }
+        initialize(plugin, originalUrl, originalHeaders);
+    }
+
+    private fun initialize(plugin: JSClient, originalUrl: String?, originalHeaders: Map<String, String>?) {
+        val config = plugin.config;
+        url = _v8Url ?: originalUrl;
+        headers = _v8Headers ?: originalHeaders ?: mapOf();
+
+        if(_v8Options != null) {
+            if(_v8Options.applyCookieClient != null && url != null) {
+                val client = plugin.getHttpClientById(_v8Options.applyCookieClient);
+                if(client != null) {
+                    val toModifyHeaders = headers.toMutableMap();
+                    client.applyHeaders(Uri.parse(url), toModifyHeaders, false, true);
+                    headers = toModifyHeaders;
+                }
+            }
+            if(_v8Options.applyAuthClient != null && url != null) {
+                val client = plugin.getHttpClientById(_v8Options.applyAuthClient);
+                if(client != null) {
+                    val toModifyHeaders = headers.toMutableMap();
+                    client.applyHeaders(Uri.parse(url), toModifyHeaders, true, false);
+                    headers = toModifyHeaders;
+                }
+            }
+        }
+    }
+
+    fun modify(plugin: JSClient, originalUrl: String?, originalHeaders: Map<String, String>?): JSRequest {
+        return JSRequest(plugin, _v8Url, _v8Headers, _v8Options, originalUrl, originalHeaders);
+    }
+
+
+    @kotlinx.serialization.Serializable
+    class Options: IModifierOptions {
+        override val applyAuthClient: String?;
+        override val applyCookieClient: String?;
+
+        constructor(config: IV8PluginConfig, obj: V8ValueObject) {
+            applyAuthClient = obj.getOrDefault(config, "applyAuthClient", "JSRequestModifier.options.applyAuthClient", null);
+            applyCookieClient = obj.getOrDefault(config, "applyCookieClient", "JSRequestModifier.options.applyCookieClient", null);
+        }
+    }
+
+    companion object {
+
     }
 }

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

@@ -1,19 +1,28 @@
 package com.futo.platformplayer.api.media.platforms.js.models
 
+import android.net.Uri
 import com.caoccao.javet.values.reference.V8ValueObject
+import com.futo.platformplayer.api.media.models.modifier.IRequest
+import com.futo.platformplayer.api.media.models.modifier.IRequestModifier
+import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.engine.IV8PluginConfig
 import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.engine.exceptions.ScriptImplementationException
+import com.futo.platformplayer.getOrDefault
 import com.futo.platformplayer.getOrNull
+import com.futo.platformplayer.getOrThrow
 
-class JSRequestModifier {
+class JSRequestModifier: IRequestModifier {
+    private val _plugin: JSClient;
     private val _config: IV8PluginConfig;
     private var _modifier: V8ValueObject;
-    val allowByteSkip: Boolean;
+    override var allowByteSkip: Boolean;
 
-    constructor(config: IV8PluginConfig, modifier: V8ValueObject) {
+    constructor(plugin: JSClient, modifier: V8ValueObject) {
+        this._plugin = plugin;
         this._modifier = modifier;
-        this._config = config;
+        this._config = plugin.config;
+        val config = plugin.config;
 
         allowByteSkip = modifier.getOrNull(config, "allowByteSkip", "JSRequestModifier") ?: true;
 
@@ -21,22 +30,19 @@ class JSRequestModifier {
             throw ScriptImplementationException(config, "RequestModifier is missing modifyRequest", null);
     }
 
-    fun modifyRequest(url: String, headers: Map<String, String>): IRequest {
+    override fun modifyRequest(url: String, headers: Map<String, String>): IRequest {
         if (_modifier.isClosed) {
             return Request(url, headers);
         }
 
         val result = V8Plugin.catchScriptErrors<Any>(_config, "[${_config.name}] JSRequestModifier", "builder.modifyRequest()") {
             _modifier.invoke("modifyRequest", url, headers);
-        };
+        } as V8ValueObject;
 
-        return JSRequest(_config, result as V8ValueObject);
+        val req = JSRequest(_plugin, result, url, headers);
+        return req;
     }
 
-    interface IRequest {
-        val url: String;
-        val headers: Map<String, String>;
-    }
 
     data class Request(override val url: String, override val headers: Map<String, String>) : IRequest;
 }

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

@@ -44,13 +44,14 @@ class JSVideoDetails : JSVideo, IPlatformVideoDetails {
     override val subtitles: List<ISubtitleSource>;
 
 
-    constructor(config: SourcePluginConfig, obj: V8ValueObject) : super(config, obj) {
+    constructor(plugin: JSClient, obj: V8ValueObject) : super(plugin.config, obj) {
         val contextName = "VideoDetails";
+        val config = plugin.config;
         description = _content.getOrThrow(config, "description", contextName);
-        video = JSVideoSourceDescriptor.fromV8(config, _content.getOrThrow(config, "video", contextName));
-        dash =  JSSource.fromV8DashNullable(config, _content.getOrThrowNullable<V8ValueObject>(config, "dash", contextName));
-        hls = JSSource.fromV8HLSNullable(config, _content.getOrThrowNullable<V8ValueObject>(config, "hls", contextName));
-        live = JSSource.fromV8VideoNullable(config, _content.getOrThrowNullable<V8ValueObject>(config, "live", contextName));
+        video = JSVideoSourceDescriptor.fromV8(plugin, _content.getOrThrow(config, "video", contextName));
+        dash =  JSSource.fromV8DashNullable(plugin, _content.getOrThrowNullable<V8ValueObject>(config, "dash", contextName));
+        hls = JSSource.fromV8HLSNullable(plugin, _content.getOrThrowNullable<V8ValueObject>(config, "hls", contextName));
+        live = JSSource.fromV8VideoNullable(plugin, _content.getOrThrowNullable<V8ValueObject>(config, "live", contextName));
         rating = IRating.fromV8OrDefault(config, _content.getOrDefault<V8ValueObject>(config, "rating", contextName, null), RatingLikes(0));
 
         if(!_content.has("subtitles"))
@@ -105,6 +106,6 @@ class JSVideoDetails : JSVideo, IPlatformVideoDetails {
         if (commentPager !is V8ValueObject) //TODO: Maybe handle this better?
             return null;
 
-        return JSCommentPager(_pluginConfig, client.getUnderlyingPlugin(), commentPager);
+        return JSCommentPager(_pluginConfig, client, commentPager);
     }
 }

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

@@ -2,12 +2,13 @@ package com.futo.platformplayer.api.media.platforms.js.models
 
 import com.caoccao.javet.values.reference.V8ValueObject
 import com.futo.platformplayer.api.media.models.video.IPlatformVideo
+import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.engine.V8Plugin
 
 class JSVideoPager : JSPager<IPlatformVideo> {
 
-    constructor(config: SourcePluginConfig, plugin: V8Plugin, pager: V8ValueObject) : super(config, plugin, pager) {}
+    constructor(config: SourcePluginConfig, plugin: JSClient, pager: V8ValueObject) : super(config, plugin, pager) {}
 
     override fun convertResult(obj: V8ValueObject): IPlatformVideo {
         return JSVideo(config, obj);

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

@@ -2,7 +2,9 @@ package com.futo.platformplayer.api.media.platforms.js.models.sources
 
 import com.caoccao.javet.values.reference.V8ValueObject
 import com.futo.platformplayer.api.media.models.streams.sources.IAudioUrlSource
+import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.engine.IV8PluginConfig
+import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.getOrDefault
 import com.futo.platformplayer.getOrThrow
 
@@ -19,8 +21,9 @@ open class JSAudioUrlSource : IAudioUrlSource, JSSource {
 
     override var priority: Boolean = false;
 
-    constructor(config: IV8PluginConfig, obj: V8ValueObject) : super(TYPE_AUDIOURL, config, obj) {
+    constructor(plugin: JSClient, obj: V8ValueObject) : super(TYPE_AUDIOURL, plugin, obj) {
         val contextName = "AudioUrlSource";
+        val config = plugin.config;
 
         bitrate = _obj.getOrThrow(config, "bitrate", contextName);
         container = _obj.getOrThrow(config, "container", contextName);

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

@@ -3,7 +3,9 @@ package com.futo.platformplayer.api.media.platforms.js.models.sources
 import com.caoccao.javet.values.reference.V8ValueObject
 import com.futo.platformplayer.api.media.models.streams.sources.other.IStreamMetaDataSource
 import com.futo.platformplayer.api.media.models.streams.sources.other.StreamMetaData
+import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.engine.IV8PluginConfig
+import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.getOrDefault
 
 class JSAudioUrlRangeSource : JSAudioUrlSource, IStreamMetaDataSource {
@@ -22,8 +24,9 @@ class JSAudioUrlRangeSource : JSAudioUrlSource, IStreamMetaDataSource {
         && indexEnd != null)
         StreamMetaData(initStart, initEnd, indexStart, indexEnd) else null;
 
-    constructor(config: IV8PluginConfig, obj: V8ValueObject) : super(config, obj) {
+    constructor(plugin: JSClient, obj: V8ValueObject) : super(plugin, obj) {
         val contextName = "JSAudioUrlRangeSource";
+        val config = plugin.config;
 
         itagId = _obj.getOrDefault(config, "itagId", contextName, null);
         initStart = _obj.getOrDefault(config, "initStart", contextName, null);

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

@@ -3,7 +3,9 @@ package com.futo.platformplayer.api.media.platforms.js.models.sources
 import com.caoccao.javet.values.reference.V8ValueObject
 import com.futo.platformplayer.api.media.models.streams.sources.IDashManifestSource
 import com.futo.platformplayer.api.media.models.streams.sources.IVideoUrlSource
+import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.engine.IV8PluginConfig
+import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.getOrNull
 import com.futo.platformplayer.getOrThrow
 
@@ -19,9 +21,9 @@ class JSDashManifestSource : IVideoUrlSource, IDashManifestSource, JSSource {
 
     override var priority: Boolean = false;
 
-    constructor(config: IV8PluginConfig, obj: V8ValueObject) : super(TYPE_DASH, config, obj) {
+    constructor(plugin: JSClient, obj: V8ValueObject) : super(TYPE_DASH, plugin, obj) {
         val contextName = "DashSource";
-
+        val config = plugin.config;
         name = _obj.getOrThrow(config, "name", contextName);
         url = _obj.getOrThrow(config, "url", contextName);
         duration = _obj.getOrThrow(config, "duration", contextName);

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

@@ -4,7 +4,9 @@ import com.caoccao.javet.values.V8Value
 import com.caoccao.javet.values.reference.V8ValueObject
 import com.futo.platformplayer.api.media.models.streams.sources.IAudioUrlSource
 import com.futo.platformplayer.api.media.models.streams.sources.IHLSManifestAudioSource
+import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.engine.IV8PluginConfig
+import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.getOrNull
 import com.futo.platformplayer.getOrThrow
 import com.futo.platformplayer.orNull
@@ -20,8 +22,9 @@ class JSHLSManifestAudioSource : IHLSManifestAudioSource, JSSource {
 
     override var priority: Boolean = false;
 
-    constructor(config: IV8PluginConfig, obj: V8ValueObject) : super(TYPE_HLS, config, obj) {
+    constructor(plugin: JSClient, obj: V8ValueObject) : super(TYPE_HLS, plugin, obj) {
         val contextName = "HLSAudioSource";
+        val config = plugin.config;
 
         name = _obj.getOrThrow(config, "name", contextName);
         url = _obj.getOrThrow(config, "url", contextName);
@@ -33,7 +36,7 @@ class JSHLSManifestAudioSource : IHLSManifestAudioSource, JSSource {
 
 
     companion object {
-        fun fromV8HLSNullable(config: IV8PluginConfig, obj: V8Value?) : JSHLSManifestAudioSource? = obj.orNull { fromV8HLS(config, it as V8ValueObject) };
-        fun fromV8HLS(config: IV8PluginConfig, obj: V8ValueObject) : JSHLSManifestAudioSource = JSHLSManifestAudioSource(config, obj);
+        fun fromV8HLSNullable(plugin: JSClient, obj: V8Value?) : JSHLSManifestAudioSource? = obj.orNull { fromV8HLS(plugin, it as V8ValueObject) };
+        fun fromV8HLS(plugin: JSClient, obj: V8ValueObject) : JSHLSManifestAudioSource = JSHLSManifestAudioSource(plugin, obj);
     }
 }

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

@@ -3,7 +3,9 @@ package com.futo.platformplayer.api.media.platforms.js.models.sources
 import com.caoccao.javet.values.reference.V8ValueObject
 import com.futo.platformplayer.api.media.models.streams.sources.IHLSManifestSource
 import com.futo.platformplayer.api.media.models.streams.sources.IVideoUrlSource
+import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.engine.IV8PluginConfig
+import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.getOrNull
 import com.futo.platformplayer.getOrThrow
 
@@ -19,8 +21,9 @@ class JSHLSManifestSource : IHLSManifestSource, JSSource {
 
     override var priority: Boolean = false;
 
-    constructor(config: IV8PluginConfig, obj: V8ValueObject) : super(TYPE_HLS, config, obj) {
+    constructor(plugin: JSClient, obj: V8ValueObject) : super(TYPE_HLS, plugin, obj) {
         val contextName = "HLSSource";
+        val config = plugin.config;
 
         name = _obj.getOrThrow(config, "name", contextName);
         url = _obj.getOrThrow(config, "url", contextName);