Refs

WIP DBStore

See merge request videostreaming/grayjay!8

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,46 @@ 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 'com.google.android.exoplayer:exoplayer-core:2.19.1'
+    implementation 'com.google.android.exoplayer:exoplayer-dash:2.19.1'
+    implementation 'com.google.android.exoplayer:exoplayer-ui:2.19.1'
+    implementation 'com.google.android.exoplayer:exoplayer-hls:2.19.1'
+    implementation 'com.google.android.exoplayer:exoplayer-rtsp:2.19.1'
+    implementation 'com.google.android.exoplayer:exoplayer-smoothstreaming:2.19.1'
+    implementation 'com.google.android.exoplayer:exoplayer-transformer:2.19.1'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.7.5'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.7.5'
 
     //Other
     implementation 'org.jmdns:jmdns:3.5.1'
@@ -180,28 +188,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

@@ -9,6 +9,8 @@
     <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="com.android.alarm.permission.SET_ALARM"/>
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
 
     <application
         android:allowBackup="true"
@@ -39,6 +41,7 @@
 
         <receiver android:name=".receivers.MediaControlReceiver" />
         <receiver android:name=".receivers.AudioNoisyReceiver" />
+        <receiver android:name=".receivers.PlannedNotificationReceiver" />
 
         <activity
             android:name=".activities.MainActivity"
@@ -58,6 +61,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 +218,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"
@@ -70,6 +71,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 +216,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_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;
@@ -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

@@ -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/Settings.kt

@@ -21,6 +21,8 @@ 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.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
@@ -28,7 +30,6 @@ import kotlinx.serialization.*
 import kotlinx.serialization.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 +44,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 +70,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 +102,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,7 +116,26 @@ class Settings : FragmentedStorageFileJson() {
 
 
 
-    @FormField(R.string.home, "group", R.string.configure_how_your_home_tab_works_and_feels, 0)
+    @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
     class LanguageSettings {
@@ -166,6 +178,21 @@ class Settings : FragmentedStorageFileJson() {
 
         @FormField(R.string.preview_feed_items, FieldForm.TOGGLE, R.string.preview_feed_items_description, 6)
         var previewFeedItems: Boolean = true;
+
+
+        @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();
+            StateMeta.instance.removeAllHiddenVideos();
+            SettingsActivity.getActivity()?.let {
+                UIDialogs.toast(it, "Creators and videos should show up again");
+            }
+        }
     }
 
     @FormField(R.string.search, "group", -1, 2)
@@ -184,6 +211,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 {
@@ -194,7 +223,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 {
@@ -212,11 +251,17 @@ 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.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, 6)
+        var progressBar: Boolean = true;
+
+        @FormField(R.string.fetch_on_app_boot, FieldForm.TOGGLE, R.string.shortly_after_opening_the_app_start_fetching_subscriptions, 7)
         @Serializable(with = FlexibleBooleanSerializer::class)
         var fetchOnAppBoot: Boolean = true;
 
-        @FormField(R.string.background_update, FieldForm.DROPDOWN, R.string.experimental_background_update_for_subscriptions_cache, 7)
+        @FormField(R.string.fetch_on_tab_opened, FieldForm.TOGGLE, R.string.fetch_on_tab_opened_description, 8)
+        var fetchOnTabOpen: Boolean = true;
+
+        @FormField(R.string.background_update, FieldForm.DROPDOWN, R.string.experimental_background_update_for_subscriptions_cache, 9)
         @DropdownFieldOptionsId(R.array.background_interval)
         var subscriptionsBackgroundUpdateInterval: Int = 0;
 
@@ -232,7 +277,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, 10)
         @DropdownFieldOptionsId(R.array.thread_count)
         var subscriptionConcurrency: Int = 3;
 
@@ -240,15 +285,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, 11)
         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, 12)
         var allowPlaytimeTracking: Boolean = true;
 
+
+        @FormField(R.string.always_reload_from_cache, FieldForm.TOGGLE, R.string.always_reload_from_cache_description, 13)
+        var alwaysReloadFromCache: Boolean = false;
+
+        @FormField(R.string.clear_channel_cache, FieldForm.BUTTON, R.string.clear_channel_cache_description, 14)
+        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 {
@@ -274,29 +329,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;
 
@@ -304,7 +359,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;
 
@@ -323,16 +378,50 @@ 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.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 {
@@ -372,7 +461,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 {
@@ -381,7 +470,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 {
@@ -389,6 +478,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)
@@ -406,8 +498,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 {
@@ -415,10 +506,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 {
@@ -434,23 +522,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
@@ -459,18 +550,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 {
@@ -493,7 +578,7 @@ 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 {
@@ -517,10 +602,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 {
@@ -549,10 +641,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 {
@@ -569,10 +658,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));
@@ -592,10 +678,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");
@@ -611,7 +694,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 {
@@ -643,28 +726,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 {
@@ -681,7 +755,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,6 +2,7 @@ package com.futo.platformplayer
 
 import android.content.Context
 import android.webkit.CookieManager
+import androidx.lifecycle.lifecycleScope
 import androidx.work.Constraints
 import androidx.work.Data
 import androidx.work.ExistingPeriodicWorkPolicy
@@ -12,9 +13,11 @@ 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,11 +28,16 @@ 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.stores.db.types.DBHistory
+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
@@ -38,6 +46,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.*
 import kotlinx.serialization.json.*
+import java.time.OffsetDateTime
 import java.util.UUID
 import java.util.concurrent.TimeUnit
 import java.util.stream.IntStream.range
@@ -81,26 +90,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 +247,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
@@ -354,6 +498,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,8 +1,11 @@
 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
@@ -10,12 +13,12 @@ import android.view.View
 import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import android.widget.*
 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.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 +94,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 +154,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 +190,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,6 +329,12 @@ 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) {
@@ -291,11 +347,22 @@ class UIDialogs {
             } else {
                 val dialog = ConnectCastingDialog(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,17 +1,17 @@
 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.api.http.ManagedHttpClient
+import com.futo.platformplayer.api.media.models.ResultCapabilities
 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
@@ -21,8 +21,9 @@ import com.futo.platformplayer.helpers.VideoHelper
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.Playlist
 import com.futo.platformplayer.models.Subscription
+import com.futo.platformplayer.parsers.HLS
 import com.futo.platformplayer.states.*
-import com.futo.platformplayer.views.Loader
+import com.futo.platformplayer.views.LoaderView
 import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuGroup
 import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuItem
 import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuOverlay
@@ -52,7 +53,6 @@ class UISlideOverlays {
 
         fun showSubscriptionOptionsOverlay(subscription: Subscription, container: ViewGroup) {
             val items = arrayListOf<View>();
-            var menu: SlideUpMenuOverlay? = null;
 
             val originalNotif = subscription.doNotifications;
             val originalLive = subscription.doFetchLive;
@@ -60,54 +60,168 @@ 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).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 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? {
@@ -149,30 +263,49 @@ 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)
+                    if (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)
+                    } else if (it 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.size > 0) {
+                //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 ->
                 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);
+                        if (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);
+                        } else if (it 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(),
@@ -181,15 +314,15 @@ class UISlideOverlays {
                     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) {
+            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, {
@@ -361,7 +494,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 +502,33 @@ class UISlideOverlays {
             return overlay;
         }
 
+        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();
@@ -389,8 +549,13 @@ class UISlideOverlays {
             val watchLater = StatePlaylists.instance.getWatchLater();
             items.add(SlideUpMenuGroup(container.context, container.context.getString(R.string.actions), "actions",
                 (listOf(
-                    SlideUpMenuItem(container.context, R.drawable.ic_download, container.context.getString(R.string.download), container.context.getString(R.string.download_the_video), container.context.getString(R.string.download),
-                        { showDownloadVideoOverlay(video, container, true); }, false))
+                    SlideUpMenuItem(container.context, R.drawable.ic_download, container.context.getString(R.string.download), container.context.getString(R.string.download_the_video), container.context.getString(R.string.download), {
+                            showDownloadVideoOverlay(video, container, true);
+                        }, false),
+                    SlideUpMenuItem(container.context, R.drawable.ic_visibility_off, container.context.getString(R.string.hide_creator_from_home), "", "hide_creator", {
+                        StateMeta.instance.addHiddenCreator(video.author.url);
+                        UIDialogs.toast(container.context, "[${video.author.name}] hidden, you may need to reload home");
+                    }))
                         + actions)
             ));
             items.add(
@@ -402,6 +567,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), "",
                     {

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

@@ -164,9 +164,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,5 +1,6 @@
 package com.futo.platformplayer.activities
 
+import android.content.Context
 import android.content.Intent
 import android.graphics.drawable.Animatable
 import android.os.Bundle
@@ -45,6 +46,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);
 

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,6 +8,7 @@ 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
@@ -43,6 +45,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();
 
@@ -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/LoginActivity.kt

@@ -17,6 +17,7 @@ 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.states.StateApp
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.serialization.decodeFromString
@@ -28,6 +29,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);

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

@@ -7,7 +7,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 +24,9 @@ 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.dialogs.ConnectCastingDialog
 import com.futo.platformplayer.fragment.mainactivity.bottombar.MenuBottomBarFragment
 import com.futo.platformplayer.fragment.mainactivity.main.*
 import com.futo.platformplayer.fragment.mainactivity.topbar.AddTopBarFragment
@@ -44,6 +42,7 @@ 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
@@ -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;
@@ -122,6 +122,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 +222,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();
@@ -281,6 +300,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;
@@ -327,6 +347,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 +425,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 +515,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 +532,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 +540,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)")
 
@@ -669,18 +733,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 +759,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();
@@ -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;
@@ -973,5 +1046,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);

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
@@ -12,6 +13,7 @@ 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.google.zxing.integration.android.IntentIntegrator
@@ -39,6 +41,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
@@ -18,6 +19,7 @@ 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
@@ -48,6 +50,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 +195,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));

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,7 +46,8 @@ 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 ->
             Logger.i("SettingsActivity", "Setting [${field.field?.name}] changed, saving");
@@ -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/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

@@ -5,8 +5,8 @@ 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 java.io.BufferedInputStream
 import java.io.OutputStream
 import java.lang.reflect.Field
 import java.lang.reflect.Method
@@ -18,6 +18,7 @@ import java.util.*
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
 import java.util.stream.IntStream.range
+import kotlin.collections.HashMap
 
 class ManagedHttpServer(private val _requestedPort: Int = 0) {
     private val _client : ManagedHttpClient = ManagedHttpClient();
@@ -29,7 +30,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 +78,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 +109,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,32 +117,78 @@ 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) {
@@ -188,7 +236,7 @@ class ManagedHttpServer(private val _requestedPort: Int = 0) {
         }
     }
 
-    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 requestsMax = 0;

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/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";
 

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/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/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/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/platforms/js/JSClient.kt

@@ -34,6 +34,7 @@ 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.ScriptLoginRequiredException
 import com.futo.platformplayer.engine.exceptions.ScriptValidationException
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.ImageVariable

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

@@ -6,10 +6,13 @@ 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.engine.exceptions.ScriptImplementationException
 import com.futo.platformplayer.matchesDomain
 
 class JSHttpClient : ManagedHttpClient {
     private val _jsClient: JSClient?;
+    private val _jsConfig: SourcePluginConfig?;
     private val _auth: SourceAuth?;
     private val _captcha: SourceCaptchaData?;
 
@@ -20,8 +23,9 @@ class JSHttpClient : ManagedHttpClient {
 
     private var _currentCookieMap: 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;
 
@@ -87,7 +91,11 @@ class JSHttpClient : ManagedHttpClient {
             }
         }
 
-        _jsClient?.validateUrlOrThrow(request.url.toString());
+        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?.let { it.build() } ?: request;
     }
 

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

@@ -23,6 +23,7 @@ interface IJSContent: IPlatformContent  {
                 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/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/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

@@ -59,8 +59,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 +68,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/structures/AdhocPager.kt

@@ -0,0 +1,31 @@
+package com.futo.platformplayer.api.media.structures
+
+class AdhocPager<T>: IPager<T> {
+    private var _page = 0;
+    private val _nextPage: (Int) -> List<T>;
+    private var _currentResults: List<T> = listOf();
+    private var _hasMore = true;
+
+    constructor(nextPage: (Int) -> List<T>, initialResults: List<T>? = null){
+        _nextPage = nextPage;
+        if(initialResults != null)
+            _currentResults = initialResults;
+        else
+            nextPage();
+    }
+
+    override fun hasMorePages(): Boolean {
+        return _hasMore;
+    }
+
+    override fun nextPage() {
+        val newResults = _nextPage(++_page);
+        if(newResults.isEmpty())
+            _hasMore = false;
+        _currentResults = newResults;
+    }
+
+    override fun getResults(): List<T> {
+        return _currentResults;
+    }
+}

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

@@ -52,7 +52,7 @@ class DedupContentPager : IPager<IPlatformContent>, IAsyncPager<IPlatformContent
             val sameItems = results.filter { isSameItem(result, it) };
             val platformItemMap = sameItems.groupBy { it.id.pluginId }.mapValues { (_, items) -> items.first() }
             val bestPlatform = _preferredPlatform.map { it.lowercase() }.firstOrNull { platformItemMap.containsKey(it) }
-            val bestItem = platformItemMap[bestPlatform] ?: sameItems.first()
+            val bestItem = platformItemMap[bestPlatform] ?: sameItems.firstOrNull();
 
             resultsToRemove.addAll(sameItems.filter { it != bestItem });
         }

app/src/main/java/com/futo/platformplayer/background/BackgroundWorker.kt

@@ -6,16 +6,13 @@ import android.app.PendingIntent
 import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.drawable.Drawable
-import android.media.MediaSession2Service.MediaNotification
-import androidx.concurrent.futures.CallbackToFutureAdapter
-import androidx.concurrent.futures.ResolvableFuture
 import androidx.core.app.NotificationCompat
 import androidx.work.CoroutineWorker
-import androidx.work.ListenableWorker
 import androidx.work.WorkerParameters
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.target.CustomTarget
 import com.bumptech.glide.request.transition.Transition
+import com.futo.platformplayer.Settings
 import com.futo.platformplayer.activities.MainActivity
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
 import com.futo.platformplayer.api.media.models.video.IPlatformVideo
@@ -23,15 +20,11 @@ import com.futo.platformplayer.getNowDiffSeconds
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.Subscription
 import com.futo.platformplayer.states.StateApp
-import com.futo.platformplayer.states.StatePlatform
+import com.futo.platformplayer.states.StateNotifications
 import com.futo.platformplayer.states.StateSubscriptions
-import com.futo.platformplayer.views.adapters.viewholders.TabViewHolder
-import com.google.common.util.concurrent.ListenableFuture
+import com.futo.platformplayer.toHumanNowDiffString
+import com.futo.platformplayer.toHumanNowDiffStringMinDay
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.coroutineScope
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import java.time.OffsetDateTime
 
@@ -53,8 +46,10 @@ class BackgroundWorker(private val appContext: Context, private val workerParams
                 this.setSound(null, null);
             };
             notificationManager.createNotificationChannel(notificationChannel);
+            val contentChannel = StateNotifications.instance.contentNotifChannel
+            notificationManager.createNotificationChannel(contentChannel);
             try {
-                    doSubscriptionUpdating(notificationManager, notificationChannel);
+                    doSubscriptionUpdating(notificationManager, notificationChannel, contentChannel);
             }
             catch(ex: Throwable) {
                 exception = ex;
@@ -76,13 +71,13 @@ class BackgroundWorker(private val appContext: Context, private val workerParams
     }
 
 
-    suspend fun doSubscriptionUpdating(manager: NotificationManager, notificationChannel: NotificationChannel) {
-        val notif = NotificationCompat.Builder(appContext, notificationChannel.id)
+    suspend fun doSubscriptionUpdating(manager: NotificationManager, backgroundChannel: NotificationChannel, contentChannel: NotificationChannel) {
+        val notif = NotificationCompat.Builder(appContext, backgroundChannel.id)
             .setSmallIcon(com.futo.platformplayer.R.drawable.foreground)
             .setContentTitle("Grayjay")
             .setContentText("Updating subscriptions...")
             .setSilent(true)
-            .setChannelId(notificationChannel.id)
+            .setChannelId(backgroundChannel.id)
             .setProgress(1, 0, true);
 
         manager.notify(12, notif.build());
@@ -93,6 +88,7 @@ class BackgroundWorker(private val appContext: Context, private val workerParams
         val newItems = mutableListOf<IPlatformContent>();
 
         val now = OffsetDateTime.now();
+        val threeDays = now.minusDays(4);
         val contentNotifs = mutableListOf<Pair<Subscription, IPlatformContent>>();
         withContext(Dispatchers.IO) {
             val results = StateSubscriptions.instance.getSubscriptionsFeedWithExceptions(true, false,this, { progress, total ->
@@ -110,8 +106,14 @@ class BackgroundWorker(private val appContext: Context, private val workerParams
                 synchronized(newSubChanges) {
                     if(!newSubChanges.contains(sub)) {
                         newSubChanges.add(sub);
-                        if(sub.doNotifications && content.datetime?.let { it < now } == true)
-                            contentNotifs.add(Pair(sub, content));
+                        if(sub.doNotifications) {
+                            if(content.datetime != null) {
+                                if(content.datetime!! <= now.plusMinutes(StateNotifications.instance.plannedWarningMinutesEarly) && content.datetime!! > threeDays)
+                                    contentNotifs.add(Pair(sub, content));
+                                else if(content.datetime!! > now.plusMinutes(StateNotifications.instance.plannedWarningMinutesEarly) && Settings.instance.notifications.plannedContentNotification)
+                                    StateNotifications.instance.scheduleContentNotification(applicationContext, content);
+                            }
+                        }
                     }
                     newItems.add(content);
                 }
@@ -120,7 +122,7 @@ class BackgroundWorker(private val appContext: Context, private val workerParams
             //Only for testing notifications
             val testNotifs = 0;
             if(contentNotifs.size == 0 && testNotifs > 0) {
-                results.first.getResults().filter { it is IPlatformVideo && it.datetime?.let { it < now } == true }
+                results.first.getResults().filter { it is IPlatformVideo }
                     .take(testNotifs).forEach {
                         contentNotifs.add(Pair(StateSubscriptions.instance.getSubscriptions().first(), it));
                     }
@@ -134,22 +136,7 @@ class BackgroundWorker(private val appContext: Context, private val workerParams
                 val items = contentNotifs.take(5).toList()
                 for(i in items.indices) {
                     val contentNotif = items.get(i);
-                    val thumbnail = if(contentNotif.second is IPlatformVideo) (contentNotif.second as IPlatformVideo).thumbnails.getHQThumbnail()
-                        else null;
-                    if(thumbnail != null)
-                        Glide.with(appContext).asBitmap()
-                            .load(thumbnail)
-                            .into(object: CustomTarget<Bitmap>() {
-                                override fun onResourceReady(resource: Bitmap, transition: Transition<in Bitmap>?) {
-                                    notifyNewContent(manager, notificationChannel, 13 + i, contentNotif.first, contentNotif.second, resource);
-                                }
-                                override fun onLoadCleared(placeholder: Drawable?) {}
-                                override fun onLoadFailed(errorDrawable: Drawable?) {
-                                    notifyNewContent(manager, notificationChannel, 13 + i, contentNotif.first, contentNotif.second, null);
-                                }
-                            })
-                    else
-                        notifyNewContent(manager, notificationChannel, 13 + i, contentNotif.first, contentNotif.second, null);
+                    StateNotifications.instance.notifyNewContentWithThumbnail(appContext, manager, contentChannel, 13 + i, contentNotif.second);
                 }
             }
             catch(ex: Throwable) {
@@ -164,20 +151,4 @@ class BackgroundWorker(private val appContext: Context, private val workerParams
                 .setSilent(true)
                 .setChannelId(notificationChannel.id).build());*/
     }
-
-    fun notifyNewContent(manager: NotificationManager, notificationChannel: NotificationChannel, id: Int, sub: Subscription, content: IPlatformContent, thumbnail: Bitmap? = null) {
-        val notifBuilder = NotificationCompat.Builder(appContext, notificationChannel.id)
-            .setSmallIcon(com.futo.platformplayer.R.drawable.foreground)
-            .setContentTitle("New by [${sub.channel.name}]")
-            .setContentText("${content.name}")
-            .setSilent(true)
-            .setContentIntent(PendingIntent.getActivity(this.appContext, 0, MainActivity.getVideoIntent(this.appContext, content.url),
-                PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE))
-            .setChannelId(notificationChannel.id);
-        if(thumbnail != null) {
-            //notifBuilder.setLargeIcon(thumbnail);
-            notifBuilder.setStyle(NotificationCompat.BigPictureStyle().bigPicture(thumbnail).bigLargeIcon(null as Bitmap?));
-        }
-        manager.notify(id, notifBuilder.build());
-    }
 }

app/src/main/java/com/futo/platformplayer/builders/DashBuilder.kt

@@ -146,7 +146,7 @@ class DashBuilder : XMLBuilder {
                 dashBuilder.withAdaptationSet(
                     mapOf(
                         Pair("mimeType", subtitleSource.format ?: "text/vtt"),
-                        Pair("lang", "en"),
+                        Pair("lang", "df"),
                         Pair("default", "true")
                     )
                 ) {

app/src/main/java/com/futo/platformplayer/builders/HlsBuilder.kt

@@ -1,37 +0,0 @@
-package com.futo.platformplayer.builders
-
-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.subtitles.ISubtitleSource
-import java.io.PrintWriter
-import java.io.StringWriter
-
-class HlsBuilder {
-    companion object{
-        fun generateOnDemandHLS(vidSource: IVideoSource, vidUrl: String, audioSource: IAudioSource?, audioUrl: String?, subtitleSource: ISubtitleSource?, subtitleUrl: String?): String {
-            val hlsBuilder = StringWriter()
-            PrintWriter(hlsBuilder).use { writer ->
-                writer.println("#EXTM3U")
-
-                // Audio
-                if (audioSource != null && audioUrl != null) {
-                    val audioFormat = audioSource.container.substringAfter("/")
-                    writer.println("#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID=\"audio\",LANGUAGE=\"en\",NAME=\"English\",AUTOSELECT=YES,DEFAULT=YES,URI=\"${audioUrl.replace("&", "&")}\",FORMAT=\"$audioFormat\"")
-                }
-
-                // Subtitles
-                if (subtitleSource != null && subtitleUrl != null) {
-                    val subtitleFormat = subtitleSource.format ?: "text/vtt"
-                    writer.println("#EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID=\"subs\",LANGUAGE=\"en\",NAME=\"English\",AUTOSELECT=YES,DEFAULT=YES,URI=\"${subtitleUrl.replace("&", "&")}\",FORMAT=\"$subtitleFormat\"")
-                }
-
-                // Video
-                val videoFormat = vidSource.container.substringAfter("/")
-                writer.println("#EXT-X-STREAM-INF:BANDWIDTH=100000,CODECS=\"${vidSource.codec}\",RESOLUTION=${vidSource.width}x${vidSource.height}${if (audioSource != null) ",AUDIO=\"audio\"" else ""}${if (subtitleSource != null) ",SUBTITLES=\"subs\"" else ""},FORMAT=\"$videoFormat\"")
-                writer.println(vidUrl.replace("&", "&"))
-            }
-
-            return hlsBuilder.toString()
-        }
-    }
-}

app/src/main/java/com/futo/platformplayer/cache/ChannelContentCache.kt

@@ -1,197 +0,0 @@
-package com.futo.platformplayer.cache
-
-import com.futo.platformplayer.api.media.models.contents.IPlatformContent
-import com.futo.platformplayer.api.media.models.video.SerializedPlatformContent
-import com.futo.platformplayer.api.media.structures.DedupContentPager
-import com.futo.platformplayer.api.media.structures.IPager
-import com.futo.platformplayer.api.media.structures.PlatformContentPager
-import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.polycentric.PolycentricCache
-import com.futo.platformplayer.resolveChannelUrl
-import com.futo.platformplayer.serializers.PlatformContentSerializer
-import com.futo.platformplayer.states.StatePlatform
-import com.futo.platformplayer.states.StateSubscriptions
-import com.futo.platformplayer.stores.FragmentedStorage
-import com.futo.platformplayer.stores.v2.ManagedStore
-import com.futo.platformplayer.toSafeFileName
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import java.time.OffsetDateTime
-import kotlin.streams.toList
-import kotlin.system.measureTimeMillis
-
-class ChannelContentCache {
-    private val _targetCacheSize = 3000;
-    val _channelCacheDir = FragmentedStorage.getOrCreateDirectory("channelCache");
-    val _channelContents: HashMap<String, ManagedStore<SerializedPlatformContent>>;
-    init {
-        val allFiles = _channelCacheDir.listFiles() ?: arrayOf();
-        val initializeTime = measureTimeMillis {
-            _channelContents = HashMap(allFiles
-                .filter { it.isDirectory }
-                .parallelStream().map {
-                    Pair(it.name, FragmentedStorage.storeJson(_channelCacheDir, it.name, PlatformContentSerializer())
-                            .withoutBackup()
-                            .load())
-                }.toList().associate { it })
-        }
-        val minDays = OffsetDateTime.now().minusDays(10);
-        val totalItems = _channelContents.map { it.value.count() }.sum();
-        val toTrim = totalItems - _targetCacheSize;
-        val trimmed: Int;
-        if(toTrim > 0) {
-            val redundantContent = _channelContents.flatMap { it.value.getItems().filter { it.datetime != null && it.datetime!!.isBefore(minDays) }.drop(9) }
-                .sortedBy { it.datetime!! }.take(toTrim);
-            for(content in redundantContent)
-                uncacheContent(content);
-            trimmed = redundantContent.size;
-        }
-        else trimmed = 0;
-        Logger.i(TAG, "ChannelContentCache time: ${initializeTime}ms channels: ${allFiles.size}, videos: ${totalItems}, trimmed: ${trimmed}, total: ${totalItems - trimmed}");
-    }
-
-    fun getChannelCachePager(channelUrl: String): PlatformContentPager {
-        val validID = channelUrl.toSafeFileName();
-
-        val validStores = _channelContents
-            .filter { it.key == validID }
-            .map { it.value };
-
-        val items = validStores.flatMap { it.getItems() }
-            .sortedByDescending { it.datetime };
-        return PlatformContentPager(items, Math.min(150, items.size));
-    }
-    fun getSubscriptionCachePager(): DedupContentPager {
-        Logger.i(TAG, "Subscriptions CachePager get subscriptions");
-        val subs = StateSubscriptions.instance.getSubscriptions();
-        Logger.i(TAG, "Subscriptions CachePager polycentric urls");
-        val allUrls = subs.map {
-            val otherUrls =  PolycentricCache.instance.getCachedProfile(it.channel.url)?.profile?.ownedClaims?.mapNotNull { c -> c.claim.resolveChannelUrl() } ?: listOf();
-            if(!otherUrls.contains(it.channel.url))
-                return@map listOf(listOf(it.channel.url), otherUrls).flatten();
-            else
-                return@map otherUrls;
-        }.flatten().distinct();
-        Logger.i(TAG, "Subscriptions CachePager compiling");
-        val validSubIds = allUrls.map { it.toSafeFileName() }.toHashSet();
-
-        val validStores = _channelContents
-            .filter { validSubIds.contains(it.key) }
-            .map { it.value };
-
-        val items = validStores.flatMap { it.getItems() }
-            .sortedByDescending { it.datetime };
-
-        return DedupContentPager(PlatformContentPager(items, Math.min(150, items.size)), StatePlatform.instance.getEnabledClients().map { it.id });
-    }
-
-    fun uncacheContent(content: SerializedPlatformContent) {
-        val store = getContentStore(content);
-        store?.delete(content);
-    }
-    fun cacheContents(contents: List<IPlatformContent>): List<IPlatformContent> {
-        return contents.filter { cacheContent(it) };
-    }
-    fun cacheContent(content: IPlatformContent, doUpdate: Boolean = false): Boolean {
-        if(content.author.url.isEmpty())
-            return false;
-
-        val channelId = content.author.url.toSafeFileName();
-        val store = getContentStore(channelId).let {
-            if(it == null) {
-                Logger.i(TAG, "New Channel Cache for channel ${content.author.name}");
-                val store = FragmentedStorage.storeJson<SerializedPlatformContent>(_channelCacheDir, channelId, PlatformContentSerializer()).load();
-                _channelContents.put(channelId, store);
-                return@let store;
-            }
-            else return@let it;
-        }
-        val serialized = SerializedPlatformContent.fromContent(content);
-        val existing = store.findItems { it.url == content.url };
-
-        if(existing.isEmpty() || doUpdate) {
-            if(existing.isNotEmpty())
-                existing.forEach { store.delete(it) };
-
-            store.save(serialized);
-        }
-
-        return existing.isEmpty();
-    }
-
-    private fun getContentStore(content: IPlatformContent): ManagedStore<SerializedPlatformContent>? {
-        val channelId = content.author.url.toSafeFileName();
-        return getContentStore(channelId);
-    }
-    private fun getContentStore(channelId: String): ManagedStore<SerializedPlatformContent>? {
-        return synchronized(_channelContents) {
-            var channelStore = _channelContents.get(channelId);
-            return@synchronized channelStore;
-        }
-    }
-
-    companion object {
-        private val TAG = "ChannelCache";
-
-        private val _lock = Object();
-        private var _instance: ChannelContentCache? = null;
-        val instance: ChannelContentCache get() {
-            synchronized(_lock) {
-                if(_instance == null) {
-                    _instance = ChannelContentCache();
-                }
-            }
-            return _instance!!;
-        }
-
-        fun cachePagerResults(scope: CoroutineScope, pager: IPager<IPlatformContent>, onNewCacheHit: ((IPlatformContent)->Unit)? = null): IPager<IPlatformContent> {
-            return ChannelVideoCachePager(pager, scope, onNewCacheHit);
-        }
-    }
-
-    class ChannelVideoCachePager(val pager: IPager<IPlatformContent>, private val scope: CoroutineScope, private val onNewCacheItem: ((IPlatformContent)->Unit)? = null): IPager<IPlatformContent> {
-
-        init {
-            val results = pager.getResults();
-
-            Logger.i(TAG, "Caching ${results.size} subscription initial results [${pager.hashCode()}]");
-            scope.launch(Dispatchers.IO) {
-                try {
-                    val newCacheItems = instance.cacheContents(results);
-                    if(onNewCacheItem != null)
-                        newCacheItems.forEach { onNewCacheItem!!(it) }
-                } catch (e: Throwable) {
-                    Logger.e(TAG, "Failed to cache videos.", e);
-                }
-            }
-        }
-
-        override fun hasMorePages(): Boolean {
-            return pager.hasMorePages();
-        }
-
-        override fun nextPage() {
-            pager.nextPage();
-            val results = pager.getResults();
-
-            Logger.i(TAG, "Caching ${results.size} subscription results");
-            scope.launch(Dispatchers.IO) {
-                try {
-                    val newCacheItems = instance.cacheContents(results);
-                    if(onNewCacheItem != null)
-                        newCacheItems.forEach { onNewCacheItem!!(it) }
-                } catch (e: Throwable) {
-                    Logger.e(TAG, "Failed to cache videos.", e);
-                }
-            }
-        }
-
-        override fun getResults(): List<IPlatformContent> {
-            val results = pager.getResults();
-
-            return results;
-        }
-
-    }
-}

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

@@ -3,7 +3,6 @@ package com.futo.platformplayer.casting
 import android.os.Looper
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.api.http.ManagedHttpClient
-import com.futo.platformplayer.casting.models.FastCastSetVolumeMessage
 import com.futo.platformplayer.getConnectedSocket
 import com.futo.platformplayer.models.CastingDeviceInfo
 import com.futo.platformplayer.toInetAddress
@@ -19,6 +18,7 @@ class AirPlayCastingDevice : CastingDevice {
     override var usedRemoteAddress: InetAddress? = null;
     override var localAddress: InetAddress? = null;
     override val canSetVolume: Boolean get() = false;
+    override val canSetSpeed: Boolean get() = false; //TODO: Implement playback speed for AirPlay
 
     var addresses: Array<InetAddress>? = null;
     var port: Int = 0;
@@ -44,12 +44,12 @@ class AirPlayCastingDevice : CastingDevice {
         return addresses?.toList() ?: listOf();
     }
 
-    override fun loadVideo(streamType: String, contentType: String, contentId: String, resumePosition: Double, duration: Double) {
-        if (invokeInIOScopeIfRequired({ loadVideo(streamType, contentType, contentId, resumePosition, duration) })) {
+    override fun loadVideo(streamType: String, contentType: String, contentId: String, resumePosition: Double, duration: Double, speed: Double?) {
+        if (invokeInIOScopeIfRequired({ loadVideo(streamType, contentType, contentId, resumePosition, duration, speed) })) {
             return;
         }
 
-        Logger.i(FastCastCastingDevice.TAG, "Start streaming (streamType: $streamType, contentType: $contentType, contentId: $contentId, resumePosition: $resumePosition, duration: $duration)");
+        Logger.i(FCastCastingDevice.TAG, "Start streaming (streamType: $streamType, contentType: $contentType, contentId: $contentId, resumePosition: $resumePosition, duration: $duration, speed: $speed)");
 
         time = resumePosition;
         if (resumePosition > 0.0) {
@@ -61,7 +61,7 @@ class AirPlayCastingDevice : CastingDevice {
         }
     }
 
-    override fun loadContent(contentType: String, content: String, resumePosition: Double, duration: Double) {
+    override fun loadContent(contentType: String, content: String, resumePosition: Double, duration: Double, speed: Double?) {
         throw NotImplementedError();
     }
 

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

@@ -1,10 +1,15 @@
 package com.futo.platformplayer.casting
 
-import android.content.Context
-import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.getNowDiffMiliseconds
 import com.futo.platformplayer.models.CastingDeviceInfo
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 import java.net.InetAddress
 import java.time.OffsetDateTime
 
@@ -14,10 +19,27 @@ enum class CastConnectionState {
     CONNECTED
 }
 
+@Serializable(with = CastProtocolType.CastProtocolTypeSerializer::class)
 enum class CastProtocolType {
     CHROMECAST,
     AIRPLAY,
-    FASTCAST
+    FCAST;
+
+    object CastProtocolTypeSerializer : KSerializer<CastProtocolType> {
+        override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("CastProtocolType", PrimitiveKind.STRING)
+
+        override fun serialize(encoder: Encoder, value: CastProtocolType) {
+            encoder.encodeString(value.name)
+        }
+
+        override fun deserialize(decoder: Decoder): CastProtocolType {
+            val name = decoder.decodeString()
+            return when (name) {
+                "FASTCAST" -> FCAST // Handle the renamed case
+                else -> CastProtocolType.valueOf(name)
+            }
+        }
+    }
 }
 
 abstract class CastingDevice {
@@ -26,6 +48,7 @@ abstract class CastingDevice {
     abstract var usedRemoteAddress: InetAddress?;
     abstract var localAddress: InetAddress?;
     abstract val canSetVolume: Boolean;
+    abstract val canSetSpeed: Boolean;
 
     var name: String? = null;
     var isPlaying: Boolean = false
@@ -55,6 +78,14 @@ abstract class CastingDevice {
                 onVolumeChanged.emit(value);
             }
         };
+    var speed: Double = 1.0
+        set(value) {
+            val changed = value != field;
+            speed = value;
+            if (changed) {
+                onSpeedChanged.emit(value);
+            }
+        };
     val expectedCurrentTime: Double
         get() {
             val diff = timeReceivedAt.getNowDiffMiliseconds().toDouble() / 1000.0;
@@ -74,6 +105,7 @@ abstract class CastingDevice {
     var onPlayChanged = Event1<Boolean>();
     var onTimeChanged = Event1<Double>();
     var onVolumeChanged = Event1<Double>();
+    var onSpeedChanged = Event1<Double>();
 
     abstract fun stopCasting();
 
@@ -81,9 +113,10 @@ abstract class CastingDevice {
     abstract fun stopVideo();
     abstract fun pauseVideo();
     abstract fun resumeVideo();
-    abstract fun loadVideo(streamType: String, contentType: String, contentId: String, resumePosition: Double, duration: Double);
-    abstract fun loadContent(contentType: String, content: String, resumePosition: Double, duration: Double);
+    abstract fun loadVideo(streamType: String, contentType: String, contentId: String, resumePosition: Double, duration: Double, speed: Double?);
+    abstract fun loadContent(contentType: String, content: String, resumePosition: Double, duration: Double, speed: Double?);
     open fun changeVolume(volume: Double) { throw NotImplementedError() }
+    open fun changeSpeed(speed: Double) { throw NotImplementedError() }
 
     abstract fun start();
     abstract fun stop();

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

@@ -2,18 +2,16 @@ package com.futo.platformplayer.casting
 
 import android.os.Looper
 import android.util.Log
-import com.futo.platformplayer.casting.models.FastCastSetVolumeMessage
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.getConnectedSocket
 import com.futo.platformplayer.models.CastingDeviceInfo
-import com.futo.platformplayer.protos.DeviceAuthMessageOuterClass
+import com.futo.platformplayer.protos.ChromeCast
 import com.futo.platformplayer.toHexString
 import com.futo.platformplayer.toInetAddress
 import kotlinx.coroutines.*
 import org.json.JSONObject
 import java.io.DataInputStream
 import java.io.DataOutputStream
-import java.io.IOException
 import java.net.InetAddress
 import java.security.cert.X509Certificate
 import javax.net.ssl.SSLContext
@@ -29,6 +27,7 @@ class ChromecastCastingDevice : CastingDevice {
     override var usedRemoteAddress: InetAddress? = null;
     override var localAddress: InetAddress? = null;
     override val canSetVolume: Boolean get() = true;
+    override val canSetSpeed: Boolean get() = false; //TODO: Implement
 
     var addresses: Array<InetAddress>? = null;
     var port: Int = 0;
@@ -64,12 +63,12 @@ class ChromecastCastingDevice : CastingDevice {
         return addresses?.toList() ?: listOf();
     }
 
-    override fun loadVideo(streamType: String, contentType: String, contentId: String, resumePosition: Double, duration: Double) {
-        if (invokeInIOScopeIfRequired({ loadVideo(streamType, contentType, contentId, resumePosition, duration) })) {
+    override fun loadVideo(streamType: String, contentType: String, contentId: String, resumePosition: Double, duration: Double, speed: Double?) {
+        if (invokeInIOScopeIfRequired({ loadVideo(streamType, contentType, contentId, resumePosition, duration, speed) })) {
             return;
         }
 
-        Logger.i(FastCastCastingDevice.TAG, "Start streaming (streamType: $streamType, contentType: $contentType, contentId: $contentId, resumePosition: $resumePosition, duration: $duration)");
+        Logger.i(TAG, "Start streaming (streamType: $streamType, contentType: $contentType, contentId: $contentId, resumePosition: $resumePosition, duration: $duration, speed: $speed)");
 
         time = resumePosition;
         _streamType = streamType;
@@ -79,7 +78,7 @@ class ChromecastCastingDevice : CastingDevice {
         playVideo();
     }
 
-    override fun loadContent(contentType: String, content: String, resumePosition: Double, duration: Double) {
+    override fun loadContent(contentType: String, content: String, resumePosition: Double, duration: Double, speed: Double?) {
         //TODO: Can maybe be implemented by sending data:contentType,base64...
         throw NotImplementedError();
     }
@@ -314,6 +313,7 @@ class ChromecastCastingDevice : CastingDevice {
                 connectionState = CastConnectionState.CONNECTING;
 
                 try {
+                    _socket?.close()
                     _socket = factory.createSocket(usedRemoteAddress, port) as SSLSocket;
                     _socket?.startHandshake();
                     Logger.i(TAG, "Successfully connected to Chromecast at $usedRemoteAddress:$port");
@@ -324,7 +324,7 @@ class ChromecastCastingDevice : CastingDevice {
                     } catch (e: Throwable) {
                         Logger.i(TAG, "Failed to authenticate to Chromecast.", e);
                     }
-                } catch (e: IOException) {
+                } catch (e: Throwable) {
                     _socket?.close();
                     Logger.i(TAG, "Failed to connect to Chromecast.", e);
 
@@ -375,7 +375,7 @@ class ChromecastCastingDevice : CastingDevice {
                         //TODO: In the future perhaps this size-1 will cause issues, why is there a 0 on the end?
                         val messageBytes = buffer.sliceArray(IntRange(0, size - 1));
                         Log.d(TAG, "Received $size bytes: ${messageBytes.toHexString()}.");
-                        val message = DeviceAuthMessageOuterClass.CastMessage.parseFrom(messageBytes);
+                        val message = ChromeCast.CastMessage.parseFrom(messageBytes);
                         if (message.namespace != "urn:x-cast:com.google.cast.tp.heartbeat") {
                             Logger.i(TAG, "Received message: $message");
                         }
@@ -428,12 +428,12 @@ class ChromecastCastingDevice : CastingDevice {
 
     private fun sendChannelMessage(sourceId: String, destinationId: String, namespace: String, json: String) {
         try {
-            val castMessage = DeviceAuthMessageOuterClass.CastMessage.newBuilder()
-                .setProtocolVersion(DeviceAuthMessageOuterClass.CastMessage.ProtocolVersion.CASTV2_1_0)
+            val castMessage = ChromeCast.CastMessage.newBuilder()
+                .setProtocolVersion(ChromeCast.CastMessage.ProtocolVersion.CASTV2_1_0)
                 .setSourceId(sourceId)
                 .setDestinationId(destinationId)
                 .setNamespace(namespace)
-                .setPayloadType(DeviceAuthMessageOuterClass.CastMessage.PayloadType.STRING)
+                .setPayloadType(ChromeCast.CastMessage.PayloadType.STRING)
                 .setPayloadUtf8(json)
                 .build();
 
@@ -447,8 +447,8 @@ class ChromecastCastingDevice : CastingDevice {
         }
     }
 
-    private fun handleMessage(message: DeviceAuthMessageOuterClass.CastMessage) {
-        if (message.payloadType == DeviceAuthMessageOuterClass.CastMessage.PayloadType.STRING) {
+    private fun handleMessage(message: ChromeCast.CastMessage) {
+        if (message.payloadType == ChromeCast.CastMessage.PayloadType.STRING) {
             val jsonObject = JSONObject(message.payloadUtf8);
             val type = jsonObject.getString("type");
             if (type == "RECEIVER_STATUS") {

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

@@ -2,6 +2,7 @@ package com.futo.platformplayer.casting
 
 import android.os.Looper
 import android.util.Log
+import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.casting.models.*
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.getConnectedSocket
@@ -27,17 +28,21 @@ enum class Opcode(val value: Byte) {
     SEEK(5),
     PLAYBACK_UPDATE(6),
     VOLUME_UPDATE(7),
-    SET_VOLUME(8)
+    SET_VOLUME(8),
+    PLAYBACK_ERROR(9),
+    SET_SPEED(10),
+    VERSION(11)
 }
 
-class FastCastCastingDevice : CastingDevice {
+class FCastCastingDevice : CastingDevice {
     //See for more info: TODO
 
-    override val protocol: CastProtocolType get() = CastProtocolType.FASTCAST;
+    override val protocol: CastProtocolType get() = CastProtocolType.FCAST;
     override val isReady: Boolean get() = name != null && addresses != null && addresses?.isNotEmpty() == true && port != 0;
     override var usedRemoteAddress: InetAddress? = null;
     override var localAddress: InetAddress? = null;
     override val canSetVolume: Boolean get() = true;
+    override val canSetSpeed: Boolean get() = true;
 
     var addresses: Array<InetAddress>? = null;
     var port: Int = 0;
@@ -47,6 +52,7 @@ class FastCastCastingDevice : CastingDevice {
     private var _inputStream: DataInputStream? = null;
     private var _scopeIO: CoroutineScope? = null;
     private var _started: Boolean = false;
+    private var _version: Long = 1;
 
     constructor(name: String, addresses: Array<InetAddress>, port: Int) : super() {
         this.name = name;
@@ -64,33 +70,45 @@ class FastCastCastingDevice : CastingDevice {
         return addresses?.toList() ?: listOf();
     }
 
-    override fun loadVideo(streamType: String, contentType: String, contentId: String, resumePosition: Double, duration: Double) {
-        if (invokeInIOScopeIfRequired({ loadVideo(streamType, contentType, contentId, resumePosition, duration) })) {
+    override fun loadVideo(streamType: String, contentType: String, contentId: String, resumePosition: Double, duration: Double, speed: Double?) {
+        if (invokeInIOScopeIfRequired({ loadVideo(streamType, contentType, contentId, resumePosition, duration, speed) })) {
             return;
         }
 
-        Logger.i(TAG, "Start streaming (streamType: $streamType, contentType: $contentType, contentId: $contentId, resumePosition: $resumePosition, duration: $duration)");
+        //TODO: Remove this later, temporary for the transition
+        if (_version <= 1L) {
+            UIDialogs.toast("Version not received, if you are experiencing issues, try updating FCast")
+        }
+
+        Logger.i(TAG, "Start streaming (streamType: $streamType, contentType: $contentType, contentId: $contentId, resumePosition: $resumePosition, duration: $duration, speed: $speed)");
 
         time = resumePosition;
-        sendMessage(Opcode.PLAY, FastCastPlayMessage(
+        sendMessage(Opcode.PLAY, FCastPlayMessage(
             container = contentType,
             url = contentId,
-            time = resumePosition.toInt()
+            time = resumePosition,
+            speed = speed
         ));
     }
 
-    override fun loadContent(contentType: String, content: String, resumePosition: Double, duration: Double) {
-        if (invokeInIOScopeIfRequired({ loadContent(contentType, content, resumePosition, duration) })) {
+    override fun loadContent(contentType: String, content: String, resumePosition: Double, duration: Double, speed: Double?) {
+        if (invokeInIOScopeIfRequired({ loadContent(contentType, content, resumePosition, duration, speed) })) {
             return;
         }
 
-        Logger.i(TAG, "Start streaming content (contentType: $contentType, resumePosition: $resumePosition, duration: $duration)");
+        //TODO: Remove this later, temporary for the transition
+        if (_version <= 1L) {
+            UIDialogs.toast("Version not received, if you are experiencing issues, try updating FCast")
+        }
+
+        Logger.i(TAG, "Start streaming content (contentType: $contentType, resumePosition: $resumePosition, duration: $duration, speed: $speed)");
 
         time = resumePosition;
-        sendMessage(Opcode.PLAY, FastCastPlayMessage(
+        sendMessage(Opcode.PLAY, FCastPlayMessage(
             container = contentType,
             content = content,
-            time = resumePosition.toInt()
+            time = resumePosition,
+            speed = speed
         ));
     }
 
@@ -100,7 +118,16 @@ class FastCastCastingDevice : CastingDevice {
         }
 
         this.volume = volume
-        sendMessage(Opcode.SET_VOLUME, FastCastSetVolumeMessage(volume))
+        sendMessage(Opcode.SET_VOLUME, FCastSetVolumeMessage(volume))
+    }
+
+    override fun changeSpeed(speed: Double) {
+        if (invokeInIOScopeIfRequired({ changeSpeed(volume) })) {
+            return;
+        }
+
+        this.speed = speed
+        sendMessage(Opcode.SET_SPEED, FCastSetSpeedMessage(volume))
     }
 
     override fun seekVideo(timeSeconds: Double) {
@@ -108,8 +135,8 @@ class FastCastCastingDevice : CastingDevice {
             return;
         }
 
-        sendMessage(Opcode.SEEK, FastCastSeekMessage(
-            time = timeSeconds.toInt()
+        sendMessage(Opcode.SEEK, FCastSeekMessage(
+            time = timeSeconds
         ));
     }
 
@@ -282,8 +309,8 @@ class FastCastCastingDevice : CastingDevice {
                     return;
                 }
 
-                val playbackUpdate = Json.decodeFromString<FastCastPlaybackUpdateMessage>(json);
-                time = playbackUpdate.time.toDouble();
+                val playbackUpdate = FCastCastingDevice.json.decodeFromString<FCastPlaybackUpdateMessage>(json);
+                time = playbackUpdate.time;
                 isPlaying = when (playbackUpdate.state) {
                     1 -> true
                     else -> false
@@ -295,9 +322,28 @@ class FastCastCastingDevice : CastingDevice {
                     return;
                 }
 
-                val volumeUpdate = Json.decodeFromString<FastCastVolumeUpdateMessage>(json);
+                val volumeUpdate = FCastCastingDevice.json.decodeFromString<FCastVolumeUpdateMessage>(json);
                 volume = volumeUpdate.volume;
             }
+            Opcode.PLAYBACK_ERROR -> {
+                if (json == null) {
+                    Logger.w(TAG, "Got playback error without JSON, ignoring.");
+                    return;
+                }
+
+                val playbackError = FCastCastingDevice.json.decodeFromString<FCastPlaybackErrorMessage>(json);
+                Logger.e(TAG, "Remote casting playback error received: $playbackError")
+            }
+            Opcode.VERSION -> {
+                if (json == null) {
+                    Logger.w(TAG, "Got version without JSON, ignoring.");
+                    return;
+                }
+
+                val version = FCastCastingDevice.json.decodeFromString<FCastVersionMessage>(json);
+                _version = version.version;
+                Logger.i(TAG, "Remote version received: $version")
+            }
             else -> { }
         }
     }
@@ -333,7 +379,7 @@ class FastCastCastingDevice : CastingDevice {
             val data: ByteArray;
             var jsonString: String? = null;
             if (message != null) {
-                jsonString = Json.encodeToString(message);
+                jsonString = json.encodeToString(message);
                 data = jsonString.encodeToByteArray();
             } else {
                 data = ByteArray(0);
@@ -398,10 +444,11 @@ class FastCastCastingDevice : CastingDevice {
     }
 
     override fun getDeviceInfo(): CastingDeviceInfo {
-        return CastingDeviceInfo(name!!, CastProtocolType.FASTCAST, addresses!!.filter { a -> a.hostAddress != null }.map { a -> a.hostAddress!!  }.toTypedArray(), port);
+        return CastingDeviceInfo(name!!, CastProtocolType.FCAST, addresses!!.filter { a -> a.hostAddress != null }.map { a -> a.hostAddress!!  }.toTypedArray(), port);
     }
 
     companion object {
         val TAG = "FastCastCastingDevice";
+        private val json = Json { ignoreUnknownKeys = true }
     }
 }

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

@@ -2,8 +2,12 @@ package com.futo.platformplayer.casting
 
 import android.content.ContentResolver
 import android.content.Context
+import android.net.Uri
 import android.os.Looper
+import android.util.Base64
 import com.futo.platformplayer.*
+import com.futo.platformplayer.activities.MainActivity
+import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.http.server.ManagedHttpServer
 import com.futo.platformplayer.api.http.server.handlers.*
 import com.futo.platformplayer.api.media.models.streams.sources.*
@@ -15,6 +19,7 @@ import com.futo.platformplayer.constructs.Event2
 import com.futo.platformplayer.exceptions.UnsupportedCastException
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.CastingDeviceInfo
+import com.futo.platformplayer.parsers.HLS
 import com.futo.platformplayer.states.StateApp
 import kotlinx.coroutines.*
 import java.net.InetAddress
@@ -25,6 +30,9 @@ import javax.jmdns.ServiceListener
 import kotlin.collections.HashMap
 import com.futo.platformplayer.stores.CastingDeviceInfoStorage
 import com.futo.platformplayer.stores.FragmentedStorage
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.json.Json
 import javax.jmdns.ServiceTypeListener
 
 class StateCasting {
@@ -45,6 +53,7 @@ class StateCasting {
     val onActiveDevicePlayChanged = Event1<Boolean>();
     val onActiveDeviceTimeChanged = Event1<Double>();
     var activeDevice: CastingDevice? = null;
+    private val _client = ManagedHttpClient();
 
     val isCasting: Boolean get() = activeDevice != null;
 
@@ -144,6 +153,32 @@ class StateCasting {
         }
     }
 
+    fun handleUrl(context: Context, url: String) {
+        val uri = Uri.parse(url)
+        if (uri.scheme != "fcast") {
+            throw Exception("Expected scheme to be FCast")
+        }
+
+        val type = uri.host
+        if (type != "r") {
+            throw Exception("Expected type r")
+        }
+
+        val connectionInfo = uri.pathSegments[0]
+        val json = Base64.decode(connectionInfo, Base64.URL_SAFE or Base64.NO_PADDING or Base64.NO_WRAP).toString(Charsets.UTF_8)
+        val networkConfig = Json.decodeFromString<FCastNetworkConfig>(json)
+        val tcpService = networkConfig.services.first { v -> v.type == 0 }
+
+        addRememberedDevice(CastingDeviceInfo(
+            name = networkConfig.name,
+            type = CastProtocolType.FCAST,
+            addresses = networkConfig.addresses.toTypedArray(),
+            port = tcpService.port
+        ))
+
+        UIDialogs.toast(context,"FCast device '${networkConfig.name}' added")
+    }
+
     fun onStop() {
         val ad = activeDevice ?: return;
         Logger.i(TAG, "Stopping active device because of onStop.");
@@ -331,20 +366,25 @@ class StateCasting {
         }
 
         if (sourceCount > 1) {
-            if (ad is AirPlayCastingDevice) {
-                StateApp.withContext(false) { context -> UIDialogs.toast(context, "AirPlay does not support DASH. Try ChromeCast or FastCast for casting this video."); };
-                ad.stopCasting();
-                return false;
-            }
-
             if (videoSource is LocalVideoSource || audioSource is LocalAudioSource || subtitleSource is LocalSubtitleSource) {
-                castLocalDash(video, videoSource as LocalVideoSource?, audioSource as LocalAudioSource?, subtitleSource as LocalSubtitleSource?, resumePosition);
+                if (ad is AirPlayCastingDevice) {
+                    Logger.i(TAG, "Casting as local HLS");
+                    castLocalHls(video, videoSource as LocalVideoSource?, audioSource as LocalAudioSource?, subtitleSource as LocalSubtitleSource?, resumePosition);
+                } else {
+                    Logger.i(TAG, "Casting as local DASH");
+                    castLocalDash(video, videoSource as LocalVideoSource?, audioSource as LocalAudioSource?, subtitleSource as LocalSubtitleSource?, resumePosition);
+                }
             } else {
                 StateApp.instance.scope.launch(Dispatchers.IO) {
                     try {
-                        if (ad is FastCastCastingDevice) {
+                        if (ad is FCastCastingDevice) {
+                            Logger.i(TAG, "Casting as DASH direct");
                             castDashDirect(contentResolver, video, videoSource as IVideoUrlSource?, audioSource as IAudioUrlSource?, subtitleSource, resumePosition);
+                        } else if (ad is AirPlayCastingDevice) {
+                            Logger.i(TAG, "Casting as HLS indirect");
+                            castHlsIndirect(contentResolver, video, videoSource as IVideoUrlSource?, audioSource as IAudioUrlSource?, subtitleSource, resumePosition);
                         } else {
+                            Logger.i(TAG, "Casting as DASH indirect");
                             castDashIndirect(contentResolver, video, videoSource as IVideoUrlSource?, audioSource as IAudioUrlSource?, subtitleSource, resumePosition);
                         }
                     } catch (e: Throwable) {
@@ -353,19 +393,35 @@ class StateCasting {
                 }
             }
         } else {
-            if (videoSource is IVideoUrlSource)
-                ad.loadVideo("BUFFERED", videoSource.container, videoSource.getVideoUrl(), resumePosition, video.duration.toDouble());
-            else if(videoSource is IHLSManifestSource)
-                ad.loadVideo("BUFFERED", videoSource.container, videoSource.url, resumePosition, video.duration.toDouble());
-            else if (audioSource is IAudioUrlSource)
-                ad.loadVideo("BUFFERED", audioSource.container, audioSource.getAudioUrl(), resumePosition, video.duration.toDouble());
-            else if(audioSource is IHLSManifestAudioSource)
-                ad.loadVideo("BUFFERED", audioSource.container, audioSource.url, resumePosition, video.duration.toDouble());
-            else if (videoSource is LocalVideoSource)
+            if (videoSource is IVideoUrlSource) {
+                Logger.i(TAG, "Casting as singular video");
+                ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", videoSource.container, videoSource.getVideoUrl(), resumePosition, video.duration.toDouble(), null);
+            } else if (audioSource is IAudioUrlSource) {
+                Logger.i(TAG, "Casting as singular audio");
+                ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", audioSource.container, audioSource.getAudioUrl(), resumePosition, video.duration.toDouble(), null);
+            } else if(videoSource is IHLSManifestSource) {
+                if (ad is ChromecastCastingDevice) {
+                    Logger.i(TAG, "Casting as proxied HLS");
+                    castProxiedHls(video, videoSource.url, videoSource.codec, resumePosition);
+                } else {
+                    Logger.i(TAG, "Casting as non-proxied HLS");
+                    ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", videoSource.container, videoSource.url, resumePosition, video.duration.toDouble(), null);
+                }
+            } else if(audioSource is IHLSManifestAudioSource) {
+                if (ad is ChromecastCastingDevice) {
+                    Logger.i(TAG, "Casting as proxied audio HLS");
+                    castProxiedHls(video, audioSource.url, audioSource.codec, resumePosition);
+                } else {
+                    Logger.i(TAG, "Casting as non-proxied audio HLS");
+                    ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", audioSource.container, audioSource.url, resumePosition, video.duration.toDouble(), null);
+                }
+            } else if (videoSource is LocalVideoSource) {
+                Logger.i(TAG, "Casting as local video");
                 castLocalVideo(video, videoSource, resumePosition);
-            else if (audioSource is LocalAudioSource)
+            } else if (audioSource is LocalAudioSource) {
+                Logger.i(TAG, "Casting as local audio");
                 castLocalAudio(video, audioSource, resumePosition);
-            else {
+            } else {
                 var str = listOf(
                     if(videoSource != null) "Video: ${videoSource::class.java.simpleName}" else null,
                     if(audioSource != null) "Audio: ${audioSource::class.java.simpleName}" else null,
@@ -402,21 +458,29 @@ class StateCasting {
         return true;
     }
 
+    private fun castVideoIndirect() {
+
+    }
+
+    private fun castAudioIndirect() {
+
+    }
+
     private fun castLocalVideo(video: IPlatformVideoDetails, videoSource: LocalVideoSource, resumePosition: Double) : List<String> {
         val ad = activeDevice ?: return listOf();
 
-        val url = "http://${ad.localAddress}:${_castServer.port}";
+        val url = "http://${ad.localAddress.toString().trim('/')}:${_castServer.port}";
         val id = UUID.randomUUID();
         val videoPath = "/video-${id}"
         val videoUrl = url + videoPath;
 
-        _castServer.addHandler(
+        _castServer.addHandlerWithAllowAllOptions(
             HttpFileHandler("GET", videoPath, videoSource.container, videoSource.filePath)
                 .withHeader("Access-Control-Allow-Origin", "*"), true
         ).withTag("cast");
 
         Logger.i(TAG, "Casting local video (videoUrl: $videoUrl).");
-        ad.loadVideo("BUFFERED", videoSource.container, videoUrl, resumePosition, video.duration.toDouble());
+        ad.loadVideo("BUFFERED", videoSource.container, videoUrl, resumePosition, video.duration.toDouble(), null);
 
         return listOf(videoUrl);
     }
@@ -424,27 +488,122 @@ class StateCasting {
     private fun castLocalAudio(video: IPlatformVideoDetails, audioSource: LocalAudioSource, resumePosition: Double) : List<String> {
         val ad = activeDevice ?: return listOf();
 
-        val url = "http://${ad.localAddress}:${_castServer.port}";
+        val url = "http://${ad.localAddress.toString().trim('/')}:${_castServer.port}";
         val id = UUID.randomUUID();
         val audioPath = "/audio-${id}"
         val audioUrl = url + audioPath;
 
-        _castServer.addHandler(
+        _castServer.addHandlerWithAllowAllOptions(
             HttpFileHandler("GET", audioPath, audioSource.container, audioSource.filePath)
                 .withHeader("Access-Control-Allow-Origin", "*"), true
         ).withTag("cast");
 
         Logger.i(TAG, "Casting local audio (audioUrl: $audioUrl).");
-        ad.loadVideo("BUFFERED", audioSource.container, audioUrl, resumePosition, video.duration.toDouble());
+        ad.loadVideo("BUFFERED", audioSource.container, audioUrl, resumePosition, video.duration.toDouble(), null);
 
         return listOf(audioUrl);
     }
 
+    private fun castLocalHls(video: IPlatformVideoDetails, videoSource: LocalVideoSource?, audioSource: LocalAudioSource?, subtitleSource: LocalSubtitleSource?, resumePosition: Double): List<String> {
+        val ad = activeDevice ?: return listOf()
+
+        val url = "http://${ad.localAddress.toString().trim('/')}:${_castServer.port}"
+        val id = UUID.randomUUID()
+
+        val hlsPath = "/hls-${id}"
+        val videoPath = "/video-${id}"
+        val audioPath = "/audio-${id}"
+        val subtitlePath = "/subtitle-${id}"
+
+        val hlsUrl = url + hlsPath
+        val videoUrl = url + videoPath
+        val audioUrl = url + audioPath
+        val subtitleUrl = url + subtitlePath
+
+        val mediaRenditions = arrayListOf<HLS.MediaRendition>()
+        val variantPlaylistReferences = arrayListOf<HLS.VariantPlaylistReference>()
+
+        if (videoSource != null) {
+            _castServer.addHandlerWithAllowAllOptions(
+                HttpFileHandler("GET", videoPath, videoSource.container, videoSource.filePath)
+                    .withHeader("Access-Control-Allow-Origin", "*"), true
+            ).withTag("castLocalHls")
+
+            val duration = videoSource.duration
+            val videoVariantPlaylistPath = "/video-playlist-${id}"
+            val videoVariantPlaylistUrl = url + videoVariantPlaylistPath
+            val videoVariantPlaylistSegments = listOf(HLS.MediaSegment(duration.toDouble(), videoUrl))
+            val videoVariantPlaylist = HLS.VariantPlaylist(3, duration.toInt(), 0, 0, null, null, null, videoVariantPlaylistSegments)
+
+            _castServer.addHandlerWithAllowAllOptions(
+                HttpConstantHandler("GET", videoVariantPlaylistPath, videoVariantPlaylist.buildM3U8(),
+                    "application/vnd.apple.mpegurl")
+                    .withHeader("Access-Control-Allow-Origin", "*"), true
+            ).withTag("castLocalHls")
+
+            variantPlaylistReferences.add(HLS.VariantPlaylistReference(videoVariantPlaylistUrl, HLS.StreamInfo(
+                videoSource.bitrate, "${videoSource.width}x${videoSource.height}", videoSource.codec, null, null, if (audioSource != null) "audio" else null, if (subtitleSource != null) "subtitles" else null, null, null)))
+        }
+
+        if (audioSource != null) {
+            _castServer.addHandlerWithAllowAllOptions(
+                HttpFileHandler("GET", audioPath, audioSource.container, audioSource.filePath)
+                    .withHeader("Access-Control-Allow-Origin", "*"), true
+            ).withTag("castLocalHls")
+
+            val duration = audioSource.duration ?: videoSource?.duration ?: throw Exception("Duration unknown")
+            val audioVariantPlaylistPath = "/audio-playlist-${id}"
+            val audioVariantPlaylistUrl = url + audioVariantPlaylistPath
+            val audioVariantPlaylistSegments = listOf(HLS.MediaSegment(duration.toDouble(), audioUrl))
+            val audioVariantPlaylist = HLS.VariantPlaylist(3, duration.toInt(), 0, 0, null, null, null, audioVariantPlaylistSegments)
+
+            _castServer.addHandlerWithAllowAllOptions(
+                HttpConstantHandler("GET", audioVariantPlaylistPath, audioVariantPlaylist.buildM3U8(),
+                    "application/vnd.apple.mpegurl")
+                    .withHeader("Access-Control-Allow-Origin", "*"), true
+            ).withTag("castLocalHls")
+
+            mediaRenditions.add(HLS.MediaRendition("AUDIO", audioVariantPlaylistUrl, "audio", "df", "default", true, true, true))
+        }
+
+        if (subtitleSource != null) {
+            _castServer.addHandlerWithAllowAllOptions(
+                HttpFileHandler("GET", subtitlePath, subtitleSource.format ?: "text/vtt", subtitleSource.filePath)
+                    .withHeader("Access-Control-Allow-Origin", "*"), true
+            ).withTag("castLocalHls")
+
+            val duration = videoSource?.duration ?: audioSource?.duration ?: throw Exception("Duration unknown")
+            val subtitleVariantPlaylistPath = "/subtitle-playlist-${id}"
+            val subtitleVariantPlaylistUrl = url + subtitleVariantPlaylistPath
+            val subtitleVariantPlaylistSegments = listOf(HLS.MediaSegment(duration.toDouble(), subtitleUrl))
+            val subtitleVariantPlaylist = HLS.VariantPlaylist(3, duration.toInt(), 0, 0, null, null, null, subtitleVariantPlaylistSegments)
+
+            _castServer.addHandlerWithAllowAllOptions(
+                HttpConstantHandler("GET", subtitleVariantPlaylistPath, subtitleVariantPlaylist.buildM3U8(),
+                    "application/vnd.apple.mpegurl")
+                    .withHeader("Access-Control-Allow-Origin", "*"), true
+            ).withTag("castLocalHls")
+
+            mediaRenditions.add(HLS.MediaRendition("SUBTITLES", subtitleVariantPlaylistUrl, "subtitles", "df", "default", true, true, true))
+        }
+
+        val masterPlaylist = HLS.MasterPlaylist(variantPlaylistReferences, mediaRenditions, listOf(), true)
+        _castServer.addHandlerWithAllowAllOptions(
+            HttpConstantHandler("GET", hlsPath, masterPlaylist.buildM3U8(),
+                "application/vnd.apple.mpegurl")
+                .withHeader("Access-Control-Allow-Origin", "*"), true
+        ).withTag("castLocalHls")
+
+        Logger.i(TAG, "added new castLocalHls handlers (hlsPath: $hlsPath, videoPath: $videoPath, audioPath: $audioPath, subtitlePath: $subtitlePath).")
+        ad.loadVideo("BUFFERED", "application/vnd.apple.mpegurl", hlsUrl, resumePosition, video.duration.toDouble(), null)
+
+        return listOf(hlsUrl, videoUrl, audioUrl, subtitleUrl)
+    }
 
     private fun castLocalDash(video: IPlatformVideoDetails, videoSource: LocalVideoSource?, audioSource: LocalAudioSource?, subtitleSource: LocalSubtitleSource?, resumePosition: Double) : List<String> {
         val ad = activeDevice ?: return listOf();
 
-        val url = "http://${ad.localAddress}:${_castServer.port}";
+        val url = "http://${ad.localAddress.toString().trim('/')}:${_castServer.port}";
         val id = UUID.randomUUID();
 
         val dashPath = "/dash-${id}"
@@ -457,47 +616,32 @@ class StateCasting {
         val audioUrl = url + audioPath;
         val subtitleUrl = url + subtitlePath;
 
-        _castServer.addHandler(
+        _castServer.addHandlerWithAllowAllOptions(
                 HttpConstantHandler("GET", dashPath, DashBuilder.generateOnDemandDash(videoSource, videoUrl, audioSource, audioUrl, subtitleSource, subtitleUrl),
                     "application/dash+xml")
                     .withHeader("Access-Control-Allow-Origin", "*"), true
             ).withTag("cast");
         if (videoSource != null) {
-            _castServer.addHandler(
+            _castServer.addHandlerWithAllowAllOptions(
                 HttpFileHandler("GET", videoPath, videoSource.container, videoSource.filePath)
                     .withHeader("Access-Control-Allow-Origin", "*"), true
             ).withTag("cast");
-            _castServer.addHandler(
-                HttpOptionsAllowHandler(videoPath)
-                    .withHeader("Access-Control-Allow-Origin", "*")
-                    .withHeader("Connection", "keep-alive"))
-                .withTag("cast");
         }
         if (audioSource != null) {
-            _castServer.addHandler(
+            _castServer.addHandlerWithAllowAllOptions(
                 HttpFileHandler("GET", audioPath, audioSource.container, audioSource.filePath)
                     .withHeader("Access-Control-Allow-Origin", "*"), true
             ).withTag("cast");
-            _castServer.addHandler(
-                HttpOptionsAllowHandler(audioPath)
-                    .withHeader("Access-Control-Allow-Origin", "*")
-                    .withHeader("Connection", "keep-alive"))
-                .withTag("cast");
         }
         if (subtitleSource != null) {
-            _castServer.addHandler(
-                HttpFileHandler("GET", subtitlePath, subtitleSource.format ?: "text/vtt", subtitleSource.filePath, true)
+            _castServer.addHandlerWithAllowAllOptions(
+                HttpFileHandler("GET", subtitlePath, subtitleSource.format ?: "text/vtt", subtitleSource.filePath)
                     .withHeader("Access-Control-Allow-Origin", "*"), true
             ).withTag("cast");
-            _castServer.addHandler(
-                HttpOptionsAllowHandler(subtitlePath)
-                    .withHeader("Access-Control-Allow-Origin", "*")
-                    .withHeader("Connection", "keep-alive"))
-                .withTag("cast");
         }
 
         Logger.i(TAG, "added new castLocalDash handlers (dashPath: $dashPath, videoPath: $videoPath, audioPath: $audioPath, subtitlePath: $subtitlePath).");
-        ad.loadVideo("BUFFERED", "application/dash+xml", dashUrl, resumePosition, video.duration.toDouble());
+        ad.loadVideo("BUFFERED", "application/dash+xml", dashUrl, resumePosition, video.duration.toDouble(), null);
 
         return listOf(dashUrl, videoUrl, audioUrl, subtitleUrl);
     }
@@ -505,7 +649,7 @@ class StateCasting {
     private suspend fun castDashDirect(contentResolver: ContentResolver, video: IPlatformVideoDetails, videoSource: IVideoUrlSource?, audioSource: IAudioUrlSource?, subtitleSource: ISubtitleSource?, resumePosition: Double) : List<String> {
         val ad = activeDevice ?: return listOf();
 
-        val url = "http://${ad.localAddress}:${_castServer.port}";
+        val url = "http://${ad.localAddress.toString().trim('/')}:${_castServer.port}";
         val id = UUID.randomUUID();
         val subtitlePath = "/subtitle-${id}";
 
@@ -527,7 +671,7 @@ class StateCasting {
                 }
 
                 if (content != null) {
-                    _castServer.addHandler(
+                    _castServer.addHandlerWithAllowAllOptions(
                         HttpConstantHandler("GET", subtitlePath, content!!, subtitleSource?.format ?: "text/vtt")
                             .withHeader("Access-Control-Allow-Origin", "*"), true
                     ).withTag("cast");
@@ -542,18 +686,316 @@ class StateCasting {
         val content = DashBuilder.generateOnDemandDash(videoSource, videoUrl, audioSource, audioUrl, subtitleSource, subtitlesUrl);
 
         Logger.i(TAG, "Direct dash cast to casting device (videoUrl: $videoUrl, audioUrl: $audioUrl).");
-        ad.loadContent("application/dash+xml", content, resumePosition, video.duration.toDouble());
+        ad.loadContent("application/dash+xml", content, resumePosition, video.duration.toDouble(), null);
 
         return listOf(videoSource?.getVideoUrl() ?: "", audioSource?.getAudioUrl() ?: "");
     }
 
+    private fun castProxiedHls(video: IPlatformVideoDetails, sourceUrl: String, codec: String?, resumePosition: Double): List<String> {
+        _castServer.removeAllHandlers("castProxiedHlsMaster")
+
+        val ad = activeDevice ?: return listOf();
+        val url = "http://${ad.localAddress.toString().trim('/')}:${_castServer.port}";
+
+        val id = UUID.randomUUID();
+        val hlsPath = "/hls-${id}"
+        val hlsUrl = url + hlsPath
+        Logger.i(TAG, "HLS url: $hlsUrl");
+
+        _castServer.addHandlerWithAllowAllOptions(HttpFuntionHandler("GET", hlsPath) { masterContext ->
+            _castServer.removeAllHandlers("castProxiedHlsVariant")
+
+            val headers = masterContext.headers.clone()
+            headers["Content-Type"] = "application/vnd.apple.mpegurl";
+
+            val masterPlaylistResponse = _client.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 masterPlaylist: HLS.MasterPlaylist
+            try {
+                masterPlaylist = HLS.parseMasterPlaylist(masterPlaylistContent, sourceUrl)
+            } catch (e: Throwable) {
+                if (masterPlaylistContent.lines().any { it.startsWith("#EXTINF:") }) {
+                    //This is a variant playlist, not a master playlist
+                    Logger.i(TAG, "HLS casting as variant playlist (codec: $codec): $hlsUrl");
+
+                    val vpHeaders = masterContext.headers.clone()
+                    vpHeaders["Content-Type"] = "application/vnd.apple.mpegurl";
+
+                    val variantPlaylist = HLS.parseVariantPlaylist(masterPlaylistContent, sourceUrl)
+                    val proxiedVariantPlaylist = proxyVariantPlaylist(url, id, variantPlaylist, video.isLive)
+                    val proxiedVariantPlaylist_m3u8 = proxiedVariantPlaylist.buildM3U8()
+                    masterContext.respondCode(200, vpHeaders, proxiedVariantPlaylist_m3u8);
+                    return@HttpFuntionHandler
+                } else {
+                    throw e
+                }
+            }
+
+            Logger.i(TAG, "HLS casting as master playlist: $hlsUrl");
+
+            val newVariantPlaylistRefs = arrayListOf<HLS.VariantPlaylistReference>()
+            val newMediaRenditions = arrayListOf<HLS.MediaRendition>()
+            val newMasterPlaylist = HLS.MasterPlaylist(newVariantPlaylistRefs, newMediaRenditions, masterPlaylist.sessionDataList, masterPlaylist.independentSegments)
+
+            for (variantPlaylistRef in masterPlaylist.variantPlaylistsRefs) {
+                val playlistId = UUID.randomUUID();
+                val newPlaylistPath = "/hls-playlist-${playlistId}"
+                val newPlaylistUrl = url + newPlaylistPath;
+
+                _castServer.addHandlerWithAllowAllOptions(HttpFuntionHandler("GET", newPlaylistPath) { vpContext ->
+                    val vpHeaders = vpContext.headers.clone()
+                    vpHeaders["Content-Type"] = "application/vnd.apple.mpegurl";
+
+                    val response = _client.get(variantPlaylistRef.url)
+                    check(response.isOk) { "Failed to get variant playlist: ${response.code}" }
+
+                    val vpContent = response.body?.string()
+                        ?: throw Exception("Variant playlist content is empty")
+
+                    val variantPlaylist = HLS.parseVariantPlaylist(vpContent, variantPlaylistRef.url)
+                    val proxiedVariantPlaylist = proxyVariantPlaylist(url, playlistId, variantPlaylist, video.isLive)
+                    val proxiedVariantPlaylist_m3u8 = proxiedVariantPlaylist.buildM3U8()
+                    vpContext.respondCode(200, vpHeaders, proxiedVariantPlaylist_m3u8);
+                }.withHeader("Access-Control-Allow-Origin", "*"), true).withTag("castProxiedHlsVariant")
+
+                newVariantPlaylistRefs.add(HLS.VariantPlaylistReference(
+                    newPlaylistUrl,
+                    variantPlaylistRef.streamInfo
+                ))
+            }
+
+            for (mediaRendition in masterPlaylist.mediaRenditions) {
+                val playlistId = UUID.randomUUID()
+
+                var newPlaylistUrl: String? = null
+                if (mediaRendition.uri != null) {
+                    val newPlaylistPath = "/hls-playlist-${playlistId}"
+                    newPlaylistUrl = url + newPlaylistPath
+
+                    _castServer.addHandlerWithAllowAllOptions(HttpFuntionHandler("GET", newPlaylistPath) { vpContext ->
+                        val vpHeaders = vpContext.headers.clone()
+                        vpHeaders["Content-Type"] = "application/vnd.apple.mpegurl";
+
+                        val response = _client.get(mediaRendition.uri)
+                        check(response.isOk) { "Failed to get variant playlist: ${response.code}" }
+
+                        val vpContent = response.body?.string()
+                            ?: throw Exception("Variant playlist content is empty")
+
+                        val variantPlaylist = HLS.parseVariantPlaylist(vpContent, mediaRendition.uri)
+                        val proxiedVariantPlaylist = proxyVariantPlaylist(url, playlistId, variantPlaylist, video.isLive)
+                        val proxiedVariantPlaylist_m3u8 = proxiedVariantPlaylist.buildM3U8()
+                        vpContext.respondCode(200, vpHeaders, proxiedVariantPlaylist_m3u8);
+                    }.withHeader("Access-Control-Allow-Origin", "*"), true).withTag("castProxiedHlsVariant")
+                }
+
+                newMediaRenditions.add(HLS.MediaRendition(
+                    mediaRendition.type,
+                    newPlaylistUrl,
+                    mediaRendition.groupID,
+                    mediaRendition.language,
+                    mediaRendition.name,
+                    mediaRendition.isDefault,
+                    mediaRendition.isAutoSelect,
+                    mediaRendition.isForced
+                ))
+            }
+
+            masterContext.respondCode(200, headers, newMasterPlaylist.buildM3U8());
+        }.withHeader("Access-Control-Allow-Origin", "*"), true).withTag("castProxiedHlsMaster")
+
+        Logger.i(TAG, "added new castHlsIndirect handlers (hlsPath: $hlsPath).");
+
+        //ChromeCast is sometimes funky with resume position 0
+        val hackfixResumePosition = if (ad is ChromecastCastingDevice && !video.isLive && resumePosition == 0.0) 0.1 else resumePosition;
+        ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", "application/vnd.apple.mpegurl", hlsUrl, hackfixResumePosition, video.duration.toDouble(), null);
+
+        return listOf(hlsUrl);
+    }
+
+    private fun proxyVariantPlaylist(url: String, playlistId: UUID, variantPlaylist: HLS.VariantPlaylist, isLive: Boolean, proxySegments: Boolean = true): HLS.VariantPlaylist {
+        val newSegments = arrayListOf<HLS.Segment>()
+
+        if (proxySegments) {
+            variantPlaylist.segments.forEachIndexed { index, segment ->
+                val sequenceNumber = (variantPlaylist.mediaSequence ?: 0) + index.toLong()
+                newSegments.add(proxySegment(url, playlistId, segment, sequenceNumber))
+            }
+        } else {
+            newSegments.addAll(variantPlaylist.segments)
+        }
+
+        return HLS.VariantPlaylist(
+            variantPlaylist.version,
+            variantPlaylist.targetDuration,
+            variantPlaylist.mediaSequence,
+            variantPlaylist.discontinuitySequence,
+            variantPlaylist.programDateTime,
+            variantPlaylist.playlistType,
+            variantPlaylist.streamInfo,
+            newSegments
+        )
+    }
+
+    private fun proxySegment(url: String, playlistId: UUID, segment: HLS.Segment, index: Long): HLS.Segment {
+        if (segment is HLS.MediaSegment) {
+            val newSegmentPath = "/hls-playlist-${playlistId}-segment-${index}"
+            val newSegmentUrl = url + newSegmentPath;
+
+            if (_castServer.getHandler("GET", newSegmentPath) == null) {
+                _castServer.addHandlerWithAllowAllOptions(
+                    HttpProxyHandler("GET", newSegmentPath, segment.uri, true)
+                        .withInjectedHost()
+                        .withHeader("Access-Control-Allow-Origin", "*"), true
+                ).withTag("castProxiedHlsVariant")
+            }
+
+            return HLS.MediaSegment(
+                segment.duration,
+                newSegmentUrl
+            )
+        } else {
+            return segment
+        }
+    }
+
+    private suspend fun castHlsIndirect(contentResolver: ContentResolver, video: IPlatformVideoDetails, videoSource: IVideoUrlSource?, audioSource: IAudioUrlSource?, subtitleSource: ISubtitleSource?, resumePosition: Double) : List<String> {
+        val ad = activeDevice ?: return listOf();
+        val url = "http://${ad.localAddress.toString().trim('/')}:${_castServer.port}";
+        val id = UUID.randomUUID();
+
+        val hlsPath = "/hls-${id}"
+
+        val hlsUrl = url + hlsPath;
+        Logger.i(TAG, "HLS url: $hlsUrl");
+
+        val mediaRenditions = arrayListOf<HLS.MediaRendition>()
+        val variantPlaylistReferences = arrayListOf<HLS.VariantPlaylistReference>()
+
+        if (audioSource != null) {
+            val audioPath = "/audio-${id}"
+            val audioUrl = url + audioPath
+
+            val duration = audioSource.duration ?: videoSource?.duration ?: throw Exception("Duration unknown")
+            val audioVariantPlaylistPath = "/audio-playlist-${id}"
+            val audioVariantPlaylistUrl = url + audioVariantPlaylistPath
+            val audioVariantPlaylistSegments = listOf(HLS.MediaSegment(duration.toDouble(), audioUrl))
+            val audioVariantPlaylist = HLS.VariantPlaylist(3, duration.toInt(), 0, 0, null, null, null, audioVariantPlaylistSegments)
+
+            _castServer.addHandlerWithAllowAllOptions(
+                HttpConstantHandler("GET", audioVariantPlaylistPath, audioVariantPlaylist.buildM3U8(),
+                    "application/vnd.apple.mpegurl")
+                    .withHeader("Access-Control-Allow-Origin", "*"), true
+            ).withTag("castHlsIndirectVariant");
+
+            mediaRenditions.add(HLS.MediaRendition("AUDIO", audioVariantPlaylistUrl, "audio", "df", "default", true, true, true))
+
+            _castServer.addHandlerWithAllowAllOptions(
+                HttpProxyHandler("GET", audioPath, audioSource.getAudioUrl(), true)
+                    .withInjectedHost()
+                    .withHeader("Access-Control-Allow-Origin", "*"), true
+            ).withTag("castHlsIndirectVariant");
+        }
+
+        val subtitlesUri = if (subtitleSource != null) withContext(Dispatchers.IO) {
+            return@withContext subtitleSource.getSubtitlesURI();
+        } else null;
+
+        var subtitlesUrl: String? = null;
+        if (subtitlesUri != null) {
+            val subtitlePath = "/subtitles-${id}"
+            if(subtitlesUri.scheme == "file") {
+                var content: String? = null;
+                val inputStream = contentResolver.openInputStream(subtitlesUri);
+                inputStream?.use { stream ->
+                    val reader = stream.bufferedReader();
+                    content = reader.use { it.readText() };
+                }
+
+                if (content != null) {
+                    _castServer.addHandlerWithAllowAllOptions(
+                        HttpConstantHandler("GET", subtitlePath, content!!, subtitleSource?.format ?: "text/vtt")
+                            .withHeader("Access-Control-Allow-Origin", "*"), true
+                    ).withTag("castHlsIndirectVariant");
+                }
+
+                subtitlesUrl = url + subtitlePath;
+            } else {
+                subtitlesUrl = subtitlesUri.toString();
+            }
+        }
+
+        if (subtitlesUrl != null) {
+            val duration = videoSource?.duration ?: audioSource?.duration ?: throw Exception("Duration unknown")
+            val subtitleVariantPlaylistPath = "/subtitle-playlist-${id}"
+            val subtitleVariantPlaylistUrl = url + subtitleVariantPlaylistPath
+            val subtitleVariantPlaylistSegments = listOf(HLS.MediaSegment(duration.toDouble(), subtitlesUrl))
+            val subtitleVariantPlaylist = HLS.VariantPlaylist(3, duration.toInt(), 0, 0, null, null, null, subtitleVariantPlaylistSegments)
+
+            _castServer.addHandlerWithAllowAllOptions(
+                HttpConstantHandler("GET", subtitleVariantPlaylistPath, subtitleVariantPlaylist.buildM3U8(),
+                    "application/vnd.apple.mpegurl")
+                    .withHeader("Access-Control-Allow-Origin", "*"), true
+            ).withTag("castHlsIndirectVariant");
+
+            mediaRenditions.add(HLS.MediaRendition("SUBTITLES", subtitleVariantPlaylistUrl, "subtitles", "df", "default", true, true, true))
+        }
+
+        if (videoSource != null) {
+            val videoPath = "/video-${id}"
+            val videoUrl = url + videoPath
+
+            val duration = videoSource.duration
+            val videoVariantPlaylistPath = "/video-playlist-${id}"
+            val videoVariantPlaylistUrl = url + videoVariantPlaylistPath
+            val videoVariantPlaylistSegments = listOf(HLS.MediaSegment(duration.toDouble(), videoUrl))
+            val videoVariantPlaylist = HLS.VariantPlaylist(3, duration.toInt(), 0, 0, null, null, null, videoVariantPlaylistSegments)
+
+            _castServer.addHandlerWithAllowAllOptions(
+                HttpConstantHandler("GET", videoVariantPlaylistPath, videoVariantPlaylist.buildM3U8(),
+                    "application/vnd.apple.mpegurl")
+                    .withHeader("Access-Control-Allow-Origin", "*"), true
+            ).withTag("castHlsIndirectVariant");
+
+            variantPlaylistReferences.add(HLS.VariantPlaylistReference(videoVariantPlaylistUrl, HLS.StreamInfo(
+                videoSource.bitrate ?: 0,
+                "${videoSource.width}x${videoSource.height}",
+                videoSource.codec,
+                null,
+                null,
+                if (audioSource != null) "audio" else null,
+                if (subtitleSource != null) "subtitles" else null,
+                null, null)))
+
+            _castServer.addHandlerWithAllowAllOptions(
+                HttpProxyHandler("GET", videoPath, videoSource.getVideoUrl(), true)
+                    .withInjectedHost()
+                    .withHeader("Access-Control-Allow-Origin", "*"), true
+            ).withTag("castHlsIndirectVariant");
+        }
+
+        val masterPlaylist = HLS.MasterPlaylist(variantPlaylistReferences, mediaRenditions, listOf(), true)
+        _castServer.addHandlerWithAllowAllOptions(
+            HttpConstantHandler("GET", hlsPath, masterPlaylist.buildM3U8(),
+                "application/vnd.apple.mpegurl")
+                .withHeader("Access-Control-Allow-Origin", "*"), true
+        ).withTag("castHlsIndirectMaster")
+
+        Logger.i(TAG, "added new castHls handlers (hlsPath: $hlsPath).");
+        ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", "application/vnd.apple.mpegurl", hlsUrl, resumePosition, video.duration.toDouble(), null);
+
+        return listOf(hlsUrl, videoSource?.getVideoUrl() ?: "", audioSource?.getAudioUrl() ?: "", subtitlesUri.toString());
+    }
+
     private suspend fun castDashIndirect(contentResolver: ContentResolver, video: IPlatformVideoDetails, videoSource: IVideoUrlSource?, audioSource: IAudioUrlSource?, subtitleSource: ISubtitleSource?, resumePosition: Double) : List<String> {
         val ad = activeDevice ?: return listOf();
-        val proxyStreams = ad !is FastCastCastingDevice;
-
-        val url = "http://${ad.localAddress}:${_castServer.port}";
-        Logger.i(TAG, "DASH url: $url");
+        val proxyStreams = ad !is FCastCastingDevice;
 
+        val url = "http://${ad.localAddress.toString().trim('/')}:${_castServer.port}";
         val id = UUID.randomUUID();
 
         val dashPath = "/dash-${id}"
@@ -562,6 +1004,8 @@ class StateCasting {
         val subtitlePath = "/subtitle-${id}"
 
         val dashUrl = url + dashPath;
+        Logger.i(TAG, "DASH url: $dashUrl");
+
         val videoUrl = if(proxyStreams) url + videoPath else videoSource?.getVideoUrl();
         val audioUrl = if(proxyStreams) url + audioPath else audioSource?.getAudioUrl();
 
@@ -583,7 +1027,7 @@ class StateCasting {
                 }
 
                 if (content != null) {
-                    _castServer.addHandler(
+                    _castServer.addHandlerWithAllowAllOptions(
                         HttpConstantHandler("GET", subtitlePath, content!!, subtitleSource?.format ?: "text/vtt")
                             .withHeader("Access-Control-Allow-Origin", "*"), true
                     ).withTag("cast");
@@ -595,38 +1039,29 @@ class StateCasting {
             }
         }
 
-        _castServer.addHandler(
+        _castServer.addHandlerWithAllowAllOptions(
             HttpConstantHandler("GET", dashPath, DashBuilder.generateOnDemandDash(videoSource, videoUrl, audioSource, audioUrl, subtitleSource, subtitlesUrl),
                 "application/dash+xml")
                 .withHeader("Access-Control-Allow-Origin", "*"), true
         ).withTag("cast");
+
         if (videoSource != null) {
-            _castServer.addHandler(
-                HttpProxyHandler("GET", videoPath, videoSource.getVideoUrl())
+            _castServer.addHandlerWithAllowAllOptions(
+                HttpProxyHandler("GET", videoPath, videoSource.getVideoUrl(), true)
                     .withInjectedHost()
                     .withHeader("Access-Control-Allow-Origin", "*"), true
             ).withTag("cast");
-            _castServer.addHandler(
-                HttpOptionsAllowHandler(videoPath)
-                .withHeader("Access-Control-Allow-Origin", "*")
-                .withHeader("Connection", "keep-alive"))
-                .withTag("cast");
         }
         if (audioSource != null) {
-            _castServer.addHandler(
-                HttpProxyHandler("GET", audioPath, audioSource.getAudioUrl())
+            _castServer.addHandlerWithAllowAllOptions(
+                HttpProxyHandler("GET", audioPath, audioSource.getAudioUrl(), true)
                     .withInjectedHost()
                     .withHeader("Access-Control-Allow-Origin", "*"), true
             ).withTag("cast");
-            _castServer.addHandler(
-                HttpOptionsAllowHandler(audioPath)
-                    .withHeader("Access-Control-Allow-Origin", "*")
-                    .withHeader("Connection", "keep-alivcontexte"))
-                .withTag("cast");
         }
 
         Logger.i(TAG, "added new castDash handlers (dashPath: $dashPath, videoPath: $videoPath, audioPath: $audioPath).");
-        ad.loadVideo("BUFFERED", "application/dash+xml", dashUrl, resumePosition, video.duration.toDouble());
+        ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", "application/dash+xml", dashUrl, resumePosition, video.duration.toDouble(), null);
 
         return listOf(dashUrl, videoUrl ?: "", audioUrl ?: "", subtitlesUrl ?: "", videoSource?.getVideoUrl() ?: "", audioSource?.getAudioUrl() ?: "", subtitlesUri.toString());
     }
@@ -639,8 +1074,8 @@ class StateCasting {
             CastProtocolType.AIRPLAY -> {
                 AirPlayCastingDevice(deviceInfo);
             }
-            CastProtocolType.FASTCAST -> {
-                FastCastCastingDevice(deviceInfo);
+            CastProtocolType.FCAST -> {
+                FCastCastingDevice(deviceInfo);
             }
             else -> throw Exception("${deviceInfo.type} is not a valid casting protocol")
         }
@@ -687,8 +1122,8 @@ class StateCasting {
     }
 
     private fun addOrUpdateFastCastDevice(name: String, addresses: Array<InetAddress>, port: Int) {
-        return addOrUpdateCastDevice<FastCastCastingDevice>(name,
-            deviceFactory = { FastCastCastingDevice(name, addresses, port) },
+        return addOrUpdateCastDevice<FCastCastingDevice>(name,
+            deviceFactory = { FCastCastingDevice(name, addresses, port) },
             deviceUpdater = { d ->
                 if (d.isReady) {
                     return@addOrUpdateCastDevice false;
@@ -764,6 +1199,19 @@ class StateCasting {
         }
     }
 
+    @Serializable
+    private data class FCastNetworkConfig(
+        val name: String,
+        val addresses: List<String>,
+        val services: List<FCastService>
+    )
+
+    @Serializable
+    private data class FCastService(
+        val port: Int,
+        val type: Int
+    )
+
     companion object {
         val instance: StateCasting = StateCasting();
 

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

@@ -0,0 +1,53 @@
+package com.futo.platformplayer.casting.models
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class FCastPlayMessage(
+    val container: String,
+    val url: String? = null,
+    val content: String? = null,
+    val time: Double? = null,
+    val speed: Double? = null
+) { }
+
+@Serializable
+data class FCastSeekMessage(
+    val time: Double
+) { }
+
+@Serializable
+data class FCastPlaybackUpdateMessage(
+    val generationTime: Long,
+    val time: Double,
+    val duration: Double,
+    val state: Int,
+    val speed: Double
+) { }
+
+
+@Serializable
+data class FCastVolumeUpdateMessage(
+    val generationTime: Long,
+    val volume: Double
+)
+
+@Serializable
+data class FCastSetVolumeMessage(
+    val volume: Double
+)
+
+@Serializable
+data class FCastSetSpeedMessage(
+    val speed: Double
+)
+
+@Serializable
+data class FCastPlaybackErrorMessage(
+    val message: String
+)
+
+@Serializable
+data class FCastVersionMessage(
+    val version: Long
+)

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

@@ -1,33 +0,0 @@
-package com.futo.platformplayer.casting.models
-
-import kotlinx.serialization.Serializable
-
-@kotlinx.serialization.Serializable
-data class FastCastPlayMessage(
-    val container: String,
-    val url: String? = null,
-    val content: String? = null,
-    val time: Int? = null
-) { }
-
-@kotlinx.serialization.Serializable
-data class FastCastSeekMessage(
-    val time: Int
-) { }
-
-@kotlinx.serialization.Serializable
-data class FastCastPlaybackUpdateMessage(
-    val time: Int,
-    val state: Int
-) { }
-
-
-@Serializable
-data class FastCastVolumeUpdateMessage(
-    val volume: Double
-)
-
-@Serializable
-data class FastCastSetVolumeMessage(
-    val volume: Double
-)

app/src/main/java/com/futo/platformplayer/developer/DeveloperEndpoints.kt

@@ -24,6 +24,7 @@ import com.google.gson.JsonArray
 import com.google.gson.JsonParser
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
+import java.lang.reflect.InvocationTargetException
 import java.util.UUID
 import kotlin.reflect.jvm.jvmErasure
 
@@ -185,7 +186,11 @@ class DeveloperEndpoints(private val context: Context) {
         val config = context.readContentJson<SourcePluginConfig>()
         try {
             _testPluginVariables.clear();
-            _testPlugin = V8Plugin(StateApp.instance.context, config);
+
+            val client = JSHttpClient(null, null, null, config);
+            val clientAuth = JSHttpClient(null, null, null, config);
+            _testPlugin = V8Plugin(StateApp.instance.context, config, null, client, clientAuth);
+
             context.respondJson(200, testPluginOrThrow.getPackageVariables());
         }
         catch(ex: Throwable) {
@@ -235,7 +240,7 @@ class DeveloperEndpoints(private val context: Context) {
             }
             LoginActivity.showLogin(StateApp.instance.context, config) {
                 _testPluginVariables.clear();
-                _testPlugin = V8Plugin(StateApp.instance.context, config, null, JSHttpClient(null), JSHttpClient(null, it));
+                _testPlugin = V8Plugin(StateApp.instance.context, config, null, JSHttpClient(null, null, null, config), JSHttpClient(null, it, null, config));
 
             };
             context.respondCode(200, "Login started");
@@ -287,7 +292,6 @@ class DeveloperEndpoints(private val context: Context) {
     @HttpPOST("/plugin/remoteCall")
     fun pluginRemoteCall(context: HttpContext) {
         try {
-            val parameters = context.readContentString();
             val objId = context.query.get("id")
             val method = context.query.get("method")
 
@@ -299,16 +303,24 @@ class DeveloperEndpoints(private val context: Context) {
                 context.respondCode(400, "Missing method");
                 return;
             }
+            if(method != "isLoggedIn")
+                Logger.i(TAG, "Remote Call [${objId}].${method}(...)");
+
+            val parameters = context.readContentString();
+
             val remoteObj = getRemoteObject(objId);
             val paras = JsonParser.parseString(parameters);
             if(!paras.isJsonArray)
                 throw IllegalArgumentException("Expected json array as body");
-            if(method != "isLoggedIn")
-                Logger.i(TAG, "Remote Call [${objId}].${method}(...)");
             val callResult = remoteObj.call(method, paras as JsonArray);
             val json = wrapRemoteResult(callResult, false);
             context.respondCode(200, json, "application/json");
         }
+        catch(invocation: InvocationTargetException) {
+            val innerException = invocation.targetException;
+            Logger.e("DeveloperEndpoints", innerException.message, innerException);
+            context.respondCode(500, innerException::class.simpleName + ":" + innerException.message ?: "", "text/plain")
+        }
         catch(ilEx: IllegalArgumentException) {
             if(ilEx.message?.contains("does not exist") ?: false) {
                 context.respondCode(400, ilEx.message ?: "", "text/plain");

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

@@ -95,6 +95,8 @@ class AutoUpdateDialog(context: Context?) : AlertDialog(context) {
         _buttonUpdate.visibility = Button.GONE;
         setCancelable(false);
         setCanceledOnTouchOutside(false);
+
+        Logger.i(TAG, "Keep screen on set update")
         window?.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
 
         _text.text = context.resources.getText(R.string.downloading_update);
@@ -178,6 +180,7 @@ class AutoUpdateDialog(context: Context?) : AlertDialog(context) {
             }
         } finally {
             withContext(Dispatchers.Main) {
+                Logger.i(TAG, "Keep screen on unset install")
                 window?.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
             }
         }

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

@@ -12,10 +12,7 @@ import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.casting.CastProtocolType
 import com.futo.platformplayer.casting.StateCasting
 import com.futo.platformplayer.models.CastingDeviceInfo
-import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.toInetAddress
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 
 
 class CastingAddDialog(context: Context?) : AlertDialog(context) {
@@ -26,6 +23,7 @@ class CastingAddDialog(context: Context?) : AlertDialog(context) {
     private lateinit var _textError: TextView;
     private lateinit var _buttonCancel: Button;
     private lateinit var _buttonConfirm: LinearLayout;
+    private lateinit var _buttonTutorial: TextView;
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState);
@@ -38,6 +36,7 @@ class CastingAddDialog(context: Context?) : AlertDialog(context) {
         _textError = findViewById(R.id.text_error);
         _buttonCancel = findViewById(R.id.button_cancel);
         _buttonConfirm = findViewById(R.id.button_confirm);
+        _buttonTutorial = findViewById(R.id.button_tutorial)
 
         ArrayAdapter.createFromResource(context, R.array.casting_device_type_array, R.layout.spinner_item_simple).also { adapter ->
             adapter.setDropDownViewResource(R.layout.spinner_dropdownitem_simple);
@@ -62,7 +61,7 @@ class CastingAddDialog(context: Context?) : AlertDialog(context) {
 
         _buttonConfirm.setOnClickListener {
             val castProtocolType: CastProtocolType = when (_spinnerType.selectedItemPosition) {
-                0 -> CastProtocolType.FASTCAST
+                0 -> CastProtocolType.FCAST
                 1 -> CastProtocolType.CHROMECAST
                 2 -> CastProtocolType.AIRPLAY
                 else -> {
@@ -105,6 +104,11 @@ class CastingAddDialog(context: Context?) : AlertDialog(context) {
             StateCasting.instance.addRememberedDevice(castingDeviceInfo);
             performDismiss();
         };
+
+        _buttonTutorial.setOnClickListener {
+            UIDialogs.showCastingTutorialDialog(context)
+            dismiss()
+        }
     }
 
     override fun show() {

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

@@ -0,0 +1,63 @@
+package com.futo.platformplayer.dialogs
+
+import android.app.AlertDialog
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.view.LayoutInflater
+import com.futo.platformplayer.R
+import com.futo.platformplayer.UIDialogs
+import com.futo.platformplayer.activities.FCastGuideActivity
+import com.futo.platformplayer.activities.PolycentricWhyActivity
+import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.views.buttons.BigButton
+
+
+class CastingHelpDialog(context: Context?) : AlertDialog(context) {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState);
+        setContentView(LayoutInflater.from(context).inflate(R.layout.dialog_casting_help, null));
+
+        findViewById<BigButton>(R.id.button_guide).onClick.subscribe {
+            context.startActivity(Intent(context, FCastGuideActivity::class.java))
+        }
+
+        findViewById<BigButton>(R.id.button_video).onClick.subscribe {
+            try {
+                //TODO: Replace the URL with the casting video URL
+                val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse("https://fcast.org/"))
+                context.startActivity(browserIntent);
+            } catch (e: Throwable) {
+                Logger.i(TAG, "Failed to open browser.", e)
+            }
+        }
+
+        findViewById<BigButton>(R.id.button_website).onClick.subscribe {
+            try {
+                val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse("https://fcast.org/"))
+                context.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"))
+                context.startActivity(browserIntent);
+            } catch (e: Throwable) {
+                Logger.i(TAG, "Failed to open browser.", e)
+            }
+        }
+
+        findViewById<BigButton>(R.id.button_close).onClick.subscribe {
+            dismiss()
+            UIDialogs.showCastingAddDialog(context)
+        }
+    }
+
+    companion object {
+        private val TAG = "CastingTutorialDialog";
+    }
+}

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

@@ -20,6 +20,7 @@ import com.futo.platformplayer.api.media.models.comments.PolycentricPlatformComm
 import com.futo.platformplayer.api.media.models.ratings.RatingLikeDislikes
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.dp
+import com.futo.platformplayer.fullyBackfillServersAnnounceExceptions
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.selectBestImage
 import com.futo.platformplayer.states.StateApp
@@ -85,6 +86,11 @@ class CommentDialog(context: Context?, val contextUrl: String, val ref: Protocol
                 return@setOnClickListener;
             }
 
+            if (_editComment.text.isBlank()) {
+                UIDialogs.toast(context, "Comment should not be blank.");
+                return@setOnClickListener;
+            }
+
             val comment = _editComment.text.toString();
             val processHandle = StatePolycentric.instance.processHandle!!
             val eventPointer = processHandle.post(comment, null, ref)
@@ -92,7 +98,7 @@ class CommentDialog(context: Context?, val contextUrl: String, val ref: Protocol
             StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
                 try {
                     Logger.i(TAG, "Started backfill");
-                    processHandle.fullyBackfillServers()
+                    processHandle.fullyBackfillServersAnnounceExceptions()
                     Logger.i(TAG, "Finished backfill");
                 } catch (e: Throwable) {
                     Logger.e(TAG, "Failed to backfill servers.", e);
@@ -112,7 +118,7 @@ class CommentDialog(context: Context?, val contextUrl: String, val ref: Protocol
                 msg = comment,
                 rating = RatingLikeDislikes(0, 0),
                 date = OffsetDateTime.now(),
-                reference = eventPointer.toReference()
+                eventPointer = eventPointer
             ));
 
             dismiss();

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

@@ -1,24 +1,33 @@
 package com.futo.platformplayer.dialogs
 
+import android.app.Activity
 import android.app.AlertDialog
 import android.content.Context
+import android.content.Intent
 import android.graphics.drawable.Animatable
+import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.Button
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.R
 import com.futo.platformplayer.UIDialogs
+import com.futo.platformplayer.activities.AddSourceActivity
+import com.futo.platformplayer.activities.MainActivity
+import com.futo.platformplayer.activities.QRCaptureActivity
 import com.futo.platformplayer.casting.CastConnectionState
 import com.futo.platformplayer.casting.CastingDevice
 import com.futo.platformplayer.casting.StateCasting
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.views.adapters.DeviceAdapter
+import com.google.zxing.integration.android.IntentIntegrator
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
@@ -28,6 +37,7 @@ class ConnectCastingDialog(context: Context?) : AlertDialog(context) {
     private lateinit var _imageLoader: ImageView;
     private lateinit var _buttonClose: Button;
     private lateinit var _buttonAdd: Button;
+    private lateinit var _buttonScanQR: Button;
     private lateinit var _textNoDevicesFound: TextView;
     private lateinit var _textNoDevicesRemembered: TextView;
     private lateinit var _recyclerDevices: RecyclerView;
@@ -44,6 +54,7 @@ class ConnectCastingDialog(context: Context?) : AlertDialog(context) {
         _imageLoader = findViewById(R.id.image_loader);
         _buttonClose = findViewById(R.id.button_close);
         _buttonAdd = findViewById(R.id.button_add);
+        _buttonScanQR = findViewById(R.id.button_scan_qr);
         _recyclerDevices = findViewById(R.id.recycler_devices);
         _recyclerRememberedDevices = findViewById(R.id.recycler_remembered_devices);
         _textNoDevicesFound = findViewById(R.id.text_no_devices_found);
@@ -77,6 +88,17 @@ class ConnectCastingDialog(context: Context?) : AlertDialog(context) {
             UIDialogs.showCastingAddDialog(context);
             dismiss();
         };
+
+        val c = ownerActivity
+        if (c is MainActivity) {
+            _buttonScanQR.visibility = View.VISIBLE
+            _buttonScanQR.setOnClickListener {
+                c.showUrlQrCodeScanner()
+                dismiss()
+            };
+        } else {
+            _buttonScanQR.visibility = View.GONE
+        }
     }
 
     override fun show() {

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

@@ -16,9 +16,7 @@ import com.futo.platformplayer.casting.*
 import com.futo.platformplayer.states.StateApp
 import com.google.android.material.slider.Slider
 import com.google.android.material.slider.Slider.OnChangeListener
-import com.google.android.material.slider.Slider.OnSliderTouchListener
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 
 class ConnectedCastingDialog(context: Context?) : AlertDialog(context) {
@@ -105,7 +103,7 @@ class ConnectedCastingDialog(context: Context?) : AlertDialog(context) {
         } else if (d is AirPlayCastingDevice) {
             _imageDevice.setImageResource(R.drawable.ic_airplay);
             _textType.text = "AirPlay";
-        } else if (d is FastCastCastingDevice) {
+        } else if (d is FCastCastingDevice) {
             _imageDevice.setImageResource(R.drawable.ic_fc);
             _textType.text = "FastCast";
         }

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

@@ -134,6 +134,8 @@ class ImportDialog : AlertDialog {
 
         setCancelable(false);
         setCanceledOnTouchOutside(false);
+
+        Logger.i(TAG, "Keep screen on set import")
         window?.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
 
         _updateSpinner.drawable?.assume<Animatable>()?.start();
@@ -201,6 +203,7 @@ class ImportDialog : AlertDialog {
                     } catch (e: Throwable) {
                         Logger.e(TAG, "Failed to update import UI.", e)
                     } finally {
+                        Logger.i(TAG, "Keep screen on unset update")
                         window?.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
                     }
                 }

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

@@ -0,0 +1,80 @@
+package com.futo.platformplayer.dialogs
+
+import android.app.AlertDialog
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.widget.Button
+import com.futo.platformplayer.R
+import com.futo.platformplayer.activities.MainActivity
+import com.futo.platformplayer.fragment.mainactivity.main.SourcesFragment
+import com.futo.platformplayer.readBytes
+import com.futo.platformplayer.states.StateApp
+import com.futo.platformplayer.states.StateBackup
+import com.futo.platformplayer.views.buttons.BigButton
+
+class ImportOptionsDialog: AlertDialog {
+    private val _context: MainActivity;
+
+    private lateinit var _button_import_zip: BigButton;
+    private lateinit var _button_import_ezip: BigButton;
+    private lateinit var _button_import_txt: BigButton;
+    private lateinit var _button_import_newpipe_subs: BigButton;
+    private lateinit var _button_import_platform: BigButton;
+    private lateinit var _button_close: Button;
+
+
+    constructor(context: MainActivity): super(context) {
+        _context = context;
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState);
+        setContentView(LayoutInflater.from(context).inflate(R.layout.dialog_import_options, null));
+        _button_import_zip = findViewById(R.id.button_import_zip);
+        _button_import_ezip = findViewById(R.id.button_import_ezip);
+        _button_import_txt = findViewById(R.id.button_import_txt);
+        _button_import_newpipe_subs = findViewById(R.id.button_import_newpipe_subs);
+        _button_import_platform = findViewById(R.id.button_import_platform);
+        _button_close = findViewById(R.id.button_cancel);
+
+        _button_import_zip.onClick.subscribe {
+            dismiss();
+            StateApp.instance.requestFileReadAccess(_context, null, "application/zip") {
+                val zipBytes = it?.readBytes(context) ?: return@requestFileReadAccess;
+                StateBackup.importZipBytes(_context, StateApp.instance.scope, zipBytes);
+            };
+        }
+        _button_import_ezip.setOnClickListener {
+
+        }
+        _button_import_txt.onClick.subscribe  {
+            dismiss();
+            StateApp.instance.requestFileReadAccess(_context, null, "text/plain") {
+                val txtBytes = it?.readBytes(context) ?: return@requestFileReadAccess;
+                val txt = String(txtBytes);
+                StateBackup.importTxt(_context, txt);
+            };
+        }
+        _button_import_newpipe_subs.onClick.subscribe  {
+            dismiss();
+            StateApp.instance.requestFileReadAccess(_context, null, "application/json") {
+                val jsonBytes = it?.readBytes(context) ?: return@requestFileReadAccess;
+                val json = String(jsonBytes);
+                StateBackup.importNewPipeSubs(_context, json);
+            };
+        };
+        _button_import_platform.onClick.subscribe  {
+            dismiss();
+            _context.navigate(_context.getFragment<SourcesFragment>());
+        };
+        _button_close.setOnClickListener {
+            dismiss();
+        }
+    }
+
+    override fun dismiss() {
+        super.dismiss();
+    }
+
+}

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

@@ -144,6 +144,7 @@ class MigrateDialog : AlertDialog {
 
         setCancelable(false);
         setCanceledOnTouchOutside(false);
+        Logger.i(TAG, "Keep screen on set restore")
         window?.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
 
         _updateSpinner.drawable?.assume<Animatable>()?.start();
@@ -214,6 +215,7 @@ class MigrateDialog : AlertDialog {
                     } catch (e: Throwable) {
                         Logger.e(TAG, "Failed to update import UI.", e)
                     } finally {
+                        Logger.i(TAG, "Keep screen on unset restore")
                         window?.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
                     }
                 }

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

@@ -1,11 +1,17 @@
 package com.futo.platformplayer.downloads
 
+import android.content.Context
+import android.util.Log
+import com.arthenica.ffmpegkit.FFmpegKit
+import com.arthenica.ffmpegkit.ReturnCode
+import com.arthenica.ffmpegkit.StatisticsCallback
 import com.futo.platformplayer.Settings
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateDownloads
 import com.futo.platformplayer.states.StatePlatform
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.media.PlatformID
+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.other.IStreamMetaDataSource
 import com.futo.platformplayer.api.media.models.video.IPlatformVideo
@@ -18,22 +24,28 @@ import com.futo.platformplayer.hasAnySource
 import com.futo.platformplayer.helpers.FileHelper.Companion.sanitizeFileName
 import com.futo.platformplayer.helpers.VideoHelper
 import com.futo.platformplayer.isDownloadable
+import com.futo.platformplayer.parsers.HLS
 import com.futo.platformplayer.serializers.OffsetDateTimeNullableSerializer
-import com.futo.platformplayer.serializers.OffsetDateTimeSerializer
 import com.futo.platformplayer.toHumanBitrate
 import com.futo.platformplayer.toHumanBytesSpeed
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.withContext
 import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
 import java.time.OffsetDateTime
+import java.util.UUID
+import java.util.concurrent.Executors
 import java.util.concurrent.ForkJoinPool
 import java.util.concurrent.ForkJoinTask
 import java.util.concurrent.ThreadLocalRandom
+import kotlin.coroutines.resumeWithException
 
 @kotlinx.serialization.Serializable
 class VideoDownload {
@@ -137,7 +149,7 @@ class VideoDownload {
         return items.joinToString(" • ");
     }
 
-    suspend fun prepare() {
+    suspend fun prepare(client: ManagedHttpClient) {
         Logger.i(TAG, "VideoDownload Prepare [${name}]");
         if(video == null && videoDetails == null)
             throw IllegalStateException("Missing information for download to complete");
@@ -157,24 +169,65 @@ class VideoDownload {
 
             videoDetails = SerializedPlatformVideoDetails.fromVideo(original, if (subtitleSource != null) listOf(subtitleSource!!) else listOf());
             if(videoSource == null && targetPixelCount != null) {
-                val vsource = VideoHelper.selectBestVideoSource(videoDetails!!.video, targetPixelCount!!.toInt(), arrayOf())
+                val videoSources = arrayListOf<IVideoSource>()
+                for (source in original.video.videoSources) {
+                    if (source is IHLSManifestSource) {
+                        try {
+                            val playlistResponse = client.get(source.url)
+                            if (playlistResponse.isOk) {
+                                val playlistContent = playlistResponse.body?.string()
+                                if (playlistContent != null) {
+                                    videoSources.addAll(HLS.parseAndGetVideoSources(source, playlistContent, source.url))
+                                }
+                            }
+                        } catch (e: Throwable) {
+                            Log.i(TAG, "Failed to get HLS video sources", e)
+                        }
+                    } else {
+                        videoSources.add(source)
+                    }
+                }
+
+                val vsource = VideoHelper.selectBestVideoSource(videoSources, targetPixelCount!!.toInt(), arrayOf())
                 //    ?: throw IllegalStateException("Could not find a valid video source for video");
                 if(vsource != null) {
                     if (vsource is IVideoUrlSource)
-                        videoSource = VideoUrlSource.fromUrlSource(vsource);
+                        videoSource = VideoUrlSource.fromUrlSource(vsource)
                     else
                         throw DownloadException("Video source is not supported for downloading (yet)", false);
                 }
             }
 
             if(audioSource == null && targetBitrate != null) {
-                val asource = VideoHelper.selectBestAudioSource(videoDetails!!.video, arrayOf(), null, targetPixelCount)
+                val audioSources = arrayListOf<IAudioSource>()
+                val video = original.video
+                if (video is VideoUnMuxedSourceDescriptor) {
+                    for (source in video.audioSources) {
+                        if (source is IHLSManifestSource) {
+                            try {
+                                val playlistResponse = client.get(source.url)
+                                if (playlistResponse.isOk) {
+                                    val playlistContent = playlistResponse.body?.string()
+                                    if (playlistContent != null) {
+                                        audioSources.addAll(HLS.parseAndGetAudioSources(source, playlistContent, source.url))
+                                    }
+                                }
+                            } catch (e: Throwable) {
+                                Log.i(TAG, "Failed to get HLS audio sources", e)
+                            }
+                        } else {
+                            audioSources.add(source)
+                        }
+                    }
+                }
+
+                val asource = VideoHelper.selectBestAudioSource(audioSources, arrayOf(), null, targetBitrate)
                     ?: if(videoSource != null ) null
                     else throw DownloadException("Could not find a valid video or audio source for download")
                 if(asource == null)
                     audioSource = null;
                 else if(asource is IAudioUrlSource)
-                    audioSource = AudioUrlSource.fromUrlSource(asource);
+                    audioSource = AudioUrlSource.fromUrlSource(asource)
                 else
                     throw DownloadException("Audio source is not supported for downloading (yet)", false);
             }
@@ -183,7 +236,8 @@ class VideoDownload {
                 throw DownloadException("No valid sources found for video/audio");
         }
     }
-    suspend fun download(client: ManagedHttpClient, onProgress: ((Double) -> Unit)? = null) = coroutineScope {
+
+    suspend fun download(context: Context, client: ManagedHttpClient, onProgress: ((Double) -> Unit)? = null) = coroutineScope {
         Logger.i(TAG, "VideoDownload Download [${name}]");
         if(videoDetails == null || (videoSource == null && audioSource == null))
             throw IllegalStateException("Missing information for download to complete");
@@ -199,7 +253,7 @@ class VideoDownload {
             videoFilePath = File(downloadDir, videoFileName!!).absolutePath;
         }
         if(audioSource != null) {
-            audioFileName = "${videoDetails!!.id.value!!} [${audioSource!!.bitrate}].${audioContainerToExtension(audioSource!!.container)}".sanitizeFileName();
+            audioFileName = "${videoDetails!!.id.value!!} [${audioSource!!.language}-${audioSource!!.bitrate}].${audioContainerToExtension(audioSource!!.container)}".sanitizeFileName();
             audioFilePath = File(downloadDir, audioFileName!!).absolutePath;
         }
         if(subtitleSource != null) {
@@ -217,7 +271,8 @@ class VideoDownload {
         if(videoSource != null) {
             sourcesToDownload.add(async {
                 Logger.i(TAG, "Started downloading video");
-                videoFileSize = downloadSource("Video", client, videoSource!!.getVideoUrl(), File(downloadDir, videoFileName!!)) { length, totalRead, speed ->
+
+                val progressCallback = { length: Long, totalRead: Long, speed: Long ->
                     synchronized(progressLock) {
                         lastVideoLength = length;
                         lastVideoRead = totalRead;
@@ -235,12 +290,18 @@ class VideoDownload {
                         }
                     }
                 }
+
+                videoFileSize = when (videoSource!!.container) {
+                    "application/vnd.apple.mpegurl" -> downloadHlsSource(context, "Video", client, videoSource!!.getVideoUrl(), File(downloadDir, videoFileName!!), progressCallback)
+                    else -> downloadFileSource("Video", client, videoSource!!.getVideoUrl(), File(downloadDir, videoFileName!!), progressCallback)
+                }
             });
         }
         if(audioSource != null) {
             sourcesToDownload.add(async {
                 Logger.i(TAG, "Started downloading audio");
-                audioFileSize = downloadSource("Audio", client, audioSource!!.getAudioUrl(), File(downloadDir, audioFileName!!)) { length, totalRead, speed ->
+
+                val progressCallback = { length: Long, totalRead: Long, speed: Long ->
                     synchronized(progressLock) {
                         lastAudioLength = length;
                         lastAudioRead = totalRead;
@@ -258,6 +319,11 @@ class VideoDownload {
                         }
                     }
                 }
+
+                audioFileSize = when (audioSource!!.container) {
+                    "application/vnd.apple.mpegurl" -> downloadHlsSource(context, "Audio", client, audioSource!!.getAudioUrl(), File(downloadDir, audioFileName!!), progressCallback)
+                    else -> downloadFileSource("Audio", client, audioSource!!.getAudioUrl(), File(downloadDir, audioFileName!!), progressCallback)
+                }
             });
         }
         if (subtitleSource != null) {
@@ -279,7 +345,105 @@ class VideoDownload {
             throw ex;
         }
     }
-    private fun downloadSource(name: String, client: ManagedHttpClient, videoUrl: String, targetFile: File, onProgress: (Long, Long, Long) -> Unit): Long {
+
+    private suspend fun downloadHlsSource(context: Context, name: String, client: ManagedHttpClient, hlsUrl: String, targetFile: File, onProgress: (Long, Long, Long) -> Unit): Long {
+        if(targetFile.exists())
+            targetFile.delete();
+
+        var downloadedTotalLength = 0L
+
+        val segmentFiles = arrayListOf<File>()
+        try {
+            val response = client.get(hlsUrl)
+            check(response.isOk) { "Failed to get variant playlist: ${response.code}" }
+
+            val vpContent = response.body?.string()
+                ?: throw Exception("Variant playlist content is empty")
+
+            val variantPlaylist = HLS.parseVariantPlaylist(vpContent, hlsUrl)
+            variantPlaylist.segments.forEachIndexed { index, segment ->
+                if (segment !is HLS.MediaSegment) {
+                    return@forEachIndexed
+                }
+
+                Logger.i(TAG, "Download '$name' segment $index Sequential");
+                val segmentFile = File(context.cacheDir, "segment-${UUID.randomUUID()}")
+                segmentFiles.add(segmentFile)
+
+                val segmentLength = downloadSource_Sequential(client, segmentFile.outputStream(), segment.uri) { segmentLength, totalRead, lastSpeed ->
+                    val averageSegmentLength = if (index == 0) segmentLength else downloadedTotalLength / index
+                    val expectedTotalLength = averageSegmentLength * (variantPlaylist.segments.size - 1) + segmentLength
+                    onProgress(expectedTotalLength, downloadedTotalLength + totalRead, lastSpeed)
+                }
+
+                downloadedTotalLength += segmentLength
+            }
+
+            Logger.i(TAG, "Combining segments into $targetFile");
+            combineSegments(context, segmentFiles, targetFile)
+
+            Logger.i(TAG, "${name} downloadSource Finished");
+        }
+        catch(ioex: IOException) {
+            if(targetFile.exists() ?: false)
+                targetFile.delete();
+            if(ioex.message?.contains("ENOSPC") ?: false)
+                throw Exception("Not enough space on device", ioex);
+            else
+                throw ioex;
+        }
+        catch(ex: Throwable) {
+            if(targetFile.exists() ?: false)
+                targetFile.delete();
+            throw ex;
+        }
+        finally {
+            for (segmentFile in segmentFiles) {
+                segmentFile.delete()
+            }
+        }
+        return downloadedTotalLength;
+    }
+
+    private suspend fun combineSegments(context: Context, segmentFiles: List<File>, targetFile: File) = withContext(Dispatchers.IO) {
+        suspendCancellableCoroutine { continuation ->
+            val fileList = File(context.cacheDir, "fileList-${UUID.randomUUID()}.txt")
+            fileList.writeText(segmentFiles.joinToString("\n") { "file '${it.absolutePath}'" })
+
+            val cmd = "-f concat -safe 0 -i \"${fileList.absolutePath}\" -c copy \"${targetFile.absolutePath}\""
+
+            val statisticsCallback = StatisticsCallback { statistics ->
+                //TODO: Show progress?
+            }
+
+            val executorService = Executors.newSingleThreadExecutor()
+            val session = FFmpegKit.executeAsync(cmd,
+                { session ->
+                    if (ReturnCode.isSuccess(session.returnCode)) {
+                        fileList.delete()
+                        continuation.resumeWith(Result.success(Unit))
+                    } else {
+                        val errorMessage = if (ReturnCode.isCancel(session.returnCode)) {
+                            "Command cancelled"
+                        } else {
+                            "Command failed with state '${session.state}' and return code ${session.returnCode}, stack trace ${session.failStackTrace}"
+                        }
+                        fileList.delete()
+                        continuation.resumeWithException(RuntimeException(errorMessage))
+                    }
+                },
+                { Logger.v(TAG, it.message) },
+                statisticsCallback,
+                executorService
+            )
+
+            continuation.invokeOnCancellation {
+                session.cancel()
+            }
+        }
+    }
+
+    private fun downloadFileSource(name: String, client: ManagedHttpClient, videoUrl: String, targetFile: File, onProgress: (Long, Long, Long) -> Unit): Long {
         if(targetFile.exists())
             targetFile.delete();
 
@@ -472,8 +636,10 @@ class VideoDownload {
             val expectedFile = File(videoFilePath!!);
             if(!expectedFile.exists())
                 throw IllegalStateException("Video file missing after download");
-            if(expectedFile.length() != videoFileSize)
-                throw IllegalStateException("Expected size [${videoFileSize}], but found ${expectedFile.length()}");
+            if (videoSource?.container != "application/vnd.apple.mpegurl") {
+                if (expectedFile.length() != videoFileSize)
+                    throw IllegalStateException("Expected size [${videoFileSize}], but found ${expectedFile.length()}");
+            }
         }
         if(audioSource != null) {
             if(audioFilePath == null)
@@ -481,8 +647,10 @@ class VideoDownload {
             val expectedFile = File(audioFilePath!!);
             if(!expectedFile.exists())
                 throw IllegalStateException("Audio file missing after download");
-            if(expectedFile.length() != audioFileSize)
-                throw IllegalStateException("Expected size [${audioFileSize}], but found ${expectedFile.length()}");
+            if (audioSource?.container != "application/vnd.apple.mpegurl") {
+                if (expectedFile.length() != audioFileSize)
+                    throw IllegalStateException("Expected size [${audioFileSize}], but found ${expectedFile.length()}");
+            }
         }
         if(subtitleSource != null) {
             if(subtitleFilePath == null)
@@ -560,7 +728,7 @@ class VideoDownload {
         const val GROUP_PLAYLIST = "Playlist";
 
         fun videoContainerToExtension(container: String): String? {
-            if (container.contains("video/mp4"))
+            if (container.contains("video/mp4") || container == "application/vnd.apple.mpegurl")
                 return "mp4";
             else if (container.contains("application/x-mpegURL"))
                 return "m3u8";
@@ -585,6 +753,8 @@ class VideoDownload {
                 return "mp3";
             else if (container.contains("audio/webm"))
                 return "webma";
+            else if (container == "application/vnd.apple.mpegurl")
+                return "mp4";
             else
                 return "audio";
         }

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

@@ -1,13 +1,18 @@
 package com.futo.platformplayer.downloads
 
+import android.content.Context
+import android.net.Uri
 import android.os.Environment
+import androidx.documentfile.provider.DocumentFile
 import com.arthenica.ffmpegkit.*
 import com.futo.platformplayer.api.media.models.streams.sources.*
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.toHumanBitrate
 import kotlinx.coroutines.*
 import java.io.*
+import java.util.UUID
 import java.util.concurrent.CancellationException
 import java.util.concurrent.Executors
 import kotlin.coroutines.resumeWithException
@@ -43,7 +48,7 @@ class VideoExport {
         this.subtitleSource = subtitleSource;
     }
 
-    suspend fun export(onProgress: ((Double) -> Unit)? = null): File = coroutineScope {
+    suspend fun export(context: Context, onProgress: ((Double) -> Unit)? = null): DocumentFile = coroutineScope {
         if(isCancelled) throw CancellationException("Export got cancelled");
 
         val v = videoSource;
@@ -55,34 +60,47 @@ class VideoExport {
         if (a != null) sourceCount++;
         if (s != null) sourceCount++;
 
-        var outputFile: File? = null;
-        val moviesRoot = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MOVIES);
-        val musicRoot = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC);
-        val moviesGrayjay = File(moviesRoot, "Grayjay");
-        val musicGrayjay = File(musicRoot, "Grayjay");
-        if(!moviesGrayjay.exists())
-            moviesGrayjay.mkdirs();
-        if(!musicGrayjay.exists())
-            musicGrayjay.mkdirs();
-
+        val outputFile: DocumentFile?;
+        val downloadRoot = StateApp.instance.getExternalDownloadDirectory(context) ?: throw Exception("External download directory is not set");
         if (sourceCount > 1) {
             val outputFileName = toSafeFileName(videoLocal.name) + ".mp4"// + VideoDownload.videoContainerToExtension(v.container);
-            val f = File(moviesGrayjay, outputFileName);
+            val f = downloadRoot.createFile("video/mp4", outputFileName)
+                ?: throw Exception("Failed to create file in external directory.");
 
             Logger.i(TAG, "Combining video and audio through FFMPEG.");
-            combine(a?.filePath, v?.filePath, s?.filePath, f.absolutePath, videoLocal.duration.toDouble()) { progress -> onProgress?.invoke(progress) };
+            val tempFile = File(context.cacheDir, "${UUID.randomUUID()}.mp4");
+            try {
+                combine(a?.filePath, v?.filePath, s?.filePath, tempFile.absolutePath, videoLocal.duration.toDouble()) { progress -> onProgress?.invoke(progress) };
+                context.contentResolver.openOutputStream(f.uri)?.use { outputStream ->
+                    copy(tempFile.absolutePath, outputStream) { progress -> onProgress?.invoke(progress) };
+                }
+            } finally {
+                tempFile.delete();
+            }
             outputFile = f;
         } else if (v != null) {
             val outputFileName = toSafeFileName(videoLocal.name) + "." + VideoDownload.videoContainerToExtension(v.container);
-            val f = File(moviesGrayjay, outputFileName);
+            val f = downloadRoot.createFile(v.container, outputFileName)
+                ?: throw Exception("Failed to create file in external directory.");
+
             Logger.i(TAG, "Copying video.");
-            copy(v.filePath, f.absolutePath) { progress -> onProgress?.invoke(progress) };
+
+            context.contentResolver.openOutputStream(f.uri)?.use { outputStream ->
+                copy(v.filePath, outputStream) { progress -> onProgress?.invoke(progress) };
+            }
+
             outputFile = f;
         } else if (a != null) {
             val outputFileName = toSafeFileName(videoLocal.name) + "." + VideoDownload.audioContainerToExtension(a.container);
-            val f = File(musicGrayjay, outputFileName);
+            val f = downloadRoot.createFile(a.container, outputFileName)
+                ?: throw Exception("Failed to create file in external directory.");
+
             Logger.i(TAG, "Copying audio.");
-            copy(a.filePath, f.absolutePath) { progress -> onProgress?.invoke(progress) };
+
+            context.contentResolver.openOutputStream(f.uri)?.use { outputStream ->
+                copy(a.filePath, outputStream) { progress -> onProgress?.invoke(progress) };
+            }
+
             outputFile = f;
         } else {
             throw Exception("Cannot export when no audio or video source is set.");
@@ -179,10 +197,9 @@ class VideoExport {
         }
     }
 
-    private suspend fun copy(fromPath: String, toPath: String, bufferSize: Int = 8192, onProgress: ((Double) -> Unit)? = null) {
+    private suspend fun copy(fromPath: String, outputStream: OutputStream, bufferSize: Int = 8192, onProgress: ((Double) -> Unit)? = null) {
         withContext(Dispatchers.IO) {
             var inputStream: FileInputStream? = null
-            var outputStream: FileOutputStream? = null
 
             try {
                 val srcFile = File(fromPath)
@@ -190,17 +207,7 @@ class VideoExport {
                     throw IOException("Source file not found.")
                 }
 
-                val dstFile = File(toPath)
-                val parentDir = dstFile.parentFile ?: throw IOException("Non existent parent dir.")
-
-                if (!parentDir.exists()) {
-                    if (!parentDir.mkdirs()) {
-                        throw IOException("Failed to create destination directory.")
-                    }
-                }
-
                 inputStream = FileInputStream(srcFile)
-                outputStream = FileOutputStream(dstFile)
 
                 val buffer = ByteArray(bufferSize)
                 val totalBytes = srcFile.length()
@@ -221,7 +228,6 @@ class VideoExport {
                 throw IOException("Error occurred while copying file: ${e.message}", e)
             } finally {
                 inputStream?.close()
-                outputStream?.close()
             }
         }
     }

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

@@ -301,6 +301,7 @@ class V8Plugin {
                 "CriticalException" -> throw ScriptCriticalException(config, msg, innerEx, stack, code);
                 "AgeException" -> throw ScriptAgeException(config, msg, innerEx, stack, code);
                 "UnavailableException" -> throw ScriptUnavailableException(config, msg, innerEx, stack, code);
+                "ScriptLoginRequiredException" -> throw ScriptLoginRequiredException(config, msg, innerEx, stack, code);
                 "ScriptExecutionException" -> throw ScriptExecutionException(config, msg, innerEx, stack, code);
                 "ScriptCompilationException" -> throw ScriptCompilationException(config, msg, innerEx, code);
                 "ScriptImplementationException" -> throw ScriptImplementationException(config, msg, innerEx, null, code);

app/src/main/java/com/futo/platformplayer/engine/exceptions/ScriptLoginRequiredException.kt

@@ -0,0 +1,14 @@
+package com.futo.platformplayer.engine.exceptions
+
+import com.caoccao.javet.values.reference.V8ValueObject
+import com.futo.platformplayer.engine.IV8PluginConfig
+import com.futo.platformplayer.getOrThrow
+
+class ScriptLoginRequiredException(config: IV8PluginConfig, error: String, ex: Exception? = null, stack: String? = null, code: String? = null) : ScriptException(config, error, ex, stack, code) {
+
+    companion object {
+        fun fromV8(config: IV8PluginConfig, obj: V8ValueObject) : ScriptException {
+            return ScriptLoginRequiredException(config, obj.getOrThrow(config, "message", "ScriptLoginRequiredException"));
+        }
+    }
+}

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

@@ -18,6 +18,7 @@ import com.futo.platformplayer.engine.internal.V8BindObject
 import com.futo.platformplayer.getOrThrow
 import kotlinx.coroutines.CoroutineScope
 import java.net.SocketTimeoutException
+import kotlin.streams.asSequence
 import kotlin.streams.toList
 
 class PackageHttp: V8Package {
@@ -171,7 +172,9 @@ class PackageHttp: V8Package {
                     return@map it.first.requestWithBody(it.second.method, it.second.url, it.second.body!!, it.second.headers);
                 else
                     return@map it.first.request(it.second.method, it.second.url, it.second.headers);
-            }.toList();
+            }
+                .asSequence()
+                .toList();
         }
     }
 

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

@@ -4,7 +4,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.FrameLayout
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -12,8 +11,8 @@ import androidx.recyclerview.widget.RecyclerView
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StatePlatform
 import com.futo.platformplayer.R
+import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
-import com.futo.platformplayer.UISlideOverlays
 import com.futo.platformplayer.api.media.models.PlatformAuthorLink
 import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
 import com.futo.platformplayer.api.media.models.contents.ContentType
@@ -25,7 +24,6 @@ import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.api.media.structures.IRefreshPager
 import com.futo.platformplayer.api.media.structures.IReplacerPager
 import com.futo.platformplayer.api.media.structures.MultiPager
-import com.futo.platformplayer.cache.ChannelContentCache
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.constructs.Event2
 import com.futo.platformplayer.constructs.TaskHandler
@@ -33,10 +31,11 @@ import com.futo.platformplayer.engine.exceptions.PluginException
 import com.futo.platformplayer.engine.exceptions.ScriptCaptchaRequiredException
 import com.futo.platformplayer.fragment.mainactivity.main.FeedView
 import com.futo.platformplayer.fragment.mainactivity.main.PolycentricProfile
+import com.futo.platformplayer.states.StateCache
 import com.futo.platformplayer.states.StatePolycentric
 import com.futo.platformplayer.states.StateSubscriptions
 import com.futo.platformplayer.views.FeedStyle
-import com.futo.platformplayer.views.adapters.PreviewContentListAdapter
+import com.futo.platformplayer.views.adapters.feedtypes.PreviewContentListAdapter
 import com.futo.platformplayer.views.adapters.ContentPreviewViewHolder
 import com.futo.platformplayer.views.adapters.InsertedViewAdapterWithLoader
 import kotlinx.coroutines.Dispatchers
@@ -56,9 +55,11 @@ class ChannelContentsFragment : Fragment(), IChannelTabFragment {
 
     val onContentClicked = Event2<IPlatformContent, Long>();
     val onContentUrlClicked = Event2<String, ContentType>();
+    val onUrlClicked = Event1<String>();
     val onChannelClicked = Event1<PlatformAuthorLink>();
     val onAddToClicked = Event1<IPlatformContent>();
     val onAddToQueueClicked = Event1<IPlatformContent>();
+    val onLongPress = Event1<IPlatformContent>();
 
     private fun getContentPager(channel: IPlatformChannel): IPager<IPlatformContent> {
         Logger.i(TAG, "getContentPager");
@@ -75,15 +76,14 @@ class ChannelContentsFragment : Fragment(), IChannelTabFragment {
     }
 
     private val _taskLoadVideos = TaskHandler<IPlatformChannel, IPager<IPlatformContent>>({lifecycleScope}, {
-            return@TaskHandler getContentPager(it);
+            val livePager = getContentPager(it);
+            return@TaskHandler if(_channel?.let { StateSubscriptions.instance.isSubscribed(it) } == true)
+                StateCache.cachePagerResults(lifecycleScope, livePager);
+            else livePager;
         }).success { livePager ->
             setLoading(false);
 
-            val pager = if(_channel?.let { StateSubscriptions.instance.isSubscribed(it) } == true)
-                ChannelContentCache.cachePagerResults(lifecycleScope, livePager);
-            else livePager;
-
-            setPager(pager);
+            setPager(livePager);
         }
         .exception<ScriptCaptchaRequiredException> {  }
         .exception<Throwable> {
@@ -101,12 +101,8 @@ class ChannelContentsFragment : Fragment(), IChannelTabFragment {
         return@TaskHandler it.getResults();
     }).success {
         setLoading(false);
-        if (it.isEmpty()) {
-            return@success;
-        }
-
         val posBefore = _results.size;
-        val toAdd = it.filter { it is IPlatformVideo }.map { it as IPlatformVideo };
+        val toAdd = it.filter { it is IPlatformVideo }.map { it as IPlatformVideo }
         _results.addAll(toAdd);
         _adapterResults?.let { adapterVideo -> adapterVideo.notifyItemRangeInserted(adapterVideo.childToParentPosition(posBefore), toAdd.size); };
     }.exception<Throwable> {
@@ -153,12 +149,14 @@ class ChannelContentsFragment : Fragment(), IChannelTabFragment {
 
         _recyclerResults = view.findViewById(R.id.recycler_videos);
 
-        _adapterResults = PreviewContentListAdapter(view.context, FeedStyle.THUMBNAIL, _results).apply {
+        _adapterResults = PreviewContentListAdapter(view.context, FeedStyle.THUMBNAIL, _results, null, Settings.instance.channel.progressBar).apply {
             this.onContentUrlClicked.subscribe(this@ChannelContentsFragment.onContentUrlClicked::emit);
+            this.onUrlClicked.subscribe(this@ChannelContentsFragment.onUrlClicked::emit);
             this.onContentClicked.subscribe(this@ChannelContentsFragment.onContentClicked::emit);
             this.onChannelClicked.subscribe(this@ChannelContentsFragment.onChannelClicked::emit);
             this.onAddToClicked.subscribe(this@ChannelContentsFragment.onAddToClicked::emit);
             this.onAddToQueueClicked.subscribe(this@ChannelContentsFragment.onAddToQueueClicked::emit);
+            this.onLongPress.subscribe(this@ChannelContentsFragment.onLongPress::emit);
         }
 
         _llmVideo = LinearLayoutManager(view.context);

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

@@ -1,22 +1,20 @@
 package com.futo.platformplayer.fragment.channel.tab
 
-import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.TextView
 import androidx.fragment.app.Fragment
 import com.futo.platformplayer.R
 import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
 import com.futo.platformplayer.fragment.mainactivity.main.PolycentricProfile
-import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.views.SupportView
-import com.futo.platformplayer.views.buttons.BigButton
 
 
 class ChannelMonetizationFragment : Fragment, IChannelTabFragment {
     private var _supportView: SupportView? = null
+    private var _textMonetization: TextView? = null
 
     private var _lastChannel: IPlatformChannel? = null;
     private var _lastPolycentricProfile: PolycentricProfile? = null;
@@ -26,21 +24,22 @@ class ChannelMonetizationFragment : Fragment, IChannelTabFragment {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         val view = inflater.inflate(R.layout.fragment_channel_monetization, container, false);
         _supportView = view.findViewById(R.id.support);
+        _textMonetization = view.findViewById(R.id.text_monetization);
 
         _lastChannel?.also {
             setChannel(it);
         };
 
-        _lastPolycentricProfile?.also {
-            setPolycentricProfile(it, animate = false);
-        }
-
+        _supportView?.visibility = View.GONE;
+        _textMonetization?.visibility = View.GONE;
+        setPolycentricProfile(_lastPolycentricProfile, animate = false);
         return view;
     }
 
     override fun onDestroyView() {
         super.onDestroyView();
         _supportView = null;
+        _textMonetization = null;
     }
 
     override fun setChannel(channel: IPlatformChannel) {
@@ -49,7 +48,15 @@ class ChannelMonetizationFragment : Fragment, IChannelTabFragment {
 
     fun setPolycentricProfile(polycentricProfile: PolycentricProfile?, animate: Boolean) {
         _lastPolycentricProfile = polycentricProfile
-        _supportView?.setPolycentricProfile(polycentricProfile, animate)
+        if (polycentricProfile != null) {
+            _supportView?.setPolycentricProfile(polycentricProfile, animate)
+            _supportView?.visibility = View.VISIBLE
+            _textMonetization?.visibility = View.GONE
+        } else {
+            _supportView?.setPolycentricProfile(null, animate)
+            _supportView?.visibility = View.GONE
+            _textMonetization?.visibility = View.VISIBLE
+        }
     }
 
     companion object {

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

@@ -78,7 +78,7 @@ class MenuBottomBarFragment : MainActivityFragment() {
         private var _moreButtons = arrayListOf<MenuButton>();
 
         private var _buttonsVisible = 0;
-        private var _subscriptionsVisible = false;
+        private var _subscriptionsVisible = true;
 
         var currentButtonDefinitions: List<ButtonDefinition>? = null;
 
@@ -261,11 +261,12 @@ class MenuBottomBarFragment : MainActivityFragment() {
         }
 
         private fun registerUpdateButtonEvents() {
+            /*
             _subscriptionsVisible = StateSubscriptions.instance.getSubscriptionCount() > 0;
             StateSubscriptions.instance.onSubscriptionsChanged.subscribe(this) { subs, _ ->
                 _subscriptionsVisible = subs.isNotEmpty();
                 updateButtonDefinitions()
-            }
+            }*/
 
             StatePayment.instance.hasPaidChanged.subscribe(this) {
                 _fragment.lifecycleScope.launch(Dispatchers.Main) {
@@ -351,6 +352,7 @@ class MenuBottomBarFragment : MainActivityFragment() {
             ButtonDefinition(4, R.drawable.ic_playlist, R.drawable.ic_playlist_filled, R.string.playlists, canToggle = false, { it.currentMain is PlaylistsFragment }, { it.navigate<PlaylistsFragment>() }),
             ButtonDefinition(5, R.drawable.ic_history, R.drawable.ic_history, R.string.history, canToggle = false, { it.currentMain is HistoryFragment }, { it.navigate<HistoryFragment>() }),
             ButtonDefinition(6, R.drawable.ic_download, R.drawable.ic_download, R.string.downloads, canToggle = false, { it.currentMain is DownloadsFragment }, { it.navigate<DownloadsFragment>() }),
+            ButtonDefinition(8, R.drawable.ic_chat, R.drawable.ic_chat_filled, R.string.comments, canToggle = true, { it.currentMain is CommentsFragment }, { it.navigate<CommentsFragment>() }),
             ButtonDefinition(7, R.drawable.ic_settings, R.drawable.ic_settings, R.string.settings, canToggle = false, { false }, {
                 val c = it.context ?: return@ButtonDefinition;
                 Logger.i(TAG, "settings preventPictureInPicture()");

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

@@ -35,6 +35,11 @@ class BuyFragment : MainFragment() {
         return view;
     }
 
+    override fun onDestroyMainView() {
+        super.onDestroyMainView()
+        _view = null
+    }
+
     class BuyView: LinearLayout {
         private val _fragment: BuyFragment;
 
@@ -91,7 +96,7 @@ class BuyFragment : MainFragment() {
                         val price = prices[currency.id]!!;
                         val priceDecimal = (price.toDouble() / 100);
                         withContext(Dispatchers.Main) {
-                            _buttonBuyText.text = currency.symbol + String.format("%.2f", priceDecimal);
+                            _buttonBuyText.text = currency.symbol + String.format("%.2f", priceDecimal) + context.getString(R.string.plus_tax);
                         }
                     }
                 }

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

@@ -54,6 +54,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.Serializable
+import okhttp3.internal.platform.Platform
 
 @Serializable
 data class PolycentricProfile(val system: PublicKey, val systemState: SystemState, val ownedClaims: List<OwnedClaim>);
@@ -206,10 +207,11 @@ class ChannelFragment : MainFragment() {
             adapter.onAddToQueueClicked.subscribe { content ->
                 if(content is IPlatformVideo) {
                     StatePlayer.instance.addToQueue(content);
-                    val name = if (content.name.length > 20) (content.name.subSequence(0, 20).toString() + "...") else content.name;
-                    UIDialogs.toast(context, "Queued [$name]", false);
                 }
             }
+            adapter.onUrlClicked.subscribe { url ->
+                fragment.navigate<BrowserFragment>(url);
+            }
             adapter.onContentUrlClicked.subscribe { url, contentType ->
                 when(contentType) {
                     ContentType.MEDIA -> {
@@ -220,6 +222,12 @@ class ChannelFragment : MainFragment() {
                     else -> {};
                 }
             }
+            adapter.onLongPress.subscribe { content ->
+                _overlayContainer.let {
+                    if(content is IPlatformVideo)
+                        _slideUpOverlay = UISlideOverlays.showVideoOptionsOverlay(content, it);
+                }
+            }
             viewPager.adapter = adapter;
 
             val tabLayoutMediator = TabLayoutMediator(tabs, viewPager) { tab, position ->
@@ -289,7 +297,7 @@ class ChannelFragment : MainFragment() {
                         Glide.with(_imageBanner)
                             .clear(_imageBanner);
 
-                        _taskLoadPolycentricProfile.run(parameter.id);
+                        loadPolycentricProfile(parameter.id, parameter.url)
                     };
 
                     _url = parameter.url;
@@ -302,7 +310,7 @@ class ChannelFragment : MainFragment() {
                         Glide.with(_imageBanner)
                             .clear(_imageBanner);
 
-                        _taskLoadPolycentricProfile.run(parameter.channel.id);
+                        loadPolycentricProfile(parameter.channel.id, parameter.channel.url)
                     };
 
                     _url = parameter.channel.url;
@@ -318,6 +326,18 @@ class ChannelFragment : MainFragment() {
             _tabs.selectTab(_tabs.getTabAt(selectedTabIndex));
         }
 
+        private fun loadPolycentricProfile(id: PlatformID, url: String) {
+            val cachedPolycentricProfile = PolycentricCache.instance.getCachedProfile(url, true);
+            if (cachedPolycentricProfile != null) {
+                setPolycentricProfile(cachedPolycentricProfile, animate = true)
+                if (cachedPolycentricProfile.expired) {
+                    _taskLoadPolycentricProfile.run(id);
+                }
+            } else {
+                _taskLoadPolycentricProfile.run(id);
+            }
+        }
+
         private fun setLoading(isLoading: Boolean) {
             if (_isLoading == isLoading) {
                 return;
@@ -428,18 +448,17 @@ class ChannelFragment : MainFragment() {
         }
 
         private fun setPolycentricProfileOr(url: String, or: () -> Unit) {
+            setPolycentricProfile(null, animate = false);
+
             val cachedProfile = channel?.let { PolycentricCache.instance.getCachedProfile(it.url) };
             if (cachedProfile != null) {
                 setPolycentricProfile(cachedProfile, animate = false);
             } else {
-                setPolycentricProfile(null, animate = false);
                 or();
             }
         }
 
         private fun setPolycentricProfile(cachedPolycentricProfile: PolycentricCache.CachedPolycentricProfile?, animate: Boolean) {
-            Log.i(TAG, "setPolycentricProfile(cachedPolycentricProfile = $cachedPolycentricProfile, animate = $animate)")
-
             val dp_35 = 35.dp(resources)
             val profile = cachedPolycentricProfile?.profile;
             val avatar = profile?.systemState?.avatar?.selectBestImage(dp_35 * dp_35)

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

@@ -0,0 +1,322 @@
+package com.futo.platformplayer.fragment.mainactivity.main
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.ViewPropertyAnimator
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.FrameLayout
+import android.widget.LinearLayout
+import android.widget.Spinner
+import android.widget.TextView
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.futo.platformplayer.R
+import com.futo.platformplayer.UIDialogs
+import com.futo.platformplayer.activities.PolycentricHomeActivity
+import com.futo.platformplayer.api.media.models.comments.IPlatformComment
+import com.futo.platformplayer.api.media.models.comments.PolycentricPlatformComment
+import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
+import com.futo.platformplayer.constructs.TaskHandler
+import com.futo.platformplayer.fullyBackfillServersAnnounceExceptions
+import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.states.StateApp
+import com.futo.platformplayer.states.StatePlatform
+import com.futo.platformplayer.states.StatePolycentric
+import com.futo.platformplayer.views.adapters.CommentWithReferenceViewHolder
+import com.futo.platformplayer.views.adapters.InsertedViewAdapterWithLoader
+import com.futo.platformplayer.views.overlays.RepliesOverlay
+import com.futo.polycentric.core.PublicKey
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import java.net.UnknownHostException
+import java.util.IdentityHashMap
+
+class CommentsFragment : MainFragment() {
+    override val isMainView : Boolean = true
+    override val isTab: Boolean = true
+    override val hasBottomBar: Boolean get() = true
+
+    private var _view: CommentsView? = null
+
+    override fun onShownWithView(parameter: Any?, isBack: Boolean) {
+        super.onShownWithView(parameter, isBack)
+        _view?.onShown()
+    }
+
+    override fun onCreateMainView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        val view = CommentsView(this, inflater)
+        _view = view
+        return view
+    }
+
+    override fun onDestroyMainView() {
+        super.onDestroyMainView()
+        _view = null
+    }
+
+    override fun onBackPressed(): Boolean {
+        return _view?.onBackPressed() ?: false
+    }
+
+    override fun onResume() {
+        super.onResume()
+        _view?.onShown()
+    }
+
+    companion object {
+        fun newInstance() = CommentsFragment().apply {}
+        private const val TAG = "CommentsFragment"
+    }
+
+    class CommentsView : FrameLayout {
+        private val _fragment: CommentsFragment
+        private val _recyclerComments: RecyclerView;
+        private val _adapterComments: InsertedViewAdapterWithLoader<CommentWithReferenceViewHolder>;
+        private val _textCommentCount: TextView
+        private val _comments: ArrayList<IPlatformComment> = arrayListOf();
+        private val _llmReplies: LinearLayoutManager;
+        private val _spinnerSortBy: Spinner;
+        private val _layoutNotLoggedIn: LinearLayout;
+        private val _layoutPolycentricNotEnabled: LinearLayout;
+        private val _buttonLogin: LinearLayout;
+        private var _loading = false;
+        private val _repliesOverlay: RepliesOverlay;
+        private var _repliesAnimator: ViewPropertyAnimator? = null;
+        private val _cache: IdentityHashMap<IPlatformComment, StatePolycentric.LikesDislikesReplies> = IdentityHashMap()
+
+        private val _taskLoadComments = if(!isInEditMode) TaskHandler<PublicKey, List<IPlatformComment>>(
+            StateApp.instance.scopeGetter, { StatePolycentric.instance.getSystemComments(context, it) })
+            .success { pager -> onCommentsLoaded(pager); }
+            .exception<UnknownHostException> {
+                UIDialogs.toast("Failed to load comments");
+                setLoading(false);
+            }
+            .exception<Throwable> {
+                Logger.e(TAG, "Failed to load comments.", it);
+                UIDialogs.toast(context, context.getString(R.string.failed_to_load_comments) + "\n" + (it.message ?: ""));
+                setLoading(false);
+            } else TaskHandler(IPlatformVideoDetails::class.java, StateApp.instance.scopeGetter);
+
+        constructor(fragment: CommentsFragment, inflater: LayoutInflater) : super(inflater.context) {
+            _fragment = fragment
+            inflater.inflate(R.layout.fragment_comments, this)
+
+            val commentHeader = findViewById<LinearLayout>(R.id.layout_header)
+            (commentHeader.parent as ViewGroup).removeView(commentHeader)
+            _textCommentCount = commentHeader.findViewById(R.id.text_comment_count)
+
+            _recyclerComments = findViewById(R.id.recycler_comments)
+            _adapterComments = InsertedViewAdapterWithLoader(context, arrayListOf(commentHeader), arrayListOf(),
+                childCountGetter = { _comments.size },
+                childViewHolderBinder = { viewHolder, position -> viewHolder.bind(_comments[position]); },
+                childViewHolderFactory = { viewGroup, _ ->
+                    val holder = CommentWithReferenceViewHolder(viewGroup, _cache);
+                    holder.onDelete.subscribe(::onDelete);
+                    holder.onRepliesClick.subscribe(::onRepliesClick);
+                    return@InsertedViewAdapterWithLoader holder;
+                }
+            );
+
+            _spinnerSortBy = commentHeader.findViewById(R.id.spinner_sortby);
+            _spinnerSortBy.adapter = ArrayAdapter(context, R.layout.spinner_item_simple, resources.getStringArray(R.array.comments_sortby_array)).also {
+                it.setDropDownViewResource(R.layout.spinner_dropdownitem_simple);
+            };
+            _spinnerSortBy.setSelection(0);
+            _spinnerSortBy.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+                override fun onItemSelected(parent: AdapterView<*>, view: View?, pos: Int, id: Long) {
+                    if (_spinnerSortBy.selectedItemPosition == 0) {
+                        _comments.sortByDescending { it.date!! }
+                    } else if (_spinnerSortBy.selectedItemPosition == 1) {
+                        _comments.sortBy { it.date!! }
+                    }
+
+                    _adapterComments.notifyDataSetChanged()
+                }
+                override fun onNothingSelected(parent: AdapterView<*>?) = Unit
+            }
+
+            _llmReplies = LinearLayoutManager(context);
+            _recyclerComments.layoutManager = _llmReplies;
+            _recyclerComments.adapter = _adapterComments;
+            updateCommentCountString();
+
+            _layoutNotLoggedIn = findViewById(R.id.layout_not_logged_in)
+            _layoutNotLoggedIn.visibility = View.GONE
+
+            _layoutPolycentricNotEnabled = findViewById(R.id.layout_polycentric_disabled)
+            _layoutPolycentricNotEnabled.visibility = if (!StatePolycentric.instance.enabled) View.VISIBLE else View.GONE
+
+            _buttonLogin = findViewById(R.id.button_login)
+            _buttonLogin.setOnClickListener {
+                context.startActivity(Intent(context, PolycentricHomeActivity::class.java));
+            }
+
+            _repliesOverlay = findViewById(R.id.replies_overlay);
+            _repliesOverlay.onClose.subscribe { setRepliesOverlayVisible(isVisible = false, animate = true); };
+        }
+
+        private fun onDelete(comment: IPlatformComment) {
+            UIDialogs.showConfirmationDialog(context, "Are you sure you want to delete this comment?", {
+                val processHandle = StatePolycentric.instance.processHandle ?: return@showConfirmationDialog
+                if (comment !is PolycentricPlatformComment) {
+                    return@showConfirmationDialog
+                }
+
+                val index = _comments.indexOf(comment)
+                if (index != -1) {
+                    _comments.removeAt(index)
+                    _adapterComments.notifyItemRemoved(_adapterComments.childToParentPosition(index))
+
+                    StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
+                        try {
+                            processHandle.delete(comment.eventPointer.process, comment.eventPointer.logicalClock)
+                        } catch (e: Throwable) {
+                            Logger.e(TAG, "Failed to delete event.", e);
+                            return@launch
+                        }
+
+                        try {
+                            Logger.i(TAG, "Started backfill");
+                            processHandle.fullyBackfillServersAnnounceExceptions();
+                            Logger.i(TAG, "Finished backfill");
+                        } catch (e: Throwable) {
+                            Logger.e(TAG, "Failed to fully backfill servers.", e);
+                        }
+                    }
+                }
+            })
+        }
+
+        fun onBackPressed(): Boolean {
+            if (_repliesOverlay.visibility == View.VISIBLE) {
+                setRepliesOverlayVisible(isVisible = false, animate = true);
+                return true
+            }
+
+            return false
+        }
+
+        private fun onRepliesClick(c: IPlatformComment) {
+            val replyCount = c.replyCount ?: 0;
+            var metadata = "";
+            if (replyCount > 0) {
+                metadata += "$replyCount " + context.getString(R.string.replies);
+            }
+
+            if (c is PolycentricPlatformComment) {
+                _repliesOverlay.load(false, metadata, c.contextUrl, c.reference, c,
+                    { StatePolycentric.instance.getCommentPager(c.contextUrl, c.reference) },
+                    { newComment ->
+                        synchronized(_cache) {
+                            _cache.remove(c)
+                        }
+
+                        val newCommentIndex = if (_spinnerSortBy.selectedItemPosition == 0) {
+                            _comments.indexOfFirst { it.date!! < newComment.date!! }.takeIf { it != -1 } ?: _comments.size
+                        } else {
+                            _comments.indexOfFirst { it.date!! > newComment.date!! }.takeIf { it != -1 } ?: _comments.size
+                        }
+
+                        _comments.add(newCommentIndex, newComment)
+                        _adapterComments.notifyItemInserted(_adapterComments.childToParentPosition(newCommentIndex))
+                    });
+            } else {
+                _repliesOverlay.load(true, metadata, null, null, c, { StatePlatform.instance.getSubComments(c) });
+            }
+
+            setRepliesOverlayVisible(isVisible = true, animate = true);
+        }
+
+        private fun setRepliesOverlayVisible(isVisible: Boolean, animate: Boolean) {
+            val desiredVisibility = if (isVisible) View.VISIBLE else View.GONE
+            if (_repliesOverlay.visibility == desiredVisibility) {
+                return;
+            }
+
+            _repliesAnimator?.cancel();
+
+            if (isVisible) {
+                _repliesOverlay.visibility = View.VISIBLE;
+
+                if (animate) {
+                    _repliesOverlay.translationY = _repliesOverlay.height.toFloat();
+
+                    _repliesAnimator = _repliesOverlay.animate()
+                        .setDuration(300)
+                        .translationY(0f)
+                        .withEndAction {
+                            _repliesAnimator = null;
+                        }.apply { start() };
+                }
+            } else {
+                if (animate) {
+                    _repliesOverlay.translationY = 0f;
+
+                    _repliesAnimator = _repliesOverlay.animate()
+                        .setDuration(300)
+                        .translationY(_repliesOverlay.height.toFloat())
+                        .withEndAction {
+                            _repliesOverlay.visibility = GONE;
+                            _repliesAnimator = null;
+                        }.apply { start(); }
+                } else {
+                    _repliesOverlay.visibility = View.GONE;
+                    _repliesOverlay.translationY = _repliesOverlay.height.toFloat();
+                }
+            }
+        }
+
+        private fun updateCommentCountString() {
+            _textCommentCount.text = context.getString(R.string.these_are_all_commentcount_comments_you_have_made_in_grayjay).replace("{commentCount}", _comments.size.toString())
+        }
+
+        private fun setLoading(loading: Boolean) {
+            if (_loading == loading) {
+                return;
+            }
+
+            _loading = loading;
+            _adapterComments.setLoading(loading);
+        }
+
+        private fun fetchComments() {
+            val system = StatePolycentric.instance.processHandle?.system ?: return
+            _comments.clear()
+            _adapterComments.notifyDataSetChanged()
+            setLoading(true)
+            _taskLoadComments.run(system)
+        }
+
+        private fun onCommentsLoaded(comments: List<IPlatformComment>) {
+            setLoading(false)
+            _comments.addAll(comments)
+
+            if (_spinnerSortBy.selectedItemPosition == 0) {
+                _comments.sortByDescending { it.date!! }
+            } else if (_spinnerSortBy.selectedItemPosition == 1) {
+                _comments.sortBy { it.date!! }
+            }
+
+            _adapterComments.notifyDataSetChanged()
+            updateCommentCountString()
+        }
+
+        fun onShown() {
+            _layoutPolycentricNotEnabled.visibility = if (!StatePolycentric.instance.enabled) View.VISIBLE else View.GONE
+
+            val processHandle = StatePolycentric.instance.processHandle
+            if (processHandle != null) {
+                _layoutNotLoggedIn.visibility = View.GONE
+                _recyclerComments.visibility = View.VISIBLE
+                fetchComments()
+            } else {
+                _layoutNotLoggedIn.visibility = View.VISIBLE
+                _recyclerComments.visibility=  View.GONE
+            }
+        }
+    }
+}

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

@@ -1,6 +1,5 @@
 package com.futo.platformplayer.fragment.mainactivity.main
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.util.Log
 import android.view.LayoutInflater
@@ -17,16 +16,16 @@ import com.futo.platformplayer.api.media.structures.*
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateMeta
 import com.futo.platformplayer.states.StatePlayer
-import com.futo.platformplayer.states.StatePlaylists
 import com.futo.platformplayer.video.PlayerManager
 import com.futo.platformplayer.views.FeedStyle
-import com.futo.platformplayer.views.adapters.PreviewContentListAdapter
+import com.futo.platformplayer.views.adapters.feedtypes.PreviewContentListAdapter
 import com.futo.platformplayer.views.adapters.ContentPreviewViewHolder
 import com.futo.platformplayer.views.adapters.InsertedViewAdapterWithLoader
 import com.futo.platformplayer.views.adapters.InsertedViewHolder
-import com.futo.platformplayer.views.adapters.PreviewNestedVideoViewHolder
-import com.futo.platformplayer.views.adapters.PreviewVideoViewHolder
+import com.futo.platformplayer.views.adapters.feedtypes.PreviewNestedVideoViewHolder
+import com.futo.platformplayer.views.adapters.feedtypes.PreviewVideoViewHolder
 import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuItem
+import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuOverlay
 import kotlin.math.floor
 
 abstract class ContentFeedView<TFragment> : FeedView<TFragment, IPlatformContent, IPlatformContent, IPager<IPlatformContent>, ContentPreviewViewHolder> where TFragment : MainFragment {
@@ -37,6 +36,8 @@ abstract class ContentFeedView<TFragment> : FeedView<TFragment, IPlatformContent
     private var _previewsEnabled: Boolean = true;
     override val visibleThreshold: Int get() = if (feedStyle == FeedStyle.PREVIEW) { 5 } else { 10 };
     protected lateinit var headerView: LinearLayout;
+    private var _videoOptionsOverlay: SlideUpMenuOverlay? = null;
+    protected open val shouldShowTimeBar: Boolean get() = true
 
     constructor(fragment: TFragment, inflater: LayoutInflater, cachedRecyclerData: RecyclerData<InsertedViewAdapterWithLoader<ContentPreviewViewHolder>, LinearLayoutManager, IPager<IPlatformContent>, IPlatformContent, IPlatformContent, InsertedViewHolder<ContentPreviewViewHolder>>? = null) : super(fragment, inflater, cachedRecyclerData) {
 
@@ -57,57 +58,84 @@ abstract class ContentFeedView<TFragment> : FeedView<TFragment, IPlatformContent
         };
         headerView = v;
 
-        return PreviewContentListAdapter(context, feedStyle, dataset, player, _previewsEnabled, arrayListOf(v)).apply {
+        return PreviewContentListAdapter(context, feedStyle, dataset, player, _previewsEnabled, arrayListOf(v), arrayListOf(), shouldShowTimeBar).apply {
             attachAdapterEvents(this);
         }
     }
 
     private fun attachAdapterEvents(adapter: PreviewContentListAdapter) {
         adapter.onContentUrlClicked.subscribe(this, this@ContentFeedView::onContentUrlClicked);
+        adapter.onUrlClicked.subscribe(this, this@ContentFeedView::onUrlClicked);
         adapter.onContentClicked.subscribe(this) { content, time ->
             this@ContentFeedView.onContentClicked(content, time);
         };
         adapter.onChannelClicked.subscribe(this) { fragment.navigate<ChannelFragment>(it) };
         adapter.onAddToClicked.subscribe(this) { content ->
             //TODO: Reconstruct search video from detail if search is null
-            _overlayContainer.let {
-                if(content is IPlatformVideo)
-                    UISlideOverlays.showVideoOptionsOverlay(content, it, SlideUpMenuItem(context, R.drawable.ic_visibility_off, context.getString(R.string.hide), context.getString(R.string.hide_from_home), "hide",
-                        { StateMeta.instance.addHiddenVideo(content.url);
-                            if (fragment is HomeFragment) {
-                                val removeIndex = recyclerData.results.indexOf(content);
-                                if (removeIndex >= 0) {
-                                    recyclerData.results.removeAt(removeIndex);
-                                    recyclerData.adapter.notifyItemRemoved(recyclerData.adapter.childToParentPosition(removeIndex));
-                                }
-                            }
-                        }),
-                        SlideUpMenuItem(context, R.drawable.ic_playlist, context.getString(R.string.play_feed_as_queue), context.getString(R.string.play_entire_feed), "playFeed",
-                        {
-                            val newQueue = listOf(content) + recyclerData.results
-                                .filterIsInstance<IPlatformVideo>()
-                                .filter { it != content };
-                            StatePlayer.instance.setQueue(newQueue, StatePlayer.TYPE_QUEUE, "Feed Queue", true, false);
-                        })
-                    );
+            if(content is IPlatformVideo) {
+                showVideoOptionsOverlay(content)
             }
         };
         adapter.onAddToQueueClicked.subscribe(this) {
             if(it is IPlatformVideo) {
                 StatePlayer.instance.addToQueue(it);
-                val name = if (it.name.length > 20) (it.name.subSequence(0, 20).toString() + "...") else it.name;
-                UIDialogs.toast(context, context.getString(R.string.queued) + " [$name]", false);
             }
         };
+        adapter.onLongPress.subscribe(this) {
+            if (it is IPlatformVideo) {
+                showVideoOptionsOverlay(it)
+            }
+        };
+    }
+
+    fun onBackPressed(): Boolean {
+        val videoOptionsOverlay = _videoOptionsOverlay
+        if (videoOptionsOverlay != null) {
+            if (videoOptionsOverlay.isVisible) {
+                videoOptionsOverlay.hide();
+                _videoOptionsOverlay = null
+                return true;
+            }
+
+            _videoOptionsOverlay = null
+            return false
+        }
+
+        return false
+    }
+
+    private fun showVideoOptionsOverlay(content: IPlatformVideo) {
+        _overlayContainer.let {
+            _videoOptionsOverlay = UISlideOverlays.showVideoOptionsOverlay(content, it, SlideUpMenuItem(context, R.drawable.ic_visibility_off, context.getString(R.string.hide), context.getString(R.string.hide_from_home), "hide",
+                { StateMeta.instance.addHiddenVideo(content.url);
+                    if (fragment is HomeFragment) {
+                        val removeIndex = recyclerData.results.indexOf(content);
+                        if (removeIndex >= 0) {
+                            recyclerData.results.removeAt(removeIndex);
+                            recyclerData.adapter.notifyItemRemoved(recyclerData.adapter.childToParentPosition(removeIndex));
+                        }
+                    }
+                }),
+                SlideUpMenuItem(context, R.drawable.ic_playlist, context.getString(R.string.play_feed_as_queue), context.getString(R.string.play_entire_feed), "playFeed",
+                    {
+                        val newQueue = listOf(content) + recyclerData.results
+                            .filterIsInstance<IPlatformVideo>()
+                            .filter { it != content };
+                        StatePlayer.instance.setQueue(newQueue, StatePlayer.TYPE_QUEUE, "Feed Queue", true, false);
+                    })
+            );
+        }
     }
 
     private fun detachAdapterEvents() {
         val adapter = recyclerData.adapter as PreviewContentListAdapter? ?: return;
         adapter.onContentUrlClicked.remove(this);
+        adapter.onUrlClicked.remove(this);
         adapter.onContentClicked.remove(this);
         adapter.onChannelClicked.remove(this);
         adapter.onAddToClicked.remove(this);
         adapter.onAddToQueueClicked.remove(this);
+        adapter.onLongPress.remove(this);
     }
 
     override fun onRestoreCachedData(cachedData: RecyclerData<InsertedViewAdapterWithLoader<ContentPreviewViewHolder>, LinearLayoutManager, IPager<IPlatformContent>, IPlatformContent, IPlatformContent, InsertedViewHolder<ContentPreviewViewHolder>>) {
@@ -137,11 +165,14 @@ abstract class ContentFeedView<TFragment> : FeedView<TFragment, IPlatformContent
 
     protected open fun onContentClicked(content: IPlatformContent, time: Long) {
         if(content is IPlatformVideo) {
-            StatePlayer.instance.clearQueue();
-            if (Settings.instance.playback.shouldResumePreview(time))
-                fragment.navigate<VideoDetailFragment>(content.withTimestamp(time)).maximizeVideoDetail();
-            else
-                fragment.navigate<VideoDetailFragment>(content).maximizeVideoDetail();
+            if (StatePlayer.instance.hasQueue) {
+                StatePlayer.instance.insertToQueue(content, true);
+            } else {
+                if (Settings.instance.playback.shouldResumePreview(time))
+                    fragment.navigate<VideoDetailFragment>(content.withTimestamp(time)).maximizeVideoDetail();
+                else
+                    fragment.navigate<VideoDetailFragment>(content).maximizeVideoDetail();
+            }
         } else if (content is IPlatformPlaylist) {
             fragment.navigate<PlaylistFragment>(content);
         } else if (content is IPlatformPost) {
@@ -159,6 +190,9 @@ abstract class ContentFeedView<TFragment> : FeedView<TFragment, IPlatformContent
             else -> {};
         }
     }
+    protected open fun onUrlClicked(url: String) {
+        fragment.navigate<BrowserFragment>(url);
+    }
 
     private fun playPreview() {
         if(feedStyle == FeedStyle.THUMBNAIL)

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

@@ -62,6 +62,13 @@ class ContentSearchResultsFragment : MainFragment() {
         _view = null;
     }
 
+    override fun onBackPressed(): Boolean {
+        if (_view?.onBackPressed() == true)
+            return true
+
+        return super.onBackPressed()
+    }
+
     fun setPreviewsEnabled(previewsEnabled: Boolean) {
         _view?.setPreviewsEnabled(previewsEnabled && Settings.instance.search.previewFeedItems);
     }
@@ -77,6 +84,7 @@ class ContentSearchResultsFragment : MainFragment() {
         private var _channelUrl: String? = null;
 
         private val _taskSearch: TaskHandler<String, IPager<IPlatformContent>>;
+        override val shouldShowTimeBar: Boolean get() = Settings.instance.search.progressBar
 
         constructor(fragment: ContentSearchResultsFragment, inflater: LayoutInflater) : super(fragment, inflater) {
             _taskSearch = TaskHandler<String, IPager<IPlatformContent>>({fragment.lifecycleScope}, { query ->

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

@@ -6,8 +6,10 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
+import android.widget.EditText
 import android.widget.FrameLayout
 import android.widget.Spinner
+import androidx.core.widget.addTextChangedListener
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.futo.platformplayer.R
@@ -21,9 +23,13 @@ class CreatorsFragment : MainFragment() {
 
     private var _spinnerSortBy: Spinner? = null;
     private var _overlayContainer: FrameLayout? = null;
+    private var _containerSearch: FrameLayout? = null;
+    private var _editSearch: EditText? = null;
 
     override fun onCreateMainView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         val view = inflater.inflate(R.layout.fragment_creators, container, false);
+        _containerSearch = view.findViewById(R.id.container_search);
+        _editSearch = view.findViewById(R.id.edit_search);
 
         val adapter = SubscriptionAdapter(inflater, getString(R.string.confirm_delete_subscription));
         adapter.onClick.subscribe { platformUser -> navigate<ChannelFragment>(platformUser) };
@@ -44,6 +50,10 @@ class CreatorsFragment : MainFragment() {
 
         _spinnerSortBy = spinnerSortBy;
 
+        _editSearch?.addTextChangedListener {
+            adapter.query = it.toString();
+        }
+
         val recyclerView = view.findViewById<RecyclerView>(R.id.recycler_subscriptions);
         recyclerView.adapter = adapter;
         recyclerView.layoutManager = LinearLayoutManager(view.context);
@@ -54,6 +64,8 @@ class CreatorsFragment : MainFragment() {
         super.onDestroyMainView();
         _spinnerSortBy = null;
         _overlayContainer = null;
+        _editSearch = null;
+        _containerSearch = null;
     }
 
     companion object {

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

@@ -13,7 +13,6 @@ import androidx.recyclerview.widget.RecyclerView.LayoutManager
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.futo.platformplayer.*
 import com.futo.platformplayer.api.media.IPlatformClient
-import com.futo.platformplayer.api.media.models.contents.IPlatformContent
 import com.futo.platformplayer.api.media.platforms.js.models.JSPager
 import com.futo.platformplayer.api.media.structures.*
 import com.futo.platformplayer.constructs.Event1
@@ -21,7 +20,6 @@ import com.futo.platformplayer.constructs.TaskHandler
 import com.futo.platformplayer.engine.exceptions.PluginException
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.views.FeedStyle
-import com.futo.platformplayer.views.adapters.ContentPreviewViewHolder
 import com.futo.platformplayer.views.others.ProgressBar
 import com.futo.platformplayer.views.others.TagsView
 import com.futo.platformplayer.views.adapters.InsertedViewAdapterWithLoader
@@ -40,6 +38,7 @@ abstract class FeedView<TFragment, TResult, TConverted, TPager, TViewHolder> : L
     private val _containerSortBy: LinearLayout;
     private val _tagsView: TagsView;
     private val _textCentered: TextView;
+    private val _emptyPagerContainer: FrameLayout;
 
     protected val _toolbarContentView: LinearLayout;
 
@@ -64,12 +63,14 @@ abstract class FeedView<TFragment, TResult, TConverted, TPager, TViewHolder> : L
     val fragment: TFragment;
 
     private val _scrollListener: RecyclerView.OnScrollListener;
+    private var _automaticNextPageCounter = 0;
 
     constructor(fragment: TFragment, inflater: LayoutInflater, cachedRecyclerData: RecyclerData<InsertedViewAdapterWithLoader<TViewHolder>, LinearLayoutManager, TPager, TResult, TConverted, InsertedViewHolder<TViewHolder>>? = null) : super(inflater.context) {
         this.fragment = fragment;
         inflater.inflate(R.layout.fragment_feed, this);
 
         _textCentered = findViewById(R.id.text_centered);
+        _emptyPagerContainer = findViewById(R.id.empty_pager_container);
         _progress_bar = findViewById(R.id.progress_bar);
         _progress_bar.inactiveColor = Color.TRANSPARENT;
 
@@ -122,7 +123,6 @@ abstract class FeedView<TFragment, TResult, TConverted, TPager, TViewHolder> : L
 
         _toolbarContentView = findViewById(R.id.container_toolbar_content);
 
-        var filteredNextPageCounter = 0;
         _nextPageHandler = TaskHandler<TPager, List<TResult>>({fragment.lifecycleScope}, {
             if (it is IAsyncPager<*>)
                 it.nextPageAsync();
@@ -134,23 +134,12 @@ abstract class FeedView<TFragment, TResult, TConverted, TPager, TViewHolder> : L
         }).success {
             setLoading(false);
 
-            if (it.isEmpty()) {
-                return@success;
-            }
-
             val posBefore = recyclerData.results.size;
             val filteredResults = filterResults(it);
             recyclerData.results.addAll(filteredResults);
             recyclerData.resultsUnfiltered.addAll(it);
-            if(filteredResults.isEmpty()) {
-                filteredNextPageCounter++
-                if(filteredNextPageCounter <= 4)
-                    loadNextPage()
-            }
-            else {
-                filteredNextPageCounter = 0;
-                recyclerData.adapter.notifyItemRangeInserted(recyclerData.adapter.childToParentPosition(posBefore), filteredResults.size);
-            }
+            recyclerData.adapter.notifyItemRangeInserted(recyclerData.adapter.childToParentPosition(posBefore), filteredResults.size);
+            ensureEnoughContentVisible(filteredResults)
         }.exception<Throwable> {
             Logger.w(TAG, "Failed to load next page.", it);
             UIDialogs.showGeneralRetryErrorDialog(context, context.getString(R.string.failed_to_load_next_page), it, {
@@ -170,8 +159,10 @@ abstract class FeedView<TFragment, TResult, TConverted, TPager, TViewHolder> : L
 
                 val visibleItemCount = _recyclerResults.childCount;
                 val firstVisibleItem = recyclerData.layoutManager.findFirstVisibleItemPosition();
+                //Logger.i(TAG, "onScrolled loadNextPage visibleItemCount=$visibleItemCount firstVisibleItem=$visibleItemCount")
+
                 if (!_loading && firstVisibleItem + visibleItemCount + visibleThreshold >= recyclerData.results.size && firstVisibleItem > 0) {
-                    //Logger.i(TAG, "loadNextPage(): firstVisibleItem=$firstVisibleItem visibleItemCount=$visibleItemCount visibleThreshold=$visibleThreshold _results.size=${_results.size}")
+                    //Logger.i(TAG, "onScrolled loadNextPage(): firstVisibleItem=$firstVisibleItem visibleItemCount=$visibleItemCount visibleThreshold=$visibleThreshold recyclerData.results.size=${recyclerData.results.size}")
                     loadNextPage();
                 }
             }
@@ -180,9 +171,60 @@ abstract class FeedView<TFragment, TResult, TConverted, TPager, TViewHolder> : L
         _recyclerResults.addOnScrollListener(_scrollListener);
     }
 
+    private fun ensureEnoughContentVisible(filteredResults: List<TConverted>) {
+        val canScroll = if (recyclerData.results.isEmpty()) false else {
+            val layoutManager = recyclerData.layoutManager
+            val firstVisibleItemPosition = layoutManager.findFirstVisibleItemPosition()
+
+            if (firstVisibleItemPosition != RecyclerView.NO_POSITION) {
+                val firstVisibleView = layoutManager.findViewByPosition(firstVisibleItemPosition)
+                val itemHeight = firstVisibleView?.height ?: 0
+                val occupiedSpace = recyclerData.results.size * itemHeight
+                val recyclerViewHeight = _recyclerResults.height
+                Logger.i(TAG, "ensureEnoughContentVisible loadNextPage occupiedSpace=$occupiedSpace recyclerViewHeight=$recyclerViewHeight")
+                occupiedSpace >= recyclerViewHeight
+            } else {
+                false
+            }
+
+        }
+        Logger.i(TAG, "ensureEnoughContentVisible loadNextPage canScroll=$canScroll _automaticNextPageCounter=$_automaticNextPageCounter")
+        if (!canScroll || filteredResults.isEmpty()) {
+            _automaticNextPageCounter++
+            if(_automaticNextPageCounter <= 4)
+                loadNextPage()
+        } else {
+            _automaticNextPageCounter = 0;
+        }
+    }
+
     protected fun setTextCentered(text: String?) {
         _textCentered.text = text;
     }
+    protected open fun getEmptyPagerView(): View? {
+        return null;
+    }
+
+    fun setEmptyPager(enable: Boolean) {
+        if(enable) {
+            val viewToShow = getEmptyPagerView();
+            if(viewToShow != null) {
+                _emptyPagerContainer.removeAllViews();
+                _emptyPagerContainer.addView(viewToShow);
+                _emptyPagerContainer.visibility = VISIBLE;
+                setTextCentered(null);
+            }
+            else {
+                setTextCentered(context.getString(R.string.no_results_found_swipe_down_to_refresh));
+                _emptyPagerContainer.visibility = GONE;
+            }
+        }
+        else {
+            setTextCentered(null);
+            _emptyPagerContainer.removeAllViews();
+            _emptyPagerContainer.visibility = GONE;
+        }
+    }
 
     fun onResume() {
         //Reload the pager if the plugin was killed
@@ -352,6 +394,7 @@ abstract class FeedView<TFragment, TResult, TConverted, TPager, TViewHolder> : L
     }
 
     private fun loadPagerInternal(pager: TPager, cache: ItemCache<TResult>? = null) {
+        Logger.i(TAG, "Setting new internal pager on feed");
         _cache = cache;
 
         detachPagerEvents();
@@ -369,6 +412,7 @@ abstract class FeedView<TFragment, TResult, TConverted, TPager, TViewHolder> : L
         recyclerData.resultsUnfiltered.addAll(toAdd);
         recyclerData.adapter.notifyDataSetChanged();
         recyclerData.loadedFeedStyle = feedStyle;
+        ensureEnoughContentVisible(filteredResults)
     }
 
     private fun detachPagerEvents() {
@@ -397,17 +441,23 @@ abstract class FeedView<TFragment, TResult, TConverted, TPager, TViewHolder> : L
         }
     }
 
+    var _lastNextPage = false;
     private fun loadNextPage() {
         synchronized(_pager_lock) {
             val pager: TPager = recyclerData.pager ?: return;
             val hasMorePages = pager.hasMorePages();
-            Logger.i(TAG, "loadNextPage() hasMorePages=$hasMorePages");
+            Logger.i(TAG, "loadNextPage() hasMorePages=$hasMorePages, page size=${pager.getResults().size}");
 
             //loadCachedPage();
             if (pager.hasMorePages()) {
+                _lastNextPage = true;
                 setLoading(true);
                 _nextPageHandler.run(pager);
             }
+            else if(_lastNextPage) {
+                Logger.i(TAG, "End of page reached (Last page size: ${pager.getResults().size})");
+                _lastNextPage = false;
+            }
         }
     }
 

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

@@ -1,5 +1,6 @@
 package com.futo.platformplayer.fragment.mainactivity.main
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -8,87 +9,285 @@ import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
 import android.widget.ImageButton
+import android.widget.LinearLayout
 import androidx.core.widget.addTextChangedListener
+import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.futo.platformplayer.*
+import com.futo.platformplayer.api.media.models.contents.IPlatformContent
+import com.futo.platformplayer.api.media.structures.IAsyncPager
+import com.futo.platformplayer.api.media.structures.IPager
+import com.futo.platformplayer.api.media.structures.PlatformContentPager
+import com.futo.platformplayer.constructs.TaskHandler
+import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.models.HistoryVideo
+import com.futo.platformplayer.states.StateHistory
 import com.futo.platformplayer.states.StatePlayer
-import com.futo.platformplayer.states.StatePlaylists
 import com.futo.platformplayer.views.others.TagsView
-import com.futo.platformplayer.views.adapters.HistoryListAdapter
+import com.futo.platformplayer.views.adapters.HistoryListViewHolder
+import com.futo.platformplayer.views.adapters.InsertedViewAdapterWithLoader
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 
 class HistoryFragment : MainFragment() {
     override val isMainView : Boolean = true;
     override val isTab: Boolean = true;
     override val hasBottomBar: Boolean get() = true;
 
-    private var _adapter: HistoryListAdapter? = null;
+    private var _view: HistoryView? = null;
 
     override fun onCreateMainView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        val view = inflater.inflate(R.layout.fragment_history, container, false);
-
-        val inputMethodManager = view.context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager;
-
-        val recyclerHistory = view.findViewById<RecyclerView>(R.id.recycler_history);
-        val clearSearch = view.findViewById<ImageButton>(R.id.button_clear_search);
-        val editSearch = view.findViewById<EditText>(R.id.edit_search);
-        var tagsView = view.findViewById<TagsView>(R.id.tags_text);
-        tagsView.setPairs(listOf(
-            Pair(getString(R.string.last_hour), 60L),
-            Pair(getString(R.string.last_24_hours), 24L * 60L),
-            Pair(getString(R.string.last_week), 7L * 24L * 60L),
-            Pair(getString(R.string.last_30_days), 30L * 24L * 60L),
-            Pair(getString(R.string.last_year), 365L * 30L * 24L * 60L),
-            Pair(getString(R.string.all_time), -1L)));
-
-        val adapter = HistoryListAdapter();
-        adapter.onClick.subscribe { v ->
-            val diff = v.video.duration - v.position;
-            val vid: Any = if (diff > 5) { v.video.withTimestamp(v.position) } else { v.video };
-            StatePlayer.instance.clearQueue();
-            navigate<VideoDetailFragment>(vid).maximizeVideoDetail();
-            editSearch.clearFocus();
-            inputMethodManager.hideSoftInputFromWindow(editSearch.windowToken, 0);
-        };
-        _adapter = adapter;
-
-        recyclerHistory.adapter = adapter;
-        recyclerHistory.isSaveEnabled = false;
-        recyclerHistory.layoutManager = LinearLayoutManager(context);
-
-        tagsView.onClick.subscribe { timeMinutesToErase ->
-            UIDialogs.showConfirmationDialog(requireContext(), getString(R.string.are_you_sure_delete_historical), {
-                StatePlaylists.instance.removeHistoryRange(timeMinutesToErase.second as Long);
-                UIDialogs.toast(view.context, timeMinutesToErase.first + " " + getString(R.string.removed));
-                adapter.updateFilteredVideos();
-                adapter.notifyDataSetChanged();
-            });
-        };
-
-        clearSearch.setOnClickListener {
-            editSearch.text.clear();
-            clearSearch.visibility = View.GONE;
-            adapter.setQuery("");
-            editSearch.clearFocus();
-            inputMethodManager.hideSoftInputFromWindow(editSearch.windowToken, 0);
-        };
-
-        editSearch.addTextChangedListener { _ ->
-            val text = editSearch.text;
-            clearSearch.visibility = if (text.isEmpty()) { View.GONE } else { View.VISIBLE };
-            adapter.setQuery(text.toString());
-        };
-
+        val view = HistoryView(this, inflater);
+        _view = view;
         return view;
     }
 
     override fun onDestroyMainView() {
         super.onDestroyMainView();
-        _adapter?.cleanup();
-        _adapter = null;
+        _view = null;
+    }
+
+    override fun onShownWithView(parameter: Any?, isBack: Boolean) {
+        super.onShownWithView(parameter, isBack)
+        _view?.setPager(StateHistory.instance.getHistoryPager());
+    }
+
+    @SuppressLint("ViewConstructor")
+    class HistoryView : LinearLayout {
+        private val _fragment: HistoryFragment;
+        private val _adapter: InsertedViewAdapterWithLoader<HistoryListViewHolder>;
+        private val _recyclerHistory: RecyclerView;
+        private val _clearSearch: ImageButton;
+        private val _editSearch: EditText;
+        private val _tagsView: TagsView;
+        private val _llmHistory: LinearLayoutManager;
+        private val _pagerLock = Object();
+        private var _nextPageHandler: TaskHandler<IPager<HistoryVideo>, List<HistoryVideo>>;
+        private var _pager: IPager<HistoryVideo>? = null;
+        private val _results = arrayListOf<HistoryVideo>();
+        private var _loading = false;
+
+        private var _automaticNextPageCounter = 0;
+
+        constructor(fragment: HistoryFragment, inflater: LayoutInflater) : super(inflater.context) {
+            _fragment = fragment;
+            inflater.inflate(R.layout.fragment_history, this);
+
+            _recyclerHistory = findViewById(R.id.recycler_history);
+            _clearSearch = findViewById(R.id.button_clear_search);
+            _editSearch = findViewById(R.id.edit_search);
+            _tagsView = findViewById(R.id.tags_text);
+            _tagsView.setPairs(listOf(
+                Pair(context.getString(R.string.last_hour), 60L),
+                Pair(context.getString(R.string.last_24_hours), 24L * 60L),
+                Pair(context.getString(R.string.last_week), 7L * 24L * 60L),
+                Pair(context.getString(R.string.last_30_days), 30L * 24L * 60L),
+                Pair(context.getString(R.string.last_year), 365L * 30L * 24L * 60L),
+                Pair(context.getString(R.string.all_time), -1L)
+            ));
+
+            _adapter = InsertedViewAdapterWithLoader(context, arrayListOf(), arrayListOf(),
+                { _results.size },
+                { view, _ ->
+                    val holder = HistoryListViewHolder(view);
+                    holder.onRemove.subscribe(::onHistoryVideoRemove);
+                    holder.onClick.subscribe(::onHistoryVideoClick);
+                    return@InsertedViewAdapterWithLoader holder;
+                },
+                { viewHolder, position ->
+                    var watchTime: String? = null;
+                    if (position == 0) {
+                        watchTime = _results[position].date.toHumanNowDiffStringMinDay();
+                    } else {
+                        val previousWatchTime = _results[position - 1].date.toHumanNowDiffStringMinDay();
+                        val currentWatchTime = _results[position].date.toHumanNowDiffStringMinDay();
+                        if (previousWatchTime != currentWatchTime) {
+                            watchTime = currentWatchTime;
+                        }
+                    }
+
+                    viewHolder.bind(_results[position], watchTime);
+                }
+            );
+
+            _recyclerHistory.adapter = _adapter;
+            _recyclerHistory.isSaveEnabled = false;
+            _llmHistory = LinearLayoutManager(context);
+            _recyclerHistory.layoutManager = _llmHistory;
+
+            _tagsView.onClick.subscribe { timeMinutesToErase ->
+                UIDialogs.showConfirmationDialog(context, context.getString(R.string.are_you_sure_delete_historical), {
+                    StateHistory.instance.removeHistoryRange(timeMinutesToErase.second as Long);
+                    UIDialogs.toast(context, timeMinutesToErase.first + " " + context.getString(R.string.removed));
+                    updatePager();
+                });
+            };
+
+            _clearSearch.setOnClickListener {
+                val inputMethodManager = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager;
+                _editSearch.text.clear();
+                _clearSearch.visibility = View.GONE;
+                setPager(StateHistory.instance.getHistoryPager());
+                _editSearch.clearFocus();
+                inputMethodManager.hideSoftInputFromWindow(_editSearch.windowToken, 0);
+            };
+
+            _editSearch.addTextChangedListener { _ ->
+                val text = _editSearch.text;
+                _clearSearch.visibility = if (text.isEmpty()) { View.GONE } else { View.VISIBLE };
+                updatePager();
+            };
+
+            _recyclerHistory.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+                override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+                    super.onScrolled(recyclerView, dx, dy);
+
+                    val visibleItemCount = _recyclerHistory.childCount;
+                    val firstVisibleItem = _llmHistory.findFirstVisibleItemPosition();
+
+                    Logger.i(TAG, "onScrolled _loading = $_loading, firstVisibleItem = $firstVisibleItem, visibleItemCount = $visibleItemCount, _results.size = ${_results.size}")
+
+                    val visibleThreshold = 15;
+                    if (!_loading && firstVisibleItem + visibleItemCount + visibleThreshold >= _results.size && firstVisibleItem > 0) {
+                        loadNextPage();
+                    }
+                }
+            });
+
+            _nextPageHandler = TaskHandler<IPager<HistoryVideo>, List<HistoryVideo>>({fragment.lifecycleScope}, {
+                if (it is IAsyncPager<*>)
+                    it.nextPageAsync();
+                else
+                    it.nextPage();
+
+                return@TaskHandler it.getResults();
+            }).success {
+                setLoading(false);
+
+                val posBefore = _results.size;
+                _results.addAll(it);
+                _adapter.notifyItemRangeInserted(_adapter.childToParentPosition(posBefore), it.size);
+                ensureEnoughContentVisible(it)
+            }.exception<Throwable> {
+                Logger.w(TAG, "Failed to load next page.", it);
+                UIDialogs.showGeneralRetryErrorDialog(context, context.getString(R.string.failed_to_load_next_page), it, {
+                    loadNextPage();
+                });
+            };
+        }
+
+        private fun updatePager() {
+            val query = _editSearch.text.toString();
+            if (_editSearch.text.isNotEmpty()) {
+                setPager(StateHistory.instance.getHistorySearchPager(query));
+                //setPager(StateHistory.instance.getHistorySearchPager(query));
+            } else {
+                setPager(StateHistory.instance.getHistoryPager());
+            }
+        }
+
+        fun setPager(pager: IPager<HistoryVideo>) {
+            Logger.i(TAG, "setPager()");
+
+            synchronized(_pagerLock) {
+                loadPagerInternal(pager);
+            }
+        }
+
+        private fun onHistoryVideoRemove(v: HistoryVideo) {
+            val index = _results.indexOf(v);
+            if (index == -1) {
+                return;
+            }
+
+            StateHistory.instance.removeHistory(v.video.url);
+            _results.removeAt(index);
+            _adapter.notifyItemRemoved(index);
+        }
+
+        private fun onHistoryVideoClick(v: HistoryVideo) {
+            val index = _results.indexOf(v);
+            if (index == -1) {
+                return;
+            }
+
+            val inputMethodManager = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager;
+            val diff = v.video.duration - v.position;
+            val vid: Any = if (diff > 5) { v.video.withTimestamp(v.position) } else { v.video };
+            StatePlayer.instance.clearQueue();
+            _fragment.navigate<VideoDetailFragment>(vid).maximizeVideoDetail();
+            _editSearch.clearFocus();
+            inputMethodManager.hideSoftInputFromWindow(_editSearch.windowToken, 0);
+
+            _fragment.lifecycleScope.launch(Dispatchers.Main) {
+                delay(2000)
+                updatePager()
+            }
+        }
+
+        private fun loadNextPage() {
+            synchronized(_pagerLock) {
+                val pager: IPager<HistoryVideo> = _pager ?: return;
+                val hasMorePages = pager.hasMorePages();
+                Logger.i(TAG, "loadNextPage() hasMorePages=$hasMorePages");
+
+                if (pager.hasMorePages()) {
+                    setLoading(true);
+                    _nextPageHandler.run(pager);
+                }
+            }
+        }
+
+        private fun setLoading(loading: Boolean) {
+            Logger.v(TAG, "setLoading loading=${loading}");
+            _loading = loading;
+            _adapter.setLoading(loading);
+        }
+
+        private fun loadPagerInternal(pager: IPager<HistoryVideo>) {
+            Logger.i(TAG, "Setting new internal pager on feed");
+
+            _results.clear();
+            val toAdd = pager.getResults();
+            _results.addAll(toAdd);
+            _adapter.notifyDataSetChanged();
+            ensureEnoughContentVisible(toAdd)
+            _pager = pager;
+        }
+
+        private fun ensureEnoughContentVisible(results: List<HistoryVideo>) {
+            val canScroll = if (_results.isEmpty()) false else {
+                val layoutManager = _llmHistory
+                val firstVisibleItemPosition = layoutManager.findFirstVisibleItemPosition()
+
+                if (firstVisibleItemPosition != RecyclerView.NO_POSITION) {
+                    val firstVisibleView = layoutManager.findViewByPosition(firstVisibleItemPosition)
+                    val itemHeight = firstVisibleView?.height ?: 0
+                    val occupiedSpace = _results.size * itemHeight
+                    val recyclerViewHeight = _recyclerHistory.height
+                    Logger.i(TAG, "ensureEnoughContentVisible loadNextPage occupiedSpace=$occupiedSpace recyclerViewHeight=$recyclerViewHeight")
+                    occupiedSpace >= recyclerViewHeight
+                } else {
+                    false
+                }
+
+            }
+
+            Logger.i(TAG, "ensureEnoughContentVisible loadNextPage canScroll=$canScroll _automaticNextPageCounter=$_automaticNextPageCounter")
+            if (!canScroll || results.isEmpty()) {
+                _automaticNextPageCounter++
+                if(_automaticNextPageCounter <= 4)
+                    loadNextPage()
+            } else {
+                _automaticNextPageCounter = 0;
+            }
+        }
     }
 
     companion object {
         fun newInstance() = HistoryFragment().apply {}
+        private const val TAG = "HistoryFragment"
     }
 }

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

@@ -66,6 +66,13 @@ class HomeFragment : MainFragment() {
         return view;
     }
 
+    override fun onBackPressed(): Boolean {
+        if (_view?.onBackPressed() == true)
+            return true
+
+        return super.onBackPressed()
+    }
+
     override fun onDestroyMainView() {
         super.onDestroyMainView();
 
@@ -88,6 +95,7 @@ class HomeFragment : MainFragment() {
         private var _announcementsView: AnnouncementView;
 
         private val _taskGetPager: TaskHandler<Boolean, IPager<IPlatformContent>>;
+        override val shouldShowTimeBar: Boolean get() = Settings.instance.home.progressBar
 
         constructor(fragment: HomeFragment, inflater: LayoutInflater, cachedRecyclerData: RecyclerData<InsertedViewAdapterWithLoader<ContentPreviewViewHolder>, LinearLayoutManager, IPager<IPlatformContent>, IPlatformContent, IPlatformContent, InsertedViewHolder<ContentPreviewViewHolder>>? = null) : super(fragment, inflater, cachedRecyclerData) {
             _announcementsView = AnnouncementView(context, null).apply {
@@ -152,7 +160,7 @@ class HomeFragment : MainFragment() {
         }
 
         override fun filterResults(contents: List<IPlatformContent>): List<IPlatformContent> {
-            return contents.filter { it !is IPlatformVideo || !StateMeta.instance.isVideoHidden(it.url) };
+            return contents.filter { !StateMeta.instance.isVideoHidden(it.url) && !StateMeta.instance.isCreatorHidden(it.author.url) };
         }
 
         private fun loadResults() {

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

@@ -22,6 +22,10 @@ import com.futo.platformplayer.views.adapters.viewholders.SelectableIPlatformCha
 import com.futo.platformplayer.states.StateSubscriptions
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StatePlatform
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
 class ImportSubscriptionsFragment : MainFragment() {
     override val isMainView : Boolean = true;
@@ -59,11 +63,15 @@ class ImportSubscriptionsFragment : MainFragment() {
     class ImportSubscriptionsView : LinearLayout {
         private val _fragment: ImportSubscriptionsFragment;
 
+        private val SLOWDOWN_COUNT = 100;
+        private val SLOWDOWN_MS: Long = 1000;
+
         private var _spinner: ImageView;
         private var _textSelectDeselectAll: TextView;
         private var _textNothingToImport: TextView;
         private var _textCounter: TextView;
-        private var _textLoadMore: TextView;
+        private var _loadProgress: TextView;
+        //private var _textLoadMore: TextView;
         private var _adapterView: AnyAdapterView<SelectableIPlatformChannel, ImportSubscriptionViewHolder>;
         private var _links: List<String> = listOf();
         private val _items: ArrayList<SelectableIPlatformChannel> = arrayListOf();
@@ -80,8 +88,9 @@ class ImportSubscriptionsFragment : MainFragment() {
             _textNothingToImport = findViewById(R.id.nothing_to_import);
             _textSelectDeselectAll = findViewById(R.id.text_select_deselect_all);
             _textCounter = findViewById(R.id.text_select_counter);
-            _textLoadMore = findViewById(R.id.text_load_more);
+            //_textLoadMore = findViewById(R.id.text_load_more);
             _spinner = findViewById(R.id.channel_loader);
+            _loadProgress = findViewById(R.id.text_load_progress);
 
             _adapterView = findViewById<RecyclerView>(R.id.recycler_import).asAny( _items) {
                 it.onSelectedChange.subscribe { c ->
@@ -113,6 +122,7 @@ class ImportSubscriptionsFragment : MainFragment() {
                 return@TaskHandler channel;
             }).success {
                 _items.add(SelectableIPlatformChannel(it));
+                _loadProgress.text = "(${_items.size}/${_links.size})";
                 _adapterView.adapter.notifyItemInserted(_items.size - 1);
                 loadNext();
             }.exceptionWithParameter<Throwable> { ex, para ->
@@ -123,6 +133,7 @@ class ImportSubscriptionsFragment : MainFragment() {
                 loadNext();
             };
 
+            /*
             _textLoadMore.setOnClickListener {
                 if (!_limitToastShown) {
                     return@setOnClickListener;
@@ -134,7 +145,7 @@ class ImportSubscriptionsFragment : MainFragment() {
                 load();
             };
 
-            _textLoadMore.visibility = View.GONE;
+            _textLoadMore.visibility = View.GONE;*/
         }
 
         fun cleanup() {
@@ -165,12 +176,23 @@ class ImportSubscriptionsFragment : MainFragment() {
                 it.title = context.getString(R.string.import_subscriptions);
                 it.onImport.subscribe(this) {
                     val subscriptionsToImport = _items.filter { i -> i.selected }.toList();
-                    for (subscriptionToImport in subscriptionsToImport) {
-                        StateSubscriptions.instance.addSubscription(subscriptionToImport.channel);
+                    UIDialogs.showDialogProgress(context) {
+                        it.setText("Importing subscriptions..");
+                        _fragment.lifecycleScope.launch(Dispatchers.IO) {
+                            for ((i, subscriptionToImport) in subscriptionsToImport.withIndex()) {
+                                StateSubscriptions.instance.addSubscription(subscriptionToImport.channel);
+                                withContext(Dispatchers.Main) {
+                                    it.setProgress(i.toDouble() / subscriptionsToImport.size);
+                                }
+                            }
+                            withContext(Dispatchers.Main) {
+                                UIDialogs.toast("${subscriptionsToImport.size} " + context.getString(R.string.subscriptions_imported));
+                                _fragment.closeSegment();
+                                it.dismiss();
+                            }
+                        }
                     }
 
-                    UIDialogs.toast("${subscriptionsToImport.size} " + context.getString(R.string.subscriptions_imported));
-                    _fragment.closeSegment();
                 };
             }
         }
@@ -180,7 +202,7 @@ class ImportSubscriptionsFragment : MainFragment() {
             if (_counter >= MAXIMUM_BATCH_SIZE) {
                 if (!_limitToastShown) {
                     _limitToastShown = true;
-                    _textLoadMore.visibility = View.VISIBLE;
+                   // _textLoadMore.visibility = View.VISIBLE;
                     UIDialogs.toast(context, context.getString(R.string.stopped_after_requestcount_to_avoid_rate_limit_click_load_more_to_load_more).replace("{requestCount}", MAXIMUM_BATCH_SIZE.toString()));
                 }
 
@@ -192,11 +214,25 @@ class ImportSubscriptionsFragment : MainFragment() {
 
         private fun loadNext() {
             _currentLoadIndex++;
+
             if (_currentLoadIndex < _links.size) {
-                load();
-            } else {
-                setLoading(false);
+                if(_currentLoadIndex >= SLOWDOWN_COUNT) {
+                    if(_currentLoadIndex % 10 == 0) {
+                        val estTime = (SLOWDOWN_MS * (_links.size - _currentLoadIndex)) / 1000;
+                        UIDialogs.toast(context, "Import slowed down to prevent rate limit (Estimate ${estTime.toInt().toHumanTimeIndicator()})");
+                    }
+                    _fragment.lifecycleScope.launch(Dispatchers.Default) {
+                        delay(SLOWDOWN_MS);
+                        withContext(Dispatchers.Main) {
+                            load();
+                        }
+                    }
+                }
+                else
+                    load();
             }
+            else
+                setLoading(false);
         }
 
         private fun updateSelected() {
@@ -216,17 +252,19 @@ class ImportSubscriptionsFragment : MainFragment() {
             if(isLoading){
                 (_spinner.drawable as Animatable?)?.start();
                 _spinner.visibility = View.VISIBLE;
+                _loadProgress.visibility = View.VISIBLE;
             }
             else {
                 _spinner.visibility = View.GONE;
                 (_spinner.drawable as Animatable?)?.stop();
+                _loadProgress.visibility = View.GONE;
             }
         }
     }
 
     companion object {
         val TAG = "ImportSubscriptionsFragment";
-        private const val MAXIMUM_BATCH_SIZE = 100;
+        private const val MAXIMUM_BATCH_SIZE = 2000;
         fun newInstance() = ImportSubscriptionsFragment().apply {}
     }
 }

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

@@ -44,6 +44,13 @@ class PlaylistSearchResultsFragment : MainFragment() {
         return view;
     }
 
+    override fun onBackPressed(): Boolean {
+        if (_view?.onBackPressed() == true)
+            return true
+
+        return super.onBackPressed()
+    }
+
     override fun onDestroyMainView() {
         super.onDestroyMainView();
         _view?.cleanup();

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

@@ -17,6 +17,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.futo.platformplayer.states.StatePlayer
 import com.futo.platformplayer.states.StatePlaylists
 import com.futo.platformplayer.R
+import com.futo.platformplayer.UISlideOverlays
 import com.futo.platformplayer.api.media.models.video.IPlatformVideo
 import com.futo.platformplayer.assume
 import com.futo.platformplayer.fragment.mainactivity.topbar.NavigationTopBarFragment
@@ -54,6 +55,14 @@ class PlaylistsFragment : MainFragment() {
         _view?.onShown(parameter, isBack);
     }
 
+    override fun onBackPressed(): Boolean {
+        if (_view?.onBackPressed() == true) {
+            return true;
+        }
+
+        return super.onBackPressed()
+    }
+
     @SuppressLint("ViewConstructor")
     class PlaylistsView : LinearLayout {
         private val _fragment: PlaylistsFragment;
@@ -64,6 +73,7 @@ class PlaylistsFragment : MainFragment() {
         private var _adapterWatchLater: VideoListHorizontalAdapter;
         private var _adapterPlaylist: PlaylistsAdapter;
         private var _layoutWatchlist: ConstraintLayout;
+        private var _slideUpOverlay: SlideUpMenuOverlay? = null;
 
         constructor(fragment: PlaylistsFragment, inflater: LayoutInflater) : super(inflater.context) {
             _fragment = fragment;
@@ -92,41 +102,24 @@ class PlaylistsFragment : MainFragment() {
             recyclerPlaylists.adapter = _adapterPlaylist;
             recyclerPlaylists.layoutManager = LinearLayoutManager(context);
 
-            val nameInput = SlideUpMenuTextInput(context, context.getString(R.string.name));
-            val addPlaylistOverlay = SlideUpMenuOverlay(context, findViewById<FrameLayout>(R.id.overlay_create_playlist), context.getString(R.string.create_new_playlist), context.getString(R.string.ok), false, nameInput);
+
+
+            val buttonCreatePlaylist = findViewById<ImageButton>(R.id.button_create_playlist);
+            buttonCreatePlaylist.setOnClickListener {
+                _slideUpOverlay = UISlideOverlays.showCreatePlaylistOverlay(findViewById<FrameLayout>(R.id.overlay_create_playlist)) {
+                    val playlist = Playlist(it, arrayListOf());
+                    playlists.add(0, playlist);
+                    StatePlaylists.instance.createOrUpdatePlaylist(playlist);
+
+                    _adapterPlaylist.notifyItemInserted(0);
+                };
+            };
 
             _adapterPlaylist.onClick.subscribe { p -> _fragment.navigate<PlaylistFragment>(p); };
             _adapterPlaylist.onPlay.subscribe { p ->
                 StatePlayer.instance.setPlaylist(p, 0, true);
             };
 
-            addPlaylistOverlay.onOK.subscribe {
-                val text = nameInput.text;
-                if (text.isBlank()) {
-                    return@subscribe;
-                }
-
-                val playlist = Playlist(text, arrayListOf());
-                playlists.add(0, playlist);
-                StatePlaylists.instance.createOrUpdatePlaylist(playlist);
-
-                _adapterPlaylist.notifyItemInserted(0);
-                addPlaylistOverlay.hide();
-                nameInput.deactivate();
-                nameInput.clear();
-            };
-
-            addPlaylistOverlay.onCancel.subscribe {
-                nameInput.deactivate();
-                nameInput.clear();
-            };
-
-            val buttonCreatePlaylist = findViewById<ImageButton>(R.id.button_create_playlist);
-            buttonCreatePlaylist.setOnClickListener {
-                addPlaylistOverlay.show();
-                nameInput.activate();
-            };
-
             _appBar = findViewById(R.id.app_bar);
             _layoutWatchlist = findViewById(R.id.layout_watchlist);
 
@@ -142,12 +135,28 @@ class PlaylistsFragment : MainFragment() {
 
         fun onShown(parameter: Any?, isBack: Boolean) {
             playlists.clear()
-            playlists.addAll(StatePlaylists.instance.getPlaylists().sortedByDescending { maxOf(it.datePlayed, it.dateUpdate, it.dateCreation) });
+            playlists.addAll(
+                StatePlaylists.instance.getPlaylists()
+                    .sortedByDescending { maxOf(it.datePlayed, it.dateUpdate, it.dateCreation) });
             _adapterPlaylist.notifyDataSetChanged();
 
             updateWatchLater();
         }
 
+        fun onBackPressed(): Boolean {
+            val slideUpOverlay = _slideUpOverlay;
+            if (slideUpOverlay != null) {
+                if (slideUpOverlay.isVisible) {
+                    slideUpOverlay.hide();
+                    return true;
+                }
+
+                return false;
+            }
+
+            return false;
+        }
+
         private fun updateWatchLater() {
             val watchList = StatePlaylists.instance.getWatchLater();
             if (watchList.isNotEmpty()) {