Implemented feedback for update flow.

Improve request modifier support for casting and downloads

See merge request videostreaming/grayjay!171

.gitlab-ci.yml

@@ -1,37 +1,64 @@
 variables:
   GIT_SUBMODULE_STRATEGY: recursive
 
-stages:
-- buildAndDeployApkUnstable
-- buildAndDeployApkStable
-- buildAndDeployPlaystore
-
 buildAndDeployApkUnstable:
-  stage: buildAndDeployApkUnstable
+  stage: build
   script:
     - sh deploy-unstable.sh
   only:
     - tags
-  except:
-    - ^(dev)
   when: manual
+  needs: []
+  allow_failure: true
+  artifacts:
+    when: always
+    expire_in: 30 days
+    paths:
+      - app/build/outputs/apk/unstable/release/*.apk
 
 buildAndDeployApkStable:
-  stage: buildAndDeployApkStable
+  stage: build
   script:
     - sh deploy-stable.sh
   only:
     - tags
-  except:
-    - branches
   when: manual
+  needs: []
+  artifacts:
+    when: always
+    expire_in: 30 days
+    paths:
+      - app/build/outputs/apk/stable/release/*.apk
 
 buildAndDeployPlaystore:
-  stage: buildAndDeployPlaystore
+  stage: deploy
   script:
-    - sh deploy-playstore.sh
+    - sh build-playstore.sh
+    - bash venv-playstore.sh
+    - . .venv-playstore/bin/activate
+    - python publish_playstore.py --sa /root/grayjay.json --package com.futo.platformplayer.playstore --aab ./app/build/outputs/bundle/playstoreRelease/app-playstore-release.aab --track production --status completed
   only:
     - tags
-  except:
-    - branches
-  when: manual
+  when: on_success
+  needs:
+    - buildAndDeployApkStable
+  artifacts:
+    when: always
+    expire_in: 30 days
+    paths:
+      - app/build/outputs/bundle/playstoreRelease/*.aab
+
+updateFdroidRepo:
+  stage: deploy
+  only:
+    - tags
+  when: on_success
+  needs:
+    - job: buildAndDeployApkStable
+      artifacts: true
+  before_script:
+    - mkdir -p ~/.ssh && chmod 700 ~/.ssh
+    - touch ~/.ssh/known_hosts && chmod 644 ~/.ssh/known_hosts
+    - ssh-keygen -F gitlab.futo.org >/dev/null 2>&1 || ssh-keyscan -t rsa,ecdsa,ed25519 gitlab.futo.org >> ~/.ssh/known_hosts
+  script:
+    - python3 update_fdroid_index.py

.gitmodules

@@ -106,3 +106,21 @@
 [submodule "app/src/unstable/assets/sources/mixcloud"]
 	path = app/src/unstable/assets/sources/mixcloud
 	url = ../plugins/mixcloud.git
+[submodule "app/src/unstable/assets/sources/radiobrowser"]
+	path = app/src/unstable/assets/sources/radiobrowser
+	url = ../plugins/radiobrowser.git
+[submodule "app/src/stable/assets/sources/radiobrowser"]
+	path = app/src/stable/assets/sources/radiobrowser
+	url = ../plugins/radiobrowser.git
+[submodule "app/src/stable/assets/sources/redbull-tv"]
+	path = app/src/stable/assets/sources/redbull-tv
+	url = ../plugins/redbull-tv.git
+[submodule "app/src/unstable/assets/sources/redbull-tv"]
+	path = app/src/unstable/assets/sources/redbull-tv
+	url = ../plugins/redbull-tv.git
+[submodule "app/src/unstable/assets/sources/fosdem"]
+	path = app/src/unstable/assets/sources/fosdem
+	url = ../plugins/fosdem.git
+[submodule "app/src/stable/assets/sources/fosdem"]
+	path = app/src/stable/assets/sources/fosdem
+	url = ../plugins/fosdem.git

app/aar/sender-sdk-minimal-0.4.1.aar

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:50b53a5d297d0c3008b3359a452a5c9e7e9f530533ec197e3dd1e9f08f9e84ad
+size 6342128

app/build.gradle

@@ -231,10 +231,4 @@ dependencies {
     testImplementation "org.mockito:mockito-core:5.20.0"
     androidTestImplementation 'androidx.test.ext:junit:1.3.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
-
-    //Rust casting SDK
-    implementation('org.futo.gitlab.videostreaming.fcast-sdk-jitpack:sender-sdk-minimal:0.4.0') {
-        // Polycentricandroid includes this
-        exclude group: 'net.java.dev.jna'
-    }
 }

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

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

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

@@ -118,14 +118,13 @@ inline fun <reified T> V8ValueArray.expectV8Variants(config: IV8PluginConfig, co
 inline fun V8Plugin.ensureIsBusy() {
     this.let {
         if (!it.isThreadAlreadyBusy()) {
-            //throw IllegalStateException("Tried to access V8Plugin without busy");
             val stacktrace = Thread.currentThread().stackTrace;
-            Logger.w("Extensions_V8",
-                "V8 USE OUTSIDE BUSY: " + stacktrace.drop(3)?.firstOrNull().toString() +
-                        ", " + stacktrace.drop(4)?.firstOrNull().toString() +
-                        ", " + stacktrace.drop(5)?.firstOrNull()?.toString() +
-                        ", " + stacktrace.drop(6)?.firstOrNull()?.toString()
-            );
+            val message = "V8 USE OUTSIDE BUSY: " + stacktrace.drop(3)?.firstOrNull().toString() +
+                ", " + stacktrace.drop(4)?.firstOrNull().toString() +
+                ", " + stacktrace.drop(5)?.firstOrNull()?.toString() +
+                ", " + stacktrace.drop(6)?.firstOrNull()?.toString();
+            Logger.w("Extensions_V8", message);
+            throw IllegalStateException(message);
         }
     }
 }
@@ -136,8 +135,7 @@ inline fun V8Value.ensureIsBusy() {
 }
 
 inline fun <reified T> V8Value.expectV8Variant(config: IV8PluginConfig, contextName: String): T {
-    if(false)
-        ensureIsBusy();
+    ensureIsBusy();
     return when(T::class) {
         String::class -> this.expectOrThrow<V8ValueString>(config, contextName).value as T;
         Int::class -> {
@@ -186,10 +184,14 @@ inline fun <reified T> V8Value.expectV8Variant(config: IV8PluginConfig, contextN
         else -> throw NotImplementedError("Type ${T::class.simpleName} not implemented conversion");
     }
 }
-fun V8ArrayToStringList(obj: V8ValueArray): List<String> = obj.keys.map { obj.getString(it) };
+fun V8ArrayToStringList(obj: V8ValueArray): List<String> {
+    obj.ensureIsBusy();
+    return obj.keys.map { obj.getString(it) };
+}
 fun V8ObjectToHashMap(obj: V8ValueObject?): HashMap<String, String> {
     if(obj == null)
         return hashMapOf();
+    obj.ensureIsBusy();
     val map = hashMapOf<String, String>();
     for(prop in obj.ownPropertyNames.keys.map { obj.ownPropertyNames.get<V8Value>(it).toString() })
         map.put(prop, obj.getString(prop));
@@ -203,21 +205,27 @@ fun <T: V8Value> V8ValuePromise.toV8ValueBlocking(plugin: V8Plugin): T {
     plugin.busy {
         this.register(object: IV8ValuePromise.IListener {
             override fun onFulfilled(p0: V8Value?) {
-                if(p0 is V8ValueError)
-                    promiseException = ScriptExecutionException(plugin.config, p0.message);
-                else {
-                    if(p0 is V8ValueObject)
-                        p0.setWeak();
-                    promiseResult = p0 as T;
+                plugin.busy {
+                    if(p0 is V8ValueError)
+                        promiseException = ScriptExecutionException(plugin.config, p0.message);
+                    else {
+                        if(p0 is V8ValueObject)
+                            p0.setWeak();
+                        promiseResult = p0 as T;
+                    }
                 }
                 latch.countDown();
             }
             override fun onRejected(p0: V8Value?) {
-                promiseException = p0?.toException(plugin.config);
+                plugin.busy {
+                    promiseException = p0?.toException(plugin.config);
+                }
                 latch.countDown();
             }
             override fun onCatch(p0: V8Value?) {
-                promiseException = p0?.toException(plugin.config);
+                plugin.busy {
+                    promiseException = p0?.toException(plugin.config);
+                }
                 latch.countDown();
             }
         });
@@ -229,20 +237,23 @@ fun <T: V8Value> V8ValuePromise.toV8ValueBlocking(plugin: V8Plugin): T {
     }
     //Logger.i("V8", "V8ValueBlocking started (Busy) [" + blockCount + "]" + Thread.currentThread().stackTrace.drop(3)?.firstOrNull()?.toString() + ", " + Thread.currentThread().stackTrace.drop(4)?.firstOrNull()?.toString()+ ", " + Thread.currentThread().stackTrace.drop(5)?.firstOrNull()?.toString());
 
-
-    if(!promise.isPending) {
-        try {
-            Logger.i("V8", "V8Promise resolved synchronously");
-            if(promise.isFulfilled)
-                promiseResult = promise.getResult<T>();
-            else
-                promiseException = promise.getResult<V8Value>().toException(plugin.config);
+    val isPending = plugin.busy {
+        promise.isPending
+    };
+    if(!isPending) {
+        plugin.busy {
+            try {
+                Logger.i("V8", "V8Promise resolved synchronously");
+                if(promise.isFulfilled)
+                    promiseResult = promise.getResult<T>();
+                else
+                    promiseException = promise.getResult<V8Value>().toException(plugin.config);
+            }
+            catch(ex: Throwable) {
+                promiseException = ex;
+            }
         }
-        catch(ex: Throwable) {
-            promiseException = ex;
-        }
-    }
-    else {
+    } else {
         plugin.unbusy {
             latch.await();
         }
@@ -266,15 +277,19 @@ fun <T: V8Value> V8ValuePromise.toV8ValueAsync(plugin: V8Plugin): V8Deferred<T>
     plugin.busy {
         this.register(object: IV8ValuePromise.IListener {
             override fun onFulfilled(p0: V8Value?) {
-                plugin.resolvePromise(promise);
-                underlyingDef.complete(p0 as T);
+                plugin.busy {
+                    plugin.resolvePromise(promise);
+                    underlyingDef.complete(p0 as T);
+                }
             }
             override fun onRejected(p0: V8Value?) {
                 try {
-                    plugin.resolvePromise(promise);
-                    val exceptionFound = p0?.toException(plugin.config) ?: NotImplementedError("onRejected promise not implemented..");
-                    Logger.i("V8", "Promise rejected, setting exception");
-                    underlyingDef.completeExceptionally(CancellationException(exceptionFound.message, exceptionFound));
+                    plugin.busy {
+                        plugin.resolvePromise(promise);
+                        val exceptionFound = p0?.toException(plugin.config) ?: NotImplementedError("onRejected promise not implemented..");
+                        Logger.i("V8", "Promise rejected, setting exception");
+                        underlyingDef.completeExceptionally(CancellationException(exceptionFound.message, exceptionFound));
+                    }
                 }
                 catch(ex: Throwable) {
                     Logger.e("V8", "Rejection handling failed?" , ex);
@@ -282,9 +297,11 @@ fun <T: V8Value> V8ValuePromise.toV8ValueAsync(plugin: V8Plugin): V8Deferred<T>
             }
             override fun onCatch(p0: V8Value?) {
                 try {
-                    plugin.resolvePromise(promise);
-                    val exceptionFound = p0?.toException(plugin.config) ?: NotImplementedError("onCatch promise not implemented..");
-                    underlyingDef.completeExceptionally(CancellationException(exceptionFound.message, exceptionFound));
+                    plugin.busy {
+                        plugin.resolvePromise(promise);
+                        val exceptionFound = p0?.toException(plugin.config) ?: NotImplementedError("onCatch promise not implemented..");
+                        underlyingDef.completeExceptionally(CancellationException(exceptionFound.message, exceptionFound));
+                    }
                 }
                 catch(ex: Throwable) {
                     Logger.e("V8", "Catching handling failed?" , ex);
@@ -300,6 +317,7 @@ fun <T: V8Value> V8ValuePromise.toV8ValueAsync(plugin: V8Plugin): V8Deferred<T>
 }
 
 fun V8Value.toException(config: IV8PluginConfig): Throwable {
+    ensureIsBusy();
     val p0 = this;
     if(p0 is V8ValueObject) {
         return V8Plugin.getExceptionFromPlugin(config, p0, null, null, null, "P:");
@@ -349,6 +367,7 @@ class V8Deferred<T>(val deferred: Deferred<T>, val estDuration: Int = -1): Defer
 
 
 fun <T: V8Value> V8ValueObject.invokeV8(method: String, vararg obj: Any?): T {
+    ensureIsBusy();
     var result = this.invoke<V8Value>(method, *obj);
     if(result is V8ValuePromise) {
         return result.toV8ValueBlocking(this.getSourcePlugin()!!);
@@ -356,6 +375,7 @@ fun <T: V8Value> V8ValueObject.invokeV8(method: String, vararg obj: Any?): T {
     return result as T;
 }
 fun <T: V8Value> V8ValueObject.invokeV8Async(method: String, vararg obj: Any?): V8Deferred<T> {
+    ensureIsBusy();
     var result = this.invoke<V8Value>(method, *obj);
     if(result is V8ValuePromise) {
         return result.toV8ValueAsync(this.getSourcePlugin()!!);
@@ -363,6 +383,7 @@ fun <T: V8Value> V8ValueObject.invokeV8Async(method: String, vararg obj: Any?):
     return V8Deferred(CompletableDeferred(result as T));
 }
 fun V8ValueObject.invokeV8Void(method: String, vararg obj: Any?): V8Value {
+    ensureIsBusy();
     var result = this.invoke<V8Value>(method, *obj);
     if(result is V8ValuePromise) {
         return result.toV8ValueBlocking(this.getSourcePlugin()!!);
@@ -370,6 +391,7 @@ fun V8ValueObject.invokeV8Void(method: String, vararg obj: Any?): V8Value {
     return result;
 }
 fun V8ValueObject.invokeV8VoidAsync(method: String, vararg obj: Any?): V8Deferred<V8Value> {
+    ensureIsBusy();
     var result = this.invoke<V8Value>(method, *obj);
     if(result is V8ValuePromise) {
         val result = result.toV8ValueAsync<V8Value>(this.getSourcePlugin()!!);
@@ -399,4 +421,4 @@ fun <T> IPager<T>.toList(): List<T> {
     }
 
     return list.toList();
-}
+}

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

@@ -313,7 +313,7 @@ class Settings : FragmentedStorageFileJson() {
         var showSubscriptionGroups: Boolean = true;
 
         @FormField(R.string.use_subscription_exchange, FieldForm.TOGGLE, R.string.use_subscription_exchange_description, 6)
-        var useSubscriptionExchange: Boolean = false;
+        var useSubscriptionExchange: Boolean = true;
 
         @AdvancedField
         @FormField(R.string.preview_feed_items, FieldForm.TOGGLE, R.string.preview_feed_items_description, 6)
@@ -789,7 +789,6 @@ class Settings : FragmentedStorageFileJson() {
     }
 
     @FormField(R.string.plugins, FieldForm.GROUP, -1, 13)
-    @Transient
     var plugins = Plugins();
     @Serializable
     class Plugins {
@@ -800,7 +799,7 @@ class Settings : FragmentedStorageFileJson() {
 
         @AdvancedField
         @FormField(R.string.clear_cookies_after_login, FieldForm.TOGGLE, R.string.clear_cookies_after_login_desc, 0)
-        var clearCookiesAfterLogin: Boolean = true;
+        var clearCookiesAfterLogin: Boolean = false;
         @AdvancedField
         @FormField(R.string.clear_cookies_on_logout, FieldForm.TOGGLE, R.string.clears_cookies_when_you_log_out, 0)
         var clearCookiesOnLogout: Boolean = true;
@@ -883,7 +882,7 @@ class Settings : FragmentedStorageFileJson() {
 
         @FormField(R.string.background_download, FieldForm.TOGGLE, R.string.configure_if_background_download_should_be_used, 1)
         //@DropdownFieldOptionsId(R.array.background_download)
-        var shouldBackgroundDownload: Boolean = false;
+        var shouldBackgroundDownload: Boolean = true;
 
         @FormField(R.string.download_when, FieldForm.DROPDOWN, R.string.configure_when_updates_should_be_downloaded, 2)
         @DropdownFieldOptionsId(R.array.when_download)

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

@@ -32,6 +32,7 @@ import com.futo.platformplayer.api.media.models.video.IPlatformVideo
 import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
 import com.futo.platformplayer.api.media.models.video.SerializedPlatformVideo
 import com.futo.platformplayer.api.media.platforms.js.JSClient
+import com.futo.platformplayer.api.media.platforms.js.models.sources.JSSource
 import com.futo.platformplayer.api.media.platforms.js.models.sources.JSDashManifestRawAudioSource
 import com.futo.platformplayer.api.media.platforms.js.models.sources.JSDashManifestRawSource
 import com.futo.platformplayer.downloads.VideoLocal
@@ -382,7 +383,8 @@ class UISlideOverlays {
             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)
+                val modifier = if (source is JSSource && source.hasRequestModifier) source.getRequestModifier() else null
+                val masterPlaylistResponse = ManagedHttpClient().get(sourceUrl, HashMap(), modifier)
                 check(masterPlaylistResponse.isOk) { "Failed to get master playlist: ${masterPlaylistResponse.code}" }
 
                 val masterPlaylistContent = masterPlaylistResponse.body?.string()
@@ -515,7 +517,7 @@ class UISlideOverlays {
 
                     slideUpMenuOverlay.onOK.subscribe {
                         //TODO: Fix SubtitleRawSource issue
-                        StateDownloads.instance.download(video, selectedVideoVariant, selectedAudioVariant, null);
+                        StateDownloads.instance.download(video, selectedVideoVariant, selectedAudioVariant, null, videoModifier = modifier, audioModifier = modifier);
                         slideUpMenuOverlay.hide()
                     }
 
@@ -526,11 +528,11 @@ class UISlideOverlays {
                     if (masterPlaylistContent.lines().any { it.startsWith("#EXTINF:") }) {
                         withContext(Dispatchers.Main) {
                             if (source is IHLSManifestSource) {
-                                StateDownloads.instance.download(video, HLSVariantVideoUrlSource("variant", 0, 0, "application/vnd.apple.mpegurl", "", null, 0, false, resolvedPlaylistUrl), null, null)
+                                StateDownloads.instance.download(video, HLSVariantVideoUrlSource("variant", 0, 0, "application/vnd.apple.mpegurl", "", null, 0, false, resolvedPlaylistUrl), null, null, videoModifier = modifier)
                                 UIDialogs.toast(container.context, "Variant video HLS playlist download started")
                                 slideUpMenuOverlay.hide()
                             } else if (source is IHLSManifestAudioSource) {
-                                StateDownloads.instance.download(video, null, HLSVariantAudioUrlSource("variant", 0, "application/vnd.apple.mpegurl", "", "", null, false, false, resolvedPlaylistUrl), null)
+                                StateDownloads.instance.download(video, null, HLSVariantAudioUrlSource("variant", 0, "application/vnd.apple.mpegurl", "", "", null, false, false, resolvedPlaylistUrl), null, audioModifier = modifier)
                                 UIDialogs.toast(container.context, "Variant audio HLS playlist download started")
                                 slideUpMenuOverlay.hide()
                             } else {

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

@@ -5,50 +5,14 @@ import android.content.Context
 import android.content.Intent
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
-import com.futo.platformplayer.activities.MainActivity
-import com.futo.platformplayer.dialogs.AutoUpdateDialog
-import com.futo.platformplayer.states.StateApp
-import java.io.File
 
 class UpdateActionReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context, intent: Intent) {
         when (intent.action) {
-            UpdateNotificationManager.ACTION_UPDATE_YES -> handleUpdateYes(context, intent)
-            UpdateNotificationManager.ACTION_UPDATE_NO -> handleUpdateNo(context)
-            UpdateNotificationManager.ACTION_UPDATE_NEVER -> handleUpdateNever(context)
             UpdateNotificationManager.ACTION_DOWNLOAD_CANCEL -> handleDownloadCancel(context, intent)
         }
     }
 
-    private fun handleUpdateYes(context: Context, intent: Intent) {
-        AutoUpdateDialog.currentDialog?.dismiss()
-
-        val version = intent.getIntExtra(UpdateNotificationManager.EXTRA_VERSION, 0)
-        if (version == 0) {
-            return
-        }
-
-        NotificationManagerCompat.from(context).cancel(UpdateNotificationManager.NOTIF_ID_AVAILABLE)
-
-        val serviceIntent = Intent(context, UpdateDownloadService::class.java).apply {
-            putExtra(UpdateDownloadService.EXTRA_VERSION, version)
-        }
-        ContextCompat.startForegroundService(context, serviceIntent)
-    }
-
-    private fun handleUpdateNo(context: Context) {
-        AutoUpdateDialog.currentDialog?.dismiss()
-        NotificationManagerCompat.from(context).cancel(UpdateNotificationManager.NOTIF_ID_AVAILABLE)
-    }
-
-    private fun handleUpdateNever(context: Context) {
-        AutoUpdateDialog.currentDialog?.dismiss()
-        Settings.instance.autoUpdate.check = 1
-        Settings.instance.save()
-
-        UpdateNotificationManager.cancelAll(context)
-    }
-
     private fun handleDownloadCancel(context: Context, intent: Intent) {
         val version = intent.getIntExtra(UpdateNotificationManager.EXTRA_VERSION, 0)
 

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

@@ -1,11 +1,12 @@
 package com.futo.platformplayer
 
 import android.content.Context
+import android.content.Intent
+import androidx.core.content.ContextCompat
 import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StateUpdate
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -35,18 +36,16 @@ class UpdateCheckWorker(appContext: Context, workerParams: WorkerParameters) : C
                     return@withContext Result.success()
                 }
 
-                UpdateNotificationManager.showUpdateAvailableNotification(applicationContext, latestVersion)
+                StateUpdate.Companion.instance.setUiAvailable(latestVersion)
 
-                if (StateApp.instance.isMainActive) {
-                    withContext(Dispatchers.Main) {
-                        StateApp.withContext { ctx ->
-                            try {
-                                UIDialogs.showUpdateAvailableDialog(ctx, latestVersion, false)
-                            } catch (t: Throwable) {
-                                Logger.w(TAG, "Failed to show in-app update dialog from worker", t)
-                            }
-                        }
+                try {
+                    val serviceIntent = Intent(applicationContext, UpdateDownloadService::class.java).apply {
+                        putExtra(UpdateDownloadService.EXTRA_VERSION, latestVersion)
                     }
+                    ContextCompat.startForegroundService(applicationContext, serviceIntent)
+                } catch (t: Throwable) {
+                    Logger.w(TAG, "Failed to start UpdateDownloadService", t)
+                    StateUpdate.Companion.instance.setUiFailed(latestVersion, t.message)
                 }
 
                 Result.success()

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

@@ -1,17 +1,15 @@
 package com.futo.platformplayer
 
-import android.app.Dialog
 import android.app.Service
 import android.content.Intent
 import android.os.IBinder
 import android.os.SystemClock
-import com.futo.platformplayer.UIDialogs.ActionStyle
+import androidx.core.app.NotificationManagerCompat
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.ImageVariable
 import com.futo.platformplayer.states.AnnouncementType
 import com.futo.platformplayer.states.SessionAnnouncement
 import com.futo.platformplayer.states.StateAnnouncement
-import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StateUpdate
 import kotlinx.coroutines.*
 import java.io.File
@@ -30,8 +28,6 @@ class UpdateDownloadService : Service() {
         private const val INITIAL_BACKOFF_MS = 5_000L
         private const val BUFFER_SIZE = 8 * 1024
         private const val MIN_PROGRESS_UPDATE_INTERVAL_MS = 500L
-
-        var updateDownloadedDialog: Dialog? = null
     }
 
     private val job = SupervisorJob()
@@ -56,6 +52,7 @@ class UpdateDownloadService : Service() {
         if (intent.getBooleanExtra(EXTRA_CANCEL, false)) {
             cancelRequested = true
             Logger.i(TAG, "Download cancel requested")
+            StateUpdate.Companion.instance.clearUi()
             stopForeground(Service.STOP_FOREGROUND_REMOVE)
             stopSelf()
             return START_NOT_STICKY
@@ -75,6 +72,10 @@ class UpdateDownloadService : Service() {
         isDownloading = true
         cancelRequested = false
 
+        StateUpdate.Companion.instance.setUiDownloading(version, 0, indeterminate = true)
+
+        NotificationManagerCompat.from(this).cancel(UpdateNotificationManager.NOTIF_ID_READY)
+
         val notification = UpdateNotificationManager.buildDownloadProgressNotification(this, version, 0, true)
         startForeground(UpdateNotificationManager.NOTIF_ID_DOWNLOADING, notification)
 
@@ -97,6 +98,7 @@ class UpdateDownloadService : Service() {
         if (force || now - lastProgressUpdateElapsedMs >= MIN_PROGRESS_UPDATE_INTERVAL_MS) {
             lastProgressUpdateElapsedMs = now
             UpdateNotificationManager.updateDownloadProgress(this, version, progress, indeterminate);
+            StateUpdate.Companion.instance.setUiDownloading(version, progress, indeterminate)
 
             if(onProgress != null)
                 onProgress.invoke(progress);
@@ -132,7 +134,7 @@ class UpdateDownloadService : Service() {
                 }
 
                 try {
-                    performDownload(StateUpdate.APK_URL, partialFile, version, {
+                    performDownload(StateUpdate.getApkUrl(version), partialFile, version, {
                         try {
                             if (announcement != null)
                                 announcement?.setProgress(it);
@@ -159,6 +161,7 @@ class UpdateDownloadService : Service() {
                     if (attempt == MAX_RETRIES - 1) {
                         Logger.e(TAG, "Download failed after ${attempt + 1} attempts", t)
                         UpdateNotificationManager.showDownloadFailedNotification(this, version, t)
+                        StateUpdate.Companion.instance.setUiFailed(version, t.message)
                         break
                     } else {
                         Logger.w(TAG, "Download attempt ${attempt + 1} failed, retrying in ${backoffMs / 1000}s", t)
@@ -264,39 +267,16 @@ class UpdateDownloadService : Service() {
     private fun onDownloadComplete(version: Int, apkFile: File) {
         Logger.i(TAG, "Download complete for version=$version, file=${apkFile.absolutePath}")
         UpdateNotificationManager.showDownloadCompleteNotification(this, version, apkFile)
+        StateUpdate.Companion.instance.setUiReady(version, apkFile)
 
-        if (StateApp.instance.isMainActive) {
-            StateApp.instance.scopeOrNull?.launch(Dispatchers.Main) {
-                StateApp.withContext { ctx ->
-                    try {
-                        updateDownloadedDialog = UIDialogs.showDialog(ctx, R.drawable.foreground,
-                            "Update downloaded",
-                            "Would you like to install it now?", null, 0,
-                            UIDialogs.Action("Not now", {
-                                updateDownloadedDialog = null
-                            }, ActionStyle.NONE, true),
-                            UIDialogs.Action("Install", {
-                                UpdateNotificationManager.cancelAll(ctx)
-                                UpdateInstaller.startInstall(ctx, version, apkFile)
-                            }, ActionStyle.PRIMARY, true));
-
-                        try {
-                            StateAnnouncement.instance.registerAnnouncement("install-update-apk", "Grayjay v${version} is ready!", "You can now install the new Grayjay version.",
-                                AnnouncementType.SESSION,
-                                OffsetDateTime.now(), "update", "Install", {
-                                    UpdateNotificationManager.cancelAll(ctx)
-                                    UpdateInstaller.startInstall(ctx, version, apkFile)
-                                });
-                        }
-                        catch(ex: Throwable) {
-
-                        }
-                    } catch (t: Throwable) {
-                        Logger.w(TAG, "Failed to show in-app update downloaded dialog", t)
-                        updateDownloadedDialog = null
-                    }
-                }
+        try {
+            val ctx = applicationContext
+            StateAnnouncement.instance.registerAnnouncement("install-update-apk", "Grayjay v${version} is ready!", "You can now install the new Grayjay version.", AnnouncementType.SESSION, OffsetDateTime.now(), "update", "Install") {
+                UpdateNotificationManager.cancelAll(ctx)
+                UpdateInstaller.startInstall(ctx, version, apkFile)
             }
+        } catch (ex: Throwable) {
+            Logger.w(TAG, "Failed to register install announcement", ex)
         }
     }
 }

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

@@ -21,6 +21,7 @@ import java.io.InputStream
 import androidx.core.net.toUri
 import com.futo.platformplayer.dialogs.AutoUpdateDialog
 import com.futo.platformplayer.states.StateApp
+import com.futo.platformplayer.states.StateUpdate
 
 object UpdateInstaller {
     private const val TAG = "UpdateInstaller"
@@ -61,6 +62,17 @@ object UpdateInstaller {
             var inputStream: InputStream? = null
             var session: PackageInstaller.Session? = null
             try {
+                val dataLength = apkFile.length()
+                val usable = try { context.filesDir.usableSpace } catch (_: Throwable) { -1L }
+                if (usable in 0 until dataLength) {
+                    val msg = "Not enough storage to install update. Need ${dataLength / 1_048_576L}MB, have ${usable / 1_048_576L}MB free."
+                    Logger.w(TAG, msg)
+                    withContext(Dispatchers.Main) {
+                        UIDialogs.toast(context, msg)
+                    }
+                    UpdateNotificationManager.showInstallFailedNotification(context, version, apkFile, msg)
+                    return@launch
+                }
 
                 val packageInstaller: PackageInstaller = context.packageManager.packageInstaller
                 val params = PackageInstaller.SessionParams(PackageInstaller.SessionParams.MODE_FULL_INSTALL)
@@ -68,7 +80,6 @@ object UpdateInstaller {
                 session = packageInstaller.openSession(sessionId)
 
                 inputStream = apkFile.inputStream()
-                val dataLength = apkFile.length()
 
                 session.openWrite("package", 0, dataLength).use { sessionStream ->
                     inputStream.copyToOutputStream(dataLength, sessionStream) { _ -> }
@@ -91,11 +102,18 @@ object UpdateInstaller {
             } catch (e: Throwable) {
                 Logger.w(TAG, "Exception while installing update", e)
                 session?.abandon()
+
+                val raw = e.message ?: ""
+                val friendly = if (raw.contains("Failed to allocate") || raw.contains("allocatable") || raw.contains("ENOSPC", ignoreCase = true)) {
+                    "Not enough storage to install update. Free up some space and try again."
+                } else {
+                    "Failed to install update: $raw"
+                }
                 withContext(Dispatchers.Main) {
-                    UIDialogs.toast(context, "Failed to install update: ${e.message}")
+                    UIDialogs.toast(context, friendly)
                 }
 
-                UpdateNotificationManager.showInstallFailedNotification(context, version, apkFile, e.message)
+                UpdateNotificationManager.showInstallFailedNotification(context, version, apkFile, friendly)
             } finally {
                 session?.close()
                 inputStream?.close()
@@ -110,10 +128,12 @@ object UpdateInstaller {
             if (result.isNullOrEmpty()) {
                 Logger.i(TAG, "Update install finished successfully")
                 UpdateNotificationManager.showInstallSucceededNotification(context, version)
+                StateUpdate.instance.clearUi()
             } else {
                 Logger.w(TAG, "Update install failed: $result")
                 UpdateNotificationManager.showInstallFailedNotification(context, version, apkFile, result)
                 UIDialogs.showGeneralErrorDialog(context, "Install failed due to:\n$result")
+                StateUpdate.instance.setUiReady(version, apkFile)
             }
         } catch (e: Throwable) {
             Logger.e(TAG, "Failed to handle install result", e)

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

@@ -22,9 +22,6 @@ object UpdateNotificationManager {
     private const val CHANNEL_NAME = "App updates"
     private const val CHANNEL_DESCRIPTION = "Notifications about new app versions"
 
-    const val ACTION_UPDATE_YES = "com.futo.platformplayer.UPDATE_YES"
-    const val ACTION_UPDATE_NO = "com.futo.platformplayer.UPDATE_NO"
-    const val ACTION_UPDATE_NEVER = "com.futo.platformplayer.UPDATE_NEVER"
     const val ACTION_DOWNLOAD_CANCEL = "com.futo.platformplayer.UPDATE_CANCEL"
     const val ACTION_INSTALL_NOW = "com.futo.platformplayer.UPDATE_INSTALL"
     private const val REQUEST_CODE_INSTALL = 1001
@@ -32,7 +29,6 @@ object UpdateNotificationManager {
     const val EXTRA_VERSION = "version"
     const val EXTRA_APK_PATH = "apk_path"
 
-    const val NOTIF_ID_AVAILABLE = 2001
     const val NOTIF_ID_DOWNLOADING = 2002
     const val NOTIF_ID_READY = 2003
     const val NOTIF_ID_INSTALL_FAILED = 2004
@@ -84,43 +80,6 @@ object UpdateNotificationManager {
         NotificationManagerCompat.from(context).notify(NOTIF_ID_INSTALL_SUCCEEDED, builder.build())
     }
 
-    fun showUpdateAvailableNotification(context: Context, version: Int) {
-        if (ContextCompat.checkSelfPermission(context, Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
-            return
-        }
-
-        ensureChannel(context)
-
-        val yesIntent = Intent(context, UpdateActionReceiver::class.java).apply {
-            action = ACTION_UPDATE_YES
-            putExtra(EXTRA_VERSION, version)
-        }
-        val yesPendingIntent = getBroadcast(context, 0, yesIntent, FLAG_MUTABLE or FLAG_UPDATE_CURRENT)
-        val noIntent = Intent(context, UpdateActionReceiver::class.java).apply {
-            action = ACTION_UPDATE_NO
-            putExtra(EXTRA_VERSION, version)
-        }
-        val noPendingIntent = getBroadcast(context, 1, noIntent, FLAG_MUTABLE or FLAG_UPDATE_CURRENT)
-        val neverIntent = Intent(context, UpdateActionReceiver::class.java).apply {
-            action = ACTION_UPDATE_NEVER
-            putExtra(EXTRA_VERSION, version)
-        }
-        val neverPendingIntent = getBroadcast(context, 2, neverIntent, FLAG_MUTABLE or FLAG_UPDATE_CURRENT)
-        val builder = NotificationCompat.Builder(context, CHANNEL_ID)
-            .setSmallIcon(R.drawable.foreground)
-            .setContentTitle("Update available")
-            .setContentText("A new version ($version) is available.")
-            .setPriority(NotificationCompat.PRIORITY_DEFAULT)
-            .setAutoCancel(true)
-            .setContentIntent(yesPendingIntent)
-            .setSilent(true)
-            .addAction(0, "Never", neverPendingIntent)
-            .addAction(0, "Not now", noPendingIntent)
-            .addAction(0, "Download", yesPendingIntent)
-
-        NotificationManagerCompat.from(context).notify(NOTIF_ID_AVAILABLE, builder.build())
-    }
-
     fun buildDownloadProgressNotification(context: Context, version: Int, progress: Int, indeterminate: Boolean): Notification {
         ensureChannel(context)
 
@@ -223,11 +182,9 @@ object UpdateNotificationManager {
     }
 
     fun cancelAll(context: Context) {
-        NotificationManagerCompat.from(context).cancel(NOTIF_ID_AVAILABLE)
         NotificationManagerCompat.from(context).cancel(NOTIF_ID_DOWNLOADING)
         NotificationManagerCompat.from(context).cancel(NOTIF_ID_READY)
         NotificationManagerCompat.from(context).cancel(NOTIF_ID_INSTALL_FAILED)
         NotificationManagerCompat.from(context).cancel(NOTIF_ID_INSTALL_SUCCEEDED)
-
     }
 }

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

@@ -68,11 +68,15 @@ class CaptchaActivity : AppCompatActivity() {
             intent.getStringExtra("body");
         else null;
 
-        _webView.settings.userAgentString = captchaConfig.userAgent ?: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 Safari/537.36";
+        // Only override UA if config specifies one, otherwise keep WebView default (matches Desktop CEF behavior)
+        if (captchaConfig.userAgent != null)
+            _webView.settings.userAgentString = captchaConfig.userAgent;
+        // Capture UA on main thread - callback fires on WebView background thread where settings access is not allowed
+        val capturedUserAgent = _webView.settings.userAgentString;
         _webView.settings.useWideViewPort = true;
         _webView.settings.loadWithOverviewMode = true;
 
-        val webViewClient = if(config != null) CaptchaWebViewClient(config) else CaptchaWebViewClient(captchaConfig);
+        val webViewClient = if(config != null) CaptchaWebViewClient(config, capturedUserAgent) else CaptchaWebViewClient(captchaConfig, capturedUserAgent);
         webViewClient.onCaptchaFinished.subscribe { captcha ->
             _callback?.let {
                 _callback = null;

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

@@ -61,11 +61,15 @@ class LoginActivity : AppCompatActivity() {
             else throw IllegalStateException("No valid configuration?");
         //TODO: Backwards compat removal?
 
-        _webView.settings.userAgentString = authConfig.userAgent ?: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 Safari/537.36";
+        // Only override UA if config specifies one, otherwise keep WebView default (matches Desktop CEF behavior)
+        if (authConfig.userAgent != null)
+            _webView.settings.userAgentString = authConfig.userAgent;
+        // Capture UA on main thread - callback fires on WebView background thread where settings access is not allowed
+        val capturedUserAgent = _webView.settings.userAgentString;
         _webView.settings.useWideViewPort = true;
         _webView.settings.loadWithOverviewMode = true;
 
-        val webViewClient = if(config != null) LoginWebViewClient(config) else LoginWebViewClient(authConfig);
+        val webViewClient = if(config != null) LoginWebViewClient(config, capturedUserAgent) else LoginWebViewClient(authConfig, capturedUserAgent);
 
         webViewClient.onLogin.subscribe { auth ->
             _callback?.let {

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

@@ -1543,4 +1543,4 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             return sourcesIntent;
         }
     }
-}
+}

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

@@ -23,6 +23,7 @@ import java.time.Duration
 import javax.net.ssl.SSLContext
 import javax.net.ssl.TrustManager
 import javax.net.ssl.X509TrustManager
+import com.futo.platformplayer.api.media.models.modifier.IRequestModifier
 import kotlin.system.measureTimeMillis
 
 open class ManagedHttpClient {
@@ -89,10 +90,16 @@ open class ManagedHttpClient {
         return clonedClient;
     }
 
-    fun tryHead(url: String): Map<String, String>? {
+    private fun applyModifier(url: String, headers: MutableMap<String, String>, modifier: IRequestModifier?): Pair<String, MutableMap<String, String>> {
+        if (modifier == null) return Pair(url, headers)
+        val modified = modifier.modifyRequest(url, headers)
+        return Pair(modified.url ?: url, modified.headers.toMutableMap())
+    }
+
+    fun tryHead(url: String, modifier: IRequestModifier? = null): Map<String, String>? {
         ensureNotMainThread()
         try {
-            val result = head(url);
+            val result = head(url, HashMap(), modifier);
             if(result.isOk)
                 return result.getHeadersFlat();
             else
@@ -141,12 +148,14 @@ open class ManagedHttpClient {
         return Socket(websocket);
     }
 
-    fun get(url : String, headers : MutableMap<String, String> = HashMap<String, String>()) : Response {
-        return execute(Request(url, "GET", null, headers));
+    fun get(url : String, headers : MutableMap<String, String> = HashMap<String, String>(), modifier: IRequestModifier? = null) : Response {
+        val (finalUrl, finalHeaders) = applyModifier(url, headers, modifier)
+        return execute(Request(finalUrl, "GET", null, finalHeaders));
     }
 
-    fun head(url : String, headers : MutableMap<String, String> = HashMap<String, String>()) : Response {
-        return execute(Request(url, "HEAD", null, headers));
+    fun head(url : String, headers : MutableMap<String, String> = HashMap<String, String>(), modifier: IRequestModifier? = null) : Response {
+        val (finalUrl, finalHeaders) = applyModifier(url, headers, modifier)
+        return execute(Request(finalUrl, "HEAD", null, finalHeaders));
     }
 
     fun post(url : String, headers : MutableMap<String, String> = HashMap<String, String>()) : Response {

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

@@ -55,6 +55,7 @@ import com.futo.platformplayer.engine.exceptions.ScriptCaptchaRequiredException
 import com.futo.platformplayer.engine.exceptions.ScriptException
 import com.futo.platformplayer.engine.exceptions.ScriptImplementationException
 import com.futo.platformplayer.engine.exceptions.ScriptValidationException
+import com.futo.platformplayer.engine.packages.PackageBridge
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.ImageVariable
 import com.futo.platformplayer.states.AnnouncementType
@@ -156,6 +157,7 @@ open class JSClient : IPlatformClient {
         _httpClient = JSHttpClient(this, null, _captcha, config);
         _httpClientAuth = JSHttpClient(this, _auth, _captcha, config);
         _plugin = V8Plugin(context, descriptor.config, null, _httpClient, _httpClientAuth);
+        _plugin.bridge.descriptor = descriptor;
         _plugin.withDependency(context, "scripts/polyfil.js");
         _plugin.withDependency(context, "scripts/source.js");
 
@@ -189,6 +191,7 @@ open class JSClient : IPlatformClient {
         _httpClient = JSHttpClient(this, null, _captcha, config);
         _httpClientAuth = JSHttpClient(this, _auth, _captcha, config);
         _plugin = V8Plugin(context, descriptor.config, script, _httpClient, _httpClientAuth);
+        _plugin.bridge.descriptor = descriptor;
         _plugin.withDependency(context, "scripts/polyfil.js");
         _plugin.withDependency(context, "scripts/source.js");
         _plugin.withScript(script);
@@ -485,13 +488,14 @@ open class JSClient : IPlatformClient {
             if (_peekChannelTypes != null) {
                 return _peekChannelTypes!!;
             }
-            val arr: V8ValueArray = plugin.executeTyped("source.getPeekChannelTypes()");
-
-            _peekChannelTypes = arr.keys.mapNotNull {
-                val str = arr.get<V8ValueString>(it);
-                return@mapNotNull str.value;
-            };
-            return _peekChannelTypes ?: listOf();
+            return busy {
+                val arr: V8ValueArray = plugin.executeTyped("source.getPeekChannelTypes()");
+                _peekChannelTypes = arr.keys.mapNotNull {
+                    val str = arr.get<V8ValueString>(it);
+                    return@mapNotNull str.value;
+                };
+                return@busy _peekChannelTypes ?: listOf();
+            }
         }
         catch(ex: Throwable) {
             announcePluginUnhandledException("getPeekChannelTypes", ex);
@@ -520,10 +524,12 @@ open class JSClient : IPlatformClient {
         if(!capabilities.hasGetChannelUrlByClaim)
             throw IllegalStateException("This plugin does not support channel url by claim");
 
-        val value = plugin.executeTyped<V8Value>("source.getChannelUrlByClaim(${claimType}, ${Json.encodeToString(claimValues)})");
-        if(value !is V8ValueString)
-            return null;
-        return value.value;
+        return busy {
+            val value = plugin.executeTyped<V8Value>("source.getChannelUrlByClaim(${claimType}, ${Json.encodeToString(claimValues)})");
+            if(value !is V8ValueString)
+                return@busy null;
+            return@busy value.value;
+        }
     }
     @JSOptional
     @JSDocs(12, "source.getChannelTemplateByClaimMap()", "Get a map for every supported claimtype mapping field to urls")
@@ -533,28 +539,30 @@ open class JSClient : IPlatformClient {
         if(!capabilities.hasGetChannelTemplateByClaimMap)
             throw IllegalStateException("This plugin does not support channel template by claim map");
 
-        val value = plugin.executeTyped<V8Value>("source.getChannelTemplateByClaimMap()");
-        if(value !is V8ValueObject)
-            return mapOf();
+        return busy {
+            val value = plugin.executeTyped<V8Value>("source.getChannelTemplateByClaimMap()");
+            if(value !is V8ValueObject)
+                return@busy mapOf();
 
-        val claimTypes = mutableMapOf<Int, Map<Int, String>>();
+            val claimTypes = mutableMapOf<Int, Map<Int, String>>();
 
-        val keys = value.ownPropertyNames;
-        for(key in keys.toArray()) {
-            if(key is V8ValueInteger) {
-                val map = value.get<V8ValueObject>(key);
-                val mapKeys = map.ownPropertyNames;
+            val keys = value.ownPropertyNames;
+            for(key in keys.toArray()) {
+                if(key is V8ValueInteger) {
+                    val map = value.get<V8ValueObject>(key);
+                    val mapKeys = map.ownPropertyNames;
 
-                claimTypes[key.value] = mapKeys.toArray().filter {
-                    it is V8ValueInteger
-                }.associate {
-                    val mapKey = (it as V8ValueInteger).value;
-                    return@associate Pair(mapKey, map.getString(mapKey));
-                };
+                    claimTypes[key.value] = mapKeys.toArray().filter {
+                        it is V8ValueInteger
+                    }.associate {
+                        val mapKey = (it as V8ValueInteger).value;
+                        return@associate Pair(mapKey, map.getString(mapKey));
+                    };
+                }
             }
+            channelClaimTemplates = claimTypes.toMap();
+            return@busy claimTypes;
         }
-        channelClaimTemplates = claimTypes.toMap();
-        return claimTypes;
     }
 
 
@@ -695,27 +703,33 @@ open class JSClient : IPlatformClient {
     @JSDocs(22, "source.getUserPlaylists()", "Gets the playlist of the current user")
     override fun getUserPlaylists(): Array<String> {
         ensureEnabled();
-        return plugin.executeTyped<V8ValueArray>("source.getUserPlaylists()")
-            .toArray()
-            .map { (it as V8ValueString).value }
-            .toTypedArray();
+        return busy {
+            return@busy plugin.executeTyped<V8ValueArray>("source.getUserPlaylists()")
+                .toArray()
+                .map { (it as V8ValueString).value }
+                .toTypedArray();
+        }
     }
 
     @JSOptional
     @JSDocs(23, "source.getUserSubscriptions()", "Gets the subscriptions of the current user")
     override fun getUserSubscriptions(): Array<String> {
         ensureEnabled();
-        return plugin.executeTyped<V8ValueArray>("source.getUserSubscriptions()")
-            .toArray()
-            .map { (it as V8ValueString).value }
-            .toTypedArray();
+        return busy {
+            return@busy plugin.executeTyped<V8ValueArray>("source.getUserSubscriptions()")
+                .toArray()
+                .map { (it as V8ValueString).value }
+                .toTypedArray();
+        }
     }
 
     @JSOptional
     @JSDocs(23, "source.getUserHistory()", "Gets the history of the current user")
     override fun getUserHistory(): IPager<IPlatformContent> {
         ensureEnabled();
-        return JSContentPager(config, this, plugin.executeTyped("source.getUserHistory()"));
+        return isBusyWith("getUserHistory") {
+            return@isBusyWith JSContentPager(config, this, plugin.executeTyped("source.getUserHistory()"));
+        }
     }
 
     fun validate() {
@@ -891,4 +905,4 @@ open class JSClient : IPlatformClient {
             return name;
         }
     }
-}
+}

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

@@ -5,9 +5,9 @@ import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 
-data class SourceAuth(val cookieMap: HashMap<String, HashMap<String, String>>? = null, val headers: Map<String, Map<String, String>> = mapOf()) {
+data class SourceAuth(val cookieMap: HashMap<String, HashMap<String, String>>? = null, val headers: Map<String, Map<String, String>> = mapOf(), val userAgent: String? = null) {
     override fun toString(): String {
-        return "(headers: '$headers', cookieString: '$cookieMap')";
+        return "(headers: '$headers', cookieString: '$cookieMap', userAgent: '$userAgent')";
     }
 
     fun toEncrypted(): String{
@@ -15,23 +15,25 @@ data class SourceAuth(val cookieMap: HashMap<String, HashMap<String, String>>? =
     }
 
     private fun serialize(): String {
-        return Json.encodeToString(SerializedAuth(cookieMap, headers));
+        return Json.encodeToString(SerializedAuth(cookieMap, headers, userAgent));
     }
 
     companion object {
         val TAG = "SourceAuth";
+        private val _json = Json { ignoreUnknownKeys = true };
 
         fun fromEncrypted(encrypted: String?): SourceAuth? {
             return SourceEncrypted.decryptEncrypted(encrypted) { deserialize(it) };
         }
 
         private fun deserialize(str: String): SourceAuth {
-            val data = Json.decodeFromString<SerializedAuth>(str);
-            return SourceAuth(data.cookieMap, data.headers);
+            val data = _json.decodeFromString<SerializedAuth>(str);
+            return SourceAuth(data.cookieMap, data.headers, data.userAgent);
         }
     }
 
     @Serializable
     data class SerializedAuth(val cookieMap: HashMap<String, HashMap<String, String>>?,
-                              val headers: Map<String, Map<String, String>> = mapOf())
+                              val headers: Map<String, Map<String, String>> = mapOf(),
+                              val userAgent: String? = null)
 }

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

@@ -5,9 +5,9 @@ import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 
-data class SourceCaptchaData(val cookieMap: HashMap<String, HashMap<String, String>>? = null, val headers: Map<String, Map<String, String>> = mapOf()) {
+data class SourceCaptchaData(val cookieMap: HashMap<String, HashMap<String, String>>? = null, val headers: Map<String, Map<String, String>> = mapOf(), val userAgent: String? = null) {
     override fun toString(): String {
-        return "(headers: '$headers', cookieString: '$cookieMap')";
+        return "(headers: '$headers', cookieString: '$cookieMap', userAgent: '$userAgent')";
     }
 
     fun toEncrypted(): String{
@@ -15,23 +15,25 @@ data class SourceCaptchaData(val cookieMap: HashMap<String, HashMap<String, Stri
     }
 
     private fun serialize(): String {
-        return Json.encodeToString(SerializedCaptchaData(cookieMap, headers));
+        return Json.encodeToString(SerializedCaptchaData(cookieMap, headers, userAgent));
     }
 
     companion object {
         val TAG = "SourceCaptchaData";
+        private val _json = Json { ignoreUnknownKeys = true };
 
         fun fromEncrypted(encrypted: String?): SourceCaptchaData? {
             return SourceEncrypted.decryptEncrypted(encrypted) { deserialize(it) };
         }
 
         fun deserialize(str: String): SourceCaptchaData {
-            val data = Json.decodeFromString<SerializedCaptchaData>(str);
-            return SourceCaptchaData(data.cookieMap, data.headers);
+            val data = _json.decodeFromString<SerializedCaptchaData>(str);
+            return SourceCaptchaData(data.cookieMap, data.headers, data.userAgent);
         }
     }
 
     @Serializable
     data class SerializedCaptchaData(val cookieMap: HashMap<String, HashMap<String, String>>?,
-                              val headers: Map<String, Map<String, String>> = mapOf())
+                              val headers: Map<String, Map<String, String>> = mapOf(),
+                              val userAgent: String? = null)
 }

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

@@ -170,12 +170,12 @@ class SourcePluginConfig(
                 "Unrestricted Http Header access",
                 "Allows this plugin to access all headers (including cookies and authorization headers) for unauthenticated requests."
             ))
-        if(packagesOptional.contains("Browser") || packages.contains("Browser")) {
+        /*if(packagesOptional.contains("Browser") || packages.contains("Browser")) {
             list.add(Pair(
                 "Browser Interop",
                 "This plugin requires webbrowser interop. May access urls outside of the restricted urls. This will only work for official plugins and during development builds."
             ))
-        }
+        }*/
 
         return list;
     }

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

@@ -21,6 +21,7 @@ import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.getOrDefault
 import com.futo.platformplayer.getOrThrow
 import com.futo.platformplayer.getOrThrowNullableList
+import com.futo.platformplayer.getSourcePlugin
 import com.futo.platformplayer.states.StateDeveloper
 
 open class JSArticle(
@@ -34,7 +35,7 @@ open class JSArticle(
         obj.getOrDefault<String>(config, "summary", "PlatformArticle", "") ?: ""
 
     override val thumbnails: Thumbnails? =
-        if (obj.has("thumbnails"))
+        if (obj.getSourcePlugin()?.busy { obj.has("thumbnails") } ?: obj.has("thumbnails"))
             Thumbnails.fromV8(
                 config,
                 obj.getOrThrow<V8ValueObject>(config, "thumbnails", "PlatformArticle")

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

@@ -31,18 +31,20 @@ open class JSArticleDetails(
 
     final override val contentType: ContentType = ContentType.ARTICLE
 
-    private val _hasGetComments: Boolean = _content.has("getComments")
-    private val _hasGetContentRecommendations: Boolean = _content.has("getContentRecommendations")
+    private val _hasGetComments: Boolean = client.busy { _content.has("getComments") }
+    private val _hasGetContentRecommendations: Boolean = client.busy { _content.has("getContentRecommendations") }
 
-    override val rating: IRating =
+    override val rating: IRating = client.busy {
         obj.getOrDefault<V8ValueObject>(client.config, "rating", "PlatformArticle", null)
             ?.let { IRating.fromV8(client.config, it, "PlatformArticle") }
             ?: RatingLikes(0)
+    }
 
-    override val summary: String =
+    override val summary: String = client.busy {
         _content.getOrThrow(client.config, "summary", "PlatformArticle")
+    }
 
-    override val thumbnails: Thumbnails? =
+    override val thumbnails: Thumbnails? = client.busy {
         if (_content.has("thumbnails"))
             Thumbnails.fromV8(
                 client.config,
@@ -50,14 +52,19 @@ open class JSArticleDetails(
             )
         else
             null
+    }
 
-    override val segments: List<IJSArticleSegment> =
+    override val segments: List<IJSArticleSegment> = client.busy {
         obj.getOrThrowNullableList<V8ValueObject>(client.config, "segments", "PlatformArticle")
             ?.mapNotNull { fromV8Segment(client, it) }
             ?: emptyList()
+    }
 
     override fun getComments(client: IPlatformClient): IPager<IPlatformComment>? {
-        if(!_hasGetComments || _content.isClosed)
+        val canGetComments = this.client.busy {
+            _hasGetComments && !_content.isClosed
+        }
+        if(!canGetComments)
             return null;
 
         if(client is DevJSClient)
@@ -73,7 +80,10 @@ open class JSArticleDetails(
     override fun getPlaybackTracker(): IPlaybackTracker? = null;
 
     override fun getContentRecommendations(client: IPlatformClient): IPager<IPlatformContent>? {
-        if(!_hasGetContentRecommendations || _content.isClosed)
+        val canGetContentRecommendations = this.client.busy {
+            _hasGetContentRecommendations && !_content.isClosed
+        }
+        if(!canGetContentRecommendations)
             return  null;
 
         if(client is DevJSClient)
@@ -87,25 +97,31 @@ open class JSArticleDetails(
     }
 
     private fun getContentRecommendationsJS(client: JSClient): JSContentPager {
-        val contentPager = _content.invokeV8<V8ValueObject>("getContentRecommendations", arrayOf<Any>());
-        return JSContentPager(_pluginConfig, client, contentPager);
+        return client.busy {
+            val contentPager = _content.invokeV8<V8ValueObject>("getContentRecommendations", arrayOf<Any>());
+            return@busy JSContentPager(_pluginConfig, client, contentPager);
+        }
     }
 
     private fun getCommentsJS(client: JSClient): JSCommentPager {
-        val commentPager = _content.invokeV8<V8ValueObject>("getComments", arrayOf<Any>());
-        return JSCommentPager(_pluginConfig, client, commentPager);
+        return client.busy {
+            val commentPager = _content.invokeV8<V8ValueObject>("getComments", arrayOf<Any>());
+            return@busy JSCommentPager(_pluginConfig, client, commentPager);
+        }
     }
 
     companion object {
         fun fromV8Segment(client: JSClient, obj: V8ValueObject): IJSArticleSegment? {
-            if(!obj.has("type"))
-                throw IllegalArgumentException("Object missing type field");
-            return when(SegmentType.fromInt(obj.getOrThrow(client.config, "type", "JSArticle.Segment"))) {
-                SegmentType.TEXT -> JSTextSegment(client, obj);
-                SegmentType.IMAGES -> JSImagesSegment(client, obj);
-                SegmentType.HEADER -> JSHeaderSegment(client, obj);
-                SegmentType.NESTED -> JSNestedSegment(client, obj);
-                else -> null;
+            return client.busy {
+                if(!obj.has("type"))
+                    throw IllegalArgumentException("Object missing type field");
+                return@busy when(SegmentType.fromInt(obj.getOrThrow(client.config, "type", "JSArticle.Segment"))) {
+                    SegmentType.TEXT -> JSTextSegment(client, obj);
+                    SegmentType.IMAGES -> JSImagesSegment(client, obj);
+                    SegmentType.HEADER -> JSHeaderSegment(client, obj);
+                    SegmentType.NESTED -> JSNestedSegment(client, obj);
+                    else -> null;
+                }
             }
         }
     }
@@ -176,4 +192,4 @@ class JSNestedSegment: IJSArticleSegment {
         val nestedObj = obj.getOrThrow<V8ValueObject>(client.config, "nested", contextName, false);
         nested = IJSContent.fromV8(client, nestedObj);
     }
-}
+}

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

@@ -46,23 +46,45 @@ class JSComment : IPlatformComment {
         _comment = obj;
         _plugin = plugin;
 
-        val contextName = "Comment";
-        contextUrl = _comment!!.getOrThrow(config, "contextUrl", contextName);
-        author = PlatformAuthorLink.fromV8(_config!!, _comment!!.getOrThrow(config, "author", contextName));
-        message = _comment!!.getOrThrow(config, "message", contextName);
-        rating = IRating.fromV8(config, _comment!!.getOrThrow(config, "rating", contextName));
-        date = _comment!!.getOrThrowNullable<Int>(config, "date", contextName)?.let { OffsetDateTime.of(LocalDateTime.ofEpochSecond(it.toLong(), 0, ZoneOffset.UTC), ZoneOffset.UTC) }
-        replyCount = _comment!!.getOrThrowNullable(config, "replyCount", contextName);
-        context = _comment!!.getOrDefault(config, "context", contextName, hashMapOf()) ?: hashMapOf();
-        _hasGetReplies = _comment!!.has("getReplies");
+        var parsedContextUrl: String? = null;
+        var parsedAuthor: PlatformAuthorLink? = null;
+        var parsedMessage: String? = null;
+        var parsedRating: IRating? = null;
+        var parsedDate: OffsetDateTime? = null;
+        var parsedReplyCount: Int? = null;
+        var parsedContext: Map<String, String>? = null;
+        var parsedHasGetReplies = false;
+
+        plugin.busy {
+            val contextName = "Comment";
+            parsedContextUrl = _comment!!.getOrThrow(config, "contextUrl", contextName);
+            parsedAuthor = PlatformAuthorLink.fromV8(_config!!, _comment!!.getOrThrow(config, "author", contextName));
+            parsedMessage = _comment!!.getOrThrow(config, "message", contextName);
+            parsedRating = IRating.fromV8(config, _comment!!.getOrThrow(config, "rating", contextName));
+            parsedDate = _comment!!.getOrThrowNullable<Int>(config, "date", contextName)?.let { OffsetDateTime.of(LocalDateTime.ofEpochSecond(it.toLong(), 0, ZoneOffset.UTC), ZoneOffset.UTC) };
+            parsedReplyCount = _comment!!.getOrThrowNullable(config, "replyCount", contextName);
+            parsedContext = _comment!!.getOrDefault(config, "context", contextName, hashMapOf()) ?: hashMapOf();
+            parsedHasGetReplies = _comment!!.has("getReplies");
+        }
+
+        contextUrl = parsedContextUrl ?: "";
+        author = parsedAuthor ?: PlatformAuthorLink.UNKNOWN;
+        message = parsedMessage ?: "";
+        rating = parsedRating ?: throw IllegalStateException("Missing comment rating");
+        date = parsedDate;
+        replyCount = parsedReplyCount;
+        context = parsedContext ?: hashMapOf();
+        _hasGetReplies = parsedHasGetReplies;
     }
 
     override fun getReplies(client: IPlatformClient): IPager<IPlatformComment>? {
         if(!_hasGetReplies)
             return null;
 
-        val obj = _comment!!.invokeV8<V8ValueObject>("getReplies", arrayOf<Any>());
         val plugin = if(client is JSClient) client else throw NotImplementedError("Only implemented for JSClient");
-        return JSCommentPager(_config!!, plugin, obj);
+        return plugin.busy {
+            val obj = _comment!!.invokeV8<V8ValueObject>("getReplies", arrayOf<Any>());
+            return@busy JSCommentPager(_config!!, plugin, obj);
+        }
     }
-}
+}

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

@@ -11,6 +11,7 @@ import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.decodeUnicode
 import com.futo.platformplayer.getOrDefault
 import com.futo.platformplayer.getOrThrow
+import com.futo.platformplayer.getSourcePlugin
 import com.futo.platformplayer.logging.Logger
 import java.time.LocalDateTime
 import java.time.OffsetDateTime
@@ -23,7 +24,8 @@ open class JSContent(
 
     override val contentType: ContentType = ContentType.UNKNOWN
 
-    protected val _hasGetDetails: Boolean = _content.has("getDetails")
+    protected val _hasGetDetails: Boolean =
+        _content.getSourcePlugin()?.busy { _content.has("getDetails") } ?: false
 
     override val id: PlatformID =
         PlatformID.fromV8(_pluginConfig, _content.getOrThrow(_pluginConfig, "id", CTX))

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

@@ -41,7 +41,9 @@ abstract class JSPager<T> : IPager<T> {
     }
 
     override fun hasMorePages(): Boolean {
-        return _hasMorePages && !pager.isClosed;
+        return plugin.getUnderlyingPlugin().busy {
+            _hasMorePages && !pager.isClosed;
+        }
     }
 
     override fun nextPage() {
@@ -91,4 +93,4 @@ abstract class JSPager<T> : IPager<T> {
     }
 
     abstract fun convertResult(obj: V8ValueObject): T;
-}
+}

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

@@ -15,6 +15,7 @@ import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.getOrDefault
+import com.futo.platformplayer.getSourcePlugin
 import com.futo.platformplayer.invokeV8
 import com.futo.platformplayer.states.StateDeveloper
 
@@ -30,52 +31,79 @@ class JSPostDetails : JSPost, IPlatformPost, IPlatformPostDetails {
 
 
     constructor(config: SourcePluginConfig, obj: V8ValueObject): super(config, obj) {
-        val contextName = "PlatformPostDetails";
+        var parsedRating: IRating? = null;
+        var parsedTextType: TextType? = null;
+        var parsedContent: String? = null;
+        var parsedHasGetComments = false;
+        var parsedHasGetContentRecommendations = false;
 
-        rating = obj.getOrDefault<V8ValueObject>(config, "rating", contextName, null)?.let { IRating.fromV8(config, it, contextName) } ?: RatingLikes(0);
-        textType = TextType.fromInt((obj.getOrDefault<Int>(config, "textType", contextName, null) ?: 0));
-        content = obj.getOrDefault(config, "content", contextName, "") ?: "";
+        val parse = {
+            val contextName = "PlatformPostDetails";
 
-        _hasGetComments = _content.has("getComments");
-        _hasGetContentRecommendations = _content.has("getContentRecommendations");
+            parsedRating = obj.getOrDefault<V8ValueObject>(config, "rating", contextName, null)?.let { IRating.fromV8(config, it, contextName) } ?: RatingLikes(0);
+            parsedTextType = TextType.fromInt((obj.getOrDefault<Int>(config, "textType", contextName, null) ?: 0));
+            parsedContent = obj.getOrDefault(config, "content", contextName, "") ?: "";
+
+            parsedHasGetComments = _content.has("getComments");
+            parsedHasGetContentRecommendations = _content.has("getContentRecommendations");
+        };
+        obj.getSourcePlugin()?.busy {
+            parse();
+        } ?: parse()
+
+        rating = parsedRating ?: RatingLikes(0);
+        textType = parsedTextType ?: TextType.RAW;
+        content = parsedContent ?: "";
+        _hasGetComments = parsedHasGetComments;
+        _hasGetContentRecommendations = parsedHasGetContentRecommendations;
     }
 
     override fun getComments(client: IPlatformClient): IPager<IPlatformComment>? {
-        if(!_hasGetComments || _content.isClosed)
+        val jsClient = client as? JSClient;
+        if(jsClient == null)
+            return null;
+        val canGetComments = jsClient.busy {
+            _hasGetComments && !_content.isClosed
+        }
+        if(!canGetComments)
             return null;
 
         if(client is DevJSClient)
             return StateDeveloper.instance.handleDevCall(client.devID, "videoDetail.getComments()") {
                 return@handleDevCall getCommentsJS(client);
             }
-        else if(client is JSClient)
-            return getCommentsJS(client);
-
-        return null;
+        return getCommentsJS(jsClient);
     }
     override fun getPlaybackTracker(): IPlaybackTracker? = null;
 
     override fun getContentRecommendations(client: IPlatformClient): IPager<IPlatformContent>? {
-        if(!_hasGetContentRecommendations || _content.isClosed)
+        val jsClient = client as? JSClient;
+        if(jsClient == null)
+            return null;
+        val canGetContentRecommendations = jsClient.busy {
+            _hasGetContentRecommendations && !_content.isClosed
+        }
+        if(!canGetContentRecommendations)
             return  null;
 
         if(client is DevJSClient)
             return StateDeveloper.instance.handleDevCall(client.devID, "postDetail.getContentRecommendations()") {
                 return@handleDevCall getContentRecommendationsJS(client);
             }
-        else if(client is JSClient)
-            return getContentRecommendationsJS(client);
-
-        return null;
+        return getContentRecommendationsJS(jsClient);
     }
     private fun getContentRecommendationsJS(client: JSClient): JSContentPager {
-        val contentPager = _content.invokeV8<V8ValueObject>("getContentRecommendations", arrayOf<Any>());
-        return JSContentPager(_pluginConfig, client, contentPager);
+        return client.busy {
+            val contentPager = _content.invokeV8<V8ValueObject>("getContentRecommendations", arrayOf<Any>());
+            return@busy JSContentPager(_pluginConfig, client, contentPager);
+        }
     }
 
     private fun getCommentsJS(client: JSClient): JSCommentPager {
-        val commentPager = _content.invokeV8<V8ValueObject>("getComments", arrayOf<Any>());
-        return JSCommentPager(_pluginConfig, client, commentPager);
+        return client.busy {
+            val commentPager = _content.invokeV8<V8ValueObject>("getComments", arrayOf<Any>());
+            return@busy JSCommentPager(_pluginConfig, client, commentPager);
+        }
     }
 
-}
+}

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

@@ -41,20 +41,26 @@ class JSRequestExecutor: AutoCloseable {
         this._config = plugin.config;
         val config = plugin.config;
 
-        urlPrefix = executor.getOrDefault(config, "urlPrefix", "RequestExecutor", null);
+        var parsedUrlPrefix: String? = null;
+        var parsedHasCleanup = false;
+        plugin.busy {
+            parsedUrlPrefix = executor.getOrDefault(config, "urlPrefix", "RequestExecutor", null);
 
-        if(!executor.has("executeRequest"))
-            throw ScriptImplementationException(config, "RequestExecutor is missing executeRequest", null);
-        hasCleanup = executor.has("cleanup");
+            if(!executor.has("executeRequest"))
+                throw ScriptImplementationException(config, "RequestExecutor is missing executeRequest", null);
+            parsedHasCleanup = executor.has("cleanup");
+        }
+
+        urlPrefix = parsedUrlPrefix;
+        hasCleanup = parsedHasCleanup;
     }
 
     //TODO: Executor properties?
     @Throws(ScriptException::class)
     open fun executeRequest(method: String, url: String, body: ByteArray?, headers: Map<String, String>): ByteArray {
-        if (_executor.isClosed)
-            throw IllegalStateException("Executor object is closed");
-
         return _plugin.getUnderlyingPlugin().busy {
+            if (_executor.isClosed)
+                throw IllegalStateException("Executor object is closed");
 
             val result = if(_plugin is DevJSClient)
                 StateDeveloper.instance.handleDevCall(_plugin.devID, "requestExecutor.executeRequest()") {
@@ -108,10 +114,12 @@ class JSRequestExecutor: AutoCloseable {
 
 
     open fun cleanup() {
-        synchronized(_cleanLock) {
-            if (!hasCleanup || _executor.isClosed || _cleaned)
-                return;
-            _cleaned = true;
+        _plugin.busy {
+            synchronized(_cleanLock) {
+                if (!hasCleanup || _executor.isClosed || _cleaned)
+                    return@busy;
+                _cleaned = true;
+            }
         }
         Logger.i("JSRequestExecutor", "JSRequestExecutor cleanup requested");
         _plugin.busy {
@@ -163,4 +171,4 @@ class ExecutorParameters {
     var rangeEnd: Int = -1;
 
     var segment: Int = -1;
-}
+}

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

@@ -36,11 +36,11 @@ class JSRequestModifier: IRequestModifier {
     }
 
     override fun modifyRequest(url: String, headers: Map<String, String>): IRequest {
-        if (_modifier.isClosed) {
-            return Request(url, headers);
-        }
-
         return _plugin.busy {
+            if (_modifier.isClosed) {
+                return@busy Request(url, headers);
+            }
+
             val result = V8Plugin.catchScriptErrors<Any>(_config, "[${_config.name}] JSRequestModifier", "builder.modifyRequest()") {
                 _modifier.invokeV8("modifyRequest", url, headers);
             } as V8ValueObject;
@@ -53,4 +53,4 @@ class JSRequestModifier: IRequestModifier {
 
 
     data class Request(override val url: String, override val headers: Map<String, String>) : IRequest;
-}
+}

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

@@ -29,12 +29,28 @@ class JSSubtitleSource : ISubtitleSource {
     constructor(config: SourcePluginConfig, v8Value: V8ValueObject) {
         _obj = v8Value;
 
-        val context = "JSSubtitles";
-        name = v8Value.getOrThrow(config, "name", context, false);
-        language = v8Value.getOrDefault(config, "language", context, null);
-        url = v8Value.getOrThrow(config, "url", context, true);
-        format = v8Value.getOrThrow(config, "format", context, true);
-        hasFetch = v8Value.has("getSubtitles");
+        var parsedName: String? = null;
+        var parsedLanguage: String? = null;
+        var parsedUrl: String? = null;
+        var parsedFormat: String? = null;
+        var parsedHasFetch = false;
+        val parse = {
+            val context = "JSSubtitles";
+            parsedName = v8Value.getOrThrow(config, "name", context, false);
+            parsedLanguage = v8Value.getOrDefault(config, "language", context, null);
+            parsedUrl = v8Value.getOrThrow(config, "url", context, true);
+            parsedFormat = v8Value.getOrThrow(config, "format", context, true);
+            parsedHasFetch = v8Value.has("getSubtitles");
+        };
+        v8Value.getSourcePlugin()?.busy {
+            parse();
+        } ?: parse()
+
+        name = parsedName ?: "";
+        language = parsedLanguage;
+        url = parsedUrl;
+        format = parsedFormat;
+        hasFetch = parsedHasFetch;
     }
 
     override fun getSubtitles(): String {
@@ -69,4 +85,4 @@ class JSSubtitleSource : ISubtitleSource {
             return JSSubtitleSource(config, value);
         }
     }
-}
+}

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

@@ -52,34 +52,63 @@ class JSVideoDetails : JSVideo, IPlatformVideoDetails {
     override val subtitles: List<ISubtitleSource>;
 
     constructor(plugin: JSClient, obj: V8ValueObject) : super(plugin.config, obj) {
-        val contextName = "VideoDetails";
         _plugin = plugin;
-        val config = plugin.config;
-        description = _content.getOrThrow(config, "description", contextName);
-        video = JSVideoSourceDescriptor.fromV8(plugin, _content.getOrThrow(config, "video", contextName));
-        dash =  JSSource.fromV8DashNullable(plugin, _content.getOrThrowNullable<V8ValueObject>(config, "dash", contextName));
-        hls = JSSource.fromV8HLSNullable(plugin, _content.getOrThrowNullable<V8ValueObject>(config, "hls", contextName));
-        live = JSSource.fromV8VideoNullable(plugin, _content.getOrThrowNullable<V8ValueObject>(config, "live", contextName));
-        rating = IRating.fromV8OrDefault(config, _content.getOrDefault<V8ValueObject>(config, "rating", contextName, null), RatingLikes(0));
+        var parsedDescription: String? = null;
+        var parsedVideo: IVideoSourceDescriptor? = null;
+        var parsedDash: IDashManifestSource? = null;
+        var parsedHls: IHLSManifestSource? = null;
+        var parsedLive: IVideoSource? = null;
+        var parsedRating: IRating? = null;
+        var parsedSubtitles: List<ISubtitleSource>? = null;
+        var parsedHasGetComments = false;
+        var parsedHasGetPlaybackTracker = false;
+        var parsedHasGetContentRecommendations = false;
+        var parsedHasGetVODEvents = false;
 
-        if(!_content.has("subtitles"))
-            subtitles = listOf();
-        else {
-            val subArrs = _content.getOrThrowNullable<V8ValueArray>(config, "subtitles", contextName);
-            if(subArrs != null)
-                subtitles = subArrs.keys.map { JSSubtitleSource.fromV8(config, subArrs.get(it)) };
-            else
-                subtitles = listOf();
+        plugin.busy {
+            val contextName = "VideoDetails";
+            val config = plugin.config;
+            parsedDescription = _content.getOrThrow(config, "description", contextName);
+            parsedVideo = JSVideoSourceDescriptor.fromV8(plugin, _content.getOrThrow(config, "video", contextName));
+            parsedDash = JSSource.fromV8DashNullable(plugin, _content.getOrThrowNullable<V8ValueObject>(config, "dash", contextName));
+            parsedHls = JSSource.fromV8HLSNullable(plugin, _content.getOrThrowNullable<V8ValueObject>(config, "hls", contextName));
+            parsedLive = JSSource.fromV8VideoNullable(plugin, _content.getOrThrowNullable<V8ValueObject>(config, "live", contextName));
+            parsedRating = IRating.fromV8OrDefault(config, _content.getOrDefault<V8ValueObject>(config, "rating", contextName, null), RatingLikes(0));
+
+            if(!_content.has("subtitles"))
+                parsedSubtitles = listOf();
+            else {
+                val subArrs = _content.getOrThrowNullable<V8ValueArray>(config, "subtitles", contextName);
+                if(subArrs != null)
+                    parsedSubtitles = subArrs.keys.map { JSSubtitleSource.fromV8(config, subArrs.get(it)) };
+                else
+                    parsedSubtitles = listOf();
+            }
+
+            parsedHasGetComments = _content.has("getComments");
+            parsedHasGetPlaybackTracker = _content.has("getPlaybackTracker");
+            parsedHasGetContentRecommendations = _content.has("getContentRecommendations");
+            parsedHasGetVODEvents = _content.has("getVODEvents");
         }
 
-        _hasGetComments = _content.has("getComments");
-        _hasGetPlaybackTracker = _content.has("getPlaybackTracker");
-        _hasGetContentRecommendations = _content.has("getContentRecommendations");
-        _hasGetVODEvents = _content.has("getVODEvents");
+        description = parsedDescription ?: "";
+        video = parsedVideo ?: throw IllegalStateException("Missing video source descriptor");
+        dash = parsedDash;
+        hls = parsedHls;
+        live = parsedLive;
+        rating = parsedRating ?: RatingLikes(0);
+        subtitles = parsedSubtitles ?: listOf();
+        _hasGetComments = parsedHasGetComments;
+        _hasGetPlaybackTracker = parsedHasGetPlaybackTracker;
+        _hasGetContentRecommendations = parsedHasGetContentRecommendations;
+        _hasGetVODEvents = parsedHasGetVODEvents;
     }
 
     override fun getPlaybackTracker(): IPlaybackTracker? {
-        if(!_hasGetPlaybackTracker || _content.isClosed)
+        val canGetPlaybackTracker = _plugin.busy {
+            _hasGetPlaybackTracker && !_content.isClosed
+        }
+        if(!canGetPlaybackTracker)
             return null;
         if(_pluginConfig.id == StateDeveloper.DEV_ID)
             return StateDeveloper.instance.handleDevCall(_pluginConfig.id, "videoDetail.getComments()") {
@@ -102,7 +131,10 @@ class JSVideoDetails : JSVideo, IPlatformVideoDetails {
     }
 
     override fun getContentRecommendations(client: IPlatformClient): IPager<IPlatformContent>? {
-        if(!_hasGetContentRecommendations || _content.isClosed)
+        val canGetContentRecommendations = _plugin.busy {
+            _hasGetContentRecommendations && !_content.isClosed
+        }
+        if(!canGetContentRecommendations)
             return  null;
 
         if(client is DevJSClient)
@@ -122,7 +154,12 @@ class JSVideoDetails : JSVideo, IPlatformVideoDetails {
     }
 
     override fun getComments(client: IPlatformClient): IPager<IPlatformComment>? {
-        if(client !is JSClient || !_hasGetComments || _content.isClosed)
+        if(client !is JSClient)
+            return null;
+        val canGetComments = _plugin.busy {
+            _hasGetComments && !_content.isClosed
+        }
+        if(!canGetComments)
             return null;
 
         if(client is DevJSClient)
@@ -153,4 +190,4 @@ class JSVideoDetails : JSVideo, IPlatformVideoDetails {
         return@busy JSVODEventPager(_plugin.config, _plugin,
             _content.invokeV8<V8ValueObject>("getVODEvents", arrayOf<Any>()));
     }
-}
+}

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

@@ -39,10 +39,10 @@ open class JSAudioUrlSource(
             ?: "$container $bitrate"
 
     override var priority: Boolean =
-        if (_obj.has("priority")) _obj.getOrThrow<Boolean>(cfg, "priority", ctx) else false
+        plugin.busy { if (_obj.has("priority")) _obj.getOrThrow<Boolean>(cfg, "priority", ctx) else false }
 
     override var original: Boolean =
-        if (_obj.has("original")) _obj.getOrThrow<Boolean>(cfg, "original", ctx) else false
+        plugin.busy { if (_obj.has("original")) _obj.getOrThrow<Boolean>(cfg, "original", ctx) else false }
 
     override fun getAudioUrl(): String = url
 

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

@@ -19,21 +19,23 @@ class JSAudioUrlWidevineSource : JSAudioUrlSource, IAudioUrlWidevineSource {
         val config = plugin.config
 
         licenseUri = _obj.getOrThrow(config, "licenseUri", contextName)
-        hasLicenseRequestExecutor = obj.has("getLicenseRequestExecutor")
+        hasLicenseRequestExecutor = plugin.busy { obj.has("getLicenseRequestExecutor") }
     }
 
     override fun getLicenseRequestExecutor(): JSRequestExecutor? {
-        if (!hasLicenseRequestExecutor || _obj.isClosed)
-            return null
+        return _plugin.busy {
+            if (!hasLicenseRequestExecutor || _obj.isClosed)
+                return@busy null
 
-        val result = V8Plugin.catchScriptErrors<Any>(_config, "[${_config.name}] JSAudioUrlWidevineSource", "obj.getLicenseRequestExecutor()") {
-            _obj.invokeV8("getLicenseRequestExecutor", arrayOf<Any>())
+            val result = V8Plugin.catchScriptErrors<Any>(_config, "[${_config.name}] JSAudioUrlWidevineSource", "obj.getLicenseRequestExecutor()") {
+                _obj.invokeV8("getLicenseRequestExecutor", arrayOf<Any>())
+            }
+
+            if (result !is V8ValueObject)
+                return@busy null
+
+            return@busy JSRequestExecutor(_plugin, result)
         }
-
-        if (result !is V8ValueObject)
-            return null
-
-        return JSRequestExecutor(_plugin, result)
     }
 
     override fun toString(): String {

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

@@ -55,7 +55,7 @@ class JSDashManifestRawAudioSource : JSSource, IAudioSource, IJSDashManifestRawS
         priority = _obj.getOrDefault(config, "priority", contextName, false) ?: false;
         language = _obj.getOrDefault(config, "language", contextName, Language.UNKNOWN) ?: Language.UNKNOWN;
         original =  obj.getOrNull(config, "original", contextName) ?: false;
-        hasGenerate = _obj.has("generate");
+        hasGenerate = plugin.busy { _obj.has("generate") };
     }
 
     private var _pregenerate: V8Deferred<String?>? = null;
@@ -67,7 +67,7 @@ class JSDashManifestRawAudioSource : JSSource, IAudioSource, IJSDashManifestRawS
     override fun generateAsync(scope: CoroutineScope): V8Deferred<String?> {
         if(!hasGenerate)
             return V8Deferred(CompletableDeferred(manifest));
-        if(_obj.isClosed)
+        if(_plugin.busy { _obj.isClosed })
             throw IllegalStateException("Source object already closed");
 
         val pregenerated = _pregenerate;
@@ -111,7 +111,7 @@ class JSDashManifestRawAudioSource : JSSource, IAudioSource, IJSDashManifestRawS
     override fun generate(): String? {
         if(!hasGenerate)
             return manifest;
-        if(_obj.isClosed)
+        if(_plugin.busy { _obj.isClosed })
             throw IllegalStateException("Source object already closed");
 
         val plugin = _plugin.getUnderlyingPlugin();
@@ -145,4 +145,4 @@ class JSDashManifestRawAudioSource : JSSource, IAudioSource, IJSDashManifestRawS
         }
         return result;
     }
-}
+}

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

@@ -73,12 +73,13 @@ open class JSDashManifestRawSource(
     override var manifest: String? =
         _obj.getOrDefault<String>(cfg, "manifest", ctx, null)
 
-    override val hasGenerate: Boolean = _obj.has("generate")
+    override val hasGenerate: Boolean = plugin.busy { _obj.has("generate") }
 
     val canMerge: Boolean =
         _obj.getOrDefault<Boolean>(cfg, "canMerge", ctx, false) ?: false
 
     override var streamMetaData: StreamMetaData? = null
+    var audioStreamMetaData: StreamMetaData? = null
 
     private var _pregenerate: V8Deferred<String?>? = null
     fun pregenerateAsync(scope: CoroutineScope): V8Deferred<String?>? {
@@ -89,7 +90,7 @@ open class JSDashManifestRawSource(
     override fun generateAsync(scope: CoroutineScope): V8Deferred<String?> {
         if(!hasGenerate)
             return V8Deferred(CompletableDeferred(manifest));
-        if(_obj.isClosed)
+        if(_plugin.busy { _obj.isClosed })
             throw IllegalStateException("Source object already closed");
         val pregenerated = _pregenerate;
         if(pregenerated != null) {
@@ -125,6 +126,14 @@ open class JSDashManifestRawSource(
                 streamMetaData = StreamMetaData(initStart, initEnd, indexStart, indexEnd);
             }
 
+            val audioInitStart = _obj.getOrDefault<Int>(_config, "audioInitStart", "JSDashManifestRawSource", null) ?: 0;
+            val audioInitEnd = _obj.getOrDefault<Int>(_config, "audioInitEnd", "JSDashManifestRawSource", null) ?: 0;
+            val audioIndexStart = _obj.getOrDefault<Int>(_config, "audioIndexStart", "JSDashManifestRawSource", null) ?: 0;
+            val audioIndexEnd = _obj.getOrDefault<Int>(_config, "audioIndexEnd", "JSDashManifestRawSource", null) ?: 0;
+            if(audioInitEnd > 0 && audioIndexStart > 0 && audioIndexEnd > 0) {
+                audioStreamMetaData = StreamMetaData(audioInitStart, audioInitEnd, audioIndexStart, audioIndexEnd);
+            }
+
             return@busy result.convert {
                 it.value
             };
@@ -133,7 +142,7 @@ open class JSDashManifestRawSource(
     override open fun generate(): String? {
         if(!hasGenerate)
             return manifest;
-        if(_obj.isClosed)
+        if(_plugin.busy { _obj.isClosed })
             throw IllegalStateException("Source object already closed");
 
         var result: String? = null;
@@ -162,6 +171,14 @@ open class JSDashManifestRawSource(
                 if(initEnd > 0 && indexStart > 0 && indexEnd > 0) {
                     streamMetaData = StreamMetaData(initStart, initEnd, indexStart, indexEnd);
                 }
+
+                val audioInitStart = _obj.getOrDefault<Int>(_config, "audioInitStart", "JSDashManifestRawSource", null) ?: 0;
+                val audioInitEnd = _obj.getOrDefault<Int>(_config, "audioInitEnd", "JSDashManifestRawSource", null) ?: 0;
+                val audioIndexStart = _obj.getOrDefault<Int>(_config, "audioIndexStart", "JSDashManifestRawSource", null) ?: 0;
+                val audioIndexEnd = _obj.getOrDefault<Int>(_config, "audioIndexEnd", "JSDashManifestRawSource", null) ?: 0;
+                if(audioInitEnd > 0 && audioIndexStart > 0 && audioIndexEnd > 0) {
+                    audioStreamMetaData = StreamMetaData(audioInitStart, audioInitEnd, audioIndexStart, audioIndexEnd);
+                }
             }
         }
         return result;
@@ -241,4 +258,4 @@ class JSDashManifestMergingRawSource(
     companion object {
         private val adaptationSetRegex = Regex("<AdaptationSet.*?>.*?<\\/AdaptationSet>", RegexOption.DOT_MATCHES_ALL);
     }
-}
+}

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

@@ -42,27 +42,29 @@ class JSDashManifestWidevineSource : IVideoUrlSource, IDashManifestSource,
         priority = obj.getOrNull(config, "priority", contextName) ?: false
 
         licenseUri = _obj.getOrThrow(config, "licenseUri", contextName)
-        hasLicenseRequestExecutor = obj.has("getLicenseRequestExecutor")
+        hasLicenseRequestExecutor = plugin.busy { obj.has("getLicenseRequestExecutor") }
 
         language = _obj.getOrNull(config, "language", contextName);
         original = _obj.getOrNull(config, "original", contextName);
     }
 
     override fun getLicenseRequestExecutor(): JSRequestExecutor? {
-        if (!hasLicenseRequestExecutor || _obj.isClosed)
-            return null
+        return _plugin.busy {
+            if (!hasLicenseRequestExecutor || _obj.isClosed)
+                return@busy null
 
-        val result = V8Plugin.catchScriptErrors<Any>(_config, "[${_config.name}] JSDashManifestWidevineSource", "obj.getLicenseRequestExecutor()") {
-            _obj.invokeV8("getLicenseRequestExecutor", arrayOf<Any>())
+            val result = V8Plugin.catchScriptErrors<Any>(_config, "[${_config.name}] JSDashManifestWidevineSource", "obj.getLicenseRequestExecutor()") {
+                _obj.invokeV8("getLicenseRequestExecutor", arrayOf<Any>())
+            }
+
+            if (result !is V8ValueObject)
+                return@busy null
+
+            return@busy JSRequestExecutor(_plugin, result)
         }
-
-        if (result !is V8ValueObject)
-            return null
-
-        return JSRequestExecutor(_plugin, result)
     }
 
     override fun getVideoUrl(): String {
         return url
     }
-}
+}

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

@@ -44,15 +44,26 @@ abstract class JSSource {
         this._obj = obj;
         this.type = type;
 
-        _requestModifier = obj.getOrDefault<V8ValueObject>(_config, "requestModifier", "JSSource.requestModifier", null)?.let {
-            JSRequest(plugin, it, null, null, true);
-        }
-        hasRequestModifier = _requestModifier != null || obj.has("getRequestModifier");
+        var parsedRequestModifier: JSRequest? = null;
+        var parsedHasRequestModifier = false;
+        var parsedRequestExecutor: JSRequest? = null;
+        var parsedHasRequestExecutor = false;
+        plugin.busy {
+            parsedRequestModifier = obj.getOrDefault<V8ValueObject>(_config, "requestModifier", "JSSource.requestModifier", null)?.let {
+                JSRequest(plugin, it, null, null, true);
+            };
+            parsedHasRequestModifier = parsedRequestModifier != null || obj.has("getRequestModifier");
 
-        _requestExecutor = obj.getOrDefault<V8ValueObject>(_config, "requestExecutor", "JSSource.requestExecutor", null)?.let {
-            JSRequest(plugin, it, null, null, true);
+            parsedRequestExecutor = obj.getOrDefault<V8ValueObject>(_config, "requestExecutor", "JSSource.requestExecutor", null)?.let {
+                JSRequest(plugin, it, null, null, true);
+            };
+            parsedHasRequestExecutor = parsedRequestExecutor != null || obj.has("getRequestExecutor");
         }
-        hasRequestExecutor = _requestExecutor != null || obj.has("getRequestExecutor");
+
+        _requestModifier = parsedRequestModifier;
+        hasRequestModifier = parsedHasRequestModifier;
+        _requestExecutor = parsedRequestExecutor;
+        hasRequestExecutor = parsedHasRequestExecutor;
     }
 
     fun getRequestModifier(): IRequestModifier? = _plugin.isBusyWith("getRequestModifier") {
@@ -166,4 +177,4 @@ abstract class JSSource {
             }
         }
     }
-}
+}

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

@@ -18,25 +18,27 @@ class JSVideoUrlWidevineSource : JSVideoUrlSource, IVideoUrlWidevineSource {
         val config = plugin.config
 
         licenseUri = _obj.getOrThrow(config, "licenseUri", contextName)
-        hasLicenseRequestExecutor = obj.has("getLicenseRequestExecutor")
+        hasLicenseRequestExecutor = plugin.busy { obj.has("getLicenseRequestExecutor") }
     }
 
     override fun getLicenseRequestExecutor(): JSRequestExecutor? {
-        if (!hasLicenseRequestExecutor || _obj.isClosed)
-            return null
+        return _plugin.busy {
+            if (!hasLicenseRequestExecutor || _obj.isClosed)
+                return@busy null
 
-        val result = V8Plugin.catchScriptErrors<Any>(_config, "[${_config.name}] JSAudioUrlWidevineSource", "obj.getLicenseRequestExecutor()") {
-            _obj.invokeV8("getLicenseRequestExecutor", arrayOf<Any>())
+            val result = V8Plugin.catchScriptErrors<Any>(_config, "[${_config.name}] JSAudioUrlWidevineSource", "obj.getLicenseRequestExecutor()") {
+                _obj.invokeV8("getLicenseRequestExecutor", arrayOf<Any>())
+            }
+
+            if (result !is V8ValueObject)
+                return@busy null
+
+            return@busy JSRequestExecutor(_plugin, result)
         }
-
-        if (result !is V8ValueObject)
-            return null
-
-        return JSRequestExecutor(_plugin, result)
     }
 
     override fun toString(): String {
         val url = getVideoUrl()
         return "(width=$width, height=$height, container=$container, codec=$codec, name=$name, bitrate=$bitrate, duration=$duration, url=$url, hasLicenseRequestExecutor=$hasLicenseRequestExecutor, licenseUri=$licenseUri)"
     }
-}
+}

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

@@ -95,79 +95,7 @@ private fun ipAddrToInetAddress(addr: IpAddr): InetAddress = when (addr) {
     )
 }
 
-// abstract class CastingDevice {
 class CastingDevice(val device: RsCastingDevice) {
-    // abstract val isReady: Boolean
-    // abstract val usedRemoteAddress: InetAddress?
-    // abstract val localAddress: InetAddress?
-    // abstract val name: String?
-    // abstract val onConnectionStateChanged: Event1<CastConnectionState>
-    // abstract val onPlayChanged: Event1<Boolean>
-    // abstract val onTimeChanged: Event1<Double>
-    // abstract val onDurationChanged: Event1<Double>
-    // abstract val onVolumeChanged: Event1<Double>
-    // abstract val onSpeedChanged: Event1<Double>
-    // abstract val onMediaItemEnd: Event0
-    // abstract var connectionState: CastConnectionState
-    // abstract val protocolType: CastProtocolType
-    // abstract var isPlaying: Boolean
-    // abstract val expectedCurrentTime: Double
-    // abstract var speed: Double
-    // abstract var time: Double
-    // abstract var duration: Double
-    // abstract var volume: Double
-    // abstract fun canSetVolume(): Boolean
-    // abstract fun canSetSpeed(): Boolean
-
-    // @Throws
-    // abstract fun resumePlayback()
-
-    // @Throws
-    // abstract fun pausePlayback()
-
-    // @Throws
-    // abstract fun stopPlayback()
-
-    // @Throws
-    // abstract fun seekTo(timeSeconds: Double)
-
-    // @Throws
-    // abstract fun changeVolume(timeSeconds: Double)
-
-    // @Throws
-    // abstract fun changeSpeed(speed: Double)
-
-    // @Throws
-    // abstract fun connect()
-
-    // @Throws
-    // abstract fun disconnect()
-    // abstract fun getDeviceInfo(): CastingDeviceInfo
-    // abstract fun getAddresses(): List<InetAddress>
-
-    // @Throws
-    // abstract fun loadVideo(
-    //     streamType: String,
-    //     contentType: String,
-    //     contentId: String,
-    //     resumePosition: Double,
-    //     duration: Double,
-    //     speed: Double?,
-    //     metadata: Metadata?
-    // )
-
-    // @Throws
-    // fun loadContent(
-    //     contentType: String,
-    //     content: String,
-    //     resumePosition: Double,
-    //     duration: Double,
-    //     speed: Double?,
-    //     metadata: Metadata?
-    // )
-
-    // fun ensureThreadStarted()
-
     class EventHandler : RsDeviceEventHandler {
         var onConnectionStateChanged = Event1<DeviceConnectionState>();
         var onPlayChanged = Event1<Boolean>()

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

@@ -920,6 +920,7 @@ class StateCasting {
         if (videoSource != null) {
             _castServer.addHandlerWithAllowAllOptions(
                 HttpProxyHandler("GET", videoPath, videoSource.getVideoUrl(), true)
+                    .withIRequestModifier((videoSource as? JSSource)?.getRequestModifier())
                     .withInjectedHost()
                     .withHeader("Access-Control-Allow-Origin", "*"), true
             ).withTag("cast");
@@ -927,6 +928,7 @@ class StateCasting {
         if (audioSource != null) {
             _castServer.addHandlerWithAllowAllOptions(
                 HttpProxyHandler("GET", audioPath, audioSource.getAudioUrl(), true)
+                    .withIRequestModifier((audioSource as? JSSource)?.getRequestModifier())
                     .withInjectedHost()
                     .withHeader("Access-Control-Allow-Origin", "*"), true
             ).withTag("cast");
@@ -968,8 +970,7 @@ class StateCasting {
                 val headers = masterContext.headers.clone()
                 headers["Content-Type"] = "application/vnd.apple.mpegurl";
 
-                val req = requestModifier?.modifyRequest(sourceUrl, mapOf())
-                val masterPlaylistResponse = _client.get(req?.url ?: sourceUrl, (req?.headers ?: mapOf()).toMutableMap())
+                val masterPlaylistResponse = _client.get(sourceUrl, mutableMapOf(), requestModifier)
 
                 check(masterPlaylistResponse.isOk) { "Failed to get master playlist: ${masterPlaylistResponse.code}" }
 
@@ -1022,7 +1023,7 @@ class StateCasting {
                             val vpHeaders = vpContext.headers.clone()
                             vpHeaders["Content-Type"] = "application/vnd.apple.mpegurl";
 
-                            val response = _client.get(variantPlaylistRef.url)
+                            val response = _client.get(variantPlaylistRef.url, mutableMapOf(), requestModifier)
                             check(response.isOk) { "Failed to get variant playlist: ${response.code}" }
 
                             val vpContent = response.body?.string()
@@ -1059,7 +1060,7 @@ class StateCasting {
                                 val vpHeaders = vpContext.headers.clone()
                                 vpHeaders["Content-Type"] = "application/vnd.apple.mpegurl";
 
-                                val response = _client.get(mediaRendition.uri)
+                                val response = _client.get(mediaRendition.uri, mutableMapOf(), requestModifier)
                                 check(response.isOk) { "Failed to get variant playlist: ${response.code}" }
 
                                 val vpContent = response.body?.string()
@@ -1190,6 +1191,7 @@ class StateCasting {
 
             _castServer.addHandlerWithAllowAllOptions(
                 HttpProxyHandler("GET", audioPath, audioSource.getAudioUrl(), true)
+                    .withIRequestModifier((audioSource as? JSSource)?.getRequestModifier())
                     .withInjectedHost()
                     .withHeader("Access-Control-Allow-Origin", "*"), true
             ).withTag("castHlsIndirectVariant");
@@ -1267,6 +1269,7 @@ class StateCasting {
 
             _castServer.addHandlerWithAllowAllOptions(
                 HttpProxyHandler("GET", videoPath, videoSource.getVideoUrl(), true)
+                    .withIRequestModifier((videoSource as? JSSource)?.getRequestModifier())
                     .withInjectedHost()
                     .withHeader("Access-Control-Allow-Origin", "*"), true
             ).withTag("castHlsIndirectVariant");
@@ -1350,6 +1353,7 @@ class StateCasting {
         if (videoSource != null) {
             _castServer.addHandlerWithAllowAllOptions(
                 HttpProxyHandler("GET", videoPath, videoSource.getVideoUrl(), true)
+                    .withIRequestModifier((videoSource as? JSSource)?.getRequestModifier())
                     .withInjectedHost()
                     .withHeader("Access-Control-Allow-Origin", "*"), true
             ).withTag("cast");
@@ -1357,6 +1361,7 @@ class StateCasting {
         if (audioSource != null) {
             _castServer.addHandlerWithAllowAllOptions(
                 HttpProxyHandler("GET", audioPath, audioSource.getAudioUrl(), true)
+                    .withIRequestModifier((audioSource as? JSSource)?.getRequestModifier())
                     .withInjectedHost()
                     .withHeader("Access-Control-Allow-Origin", "*"), true
             ).withTag("cast");

app/src/main/java/com/futo/platformplayer/constructs/Event.kt

@@ -71,16 +71,14 @@ class Event0() : EventBase<(()->Unit), (()->Boolean)>() {
     fun emit() : Boolean {
         var handled = false;
 
-        synchronized(_conditionalListeners) {
-            for (conditional in _conditionalListeners)
-                handled = handled || conditional.handler.invoke();
-        }
+        val condSnapshot = synchronized(_conditionalListeners) { _conditionalListeners.toList() };
+        for (conditional in condSnapshot)
+            handled = handled || conditional.handler.invoke();
 
-        synchronized(_listeners) {
-            handled = handled || _listeners.isNotEmpty();
-            for (handler in _listeners)
-                handler.handler.invoke();
-        }
+        val snapshot = synchronized(_listeners) { _listeners.toList() };
+        handled = handled || snapshot.isNotEmpty();
+        for (handler in snapshot)
+            handler.handler.invoke();
 
         return handled;
     }
@@ -88,16 +86,15 @@ class Event0() : EventBase<(()->Unit), (()->Boolean)>() {
 class Event1<T1>() : EventBase<((T1)->Unit), ((T1)->Boolean)>() {
     fun emit(value : T1): Boolean {
         var handled = false;
-        synchronized(_conditionalListeners) {
-            for (conditional in _conditionalListeners)
-                handled = handled || conditional.handler.invoke(value);
-        }
 
-        synchronized(_listeners) {
-            handled = handled || _listeners.isNotEmpty();
-            for (handler in _listeners)
-                handler.handler.invoke(value);
-        }
+        val condSnapshot = synchronized(_conditionalListeners) { _conditionalListeners.toList() };
+        for (conditional in condSnapshot)
+            handled = handled || conditional.handler.invoke(value);
+
+        val snapshot = synchronized(_listeners) { _listeners.toList() };
+        handled = handled || snapshot.isNotEmpty();
+        for (handler in snapshot)
+            handler.handler.invoke(value);
 
         return handled;
     }
@@ -106,16 +103,14 @@ class Event2<T1, T2>() : EventBase<((T1, T2)->Unit), ((T1, T2)->Boolean)>() {
     fun emit(value1 : T1, value2 : T2): Boolean {
         var handled = false;
 
-        synchronized(_conditionalListeners) {
-            for (conditional in _conditionalListeners)
-                handled = handled || conditional.handler.invoke(value1, value2);
-        }
+        val condSnapshot = synchronized(_conditionalListeners) { _conditionalListeners.toList() };
+        for (conditional in condSnapshot)
+            handled = handled || conditional.handler.invoke(value1, value2);
 
-        synchronized(_listeners) {
-            handled = handled || _listeners.isNotEmpty();
-            for (handler in _listeners)
-                handler.handler.invoke(value1, value2);
-        }
+        val snapshot = synchronized(_listeners) { _listeners.toList() };
+        handled = handled || snapshot.isNotEmpty();
+        for (handler in snapshot)
+            handler.handler.invoke(value1, value2);
 
         return handled;
     }
@@ -125,16 +120,14 @@ class Event3<T1, T2, T3>() : EventBase<((T1, T2, T3)->Unit), ((T1, T2, T3)->Bool
     fun emit(value1 : T1, value2 : T2, value3 : T3): Boolean {
         var handled = false;
 
-        synchronized(_conditionalListeners) {
-            for (conditional in _conditionalListeners)
-                handled = handled || conditional.handler.invoke(value1, value2, value3);
-        }
+        val condSnapshot = synchronized(_conditionalListeners) { _conditionalListeners.toList() };
+        for (conditional in condSnapshot)
+            handled = handled || conditional.handler.invoke(value1, value2, value3);
 
-        synchronized(_listeners) {
-            handled = handled || _listeners.isNotEmpty();
-            for (handler in _listeners)
-                handler.handler.invoke(value1, value2, value3);
-        }
+        val snapshot = synchronized(_listeners) { _listeners.toList() };
+        handled = handled || snapshot.isNotEmpty();
+        for (handler in snapshot)
+            handler.handler.invoke(value1, value2, value3);
 
         return handled;
     }

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

@@ -134,7 +134,7 @@ class AutoUpdateDialog(context: Context?) : AlertDialog(context) {
             var inputStream: InputStream? = null;
             try {
                 val client = ManagedHttpClient();
-                val response = client.get(StateUpdate.APK_URL);
+                val response = client.get(StateUpdate.getApkUrl(_maxVersion));
                 if (response.isOk && response.body != null) {
                     inputStream = response.body.byteStream();
                     val dataLength = response.body.contentLength();

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

@@ -15,6 +15,7 @@ import com.futo.platformplayer.R
 import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
 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.google.android.material.button.MaterialButton
@@ -81,6 +82,8 @@ class AutomaticBackupDialog(context: Context) : AlertDialog(context) {
             Settings.instance.backup.didAskAutoBackup = true
             Settings.instance.save()
 
+            StateAnnouncement.instance.deleteAnnouncement("backup")
+
             UIDialogs.toast(context, context.getString(R.string.automatic_backup_enabled))
             try {
                 StateBackup.startAutomaticBackup(true)

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

@@ -139,19 +139,35 @@ class VideoDownload {
     @Contextual
     @kotlinx.serialization.Transient
     var videoSourceLive: JSSource? = null;
-    val isLiveVideoSourceValid get() = videoSourceLive?.getUnderlyingObject()?.isClosed?.let { !it } ?: false;
+    val isLiveVideoSourceValid get() = videoSourceLive?.getUnderlyingPlugin()?.busy {
+        videoSourceLive?.getUnderlyingObject()?.isClosed?.let { !it } ?: false;
+    } ?: false;
 
     var requiresLiveAudioSource: Boolean = false;
     @Contextual
     @kotlinx.serialization.Transient
     var audioSourceLive: JSSource? = null;
-    val isLiveAudioSourceValid get() = audioSourceLive?.getUnderlyingObject()?.isClosed?.let { !it } ?: false;
+    val isLiveAudioSourceValid get() = audioSourceLive?.getUnderlyingPlugin()?.busy {
+        audioSourceLive?.getUnderlyingObject()?.isClosed?.let { !it } ?: false;
+    } ?: false;
 
     var hasVideoRequestExecutor: Boolean = false;
     var hasAudioRequestExecutor: Boolean = false;
     var hasVideoRequestModifier: Boolean = false;
     var hasAudioRequestModifier: Boolean = false;
 
+    // Transient: IRequestModifier is a runtime object from the JS plugin engine and cannot be
+    // serialized. After deserialization these are null - DownloadService must re-prepare to
+    // recapture them from the live plugin source (see needsReprepareForAuth).
+    @kotlinx.serialization.Transient
+    private var preparedVideoRequestModifier: IRequestModifier? = null;
+    @kotlinx.serialization.Transient
+    private var preparedAudioRequestModifier: IRequestModifier? = null;
+
+    val needsReprepareForAuth: Boolean get() =
+        (hasVideoRequestModifier && preparedVideoRequestModifier == null && videoSourceLive == null) ||
+        (hasAudioRequestModifier && preparedAudioRequestModifier == null && audioSourceLive == null);
+
     var progress: Double = 0.0;
     var isCancelled = false;
 
@@ -207,7 +223,7 @@ class VideoDownload {
         this.requireAudioSource = targetBitrate != null; //TODO: May not be a valid check.. can only be determined after live fetch?
         this.requiredCheck = optionalSources;
     }
-    constructor(video: IPlatformVideoDetails, videoSource: IVideoSource?, audioSource: IAudioSource?, subtitleSource: SubtitleRawSource?) {
+    constructor(video: IPlatformVideoDetails, videoSource: IVideoSource?, audioSource: IAudioSource?, subtitleSource: SubtitleRawSource?, videoModifier: IRequestModifier? = null, audioModifier: IRequestModifier? = null) {
         this.video = SerializedPlatformVideo.fromVideo(video);
         this.videoDetails = SerializedPlatformVideoDetails.fromVideo(video, if (subtitleSource != null) listOf(subtitleSource) else listOf());
         this.videoSource = if(videoSource is IVideoUrlSource) VideoUrlSource.fromUrlSource(videoSource) else null;
@@ -216,12 +232,22 @@ class VideoDownload {
         this.audioSourceLive = if(audioSource is JSSource) audioSource else null;
         this.subtitleSource = subtitleSource;
         this.prepareTime = OffsetDateTime.now();
+        this.preparedVideoRequestModifier = videoModifier ?: (if (videoSource is JSSource && videoSource.hasRequestModifier) videoSource.getRequestModifier() else null);
+        this.preparedAudioRequestModifier = audioModifier ?: (if (audioSource is JSSource && audioSource.hasRequestModifier) audioSource.getRequestModifier() else null);
         this.hasVideoRequestExecutor = videoSource is JSSource && videoSource.hasRequestExecutor;
         this.hasAudioRequestExecutor = audioSource is JSSource && audioSource.hasRequestExecutor;
-        this.hasVideoRequestModifier = videoSource is JSSource && videoSource.hasRequestModifier;
-        this.hasAudioRequestModifier = audioSource is JSSource && audioSource.hasRequestModifier;
-        this.requiresLiveVideoSource = this.hasVideoRequestModifier || this.hasVideoRequestExecutor || (videoSource is JSDashManifestRawSource && videoSource.hasGenerate);
-        this.requiresLiveAudioSource = this.hasAudioRequestModifier || this.hasAudioRequestExecutor || (audioSource is JSDashManifestRawAudioSource && audioSource.hasGenerate);
+        // Set modifier flags from either the source or an explicitly provided modifier
+        // (e.g. from the HLS picker, where the source is an HLSVariant, not JSSource).
+        // These flags are serialized and used by needsReprepareForAuth after restore.
+        this.hasVideoRequestModifier = preparedVideoRequestModifier != null;
+        this.hasAudioRequestModifier = preparedAudioRequestModifier != null;
+        // requiresLiveVideoSource means a live JSSource is needed at download time (for executors
+        // or DASH generation). Modifiers alone don't require a live source - they're already
+        // captured in preparedVideoRequestModifier and recaptured via needsReprepareForAuth.
+        val sourceHasVideoModifier = videoSource is JSSource && videoSource.hasRequestModifier;
+        val sourceHasAudioModifier = audioSource is JSSource && audioSource.hasRequestModifier;
+        this.requiresLiveVideoSource = sourceHasVideoModifier || this.hasVideoRequestExecutor || (videoSource is JSDashManifestRawSource && videoSource.hasGenerate);
+        this.requiresLiveAudioSource = sourceHasAudioModifier || this.hasAudioRequestExecutor || (audioSource is JSDashManifestRawAudioSource && audioSource.hasGenerate);
         this.targetVideoName = videoSource?.name;
         this.targetAudioName = audioSource?.name;
         this.targetPixelCount = if(videoSource != null) (videoSource.width * videoSource.height).toLong() else null;
@@ -317,8 +343,10 @@ class VideoDownload {
                 val videoSources = arrayListOf<IVideoSource>()
                 for (source in original.video.videoSources) {
                     if (source is IHLSManifestSource) {
+                        val sourceModifier = if (source is JSSource && source.hasRequestModifier) source.getRequestModifier() else null
+                        if (sourceModifier != null) preparedVideoRequestModifier = sourceModifier
                         try {
-                            val playlistResponse = client.get(source.url)
+                            val playlistResponse = client.get(source.url, HashMap(), sourceModifier)
                             if (playlistResponse.isOk) {
                                 val resolvedPlaylistUrl = playlistResponse.url
                                 val playlistContent = playlistResponse.body?.string()
@@ -345,6 +373,8 @@ class VideoDownload {
                 if(vsource is JSSource) {
                     this.hasVideoRequestExecutor = this.hasVideoRequestExecutor || vsource.hasRequestExecutor;
                     this.requiresLiveVideoSource = this.hasVideoRequestExecutor || (vsource is JSDashManifestRawSource && vsource.hasGenerate);
+                    if (vsource.hasRequestModifier && preparedVideoRequestModifier == null)
+                        preparedVideoRequestModifier = vsource.getRequestModifier()
                 }
 
                 if(vsource == null) {
@@ -366,8 +396,10 @@ class VideoDownload {
                 if (video is VideoUnMuxedSourceDescriptor) {
                     for (source in video.audioSources) {
                         if (source is IHLSManifestAudioSource) {
+                            val sourceModifier = if (source is JSSource && source.hasRequestModifier) source.getRequestModifier() else null
+                            if (sourceModifier != null) preparedAudioRequestModifier = sourceModifier
                             try {
-                                val playlistResponse = client.get(source.url)
+                                val playlistResponse = client.get(source.url, HashMap(), sourceModifier)
                                 if (playlistResponse.isOk) {
                                     val resolvedPlaylistUrl = playlistResponse.url
                                     val playlistContent = playlistResponse.body?.string()
@@ -402,6 +434,8 @@ class VideoDownload {
                 if(asource is JSSource) {
                     this.hasAudioRequestExecutor = this.hasAudioRequestExecutor || asource.hasRequestExecutor;
                     this.requiresLiveAudioSource = this.hasAudioRequestExecutor || (asource is JSDashManifestRawSource && asource.hasGenerate);
+                    if (asource.hasRequestModifier && preparedAudioRequestModifier == null)
+                        preparedAudioRequestModifier = asource.getRequestModifier()
                 }
 
                 if(asource == null) {
@@ -498,10 +532,16 @@ class VideoDownload {
                     }
                 }
 
+                val videoModifier = preparedVideoRequestModifier
                 if(actualVideoSource is IVideoUrlSource)
                     videoFileSize = when (videoSource!!.container) {
-                        "application/vnd.apple.mpegurl" -> downloadHlsSource(context, "Video", client, if (actualVideoSource is JSSource) actualVideoSource else null, videoSource!!.getVideoUrl(), File(downloadDir, videoFileName!!), progressCallback)
-                        else -> downloadFileSource("Video", client, if (actualVideoSource is JSSource) actualVideoSource else null, videoSource!!.getVideoUrl(), File(downloadDir, videoFileName!!), progressCallback)
+                        "application/vnd.apple.mpegurl" -> {
+                            // HLS segments are concatenated into an MP4 file during download,
+                            // so override the container for local playback/casting
+                            videoOverrideContainer = "video/mp4";
+                            downloadHlsSource(context, "Video", client, videoModifier, videoSource!!.getVideoUrl(), File(downloadDir, videoFileName!!), progressCallback)
+                        }
+                        else -> downloadFileSource("Video", client, videoModifier, videoSource!!.getVideoUrl(), File(downloadDir, videoFileName!!), progressCallback)
                     }
                 else if(actualVideoSource is JSDashManifestRawSource) {
                     if(actualAudioSource == null)
@@ -542,10 +582,16 @@ class VideoDownload {
                     }
                 }
 
+                val audioModifier = preparedAudioRequestModifier
                 if(actualAudioSource is IAudioUrlSource)
                     audioFileSize = when (audioSource!!.container) {
-                        "application/vnd.apple.mpegurl" -> downloadHlsSource(context, "Audio", client, if (actualAudioSource is JSSource) actualAudioSource else null, audioSource!!.getAudioUrl(), File(downloadDir, audioFileName!!), progressCallback)
-                        else -> downloadFileSource("Audio", client, if (actualAudioSource is JSSource) actualAudioSource else null, audioSource!!.getAudioUrl(), File(downloadDir, audioFileName!!), progressCallback)
+                        "application/vnd.apple.mpegurl" -> {
+                            // HLS segments are concatenated into an MP4 file during download,
+                            // so override the container for local playback/casting
+                            audioOverrideContainer = "audio/mp4";
+                            downloadHlsSource(context, "Audio", client, audioModifier, audioSource!!.getAudioUrl(), File(downloadDir, audioFileName!!), progressCallback)
+                        }
+                        else -> downloadFileSource("Audio", client, audioModifier, audioSource!!.getAudioUrl(), File(downloadDir, audioFileName!!), progressCallback)
                     }
                 else if(actualAudioSource is JSDashManifestRawAudioSource) {
                     audioFileSize = downloadDashFileSource("Audio", client, actualAudioSource, File(downloadDir, audioFileName!!), progressCallback, 2);
@@ -659,15 +705,11 @@ class VideoDownload {
         }
     }
 
-    private suspend fun downloadHlsSource(context: Context, name: String, client: ManagedHttpClient, source: JSSource?, hlsUrl: String, targetFile: File, onProgress: (Long, Long, Long) -> Unit): Long {
+    private suspend fun downloadHlsSource(context: Context, name: String, client: ManagedHttpClient, modifier: IRequestModifier?, hlsUrl: String, targetFile: File, onProgress: (Long, Long, Long) -> Unit): Long {
         if (targetFile.exists())
             targetFile.delete()
 
         var downloadedTotalLength = 0L
-        val modifier = if (source is JSSource && source.hasRequestModifier)
-            source.getRequestModifier()
-        else
-            null
 
         fun downloadBytes(url: String, rangeStart: Long? = null, rangeLength: Long? = null): ByteArray {
             val headers = mutableMapOf<String, String>()
@@ -681,17 +723,13 @@ class VideoDownload {
                 }
             }
 
-            val modified = modifier?.modifyRequest(url, headers)
-            val finalUrl = modified?.url ?: url
-            val finalHeaders = modified?.headers?.toMutableMap() ?: headers
-
-            val resp = client.get(finalUrl, finalHeaders)
+            val resp = client.get(url, headers, modifier)
             if (!resp.isOk) {
                 resp.body?.close()
-                throw IllegalStateException("Failed to download HLS resource ($finalUrl): HTTP ${resp.code}")
+                throw IllegalStateException("Failed to download HLS resource ($url): HTTP ${resp.code}")
             }
 
-            val body = resp.body ?: throw IllegalStateException("Failed to download HLS resource ($finalUrl): Empty body")
+            val body = resp.body ?: throw IllegalStateException("Failed to download HLS resource ($url): Empty body")
             val bytes = body.bytes()
             body.close()
             return bytes
@@ -706,12 +744,7 @@ class VideoDownload {
 
         val segmentFiles = arrayListOf<File>()
         try {
-            val playlistHeaders = mutableMapOf<String, String>()
-            val modifiedPlaylistReq = modifier?.modifyRequest(hlsUrl, playlistHeaders)
-            val playlistResp = client.get(
-                modifiedPlaylistReq?.url ?: hlsUrl,
-                modifiedPlaylistReq?.headers?.toMutableMap() ?: playlistHeaders
-            )
+            val playlistResp = client.get(hlsUrl, mutableMapOf(), modifier)
 
             check(playlistResp.isOk) { "Failed to get variant playlist: ${playlistResp.code}" }
 
@@ -960,16 +993,7 @@ class VideoDownload {
 
                 Logger.i(TAG, "Downloading cue ${indexCounter}")
                 val url = foundTemplateUrl.replace("\$Number\$", (indexCounter).toString());
-                val modified = modifier?.modifyRequest(url, mapOf());
-
-                val data = if(executor != null)
-                    executor.executeRequest("GET", modified?.url ?: url, null, modified?.headers ?: mapOf());
-                else {
-                    val resp = client.get(modified?.url ?: url, modified?.headers?.toMutableMap() ?: mutableMapOf());
-                    if(!resp.isOk)
-                        throw IllegalStateException("Dash request failed for index " + indexCounter.toString() + ", with code: " + resp.code.toString());
-                    resp.body!!.bytes()
-                }
+                val data = executeOrGet(client, executor, modifier, url)
                 fileStream.write(data, 0, data.size);
                 speedTracker.addWork(data.size.toLong());
                 written += data.size;
@@ -989,16 +1013,7 @@ class VideoDownload {
                         val t2 = cue2.groupValues[1];
                         val d2 = cue2.groupValues[2];
                         val url2 = foundTemplateUrl2!!.replace("\$Number\$", (index2).toString());
-                        val modified2 = modifier?.modifyRequest(url, mapOf());
-
-                        val data = if(executor != null)
-                            executor.executeRequest("GET", modified2?.url ?: url2, null, modified2?.headers ?: mapOf());
-                        else {
-                            val resp = client.get(modified2?.url ?: url, modified2?.headers?.toMutableMap() ?: mutableMapOf());
-                            if(!resp.isOk)
-                                throw IllegalStateException("Dash request2 failed for index " + indexCounter.toString() + ", with code: " + resp.code.toString());
-                            resp.body!!.bytes()
-                        }
+                        val data = executeOrGet(client, executor, modifier, url2)
                         fileStream2.write(data, 0, data.size);
                         speedTracker.addWork(data.size.toLong());
                         written2 += data.size;
@@ -1067,7 +1082,7 @@ class VideoDownload {
         }
     }
 
-    private fun downloadFileSource(name: String, client: ManagedHttpClient, source: JSSource?, videoUrl: String, targetFile: File, onProgress: (Long, Long, Long) -> Unit): Long {
+    private fun downloadFileSource(name: String, client: ManagedHttpClient, modifier: IRequestModifier?, videoUrl: String, targetFile: File, onProgress: (Long, Long, Long) -> Unit): Long {
         if(targetFile.exists())
             targetFile.delete();
 
@@ -1076,13 +1091,8 @@ class VideoDownload {
         val sourceLength: Long?;
         val fileStream = FileOutputStream(targetFile);
 
-        val modifier = if (source is JSSource && source.hasRequestModifier)
-            source.getRequestModifier();
-        else
-            null;
-
         try {
-            val head = client.tryHead(videoUrl);
+            val head = client.tryHead(videoUrl, modifier);
             val relatedPlugin = (video?.url ?: videoDetails?.url)?.let { StatePlatform.instance.getContentClient(it) }?.let { if(it is JSClient) it else null };
             if(Settings.instance.downloads.byteRangeDownload && head?.containsKey("accept-ranges") == true && head.containsKey("content-length"))
             {
@@ -1157,12 +1167,7 @@ class VideoDownload {
 
         var lastSpeed: Long = 0;
 
-        val result = if (modifier != null) {
-            val modified = modifier.modifyRequest(url, mapOf())
-            client.get(modified.url!!, modified.headers.toMutableMap())
-        } else {
-            client.get(url)
-        }
+        val result = client.get(url, HashMap(), modifier)
         if (!result.isOk) {
             result.body?.close()
             throw IllegalStateException("Failed to download source. Web[${result.code}] Error");
@@ -1375,13 +1380,12 @@ class VideoDownload {
         var lastException: Throwable? = null;
 
         val headers = mutableMapOf(Pair("Range", "bytes=${rangeStart}-${rangeEnd}"));
-        val modified = modifier?.modifyRequest(url, headers);
 
         while (retryCount <= 3) {
             try {
                 val toRead = rangeEnd - rangeStart;
 
-                val req = client.get(modified?.url ?: url, modified?.headers?.toMutableMap() ?: headers);
+                val req = client.get(url, headers.toMutableMap(), modifier);
                 if (!req.isOk) {
                     val bodyString = req.body?.string()
                     req.body?.close()
@@ -1458,6 +1462,9 @@ class VideoDownload {
         if(localAudioSource != null && audioSourceToUse != null && audioSourceToUse is IStreamMetaDataSource)
             localAudioSource.streamMetaData = (audioSourceToUse as IStreamMetaDataSource).streamMetaData;
 
+        if(localAudioSource != null && localAudioSource.streamMetaData == null && videoSourceToUse is JSDashManifestRawSource)
+            localAudioSource.streamMetaData = (videoSourceToUse as JSDashManifestRawSource).audioStreamMetaData;
+
         if(existing != null) {
             existing.videoSerialized = videoDetails!!;
             if(localVideoSource != null) {
@@ -1512,6 +1519,18 @@ class VideoDownload {
         }
     }
 
+    private fun executeOrGet(client: ManagedHttpClient, executor: JSRequestExecutor?, modifier: IRequestModifier?, url: String, headers: Map<String, String> = mapOf()): ByteArray {
+        if (executor != null) {
+            val modified = modifier?.modifyRequest(url, headers)
+            return executor.executeRequest("GET", modified?.url ?: url, null, modified?.headers ?: headers)
+        } else {
+            val resp = client.get(url, headers.toMutableMap(), modifier)
+            if (!resp.isOk)
+                throw IllegalStateException("Request failed for ($url) with code: ${resp.code}")
+            return resp.body!!.bytes()
+        }
+    }
+
     companion object {
         const val TAG = "VideoDownload";
         const val GROUP_PLAYLIST = "Playlist";
@@ -1603,4 +1622,4 @@ class VideoDownload {
         }
 
     }
-}
+}

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

@@ -13,8 +13,10 @@ import com.futo.platformplayer.helpers.FileHelper.Companion.sanitizeFileName
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.toHumanBitrate
+import kotlinx.coroutines.CancellableContinuation
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withContext
 import java.io.File
@@ -51,8 +53,12 @@ class VideoExport {
 
         val outputFile: DocumentFile?;
         val downloadRoot = documentRoot ?: StateApp.instance.getExternalDownloadDirectory(context) ?: throw Exception("External download directory is not set");
+        val safeBaseName = videoLocal.name.sanitizeFileName(true).ifBlank {
+            "video_${UUID.randomUUID()}"
+        }
+
         if (sourceCount > 1) {
-            val outputFileName = videoLocal.name.sanitizeFileName(true) + ".mp4"// + VideoDownload.videoContainerToExtension(v.container);
+            val outputFileName = "$safeBaseName.mp4"
             val f = downloadRoot.createFile("video/mp4", outputFileName)
                 ?: throw Exception("Failed to create file in external directory.");
 
@@ -60,7 +66,9 @@ class VideoExport {
             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 ->
+                val outputStream = context.contentResolver.openOutputStream(f.uri)
+                    ?: throw IOException("Failed to open output stream for ${f.uri}")
+                outputStream.use { outputStream ->
                     copy(tempFile.absolutePath, outputStream) { progress -> onProgress?.invoke(progress) };
                 }
             } finally {
@@ -68,25 +76,29 @@ class VideoExport {
             }
             outputFile = f;
         } else if (v != null) {
-            val outputFileName = videoLocal.name.sanitizeFileName(true) + "." + VideoDownload.videoContainerToExtension(v.container);
+            val outputFileName = "$safeBaseName.${VideoDownload.videoContainerToExtension(v.container)}"
             val f = downloadRoot.createFile(if (v.container == "application/vnd.apple.mpegurl") "video/mp4" else v.container, outputFileName)
                 ?: throw Exception("Failed to create file in external directory.");
 
             Logger.i(TAG, "Copying video.");
 
-            context.contentResolver.openOutputStream(f.uri)?.use { outputStream ->
+            val outputStream = context.contentResolver.openOutputStream(f.uri)
+                ?: throw IOException("Failed to open output stream for ${f.uri}")
+            outputStream.use { outputStream ->
                 copy(v.filePath, outputStream) { progress -> onProgress?.invoke(progress) };
             }
 
             outputFile = f;
         } else if (a != null) {
-            val outputFileName = videoLocal.name.sanitizeFileName(true) + "." + VideoDownload.audioContainerToExtension(a.container);
+            val outputFileName = "$safeBaseName.${VideoDownload.audioContainerToExtension(a.container)}"
             val f = downloadRoot.createFile(if (a.container == "application/vnd.apple.mpegurl") "video/mp4" else a.container, outputFileName)
                     ?: throw Exception("Failed to create file in external directory.");
 
             Logger.i(TAG, "Copying audio.");
 
-            context.contentResolver.openOutputStream(f.uri)?.use { outputStream ->
+            val outputStream = context.contentResolver.openOutputStream(f.uri)
+                ?: throw IOException("Failed to open output stream for ${f.uri}")
+            outputStream.use { outputStream ->
                 copy(a.filePath, outputStream) { progress -> onProgress?.invoke(progress) };
             }
 
@@ -98,29 +110,48 @@ class VideoExport {
         return@coroutineScope outputFile;
     }
 
+    private fun ffmpegArg(value: String): String {
+        return "\"" + value
+            .replace("\\", "\\\\")
+            .replace("\"", "\\\"") + "\""
+    }
+
+
+    private fun resumeSuccessSafely(continuation: CancellableContinuation<Unit>) {
+        if (!continuation.isActive) return
+        try {
+            continuation.resumeWith(Result.success(Unit))
+        } catch (_: IllegalStateException) {
+        }
+    }
+
+    private fun resumeFailureSafely(continuation: CancellableContinuation<Unit>, throwable: Throwable) {
+        if (!continuation.isActive) return
+        try {
+            continuation.resumeWithException(throwable)
+        } catch (_: IllegalStateException) {
+        }
+    }
+
     private suspend fun combine(inputPathAudio: String?, inputPathVideo: String?, inputPathSubtitles: String?, outputPath: String, duration: Double, onProgress: ((Double) -> Unit)? = null) = withContext(Dispatchers.IO) {
         suspendCancellableCoroutine { continuation ->
-            //ffmpeg -i a.mp4 -i b.m4a -scodec mov_text -i c.vtt -map 0:v -map 1:a -map 2 -c:v copy -c:a copy -c:s mov_text output.mp4
-
             val cmdBuilder = StringBuilder("-y")
             var counter = 0
 
             if (inputPathVideo != null) {
-                cmdBuilder.append(" -i $inputPathVideo")
+                cmdBuilder.append(" -i ${ffmpegArg(inputPathVideo)}")
             }
             if (inputPathAudio != null) {
-                cmdBuilder.append(" -i $inputPathAudio")
+                cmdBuilder.append(" -i ${ffmpegArg(inputPathAudio)}")
             }
             if (inputPathSubtitles != null) {
-                val subtitleExtension = File(inputPathSubtitles).extension
-
-                val codec = when (subtitleExtension.lowercase()) {
-                    "srt" -> "mov_text"
-                    "vtt" -> "webvtt"
+                val subtitleExtension = File(inputPathSubtitles).extension.lowercase()
+                when (subtitleExtension) {
+                    "srt", "vtt" -> {}
                     else -> throw Exception("Unsupported subtitle format: $subtitleExtension")
                 }
 
-                cmdBuilder.append(" -scodec $codec -i $inputPathSubtitles")
+                cmdBuilder.append(" -i ${ffmpegArg(inputPathSubtitles)}")
             }
 
             if (inputPathVideo != null) {
@@ -132,6 +163,7 @@ class VideoExport {
 
             if (inputPathSubtitles != null) {
                 cmdBuilder.append(" -map ${counter++}")
+                cmdBuilder.append(" -c:s mov_text")
             }
 
             if (inputPathVideo != null) {
@@ -140,33 +172,44 @@ class VideoExport {
             if (inputPathAudio != null) {
                 cmdBuilder.append(" -c:a copy")
             }
-            if (inputPathAudio != null) {
-                cmdBuilder.append(" -c:s mov_text")
-            }
 
-            cmdBuilder.append(" $outputPath")
+            cmdBuilder.append(" ${ffmpegArg(outputPath)}")
 
             val cmd = cmdBuilder.toString()
             Logger.i(TAG, "Used command: $cmd");
 
             val statisticsCallback = StatisticsCallback { statistics ->
                 val time = statistics.time.toDouble() / 1000.0
-                val progressPercentage = (time / duration)
-                onProgress?.invoke(progressPercentage)
+                val progressPercentage = if (duration > 0.0) {
+                    (time / duration).coerceIn(0.0, 1.0)
+                } else {
+                    0.0
+                }
+
+                onProgress?.let { callback ->
+                    StateApp.instance.scopeOrNull?.launch(Dispatchers.Main) {
+                        callback(progressPercentage)
+                    }
+                }
             }
 
             val executorService = Executors.newSingleThreadExecutor()
             val session = FFmpegKit.executeAsync(cmd,
                 { session ->
-                    if (ReturnCode.isSuccess(session.returnCode)) {
-                        continuation.resumeWith(Result.success(Unit))
-                    } else {
-                        val errorMessage = if (ReturnCode.isCancel(session.returnCode)) {
-                            "Command cancelled"
+                    try {
+                        if (ReturnCode.isSuccess(session.returnCode)) {
+                            resumeSuccessSafely(continuation)
                         } else {
-                            "Command failed with state '${session.state}' and return code ${session.returnCode}, stack trace ${session.failStackTrace}"
+                            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}"
+                            }
+                            resumeFailureSafely(continuation, RuntimeException(errorMessage))
+
                         }
-                        continuation.resumeWithException(RuntimeException(errorMessage))
+                    } finally {
+                        executorService.shutdown()
                     }
                 },
                 LogCallback { Logger.v(TAG, it.message) },
@@ -176,6 +219,7 @@ class VideoExport {
 
             continuation.invokeOnCancellation {
                 session.cancel()
+                executorService.shutdown()
             }
         }
     }
@@ -196,14 +240,24 @@ class VideoExport {
                 val totalBytes = srcFile.length()
                 var bytesCopied: Long = 0
 
+                if (totalBytes == 0L) {
+                    onProgress?.let {
+                        withContext(Dispatchers.Main) {
+                            it(1.0)
+                        }
+                    }
+                    return@withContext
+                }
+
                 var bytesRead: Int
                 while (inputStream.read(buffer).also { bytesRead = it } != -1) {
                     outputStream.write(buffer, 0, bytesRead)
                     bytesCopied += bytesRead.toLong()
 
                     onProgress?.let {
+                        val progress = (bytesCopied / totalBytes.toDouble()).coerceIn(0.0, 1.0)
                         withContext(Dispatchers.Main) {
-                            it(bytesCopied / totalBytes.toDouble())
+                            it(progress)
                         }
                     }
                 }

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

@@ -58,6 +58,7 @@ import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.withContext
 import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.TimeUnit
 import java.util.concurrent.locks.ReentrantLock
 import kotlin.concurrent.withLock
 
@@ -87,6 +88,7 @@ class V8Plugin {
     private val _deps : LinkedHashMap<String, String> = LinkedHashMap();
     private val _depsPackages : MutableList<V8Package> = mutableListOf();
     private var _script : String? = null;
+    val bridge: PackageBridge;
 
     var isStopped = true;
     val onStopped = Event1<V8Plugin>();
@@ -94,6 +96,9 @@ class V8Plugin {
     private val _busyLock = ReentrantLock()
     val isBusy get() = _busyLock.isLocked;
 
+    @Volatile
+    private var _busyHolder: Thread? = null;
+
     var allowDevSubmit: Boolean = false
         private set(value) {
             field = value;
@@ -114,7 +119,8 @@ class V8Plugin {
         this._clientAuth = clientAuth;
         this.config = config;
         this._script = script;
-        withDependency(PackageBridge(this, config));
+        bridge = PackageBridge(this, config);
+        withDependency(bridge);
 
         for(pack in config.packages)
             withDependency(getPackage(pack)!!);
@@ -159,51 +165,53 @@ class V8Plugin {
 
     fun start() {
         val script = _script ?: throw IllegalStateException("Attempted to start V8 without script");
-        synchronized(_runtimeLock) {
-            if (_runtime != null)
-                return;
-            runtimeId = runtimeId + 1;
-            //V8RuntimeOptions.V8_FLAGS.setUseStrict(true);
-            val host = V8Host.getV8Instance();
-            val options = host.jsRuntimeType.getRuntimeOptions();
+        tryBusy(BUSY_STARTUP_MS) {
+            synchronized(_runtimeLock) {
+                if (_runtime != null)
+                    return@tryBusy;
+                runtimeId = runtimeId + 1;
+                //V8RuntimeOptions.V8_FLAGS.setUseStrict(true);
+                val host = V8Host.getV8Instance();
+                val options = host.jsRuntimeType.getRuntimeOptions();
 
-            _runtime = host.createV8Runtime(options);
-            if (!host.isIsolateCreated)
-                throw IllegalStateException("Isolate not created");
+                _runtime = host.createV8Runtime(options);
+                if (!host.isIsolateCreated)
+                    throw IllegalStateException("Isolate not created");
 
-            _runtimeMap.put(_runtime!!, this);
+                _runtimeMap.put(_runtime!!, this);
 
-            //Setup bridge
-            _runtime?.let {
-                it.converter = V8Converter();
+                //Setup bridge
+                _runtime?.let {
+                    it.converter = V8Converter();
 
-                for (pack in _depsPackages) {
-                    if (pack.variableName != null)
-                        it.createV8ValueObject().use { v8valueObject ->
-                            it.globalObject.set(pack.variableName, v8valueObject);
-                            v8valueObject.bind(pack);
-                        };
-                    catchScriptErrors("Package Dep[${pack.name}]") {
-                        for (packScript in pack.getScripts())
-                            it.getExecutor(packScript).executeVoid();
+                    for (pack in _depsPackages) {
+                        if (pack.variableName != null)
+                            it.createV8ValueObject().use { v8valueObject ->
+                                it.globalObject.set(pack.variableName, v8valueObject);
+                                v8valueObject.bind(pack);
+                            };
+                        catchScriptErrors("Package Dep[${pack.name}]") {
+                            for (packScript in pack.getScripts())
+                                it.getExecutor(packScript).executeVoid();
+                        }
                     }
-                }
 
-                //Load deps
-                for (dep in _deps)
-                    catchScriptErrors("Dep[${dep.key}]") {
-                        it.getExecutor(dep.value).executeVoid()
+                    //Load deps
+                    for (dep in _deps)
+                        catchScriptErrors("Dep[${dep.key}]") {
+                            it.getExecutor(dep.value).executeVoid()
+                        };
+
+
+                    if (config.allowEval)
+                        it.allowEval(true);
+
+                    //Load plugin
+                    catchScriptErrors("Plugin[${config.name}]") {
+                        it.getExecutor(script).executeVoid()
                     };
-
-
-                if (config.allowEval)
-                    it.allowEval(true);
-
-                //Load plugin
-                catchScriptErrors("Plugin[${config.name}]") {
-                    it.getExecutor(script).executeVoid()
-                };
-                isStopped = false;
+                    isStopped = false;
+                }
             }
         }
     }
@@ -252,27 +260,30 @@ class V8Plugin {
     fun isThreadAlreadyBusy(): Boolean {
         return _busyLock.isHeldByCurrentThread;
     }
-    fun <T> busy(handle: ()->T): T {
-        _busyLock.lock();
-        //Logger.i(TAG, "Busy Enter [" + _busyLock.holdCount + "]" + Thread.currentThread().stackTrace.drop(3)?.firstOrNull()?.toString() + ", " + Thread.currentThread().stackTrace.drop(4)?.firstOrNull()?.toString() + ", " + Thread.currentThread().stackTrace.drop(5)?.firstOrNull()?.toString())
+    fun <T> busy(handle: ()->T): T = busyInternal(BUSY_FATAL_MS, true, "busy(enter)", handle)
+
+    fun <T> tryBusy(maxWaitMs: Long, handle: ()->T): T = busyInternal(maxWaitMs, false, "tryBusy(enter)", handle)
+
+    private fun <T> busyInternal(maxWaitMs: Long, allowUnwedge: Boolean, context: String, handle: ()->T): T {
+        acquireBusyOrThrow(context, maxWaitMs, allowUnwedge);
+        _busyHolder = Thread.currentThread();
         try {
             return handle();
         }
         finally {
-            //Logger.i(TAG, "Busy Leave [" + _busyLock.holdCount + "]" + Thread.currentThread().stackTrace.drop(3)?.firstOrNull()?.toString() + ", " + Thread.currentThread().stackTrace.drop(4)?.firstOrNull()?.toString()+ ", " + Thread.currentThread().stackTrace.drop(5)?.firstOrNull()?.toString())
-            _busyLock.unlock();
+            if (_busyLock.isHeldByCurrentThread) {
+                if (_busyLock.holdCount == 1)
+                    _busyHolder = null;
+                _busyLock.unlock();
+            }
         }
-        /*
-        _busyLock.withLock {
-            //Logger.i(TAG, "Entered busy: " + Thread.currentThread().stackTrace.drop(3)?.firstOrNull()?.toString() + ", " + Thread.currentThread().stackTrace.drop(4)?.firstOrNull()?.toString());
-            return handle();
-        }*/
     }
     fun <T> unbusy(handle: ()->T): T {
         val wasLocked = isThreadAlreadyBusy();
         if(!wasLocked)
             return handle();
         val lockCount = _busyLock.holdCount;
+        _busyHolder = null;
         for(i in 1..lockCount)
             _busyLock.unlock();
         try {
@@ -281,9 +292,90 @@ class V8Plugin {
         }
         finally {
             Logger.w(TAG, "Relocking V8 thread for [${config.name}] for a blocking resolve of a promise")
+            var acquired = 0;
+            try {
+                for (i in 1..lockCount) {
+                    acquireBusyOrThrow("unbusy(relock)");
+                    acquired++;
+                }
+                _busyHolder = Thread.currentThread();
+            }
+            catch (timeout: Throwable) {
+                for (j in 1..acquired)
+                    _busyLock.unlock();
+                throw timeout;
+            }
+        }
+    }
 
-            for(i in 1..lockCount)
-                _busyLock.lock();
+    private fun acquireBusyOrThrow(context: String, maxWaitMs: Long = BUSY_FATAL_MS, allowUnwedge: Boolean = true) {
+        val warnAt = Math.min(BUSY_WARN_MS, maxWaitMs);
+        if (_busyLock.tryLock(warnAt, TimeUnit.MILLISECONDS))
+            return;
+        logBusyContention(context);
+        val remaining = maxWaitMs - warnAt;
+        if (remaining > 0 && _busyLock.tryLock(remaining, TimeUnit.MILLISECONDS))
+            return;
+        if (!allowUnwedge)
+            throw IllegalStateException("V8 busy lock for [${config.name}] timed out after ${maxWaitMs}ms in $context (fast-fail)");
+        unwedgeBusyHolder(context);
+        if (_busyLock.tryLock(BUSY_RECOVERY_MS, TimeUnit.MILLISECONDS))
+            return;
+        throw IllegalStateException("V8 busy lock for [${config.name}] timed out after ${maxWaitMs + BUSY_RECOVERY_MS}ms in $context; holder did not release after recovery");
+    }
+
+    private fun unwedgeBusyHolder(context: String) {
+        val holder = _busyHolder;
+        Logger.w(TAG, "V8 busy lock for [${config.name}] still held in $context after ${BUSY_FATAL_MS}ms; attempting to unwedge holder ${holder?.name ?: "unknown"}");
+        try {
+            val rt = _runtime;
+            if (rt != null && !rt.isClosed && !rt.isDead) {
+                Logger.w(TAG, "Calling terminateExecution() on [${config.name}] runtime");
+                rt.terminateExecution();
+            }
+        }
+        catch (ex: Throwable) {
+            Logger.e(TAG, "terminateExecution() failed for [${config.name}]", ex);
+        }
+        try {
+            holder?.interrupt();
+        }
+        catch (ex: Throwable) {
+            Logger.e(TAG, "Interrupting holder thread for [${config.name}] failed", ex);
+        }
+    }
+
+    private fun logBusyContention(context: String) {
+        try {
+            val holder = _busyHolder;
+            val sb = StringBuilder();
+            sb.append("V8 BUSY CONTENTION [${config.name}] in $context: queueLength=${_busyLock.queueLength}, holdCount=${_busyLock.holdCount}, waited>${BUSY_WARN_MS}ms\n");
+            if (holder != null) {
+                sb.append("Lock holder: ${holder.name} (id=${holder.id}, state=${holder.state})\n");
+                for (frame in holder.stackTrace.take(40))
+                    sb.append("  at ").append(frame.toString()).append("\n");
+            } else {
+                sb.append("Lock holder unknown (likely already released or never set)\n");
+            }
+            sb.append("Suspect waiting/blocked threads:\n");
+            val cur = Thread.currentThread();
+            for ((thread, stack) in Thread.getAllStackTraces()) {
+                if (thread == cur || thread == holder) continue;
+                if (thread.state != Thread.State.WAITING && thread.state != Thread.State.BLOCKED && thread.state != Thread.State.TIMED_WAITING) continue;
+                if (stack.none {
+                        val cn = it.className;
+                        cn.contains("V8Plugin") || cn.contains("JSClient") || cn.contains("Extensions_V8")
+                            || cn.contains("Subscription") || cn.contains("PackageHttp") || cn.contains("JSPager")
+                            || cn.contains("JSContent")
+                    }) continue;
+                sb.append("  ${thread.name} (state=${thread.state}):\n");
+                for (frame in stack.take(20))
+                    sb.append("    at ").append(frame.toString()).append("\n");
+            }
+            Logger.w(TAG, sb.toString());
+        }
+        catch (ex: Throwable) {
+            Logger.e(TAG, "Failed to log busy contention", ex);
         }
     }
     fun execute(js: String) : V8Value {
@@ -428,6 +520,11 @@ class V8Plugin {
 
         val TAG = "V8Plugin";
 
+        private const val BUSY_WARN_MS = 10_000L;
+        private const val BUSY_FATAL_MS = 60_000L;
+        private const val BUSY_RECOVERY_MS = 5_000L;
+        const val BUSY_STARTUP_MS = 5_000L;
+
         fun getPluginFromRuntime(runtime: V8Runtime): V8Plugin? {
             return _runtimeMap.getOrDefault(runtime, null);
         }
@@ -565,4 +662,4 @@ class V8Plugin {
             return StateAssets.readAsset(context, path) ?: throw java.lang.IllegalStateException("script ${path} not found");
         }
     }
-}
+}

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

@@ -17,6 +17,7 @@ import com.futo.platformplayer.api.media.models.contents.ContentType
 import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.platforms.js.JSClientConstants
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
+import com.futo.platformplayer.api.media.platforms.js.SourcePluginDescriptor
 import com.futo.platformplayer.api.media.platforms.js.internal.JSHttpClient
 import com.futo.platformplayer.engine.IV8PluginConfig
 import com.futo.platformplayer.engine.V8Plugin
@@ -36,6 +37,9 @@ class PackageBridge : V8Package {
     private val _client: ManagedHttpClient
     @Transient
     private val _clientAuth: ManagedHttpClient
+    // Set by JSClient after construction to provide access to auth/captcha data
+    @Transient
+    var descriptor: SourcePluginDescriptor? = null
 
 
     override val name: String get() = "Bridge";
@@ -80,6 +84,17 @@ class PackageBridge : V8Package {
         return "android";
     }
 
+    // User agent captured during captcha/auth WebView flows, matching Desktop's bridge.captchaUserAgent/bridge.authUserAgent.
+    // Plugins use these to make HTTP requests with the same UA that was used in the WebView.
+    @V8Property
+    fun captchaUserAgent(): String? {
+        return descriptor?.getCaptchaData()?.userAgent
+    }
+    @V8Property
+    fun authUserAgent(): String? {
+        return descriptor?.getAuth()?.userAgent
+    }
+
     @V8Property
     fun supportedFeatures(): Array<String> {
         return arrayOf(
@@ -113,7 +128,9 @@ class PackageBridge : V8Package {
     @V8Function
     fun dispose(value: V8Value) {
         Logger.e(TAG, "Manual dispose: " + value.javaClass.name);
-        value.close();
+        _plugin.busy {
+            value.close();
+        }
     }
 
     var timeoutCounter = 0;
@@ -279,4 +296,4 @@ class PackageBridge : V8Package {
 
 
     }
-}
+}

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

@@ -183,32 +183,42 @@ class PackageBrowser: V8Package {
             }
             _browser?.webChromeClient = object : WebChromeClient() {
                 override fun onConsoleMessage(consoleMessage: ConsoleMessage?): Boolean {
-                    val raw = consoleMessage?.message().orEmpty()
+                    try {
+                        val raw = consoleMessage?.message().orEmpty()
 
-                    val normalized = raw.trim().let { s ->
-                        if (s.length >= 2 && s.first() == '"' && s.last() == '"') {
-                            s.substring(1, s.length - 1)
-                        } else s
+                        val normalized = raw.trim().let { s ->
+                            if (s.length >= 2 && s.first() == '"' && s.last() == '"') {
+                                s.substring(1, s.length - 1)
+                            } else s
+                        }
+
+                        if (normalized.startsWith(CONSOLE_BRIDGE_PREFIX)) {
+                            val payload = normalized.substring(CONSOLE_BRIDGE_PREFIX.length)
+                            if (handleConsoleBridgeMessage(payload)) return true
+                        }
+
+                        if (consoleMessage?.messageLevel() == ConsoleMessage.MessageLevel.ERROR) {
+                            val emsg =
+                                "Browser Error:${consoleMessage.message()} [${consoleMessage.lineNumber()}]"
+                            Logger.e("PackageBrowser", emsg)
+                            if (_plugin.config is SourcePluginConfig && _plugin.config.id == StateDeveloper.DEV_ID)
+                                StateDeveloper.instance.logDevException(
+                                    StateDeveloper.instance.currentDevID ?: "", emsg
+                                )
+                        } else {
+                            val imsg = "Browser Log:${consoleMessage?.message()}"
+                            Logger.i("PackageBrowser", imsg)
+                            if (_plugin.config is SourcePluginConfig && _plugin.config.id == StateDeveloper.DEV_ID)
+                                StateDeveloper.instance.logDevInfo(
+                                    StateDeveloper.instance.currentDevID ?: "", imsg
+                                )
+                        }
+
+                        return super.onConsoleMessage(consoleMessage)
+                    } catch (e: Throwable) {
+                        Logger.e(TAG, "Failed to handle onConsoleMessage", e)
+                        return super.onConsoleMessage(consoleMessage)
                     }
-
-                    if (normalized.startsWith(CONSOLE_BRIDGE_PREFIX)) {
-                        val payload = normalized.substring(CONSOLE_BRIDGE_PREFIX.length)
-                        if (handleConsoleBridgeMessage(payload)) return true
-                    }
-
-                    if (consoleMessage?.messageLevel() == ConsoleMessage.MessageLevel.ERROR) {
-                        val emsg = "Browser Error:${consoleMessage.message()} [${consoleMessage.lineNumber()}]"
-                        Logger.e("PackageBrowser", emsg)
-                        if (_plugin.config is SourcePluginConfig && _plugin.config.id == StateDeveloper.DEV_ID)
-                            StateDeveloper.instance.logDevException(StateDeveloper.instance.currentDevID ?: "", emsg)
-                    } else {
-                        val imsg = "Browser Log:${consoleMessage?.message()}"
-                        Logger.i("PackageBrowser", imsg)
-                        if (_plugin.config is SourcePluginConfig && _plugin.config.id == StateDeveloper.DEV_ID)
-                            StateDeveloper.instance.logDevInfo(StateDeveloper.instance.currentDevID ?: "", imsg)
-                    }
-
-                    return super.onConsoleMessage(consoleMessage)
                 }
             }
         }
@@ -507,7 +517,13 @@ class PackageBrowser: V8Package {
                 val res = parsed.result
 
                 val cb = synchronized(_callbacks) { _callbacks.remove(id) } ?: return true
-                StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) { cb.invoke(res) }
+                StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
+                    try {
+                        cb.invoke(res)
+                    } catch (e: Throwable) {
+                        Logger.e(TAG, "Failed to invoke callback asynchronously", e)
+                    }
+                }
                 return true
             }
             "log" -> {
@@ -524,6 +540,7 @@ class PackageBrowser: V8Package {
 
     private companion object {
         private const val CONSOLE_BRIDGE_PREFIX = "__GJ__:"
+        private const val TAG = "PackageBrowser"
 
         private fun String.quoteForJs(): String {
             val s = this

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

@@ -651,14 +651,17 @@ class PackageHttp: V8Package {
 
         @V8Function
         fun connect(socketObj: V8ValueObject) {
-            val hasOpen = socketObj.has("open");
-            val hasMessage = socketObj.has("message");
-            val hasClosing = socketObj.has("closing");
-            val hasClosed = socketObj.has("closed");
-            val hasFailure = socketObj.has("failure");
+            val (hasOpen, hasMessage, hasClosing, hasClosed, hasFailure) = _package._plugin.busy {
+                val open = socketObj.has("open");
+                val message = socketObj.has("message");
+                val closing = socketObj.has("closing");
+                val closed = socketObj.has("closed");
+                val failure = socketObj.has("failure");
 
-            socketObj.setWeak(); //We have to manage this lifecycle
-            _listeners = socketObj;
+                socketObj.setWeak(); //We have to manage this lifecycle
+                _listeners = socketObj;
+                Quintuple(open, message, closing, closed, failure);
+            };
 
             _socket = _packageClient.logExceptions {
                 val client = _client;
@@ -666,51 +669,50 @@ class PackageHttp: V8Package {
                     override fun open() {
                         Logger.i(TAG, "Websocket opened: " + _url);
                         _isOpen = true;
-                        if(hasOpen && _listeners?.isClosed != true) {
-                            try {
-                                _package._plugin.busy {
+                        try {
+                            _package._plugin.busy {
+                                if(hasOpen && _listeners?.isClosed != true) {
                                     _listeners?.invokeV8Void("open", arrayOf<Any>());
                                 }
                             }
-                            catch(ex: Throwable){
-                                Logger.e(TAG, "Socket for [${_packageClient.parentConfig.name}] open failed: " + ex.message, ex);
-                            }
+                        }
+                        catch(ex: Throwable){
+                            Logger.e(TAG, "Socket for [${_packageClient.parentConfig.name}] open failed: " + ex.message, ex);
                         }
                     }
                     override fun message(msg: String) {
-                        if(hasMessage && _listeners?.isClosed != true) {
-                            try {
-                                _package._plugin.busy {
+                        try {
+                            _package._plugin.busy {
+                                if(hasMessage && _listeners?.isClosed != true) {
                                     _listeners?.invokeV8Void("message", msg);
                                 }
                             }
-                            catch(ex: Throwable) {}
                         }
+                        catch(ex: Throwable) {}
                     }
                     override fun closing(code: Int, reason: String) {
-                        if(hasClosing && _listeners?.isClosed != true)
-                        {
-                            try {
-                                _package._plugin.busy {
+                        try {
+                            _package._plugin.busy {
+                                if(hasClosing && _listeners?.isClosed != true) {
                                     _listeners?.invokeV8Void("closing", code, reason);
                                 }
                             }
-                            catch(ex: Throwable){
-                                Logger.e(TAG, "Socket for [${_packageClient.parentConfig.name}] closing failed: " + ex.message, ex);
-                            }
+                        }
+                        catch(ex: Throwable){
+                            Logger.e(TAG, "Socket for [${_packageClient.parentConfig.name}] closing failed: " + ex.message, ex);
                         }
                     }
                     override fun closed(code: Int, reason: String) {
                         _isOpen = false;
-                        if(hasClosed && _listeners?.isClosed != true) {
-                            try {
-                                _package._plugin.busy {
+                        try {
+                            _package._plugin.busy {
+                                if(hasClosed && _listeners?.isClosed != true) {
                                     _listeners?.invokeV8Void("closed", code, reason);
                                 }
                             }
-                            catch(ex: Throwable){
-                                Logger.e(TAG, "Socket for [${_packageClient.parentConfig.name}] closed failed: " + ex.message, ex);
-                            }
+                        }
+                        catch(ex: Throwable){
+                            Logger.e(TAG, "Socket for [${_packageClient.parentConfig.name}] closed failed: " + ex.message, ex);
                         }
                         Logger.w(TAG, "PackageHttp Socket removed");
                         synchronized(_package.aliveSockets) {
@@ -720,15 +722,15 @@ class PackageHttp: V8Package {
                     override fun failure(exception: Throwable) {
                         _isOpen = false;
                         Logger.e(TAG, "Websocket failure: ${exception.message} (${_url})", exception);
-                        if(hasFailure &&  _listeners?.isClosed != true) {
-                            try {
-                                _package._plugin.busy {
+                        try {
+                            _package._plugin.busy {
+                                if(hasFailure &&  _listeners?.isClosed != true) {
                                     _listeners?.invokeV8Void("failure", exception.message);
                                 }
                             }
-                            catch(ex: Throwable){
-                                Logger.e(TAG, "Socket for [${_packageClient.parentConfig.name}] closed failed: " + ex.message, ex);
-                            }
+                        }
+                        catch(ex: Throwable){
+                            Logger.e(TAG, "Socket for [${_packageClient.parentConfig.name}] closed failed: " + ex.message, ex);
                         }
                     }
                 });
@@ -747,10 +749,20 @@ class PackageHttp: V8Package {
         @V8Function
         fun close(code: Int?, reason: String?) {
             _socket?.close(code ?: 1000, reason ?: "");
-            _listeners?.close()
+            _package._plugin.busy {
+                _listeners?.close()
+            }
         }
     }
 
+    private data class Quintuple<A, B, C, D, E>(
+        val first: A,
+        val second: B,
+        val third: C,
+        val fourth: D,
+        val fifth: E
+    )
+
     data class RequestDescriptor(
         val method: String,
         val url: String,
@@ -780,4 +792,4 @@ class PackageHttp: V8Package {
         private const val TAG = "PackageHttp";
         private val WHITELISTED_RESPONSE_HEADERS = listOf("content-type", "date", "content-length", "last-modified", "etag", "cache-control", "content-encoding", "content-disposition", "connection")
     }
-}
+}

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

@@ -367,7 +367,7 @@ class ArticleDetailFragment : MainFragment {
 
                         _rating.visibility = VISIBLE;
                         _rating.setRating(RatingLikeDislikes(likes, dislikes), hasLiked, hasDisliked);
-                        _rating.onLikeDislikeUpdated.subscribe(this) { args ->
+                        _rating.onLikeDislikeUpdated.subscribe(this@ArticleDetailView) { args ->
                             if (args.hasLiked) {
                                 args.processHandle.opinion(ref, Opinion.like);
                             } else if (args.hasDisliked) {

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

@@ -27,6 +27,7 @@ import com.futo.platformplayer.api.media.PlatformID
 import com.futo.platformplayer.api.media.exceptions.NoPlatformClientException
 import com.futo.platformplayer.api.media.models.PlatformAuthorLink
 import com.futo.platformplayer.api.media.models.ResultCapabilities
+import com.futo.platformplayer.api.media.models.article.IPlatformArticle
 import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
 import com.futo.platformplayer.api.media.models.channels.SerializedChannel
 import com.futo.platformplayer.api.media.models.contents.ContentType
@@ -215,6 +216,10 @@ class ChannelFragment : MainFragment() {
                     is IPlatformPost -> {
                         fragment.navigate<PostDetailFragment>(v)
                     }
+
+                    is IPlatformArticle -> {
+                        fragment.navigate<ArticleDetailFragment>(v)
+                    }
                 }
             }
             adapter.onShortClicked.subscribe { v, _, pagerPair ->

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

@@ -150,7 +150,7 @@ class DownloadsFragment : MainFragment() {
             spinnerSortBy.adapter = ArrayAdapter(context, R.layout.spinner_item_simple, resources.getStringArray(R.array.downloads_sortby_array)).also {
                 it.setDropDownViewResource(R.layout.spinner_dropdownitem_simple);
             };
-            val options = listOf("nameAsc", "nameDesc", "downloadDateAsc", "downloadDateDesc", "releasedAsc", "releasedDesc", "sizeAsc", "sizeDesc");
+            val options = listOf("nameAsc", "nameDesc", "downloadDateAsc", "downloadDateDesc", "releasedAsc", "releasedDesc", "sizeAsc", "sizeDesc", "typeAudio", "typeVideo");
             spinnerSortBy.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
                 override fun onItemSelected(parent: AdapterView<*>, view: View?, pos: Int, id: Long) {
                     when(pos) {
@@ -162,6 +162,8 @@ class DownloadsFragment : MainFragment() {
                         5 -> ordering.setAndSave("releasedDesc")
                         6 -> ordering.setAndSave("sizeAsc")
                         7 -> ordering.setAndSave("sizeDesc")
+                        8 -> ordering.setAndSave("typeAudio")
+                        9 -> ordering.setAndSave("typeVideo")
                         else -> ordering.setAndSave("")
                     }
                     updateContentFilters()
@@ -261,6 +263,8 @@ class DownloadsFragment : MainFragment() {
                     "releasedDesc" -> vidsToReturn.sortedByDescending { it.datetime ?: OffsetDateTime.MIN }
                     "sizeAsc" -> vidsToReturn.sortedBy { it.videoSource.sumOf { it.fileSize } + it.audioSource.sumOf { it.fileSize } }
                     "sizeDesc" -> vidsToReturn.sortedByDescending { it.videoSource.sumOf { it.fileSize } + it.audioSource.sumOf { it.fileSize } }
+                    "typeAudio" -> vidsToReturn.sortedBy { if (it.videoSource.isEmpty() && it.audioSource.isNotEmpty()) 0 else 1 }
+                    "typeVideo" -> vidsToReturn.sortedBy { if (it.videoSource.isNotEmpty()) 0 else 1 }
                     else -> vidsToReturn
                 }
             }

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

@@ -28,6 +28,7 @@ import com.futo.platformplayer.R
 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.article.IPlatformArticle
 import com.futo.platformplayer.api.media.models.contents.ContentType
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
 import com.futo.platformplayer.api.media.models.playlists.IPlatformPlaylist
@@ -176,6 +177,10 @@ class LibraryArtistFragment : MainFragment() {
                     is IPlatformPost -> {
                         fragment.navigate<PostDetailFragment>(v)
                     }
+
+                    is IPlatformArticle -> {
+                        fragment.navigate<ArticleDetailFragment>(v)
+                    }
                 }
             }
             adapter.onShortClicked.subscribe { v, _, pagerPair ->

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

@@ -96,11 +96,15 @@ class LoginFragment : MainFragment() {
             else throw IllegalStateException("No valid configuration?");
             //TODO: Backwards compat removal?
 
-            _webView.settings.userAgentString = authConfig.userAgent ?: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 Safari/537.36";
+            // Only override UA if config specifies one, otherwise keep WebView default (matches Desktop CEF behavior)
+            if (authConfig.userAgent != null)
+                _webView.settings.userAgentString = authConfig.userAgent;
+            // Capture UA on main thread - callback fires on WebView background thread where settings access is not allowed
+            val capturedUserAgent = _webView.settings.userAgentString;
             _webView.settings.useWideViewPort = true;
             _webView.settings.loadWithOverviewMode = true;
 
-            val webViewClient = if(config != null) LoginWebViewClient(config) else LoginWebViewClient(authConfig);
+            val webViewClient = if(config != null) LoginWebViewClient(config, capturedUserAgent) else LoginWebViewClient(authConfig, capturedUserAgent);
 
             webViewClient.onLogin.subscribe { auth ->
                 _callback?.let {

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

@@ -370,7 +370,7 @@ class PostDetailFragment : MainFragment {
 
                         _rating.visibility = VISIBLE;
                         _rating.setRating(RatingLikeDislikes(likes, dislikes), hasLiked, hasDisliked);
-                        _rating.onLikeDislikeUpdated.subscribe(this) { args ->
+                        _rating.onLikeDislikeUpdated.subscribe(this@PostDetailView) { args ->
                             if (args.hasLiked) {
                                 args.processHandle.opinion(ref, Opinion.like);
                             } else if (args.hasDisliked) {

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

@@ -688,6 +688,7 @@ class ShortView : FrameLayout {
         dislikeButton.visibility = GONE
 
         loadLikesTask?.cancel()
+        onLikeDislikeUpdated.remove(this@ShortView)
         loadLikesTask =
             TaskHandler<IPlatformVideo, Pair<Protocol.Reference, Protocol.QueryReferencesResponse>>(
                 StateApp.instance.scopeGetter, {
@@ -715,7 +716,7 @@ class ShortView : FrameLayout {
                 val hasLiked = StatePolycentric.instance.hasLiked(ref.toByteArray())
                 val hasDisliked = StatePolycentric.instance.hasDisliked(ref.toByteArray())
                 onLikesLoaded.emit(RatingLikeDislikes(likes, dislikes), hasLiked, hasDisliked)
-                onLikeDislikeUpdated.subscribe(this) { args ->
+                onLikeDislikeUpdated.subscribe(this@ShortView) { args ->
                     if (args.hasLiked) {
                         args.processHandle.opinion(ref, Opinion.like)
                     } else if (args.hasDisliked) {

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

@@ -459,7 +459,14 @@ class VideoDetailFragment() : MainFragment() {
             val params = _viewDetail?.getPictureInPictureParams();
             if(params != null) {
                 Logger.i(TAG, "enterPictureInPictureMode")
-                activity?.enterPictureInPictureMode(params);
+
+                try {
+                    activity?.enterPictureInPictureMode(params);
+                } catch(e: IllegalStateException) {
+                    if(e.message?.contains("Device doesn't support picture-in-picture") != true) {
+                        throw e
+                    }
+                }
             }
         }
 
@@ -470,8 +477,15 @@ class VideoDetailFragment() : MainFragment() {
 
     fun forcePictureInPicture() {
         val params = _viewDetail?.getPictureInPictureParams();
-        if(params != null)
-            activity?.enterPictureInPictureMode(params);
+        if(params != null) {
+            try {
+                activity?.enterPictureInPictureMode(params);
+            } catch(e: IllegalStateException) {
+                if(e.message?.contains("Device doesn't support picture-in-picture") != true) {
+                    throw e
+                }
+            }
+        }
     }
     fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean, isStop: Boolean, newConfig: Configuration) {
         try {

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

@@ -694,7 +694,14 @@ class VideoDetailView : ConstraintLayout {
 
         onShouldEnterPictureInPictureChanged.subscribe {
             val params = getPictureInPictureParams()
-            fragment.activity?.setPictureInPictureParams(params)
+
+            try {
+                fragment.activity?.setPictureInPictureParams(params)
+            } catch(e: IllegalStateException) {
+                if(e.message?.contains("Device doesn't support picture-in-picture") != true) {
+                    throw e
+                }
+            }
         }
 
         if (!isInEditMode) {
@@ -898,6 +905,7 @@ class VideoDetailView : ConstraintLayout {
             cleanupPlaybackTracker();
             Logger.i(TAG, "Keep screen on unset onClose")
             fragment.activity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+            clearChapters()
         };
 
         StatePlayer.instance.autoplayChanged.subscribe(this) {
@@ -992,6 +1000,12 @@ class VideoDetailView : ConstraintLayout {
         _cast.stopAllGestures();
     }
 
+    private fun clearChapters() {
+        _chapters = null
+        _player.setChapters(null)
+        _cast.setChapters(null)
+    }
+
     fun showChaptersUI(){
         video?.let {
             try {
@@ -1323,6 +1337,7 @@ class VideoDetailView : ConstraintLayout {
         _lastVideoSource = null;
         _lastAudioSource = null;
         _lastSubtitleSource = null;
+        clearChapters()
     }
     fun setVideo(url: String, resumeSeconds: Long = 0, playWhenReady: Boolean = true) {
         Logger.i(TAG, "setVideo url=$url resumeSeconds=$resumeSeconds playWhenReady=$playWhenReady")
@@ -1333,6 +1348,7 @@ class VideoDetailView : ConstraintLayout {
         _searchVideo = null;
         video = null;
         cleanupPlaybackTracker();
+        clearChapters()
         _url = url;
         _videoResumePositionMilliseconds = resumeSeconds * 1000;
         _rating.visibility = View.GONE;
@@ -1543,6 +1559,7 @@ class VideoDetailView : ConstraintLayout {
         }
 
         val me = this;
+        clearChapters()
         if (video is JSVideoDetails) {
             fragment.lifecycleScope.launch(Dispatchers.IO) {
                 try {
@@ -1739,7 +1756,7 @@ class VideoDetailView : ConstraintLayout {
                             hasLiked,
                             hasDisliked
                         );
-                        _rating.onLikeDislikeUpdated.subscribe(this) { args ->
+                        _rating.onLikeDislikeUpdated.subscribe(this@VideoDetailView) { args ->
                             if (args.hasLiked) {
                                 args.processHandle.opinion(ref, Opinion.like);
                             } else if (args.hasDisliked) {

app/src/main/java/com/futo/platformplayer/helpers/FileHelper.kt

@@ -1,18 +1,35 @@
 package com.futo.platformplayer.helpers
 
+import java.text.Normalizer
+
 class FileHelper {
     companion object {
+
         fun String.sanitizeFileName(allowSpace: Boolean = false): String {
-            return this.filter {
-                (it in '0' .. '9') ||
-                    (it in 'a'..'z') ||
-                    (it in 'A'..'Z') ||
-                    (it == '-' || it == '.' || it == '_' || (it == ' ' && allowSpace)) ||
-                    (it in '丁'..'龤') || //Chinese/Kanji
-                    (it in '\u3040'..'\u309f') || //Hiragana
-                    (it in '\u30A0'..'\u30ff') || //Katakana
-                    (it in '\u0600'..'\u06FF') //Arabic
-            }; //Chinese
+            val normalized = Normalizer.normalize(this, Normalizer.Form.NFC)
+
+            val cleaned = buildString(normalized.length) {
+                for (ch in normalized) {
+                    when {
+                        ch == '\u0000' -> {}
+                        Character.isISOControl(ch) -> {}
+                        ch == '/' || ch == '\\' || ch == ':' || ch == '*' ||
+                                ch == '?' || ch == '"' || ch == '<' || ch == '>' || ch == '|' -> append('_')
+                        ch == ' ' && !allowSpace -> append('_')
+                        else -> append(ch)
+                    }
+                }
+            }
+
+            val collapsed = if (allowSpace) {
+                cleaned.replace(Regex("""\s+"""), " ")
+            } else {
+                cleaned.replace(Regex("""\s+"""), "_")
+            }
+
+            return collapsed
+                .trim()
+                .trimEnd('.')
         }
     }
 }

app/src/main/java/com/futo/platformplayer/others/CaptchaWebViewClient.kt

@@ -16,13 +16,15 @@ class CaptchaWebViewClient : WebViewClient {
 
     private val _pluginConfig: SourcePluginConfig?;
     private val _captchaConfig: SourcePluginCaptchaConfig;
+    private val _userAgent: String?;
 
     private var _didNotify = false;
     private val _extractor: WebViewRequirementExtractor;
 
-    constructor(config: SourcePluginConfig) : super() {
+    constructor(config: SourcePluginConfig, userAgent: String? = null) : super() {
         _pluginConfig = config;
         _captchaConfig = config.captcha!!;
+        _userAgent = userAgent;
         _extractor = WebViewRequirementExtractor(
             config.allowUrls,
             null,
@@ -34,9 +36,10 @@ class CaptchaWebViewClient : WebViewClient {
         Logger.i(TAG, "Captcha [${config.name}]" +
                 "\nRequired Cookies: ${Serializer.json.encodeToString(config.captcha!!.cookiesToFind)}",);
     }
-    constructor(captcha: SourcePluginCaptchaConfig) : super() {
+    constructor(captcha: SourcePluginCaptchaConfig, userAgent: String? = null) : super() {
         _pluginConfig = null;
         _captchaConfig = captcha;
+        _userAgent = userAgent;
         _extractor = WebViewRequirementExtractor(
             null,
             null,
@@ -62,7 +65,8 @@ class CaptchaWebViewClient : WebViewClient {
             _didNotify = true;
             onCaptchaFinished.emit(SourceCaptchaData(
                extracted.cookies,
-               extracted.headers
+               extracted.headers,
+               _userAgent
             ));
         }
 

app/src/main/java/com/futo/platformplayer/others/LoginWebViewClient.kt

@@ -24,23 +24,26 @@ class LoginWebViewClient : WebViewClient {
 
     private val _pluginConfig: SourcePluginConfig?;
     private val _authConfig: SourcePluginAuthConfig;
+    private val _userAgent: String?;
 
     private val _client = ManagedHttpClient();
 
     val onLogin = Event1<SourceAuth>();
     val onPageLoaded = Event2<WebView?, String?>()
 
-    constructor(config: SourcePluginConfig) : super() {
+    constructor(config: SourcePluginConfig, userAgent: String? = null) : super() {
         _pluginConfig = config;
         _authConfig = config.authentication!!;
+        _userAgent = userAgent;
         Logger.i(TAG, "Login [${config.name}]" +
                 "\nRequired Headers: ${config.authentication.headersToFind?.joinToString(", ")}" +
                 "\nRequired Domain Headers: ${Serializer.json.encodeToString(config.authentication.domainHeadersToFind)}" +
                 "\nRequired Cookies: ${Serializer.json.encodeToString(config.authentication.cookiesToFind)}",);
     }
-    constructor(auth: SourcePluginAuthConfig) : super() {
+    constructor(auth: SourcePluginAuthConfig, userAgent: String? = null) : super() {
         _pluginConfig = null;
         _authConfig = auth;
+        _userAgent = userAgent;
     }
 
     private val headersFoundMap: HashMap<String, HashMap<String, String>> = hashMapOf();
@@ -192,13 +195,14 @@ class LoginWebViewClient : WebViewClient {
         if (urlFound && headersFound && domainHeadersFound && cookiesFound) {
             onLogin.emit(SourceAuth(
                 cookieMap = cookiesFoundMap,
-                headers = headersFoundMap /*.associate { headerToFind ->
+                headers = headersFoundMap, /*.associate { headerToFind ->
                     headerToFind to headersFoundMap.firstNotNullOf { requestHeader ->
                         if (requestHeader.key.equals(headerToFind, ignoreCase = true))
                             requestHeader.value
                         else null;
                     }
                 } ?: mapOf()*/
+                userAgent = _userAgent
             ));
         }
 

app/src/main/java/com/futo/platformplayer/services/DownloadService.kt

@@ -28,6 +28,7 @@ import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import okhttp3.OkHttpClient
 import java.net.InetAddress
@@ -41,22 +42,16 @@ class DownloadService : Service() {
     private val TAG = "DownloadService";
 
     private val DOWNLOAD_NOTIF_ID = 3;
-    private val DOWNLOAD_NOTIF_TAG = "download";
     private val DOWNLOAD_NOTIF_CHANNEL_ID = "downloadChannel";
     private val DOWNLOAD_NOTIF_CHANNEL_NAME = "Downloads";
 
     //Context
-    private val _scope: CoroutineScope = CoroutineScope(Dispatchers.Default);
+    private val _scope: CoroutineScope = CoroutineScope(Dispatchers.IO);
     private var _notificationManager: NotificationManager? = null;
     private var _notificationChannel: NotificationChannel? = null;
     private var _isForeground = false
 
-    private val _client = ManagedHttpClient(OkHttpClient.Builder()
-        //.proxy(Proxy(Proxy.Type.HTTP, InetSocketAddress(InetAddress.getByName("192.168.1.175"), 8081)))
-        .readTimeout(Duration.ofMinutes(0))
-        .writeTimeout(Duration.ofMinutes(0))
-        .connectTimeout(Duration.ofSeconds(100))
-        .callTimeout(Duration.ofMinutes(0)))
+    private lateinit var _client: ManagedHttpClient
 
     private var _started = false;
 
@@ -76,11 +71,23 @@ class DownloadService : Service() {
         setupNotificationRequirements();
         notifyDownload(null);
 
+        if (StateDownloads.instance.getDownloading().isEmpty()) {
+            Logger.i(TAG, "No downloads queued, stopping service")
+            closeDownloadSession()
+            return START_NOT_STICKY
+        }
+
         _callOnStarted?.invoke(this);
         _instance = this;
 
         _scope.launch {
             try {
+                _client = ManagedHttpClient(OkHttpClient.Builder()
+                    //.proxy(Proxy(Proxy.Type.HTTP, InetSocketAddress(InetAddress.getByName("192.168.1.175"), 8081)))
+                    .readTimeout(Duration.ofMinutes(0))
+                    .writeTimeout(Duration.ofMinutes(0))
+                    .connectTimeout(Duration.ofSeconds(100))
+                    .callTimeout(Duration.ofMinutes(0)))
                 doDownloading();
             }
             catch(ex: Throwable) {
@@ -167,7 +174,7 @@ class DownloadService : Service() {
                 ignore.add(currentVideo);
 
                 //Give it a sec
-                Thread.sleep(500);
+                delay(500);
             }
             catch(ex: Throwable) {
                 //if(ex is ScriptReloadRequiredException)
@@ -200,7 +207,7 @@ class DownloadService : Service() {
                 }
 
                 //Give it a sec
-                Thread.sleep(500);
+                delay(500);
             }
             StateDownloads.instance.updateDownloading(currentVideo);
 
@@ -231,6 +238,16 @@ class DownloadService : Service() {
                 download.targetBitrate = download.audioSource!!.bitrate.toLong();
             download.audioSource = null;
         }
+        // Force re-prepare if auth modifiers are needed but lost (e.g. after deserialization,
+        // since IRequestModifier is transient and cannot survive serialization).
+        // Must also clear sources so prepare() enters the source selection branches where
+        // modifiers are recaptured from the live plugin JSSource.
+        if(download.needsReprepareForAuth) {
+            Logger.w(TAG, "Video Download [${download.name}] needs re-prepare for auth modifiers");
+            download.videoDetails = null;
+            download.videoSource = null;
+            download.audioSource = null;
+        }
         if(download.videoDetails == null || (!download.isVideoDownloadReady || !download.isAudioDownloadReady))
             download.changeState(VideoDownload.State.PREPARING);
         notifyDownload(download);
@@ -338,6 +355,8 @@ class DownloadService : Service() {
         fun getOrCreateService(context: Context, handle: ((DownloadService)->Unit)? = null) {
             if(!FragmentedStorage.isInitialized)
                 return;
+            if(StateDownloads.instance.getDownloading().isEmpty())
+                return
             if(_instance == null) {
                 _callOnStarted = handle;
                 val intent = Intent(context, DownloadService::class.java);

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

@@ -1,5 +1,6 @@
 package com.futo.platformplayer.states
 
+import android.content.Context
 import android.view.View
 import android.view.WindowManager
 import com.futo.platformplayer.R
@@ -122,7 +123,7 @@ class StateAnnouncement {
     //Special Announcements
     fun registerPluginUpdate(oldConfig: SourcePluginConfig, newConfig: SourcePluginConfig): SessionAnnouncement {
         val announcement = SessionAnnouncement(
-            "update-plugin-" + UUID.randomUUID().toString(),
+            "update-plugin-" + oldConfig.id + "-v" + newConfig.version,
             "${newConfig.name} update v${newConfig.version} available!",
             "An update is available to upgrade from ${oldConfig.version} to ${newConfig.version}.",
             AnnouncementType.SESSION,
@@ -130,19 +131,62 @@ class StateAnnouncement {
             null, null,oldConfig.id,
             newConfig?.absoluteIconUrl?.let { ImageVariable.fromUrl(it) }
         ).withExtraAction("Changelog", StateAnnouncement.ACTION_CHANGELOG, oldConfig.id);
+        announcement.extraObj = newConfig;
         registerAnnouncementSession(announcement);
         return announcement;
     }
     fun registerPluginUpdated(newConfig: SourcePluginConfig) {
-        registerAnnouncementSession(SessionAnnouncement(
-            "updated-plugin-" + UUID.randomUUID().toString(),
+        val announcement = SessionAnnouncement(
+            "updated-plugin-" + newConfig.id + "-v" + newConfig.version,
             "${newConfig.name} updated to v${newConfig.version}!",
             "You have succesfully been updated to v${newConfig.version}.",
             AnnouncementType.SESSION,
             null, "updates", null, null,
             null, null,null,
             newConfig?.absoluteIconUrl?.let { ImageVariable.fromUrl(it) }
-        ).withExtraAction("Changelog", StateAnnouncement.ACTION_CHANGELOG, newConfig.id));
+        ).withExtraAction("Changelog", StateAnnouncement.ACTION_CHANGELOG, newConfig.id);
+        announcement.extraObj = newConfig;
+        registerAnnouncementSession(announcement);
+    }
+
+    fun tryAutoUpdatePlugin(oldConfig: SourcePluginConfig, newConfig: SourcePluginConfig) {
+        val context = StateApp.instance.contextOrNull;
+        if(context == null) {
+            registerPluginUpdate(oldConfig, newConfig);
+            return;
+        }
+        StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
+            try {
+                val client = ManagedHttpClient();
+                client.setTimeout(10000);
+                val oldScript = StatePlugins.instance.getScript(oldConfig.id) ?: "";
+                val newScript = client.get(newConfig.absoluteScriptUrl)?.body?.string();
+                if(newScript.isNullOrEmpty()) {
+                    Logger.w(TAG, "Auto-update for ${oldConfig.name}: no script returned, falling back to notification");
+                    withContext(Dispatchers.Main) { registerPluginUpdate(oldConfig, newConfig); }
+                    return@launch;
+                }
+
+                if(!oldConfig.isLowRiskUpdate(oldScript, newConfig, newScript)) {
+                    withContext(Dispatchers.Main) { registerPluginUpdate(oldConfig, newConfig); }
+                    return@launch;
+                }
+
+                StatePlugins.instance.installPluginBackground(context, StateApp.instance.scope, newConfig, newScript,
+                    { _: String, _: Double -> },
+                    { ex ->
+                        if(ex == null) {
+                            registerPluginUpdated(newConfig);
+                        } else {
+                            Logger.e(TAG, "Auto-update for ${newConfig.name} failed during install", ex);
+                            UIDialogs.appToast("Update for ${newConfig.name} failed\n" + ex.message);
+                        }
+                    });
+            } catch(ex: Throwable) {
+                Logger.e(TAG, "Auto-update for ${oldConfig.name} failed", ex);
+                withContext(Dispatchers.Main) { registerPluginUpdate(oldConfig, newConfig); }
+            }
+        }
     }
 
     fun registerLoading(title: String, description: String, icon: ImageVariable? = null, customId: String? = null): SessionAnnouncement {
@@ -282,7 +326,7 @@ class StateAnnouncement {
             when (actionId) {
                 ACTION_NEVER -> neverAnnouncement(item.id);
                 ACTION_SOMETHING -> actionSomething();
-                ACTION_CHANGELOG -> actionChangelog(actionData);
+                ACTION_CHANGELOG -> actionChangelog(item, actionData);
                 ACTION_UPDATE_PLUGIN -> actionUpdatePlugin(item.id, actionData);
             }
         }
@@ -314,27 +358,35 @@ class StateAnnouncement {
 
     }
 
-    private fun actionChangelog(id: String?) {
-        if(id == null)
+    private fun actionChangelog(item: Announcement, id: String?) {
+        val context = StateApp.instance.contextOrNull ?: return;
+
+        val cached = (item as? SessionAnnouncement)?.extraObj as? SourcePluginConfig;
+        if(cached != null) {
+            showPluginChangelog(context, cached);
             return;
+        }
 
-        StateApp.instance.contextOrNull?.let { context ->
-            StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
-                val plugin = StatePlugins.instance.getPlugin(id);
-                if (plugin == null)
-                    return@launch
-                val update = StatePlugins.instance.checkForUpdates(plugin.config);
-                if(update == null)
-                    return@launch;
+        if(id == null) return;
 
-                StateApp.instance.scopeOrNull?.launch(Dispatchers.Main) {
-                    UIDialogs.showChangelogDialog(context, update.version, update.changelog!!.filterKeys { it.toIntOrNull() != null }
-                        .mapKeys { it.key.toInt() }
-                        .mapValues { update.getChangelogString(it.key.toString()) ?: "" });
-                }
+        StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
+            val plugin = StatePlugins.instance.getPlugin(id) ?: return@launch;
+            val update = StatePlugins.instance.checkForUpdates(plugin.config) ?: return@launch;
+            withContext(Dispatchers.Main) {
+                showPluginChangelog(context, update);
             }
         }
     }
+
+    private fun showPluginChangelog(context: Context, config: SourcePluginConfig) {
+        if(config.changelog?.any() != true) {
+            UIDialogs.toast(context, "No changelog available");
+            return;
+        }
+        UIDialogs.showChangelogDialog(context, config.version, config.changelog!!.filterKeys { it.toIntOrNull() != null }
+            .mapKeys { it.key.toInt() }
+            .mapValues { config.getChangelogString(it.key.toString()) ?: "" });
+    }
     private fun actionUpdatePlugin(notifId: String?, id: String?) {
         if(id == null)
             return;
@@ -363,7 +415,7 @@ class StateAnnouncement {
                     if(newScript.isNullOrEmpty())
                         throw IllegalStateException("No script found");
 
-                    if(true || plugin.config.isLowRiskUpdate(script, update, newScript)) {
+                    if(plugin.config.isLowRiskUpdate(script, update, newScript)) {
                         StatePlugins.instance.installPluginBackground(context, StateApp.instance.scope, update, newScript,
                             { text: String, progress: Double -> },
                             { ex ->

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

@@ -34,6 +34,7 @@ import com.futo.platformplayer.activities.IWithResultLauncher
 import com.futo.platformplayer.activities.MainActivity
 import com.futo.platformplayer.api.media.platforms.js.DevJSClient
 import com.futo.platformplayer.api.media.platforms.js.JSClient
+import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.background.BackgroundWorker
 import com.futo.platformplayer.casting.StateCasting
 import com.futo.platformplayer.constructs.Event0
@@ -103,10 +104,16 @@ class StateApp {
     var hasMediaStoreVideoPermission: Boolean = false;
 
     fun getExternalGeneralDirectory(context: Context): DocumentFile? {
-        val generalUri = Settings.instance.storage.getStorageGeneralUri();
-        if(isValidStorageUri(context, generalUri))
-            return DocumentFile.fromTreeUri(context, generalUri!!);
-        return null;
+        val generalUri = Settings.instance.storage.getStorageGeneralUri()
+        val document = getAccessibleTreeDirectory(context, generalUri)
+
+        if (document == null && generalUri != null) {
+            Logger.w(TAG, "Stored general directory is no longer valid, clearing setting [$generalUri]")
+            Settings.instance.storage.storage_general = null
+            Settings.instance.save()
+        }
+
+        return document
     }
     fun changeExternalGeneralDirectory(context: IWithResultLauncher, onChanged: ((DocumentFile?)->Unit)? = null) {
         if(context is Context)
@@ -127,10 +134,16 @@ class StateApp {
             };
     }
     fun getExternalDownloadDirectory(context: Context): DocumentFile? {
-        val downloadUri = Settings.instance.storage.storage_download?.let { Uri.parse(it) };
-        if(isValidStorageUri(context, downloadUri))
-            return DocumentFile.fromTreeUri(context, downloadUri!!);
-        return null;
+        val downloadUri = Settings.instance.storage.storage_download?.let { Uri.parse(it) }
+        val document = getAccessibleTreeDirectory(context, downloadUri)
+
+        if (document == null && downloadUri != null) {
+            Logger.w(TAG, "Stored download directory is no longer valid, clearing setting [$downloadUri]")
+            Settings.instance.storage.storage_download = null
+            Settings.instance.save()
+        }
+
+        return document
     }
     fun changeExternalDownloadDirectory(context: IWithResultLauncher, onChanged: ((DocumentFile?)->Unit)? = null) {
         if(context is Context)
@@ -146,11 +159,80 @@ class StateApp {
                 }
             };
     }
-    fun isValidStorageUri(context: Context, uri: Uri?): Boolean {
-        if(uri == null)
-            return false;
 
-        return context.contentResolver.persistedUriPermissions.any { it.uri == uri && it.isReadPermission && it.isWritePermission };
+    private fun hasPersistedStoragePermission(context: Context, uri: Uri?): Boolean {
+        if (uri == null)
+            return false
+
+        return context.contentResolver.persistedUriPermissions.any {
+            it.uri == uri && it.isReadPermission && it.isWritePermission
+        }
+    }
+
+    private fun getAccessibleTreeDirectory(context: Context, uri: Uri?): DocumentFile? {
+        if (uri == null)
+            return null
+
+        if (!hasPersistedStoragePermission(context, uri))
+            return null
+
+        return try {
+            val treeDocumentId = DocumentsContract.getTreeDocumentId(uri)
+            val treeDocumentUri = DocumentsContract.buildDocumentUriUsingTree(uri, treeDocumentId)
+
+            // Force a provider round-trip. If the directory was deleted, storage was removed,
+            // or the URI is otherwise stale, this usually fails here.
+            context.contentResolver.query(
+                treeDocumentUri,
+                arrayOf(
+                    DocumentsContract.Document.COLUMN_DOCUMENT_ID,
+                    DocumentsContract.Document.COLUMN_MIME_TYPE,
+                    DocumentsContract.Document.COLUMN_FLAGS
+                ),
+                null,
+                null,
+                null
+            )?.use { cursor ->
+                if (!cursor.moveToFirst())
+                    return null
+
+                val mimeTypeIndex = cursor.getColumnIndex(DocumentsContract.Document.COLUMN_MIME_TYPE)
+                if (mimeTypeIndex >= 0) {
+                    val mimeType = cursor.getString(mimeTypeIndex)
+                    if (mimeType != DocumentsContract.Document.MIME_TYPE_DIR)
+                        return null
+                }
+            } ?: return null
+
+            val document = DocumentFile.fromTreeUri(context, uri) ?: return null
+
+            if (!document.exists())
+                return null
+            if (!document.isDirectory)
+                return null
+            if (!document.canRead())
+                return null
+            if (!document.canWrite())
+                return null
+
+            document
+        }
+        catch (e: SecurityException) {
+            Logger.w(TAG, "Storage URI is no longer accessible [$uri]", e)
+            null
+        }
+        catch (e: IllegalArgumentException) {
+            Logger.w(TAG, "Storage URI is invalid [$uri]", e)
+            null
+        }
+        catch (e: Throwable) {
+            Logger.w(TAG, "Failed to validate storage URI [$uri]", e)
+            null
+        }
+    }
+
+    fun isValidStorageUri(context: Context, uri: Uri?): Boolean {
+        return getAccessibleTreeDirectory(context, uri) != null
     }
 
     //Scope
@@ -586,6 +668,9 @@ class StateApp {
         if (Settings.instance.autoUpdate.isAutoUpdateEnabled()) {
             if (Settings.instance.autoUpdate.shouldBackgroundDownload) {
                 Logger.i(TAG, "MainApp Started: Initialize [AutoUpdate Background]");
+                scopeOrNull?.launch(Dispatchers.IO) {
+                    StateUpdate.instance.seedUiFromDisk(context)
+                }
                 val constraints = Constraints.Builder()
                     .setRequiredNetworkType(NetworkType.CONNECTED)
                     .build();
@@ -723,15 +808,24 @@ class StateApp {
         if(StateHistory.instance.shouldMigrateLegacyHistory())
             StateHistory.instance.migrateLegacyHistory();
 
-        StateAnnouncement.instance.deleteAnnouncement("plugin-update")
-
         scopeOrNull?.launch(Dispatchers.IO) {
             val updateAvailable = StatePlugins.instance.checkForUpdates()
 
             withContext(Dispatchers.Main) {
-                if (updateAvailable.isNotEmpty()) {
+                val toNotify = mutableListOf<Pair<SourcePluginConfig, SourcePluginConfig>>();
+                for(update in updateAvailable) {
+                    if(!StatePlatform.instance.isClientEnabled(update.first.id))
+                        continue;
+                    val descriptor = StatePlugins.instance.getPlugin(update.first.id);
+                    if(descriptor?.appSettings?.automaticUpdate == true)
+                        StateAnnouncement.instance.tryAutoUpdatePlugin(update.first, update.second);
+                    else
+                        toNotify.add(update);
+                }
+
+                if(toNotify.isNotEmpty()) {
                     UIDialogs.appToast(
-                        ToastView.Toast(updateAvailable
+                        ToastView.Toast(toNotify
                             .map { " - " + it.first.name }
                             .joinToString("\n"),
                             true,
@@ -739,11 +833,8 @@ class StateApp {
                             "Plugin updates available"
                         ));
 
-                    for(update in updateAvailable)
-                        if(StatePlatform.instance.isClientEnabled(update.first.id)) {
-                            //UIDialogs.showPluginUpdateDialog(context, update.first, update.second);
-                            StateAnnouncement.instance.registerPluginUpdate(update.first, update.second);
-                        }
+                    for(update in toNotify)
+                        StateAnnouncement.instance.registerPluginUpdate(update.first, update.second);
                 }
             }
         }

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

@@ -10,6 +10,7 @@ import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.activities.IWithResultLauncher
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.media.PlatformID
+import com.futo.platformplayer.api.media.models.modifier.IRequestModifier
 import com.futo.platformplayer.api.media.models.streams.sources.IAudioSource
 import com.futo.platformplayer.api.media.models.streams.sources.IAudioUrlSource
 import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
@@ -341,8 +342,8 @@ class StateDownloads {
     fun download(video: IPlatformVideo, targetPixelcount: Long?, targetBitrate: Long?) {
         download(VideoDownload(video, targetPixelcount, targetBitrate));
     }
-    fun download(video: IPlatformVideoDetails, videoSource: IVideoSource?, audioSource: IAudioSource?, subtitleSource: SubtitleRawSource?) {
-        download(VideoDownload(video, videoSource, audioSource, subtitleSource));
+    fun download(video: IPlatformVideoDetails, videoSource: IVideoSource?, audioSource: IAudioSource?, subtitleSource: SubtitleRawSource?, videoModifier: IRequestModifier? = null, audioModifier: IRequestModifier? = null) {
+        download(VideoDownload(video, videoSource, audioSource, subtitleSource, videoModifier, audioModifier));
     }
 
     private fun download(videoState: VideoDownload, notify: Boolean = true) {

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

@@ -28,6 +28,7 @@ import com.futo.platformplayer.api.media.models.video.IPlatformVideo
 import com.futo.platformplayer.api.media.platforms.js.DevJSClient
 import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
+import com.futo.platformplayer.api.media.platforms.js.SourcePluginDescriptor
 import com.futo.platformplayer.api.media.platforms.local.LocalClient
 import com.futo.platformplayer.api.media.structures.EmptyPager
 import com.futo.platformplayer.api.media.structures.IPager
@@ -181,11 +182,14 @@ class StatePlatform {
         }
 
         withContext(Dispatchers.IO) {
-            var toDisables = mutableListOf<IPlatformClient>();
+            val toDispose = mutableListOf<IPlatformClient>();
             var enabled: Array<String>;
             synchronized(_clientsLock) {
-                for(e in _enabledClients) {
-                    toDisables.add(e);
+                val previousAvailable = _availableClients.toList();
+                val reusableByDescriptor = HashMap<SourcePluginDescriptor, JSClient>();
+                for (prev in previousAvailable) {
+                    if (prev is JSClient)
+                        reusableByDescriptor[prev.descriptor] = prev;
                 }
 
                 _enabledClients.clear();
@@ -199,18 +203,38 @@ class StatePlatform {
                 StatePlugins.instance.installMissingEmbeddedPlugins(context);
 
                 for (plugin in StatePlugins.instance.getPlugins()) {
-                    _icons[plugin.config.id] = StatePlugins.instance.getPluginIconOrNull(plugin.config.id) ?:
-                            ImageVariable(plugin.config.absoluteIconUrl, null);
-                    _iconsByName[plugin.config.name.lowercase()] = StatePlugins.instance.getPluginIconOrNull(plugin.config.id) ?:
-                            ImageVariable(plugin.config.absoluteIconUrl, null);
+                    try {
+                        val reused = reusableByDescriptor[plugin];
+                        val isReused = reused != null && reused.descriptor === plugin;
+                        val client: JSClient = if (isReused) {
+                            reused!!;
+                        } else {
+                            JSClient(context, plugin).also { fresh ->
+                                fresh.onCaptchaException.subscribe { c, ex ->
+                                    StateApp.instance.handleCaptchaException(c, ex);
+                                }
+                            }
+                        }
 
-                    val client = JSClient(context, plugin);
-                    client.onCaptchaException.subscribe { c, ex ->
-                        StateApp.instance.handleCaptchaException(c, ex);
+                        _icons[plugin.config.id] = StatePlugins.instance.getPluginIconOrNull(plugin.config.id) ?:
+                                ImageVariable(plugin.config.absoluteIconUrl, null);
+                        _iconsByName[plugin.config.name.lowercase()] = StatePlugins.instance.getPluginIconOrNull(plugin.config.id) ?:
+                                ImageVariable(plugin.config.absoluteIconUrl, null);
+                        _availableClients.add(client);
+
+                        if (isReused)
+                            reusableByDescriptor.remove(plugin);
+                    }
+                    catch(ex: Throwable) {
+                        Logger.e(TAG, "Failed to initialize plugin [${plugin.config.name}]", ex);
+                        StateApp.instance.scopeOrNull?.launch(Dispatchers.Main) {
+                            UIDialogs.toast("Plugin ${plugin.config.name} failed to load\n${ex.message}");
+                        }
                     }
-                    _availableClients.add(client);
                 }
 
+                toDispose.addAll(reusableByDescriptor.values);
+
                 if(_availableClients.distinctBy { it.id }.count() < _availableClients.size) {
                     val dups = _availableClients.filter { x-> _availableClients.count { it.id == x.id } > 1 };
                     val overrideClients = _availableClients.distinctBy { it.id }
@@ -236,7 +260,7 @@ class StatePlatform {
             }
             selectClients(*enabled);
 
-            for(toDisable in toDisables) {
+            for(toDisable in toDispose) {
                 launch(Dispatchers.IO) {
                     try {
                         toDisable.disable();
@@ -1136,4 +1160,4 @@ class StatePlatform {
             }
         }
     }
-}
+}

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

@@ -44,6 +44,7 @@ import kotlin.streams.asSequence
  * Used to maintain subscriptions
  */
 class StateSubscriptions {
+
     private val _subscriptions = FragmentedStorage.storeJson<Subscription>("subscriptions")
         .withUnique { it.channel.url }
         .withRestore(object: ReconstructStore<Subscription>(){
@@ -489,4 +490,4 @@ class StateSubscriptions {
             }
         }
     }
-}
+}

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

@@ -5,6 +5,7 @@ import android.os.Build
 import com.futo.platformplayer.BuildConfig
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.api.http.ManagedHttpClient
+import com.futo.platformplayer.constructs.Event0
 import com.futo.platformplayer.copyToOutputStream
 import com.futo.platformplayer.logging.Logger
 import kotlinx.coroutines.Dispatchers
@@ -14,7 +15,113 @@ import java.io.File
 import java.io.InputStream
 import java.io.OutputStream
 
+enum class UpdateUiState { NONE, AVAILABLE, DOWNLOADING, READY, FAILED }
+
 class StateUpdate {
+
+    @Volatile var uiState: UpdateUiState = UpdateUiState.NONE
+        private set
+    @Volatile var uiVersion: Int = 0
+        private set
+    @Volatile var uiProgress: Int = 0
+        private set
+    @Volatile var uiIndeterminate: Boolean = true
+        private set
+    @Volatile var uiApkFile: File? = null
+        private set
+    @Volatile var uiError: String? = null
+        private set
+    @Volatile var uiDismissed: Boolean = false
+        private set
+
+    val onUiChanged = Event0()
+
+    fun setUiAvailable(version: Int) {
+        val transitioned = uiState != UpdateUiState.AVAILABLE
+        uiState = UpdateUiState.AVAILABLE
+        uiVersion = version
+        uiError = null
+        if (transitioned) uiDismissed = false
+        onUiChanged.emit()
+    }
+
+    fun setUiDownloading(version: Int, progress: Int, indeterminate: Boolean) {
+        val transitioned = uiState != UpdateUiState.DOWNLOADING
+        uiState = UpdateUiState.DOWNLOADING
+        uiVersion = version
+        uiProgress = progress
+        uiIndeterminate = indeterminate
+        uiError = null
+        if (transitioned) uiDismissed = false
+        onUiChanged.emit()
+    }
+
+    fun setUiReady(version: Int, apkFile: File) {
+        val transitioned = uiState != UpdateUiState.READY
+        uiState = UpdateUiState.READY
+        uiVersion = version
+        uiApkFile = apkFile
+        uiError = null
+        if (transitioned) uiDismissed = false
+        onUiChanged.emit()
+    }
+
+    fun setUiFailed(version: Int, error: String?) {
+        val transitioned = uiState != UpdateUiState.FAILED
+        uiState = UpdateUiState.FAILED
+        uiVersion = version
+        uiError = error
+        if (transitioned) uiDismissed = false
+        onUiChanged.emit()
+    }
+
+    fun clearUi() {
+        uiState = UpdateUiState.NONE
+        uiVersion = 0
+        uiProgress = 0
+        uiIndeterminate = true
+        uiApkFile = null
+        uiError = null
+        uiDismissed = false
+        onUiChanged.emit()
+    }
+
+    fun dismissUi() {
+        uiDismissed = true
+        onUiChanged.emit()
+    }
+
+    fun seedUiFromDisk(context: Context) {
+        if (uiState != UpdateUiState.NONE) return
+        try {
+            val dir = File(context.filesDir, "updates")
+            if (!dir.exists()) return
+            val abi = try { DESIRED_ABI } catch (t: Throwable) { return }
+            val prefix = "app-$abi-"
+            val suffix = ".apk"
+            val candidates = dir.listFiles { f ->
+                f.isFile && f.name.startsWith(prefix) && f.name.endsWith(suffix)
+            } ?: return
+            var bestVersion = BuildConfig.VERSION_CODE
+            var bestFile: File? = null
+            for (f in candidates) {
+                val versionStr = f.name.removePrefix(prefix).removeSuffix(suffix)
+                val v = versionStr.toIntOrNull() ?: continue
+                if (v > bestVersion && f.length() > 0L) {
+                    bestVersion = v
+                    bestFile = f
+                }
+            }
+            val ready = bestFile
+            if (ready != null) {
+                Logger.i(TAG, "Seeding UI ready from disk: v=$bestVersion file=${ready.absolutePath}")
+                setUiReady(bestVersion, ready)
+            }
+        } catch (t: Throwable) {
+            Logger.w(TAG, "Failed to seed UI from disk", t)
+        }
+    }
+
     suspend fun checkForUpdates(context: Context, showUpToDateToast: Boolean, hideExceptionButtons: Boolean = false) = withContext(Dispatchers.IO) {
         try {
             val client = ManagedHttpClient();
@@ -97,16 +204,16 @@ class StateUpdate {
             throw Exception("App is not compatible. Supported ABIS: ${Build.SUPPORTED_ABIS.joinToString()}}.");
         };
         val VERSION_URL = if (BuildConfig.IS_UNSTABLE_BUILD) {
-            "https://releases.grayjay.app/version-unstable.txt"
+            "https://rel.grayjay.app/version-unstable.txt"
         } else {
-            "https://releases.grayjay.app/version.txt"
+            "https://rel.grayjay.app/version.txt"
         }
-        val APK_URL = if (BuildConfig.IS_UNSTABLE_BUILD) {
-            "https://releases.grayjay.app/app-$DESIRED_ABI-release-unstable.apk"
+        fun getApkUrl(version: Int): String = if (BuildConfig.IS_UNSTABLE_BUILD) {
+            "https://rel.grayjay.app/$version/app-$DESIRED_ABI-release-unstable.apk"
         } else {
-            "https://releases.grayjay.app/app-$DESIRED_ABI-release.apk"
+            "https://rel.grayjay.app/$version/app-$DESIRED_ABI-release.apk"
         }
-        val CHANGELOG_BASE_URL = "https://releases.grayjay.app/changelogs";
+        val CHANGELOG_BASE_URL = "https://rel.grayjay.app/changelogs";
 
         fun getApkFile(context: Context, version: Int): File {
             val dir = File(context.filesDir, "updates");

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

@@ -40,6 +40,8 @@ import java.time.OffsetDateTime
 import java.util.concurrent.ExecutionException
 import java.util.concurrent.ForkJoinPool
 import java.util.concurrent.ForkJoinTask
+import java.util.concurrent.TimeUnit
+import java.util.concurrent.TimeoutException
 import kotlin.system.measureTimeMillis
 
 abstract class SubscriptionsTaskFetchAlgorithm(
@@ -125,7 +127,7 @@ abstract class SubscriptionsTaskFetchAlgorithm(
         val timeTotal = measureTimeMillis {
             for(task in forkTasks) {
                 try {
-                    val result = task.get();
+                    val result = task.get(TASK_TIMEOUT_S, TimeUnit.SECONDS);
                     if(result != null) {
                         if(result.pager != null) {
                             taskResults.add(result);
@@ -148,6 +150,10 @@ abstract class SubscriptionsTaskFetchAlgorithm(
                     } else {
                         throw ex.cause ?: ex;
                     }
+                } catch (ex: TimeoutException) {
+                    Logger.w(TAG, "Subscription task timed out after ${TASK_TIMEOUT_S}s, abandoning");
+                    task.cancel(true);
+                    exs.add(ex);
                 };
             }
 
@@ -382,4 +388,8 @@ abstract class SubscriptionsTaskFetchAlgorithm(
         val pager: IPager<IPlatformContent>?,
         val exception: Throwable?
     )
+
+    companion object {
+        private const val TASK_TIMEOUT_S = 90L;
+    }
 }

app/src/main/java/com/futo/platformplayer/views/announcements/UpdateBannerView.kt

@@ -0,0 +1,186 @@
+package com.futo.platformplayer.views.announcements
+
+import android.content.Context
+import android.content.Intent
+import android.util.AttributeSet
+import android.view.View
+import android.widget.FrameLayout
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.ProgressBar
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.lifecycle.findViewTreeLifecycleOwner
+import androidx.lifecycle.lifecycleScope
+import com.futo.platformplayer.R
+import com.futo.platformplayer.Settings
+import com.futo.platformplayer.UpdateDownloadService
+import com.futo.platformplayer.UpdateInstaller
+import com.futo.platformplayer.UpdateNotificationManager
+import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.states.StateApp
+import com.futo.platformplayer.states.StateUpdate
+import com.futo.platformplayer.states.UpdateUiState
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+
+class UpdateBannerView : LinearLayout {
+    private val _root: FrameLayout
+    private val _iconUpdate: ImageView
+    private val _textTitle: TextView
+    private val _textBody: TextView
+    private val _progressBar: ProgressBar
+    private val _buttonAction: FrameLayout
+    private val _textAction: TextView
+    private val _buttonClose: ImageView
+
+    private val _scope: CoroutineScope?
+
+    constructor(context: Context, attrs: AttributeSet? = null) : super(context, attrs) {
+        inflate(context, R.layout.view_update_banner, this)
+
+        _scope = findViewTreeLifecycleOwner()?.lifecycleScope ?: StateApp.instance.scopeOrNull
+
+        _root = findViewById(R.id.root)
+        _iconUpdate = findViewById(R.id.icon_update)
+        _textTitle = findViewById(R.id.text_title)
+        _textBody = findViewById(R.id.text_body)
+        _progressBar = findViewById(R.id.update_banner_progress)
+        _buttonAction = findViewById(R.id.button_action)
+        _textAction = findViewById(R.id.text_action)
+        _buttonClose = findViewById(R.id.button_close)
+
+        _buttonClose.setOnClickListener {
+            StateUpdate.instance.dismissUi()
+        }
+
+        _buttonAction.setOnClickListener {
+            onActionClicked()
+        }
+
+        refresh()
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        StateUpdate.instance.onUiChanged.subscribe(this) {
+            _scope?.launch(Dispatchers.Main) {
+                refresh()
+            }
+        }
+        refresh()
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        StateUpdate.instance.onUiChanged.remove(this)
+    }
+
+    private fun onActionClicked() {
+        val st = StateUpdate.instance
+        when (st.uiState) {
+            UpdateUiState.READY -> {
+                val apk = st.uiApkFile ?: return
+                UpdateNotificationManager.cancelAll(context)
+                UpdateInstaller.startInstall(context, st.uiVersion, apk)
+            }
+            UpdateUiState.FAILED -> {
+                if (st.uiVersion == 0) return
+                val intent = Intent(context, UpdateDownloadService::class.java).apply {
+                    putExtra(UpdateDownloadService.EXTRA_VERSION, st.uiVersion)
+                }
+                try {
+                    ContextCompat.startForegroundService(context, intent)
+                } catch (t: Throwable) {
+                    Logger.w(TAG, "Retry start service failed", t)
+                }
+            }
+            UpdateUiState.DOWNLOADING -> {
+                val intent = Intent(context, UpdateDownloadService::class.java).apply {
+                    putExtra(UpdateDownloadService.EXTRA_VERSION, st.uiVersion)
+                    putExtra(UpdateDownloadService.EXTRA_CANCEL, true)
+                }
+                try {
+                    ContextCompat.startForegroundService(context, intent)
+                } catch (t: Throwable) {
+                    Logger.w(TAG, "Cancel start service failed", t)
+                }
+            }
+            UpdateUiState.AVAILABLE -> {
+                if (st.uiVersion == 0) return
+                val intent = Intent(context, UpdateDownloadService::class.java).apply {
+                    putExtra(UpdateDownloadService.EXTRA_VERSION, st.uiVersion)
+                }
+                try {
+                    ContextCompat.startForegroundService(context, intent)
+                } catch (t: Throwable) {
+                    Logger.w(TAG, "Download start service failed", t)
+                }
+            }
+            UpdateUiState.NONE -> {}
+        }
+    }
+
+    private fun refresh() {
+        val st = StateUpdate.instance
+        val gateOpen = Settings.instance.autoUpdate.shouldBackgroundDownload
+        val visible = gateOpen && !st.uiDismissed && st.uiState != UpdateUiState.NONE
+
+        if (!visible) {
+            _root.visibility = View.GONE
+            return
+        }
+        _root.visibility = View.VISIBLE
+
+        when (st.uiState) {
+            UpdateUiState.AVAILABLE -> {
+                _textTitle.text = "Update available (v${st.uiVersion})"
+                _textBody.text = "A new Grayjay version is available."
+                _textBody.visibility = View.VISIBLE
+                _progressBar.visibility = View.GONE
+                _textAction.text = "Download"
+                _buttonAction.visibility = View.VISIBLE
+            }
+            UpdateUiState.DOWNLOADING -> {
+                _textTitle.text = "Downloading update (v${st.uiVersion})"
+                if (st.uiIndeterminate) {
+                    _textBody.text = "Starting download…"
+                    _progressBar.isIndeterminate = true
+                } else {
+                    _textBody.text = "${st.uiProgress}% downloaded"
+                    _progressBar.isIndeterminate = false
+                    _progressBar.progress = st.uiProgress
+                }
+                _textBody.visibility = View.VISIBLE
+                _progressBar.visibility = View.VISIBLE
+                _textAction.text = "Cancel"
+                _buttonAction.visibility = View.VISIBLE
+            }
+            UpdateUiState.READY -> {
+                _textTitle.text = "Update v${st.uiVersion} ready"
+                _textBody.text = "Tap install to apply the update."
+                _textBody.visibility = View.VISIBLE
+                _progressBar.visibility = View.GONE
+                _textAction.text = "Install"
+                _buttonAction.visibility = View.VISIBLE
+            }
+            UpdateUiState.FAILED -> {
+                _textTitle.text = "Update failed"
+                val err = st.uiError
+                _textBody.text = if (err.isNullOrBlank()) "Could not download v${st.uiVersion}." else err
+                _textBody.visibility = View.VISIBLE
+                _progressBar.visibility = View.GONE
+                _textAction.text = "Retry"
+                _buttonAction.visibility = View.VISIBLE
+            }
+            UpdateUiState.NONE -> {
+                _root.visibility = View.GONE
+            }
+        }
+    }
+
+    companion object {
+        const val TAG = "UpdateBannerView"
+    }
+}

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

@@ -41,7 +41,7 @@ class CastButton : androidx.appcompat.widget.AppCompatImageButton {
             when (d.connectionState) {
                 CastConnectionState.CONNECTED -> setColorFilter(activeColor)
                 CastConnectionState.CONNECTING -> setColorFilter(connectingColor)
-                CastConnectionState.DISCONNECTED -> setColorFilter(activeColor)
+                CastConnectionState.DISCONNECTED -> setColorFilter(inactiveColor)
             }
         } else {
             setColorFilter(inactiveColor);

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

@@ -20,11 +20,20 @@
         app:layout_constraintRight_toRightOf="parent"
         tools:layout="@layout/fragment_overview_top_bar" />
 
+    <com.futo.platformplayer.views.announcements.UpdateBannerView
+        android:id="@+id/update_banner"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintTop_toBottomOf="@id/fragment_top_bar"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent" />
+
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/fragment_main"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:layout_constraintTop_toBottomOf="@id/fragment_top_bar"
+        app:layout_constraintTop_toBottomOf="@id/update_banner"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"

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

@@ -35,7 +35,7 @@
         android:maxLines="2"
         app:layout_constraintLeft_toRightOf="@id/image_video_thumbnail"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintRight_toLeftOf="@+id/button_trash"
         app:layout_constraintBottom_toTopOf="@id/text_metadata"
         android:layout_marginStart="10dp" />
 
@@ -51,7 +51,7 @@
         android:maxLines="1"
         app:layout_constraintTop_toBottomOf="@id/text_name"
         app:layout_constraintLeft_toRightOf="@id/image_video_thumbnail"
-        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintRight_toLeftOf="@+id/button_trash"
         app:layout_constraintBottom_toBottomOf="parent"
         android:layout_marginStart="10dp" />
 

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

@@ -12,6 +12,7 @@
         android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
+
         <TextView
             android:id="@+id/videodetail_up_next"
             android:layout_width="wrap_content"
@@ -23,18 +24,23 @@
             android:includeFontPadding="false"
             android:textSize="17dp"
             android:text="@string/up_next" />
+
         <TextView
             android:id="@+id/videodetail_queue_type"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:textColor="@color/gray_ac"
             android:fontFamily="@font/inter_extra_light"
             android:includeFontPadding="false"
             app:layout_constraintLeft_toRightOf="@id/videodetail_up_next"
             app:layout_constraintBottom_toBottomOf="@id/videodetail_up_next"
+            app:layout_constraintRight_toLeftOf="@id/videodetail_queue_position"
             android:layout_marginLeft="6dp"
+            android:maxLines="1"
+            android:ellipsize="end"
             android:textSize="14dp"
             android:text="@string/queue" />
+
         <TextView
             android:id="@+id/videodetail_queue_position"
             android:layout_width="wrap_content"
@@ -47,6 +53,7 @@
             android:layout_marginLeft="10dp"
             android:textSize="12dp"
             tools:text="1/4" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <LinearLayout

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

@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:id="@+id/root">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/background_16_round_4dp"
+        android:paddingLeft="10dp"
+        android:paddingTop="10dp"
+        android:paddingRight="10dp"
+        android:paddingBottom="10dp"
+        android:layout_margin="10dp">
+
+        <ImageView android:id="@+id/icon_update"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:src="@drawable/ic_update"
+            android:layout_marginEnd="8dp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toTopOf="@id/text_title"
+            app:layout_constraintBottom_toBottomOf="@id/text_title" />
+
+        <TextView android:id="@+id/text_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            tools:text="Downloading update v123"
+            android:fontFamily="@font/inter_semibold"
+            android:textSize="15sp"
+            android:textColor="@color/white"
+            android:layout_marginStart="8dp"
+            app:layout_constraintLeft_toRightOf="@id/icon_update"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintRight_toLeftOf="@id/button_close" />
+
+        <ImageView android:id="@+id/button_close"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:padding="6dp"
+            android:src="@drawable/ic_close"
+            android:contentDescription="@string/dismiss"
+            android:background="?android:attr/selectableItemBackgroundBorderless"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintRight_toRightOf="parent" />
+
+        <TextView android:id="@+id/text_body"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            tools:text="42% downloaded"
+            android:fontFamily="@font/inter_light"
+            android:textSize="14sp"
+            android:textColor="#9D9D9D"
+            android:layout_marginTop="2dp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toLeftOf="@id/button_close"
+            app:layout_constraintTop_toBottomOf="@id/text_title" />
+
+        <ProgressBar android:id="@+id/update_banner_progress"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:max="100"
+            android:visibility="gone"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/text_body" />
+
+        <FrameLayout android:id="@+id/button_action"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:background="@drawable/background_button_primary_round_4dp"
+            app:layout_constraintTop_toBottomOf="@id/update_banner_progress"
+            app:layout_constraintRight_toRightOf="parent">
+
+            <TextView android:id="@+id/text_action"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:text="Install"
+                android:fontFamily="@font/inter_regular"
+                android:textSize="14sp"
+                android:textColor="@color/white"
+                android:paddingTop="10dp"
+                android:paddingBottom="10dp"
+                android:paddingLeft="20dp"
+                android:paddingRight="20dp" />
+        </FrameLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>

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

@@ -2,7 +2,7 @@
 <resources>
     <string name="cast">Übertragen</string>
     <string name="search">Suche</string>
-    <string name="add_to_query">Zur Anfrage hinzufügen</string>
+    <string name="add_to_query">Zur Warteschlage hinzufügen</string>
     <string name="thumbnail">Vorschaubild</string>
     <string name="channel_image">Kanalbild</string>
     <string name="add_to">Hinzufügen zu</string>
@@ -15,7 +15,7 @@
     <string name="loading">Lädt</string>
     <string name="retry">Wiederholen</string>
     <string name="cancel">Abbrechen</string>
-    <string name="failed_to_retrieve_data_are_you_connected">Datenabruf fehlgeschlagen, sind Sie verbunden?</string>
+    <string name="failed_to_retrieve_data_are_you_connected">Datenabruf fehlgeschlagen, sind Sie online?</string>
     <string name="settings">Einstellungen</string>
     <string name="history">Verlauf</string>
     <string name="sources">Quellen</string>
@@ -28,7 +28,7 @@
     <string name="update">Aktualisieren</string>
     <string name="close">Schließen</string>
     <string name="never">Nie</string>
-    <string name="there_is_an_update_available_do_you_wish_to_update">Ein Update ist verfügbar. Möchten Sie aktualisieren?</string>
+    <string name="there_is_an_update_available_do_you_wish_to_update">Ein Update ist verfügbar, möchten Sie aktualisieren?</string>
     <string name="downloading_update">Update wird heruntergeladen…</string>
     <string name="installing_update">Update wird installiert…</string>
     <string name="done">Fertig</string>
@@ -36,10 +36,10 @@
     <string name="failed_to_update_with_error">Update fehlgeschlagen mit Fehler</string>
     <string name="general_failure">Allgemeiner Fehler</string>
     <string name="aborted">Abgebrochen</string>
-    <string name="blocked">Blockiert</string>
-    <string name="conflict">Konflikt</string>
-    <string name="incompatible">Inkompatibel</string>
-    <string name="invalid">Ungültig</string>
+    <string name="blocked">Der Vorgang ist fehlgeschlagen, weil er blockiert wurde</string>
+    <string name="conflict">Der Vorgang ist fehlgeschlagen, weil er mit einem anderen, bereits auf dem Gerät installierten Paket kollidiert (oder inkonsistent damit ist)</string>
+    <string name="incompatible">Der Vorgang ist fehlgeschlagen, weil er mit diesem Gerät grundsätzlich nicht kompatibel ist</string>
+    <string name="invalid">Der Vorgang ist fehlgeschlagen, weil eine oder mehrere APKs ungültig waren</string>
     <string name="not_enough_storage">Nicht genügend Speicherplatz</string>
     <string name="live_capitalized">LIVE</string>
     <string name="live">Live</string>
@@ -93,11 +93,11 @@
     <string name="add_source">Quelle hinzufügen</string>
     <string name="repository_url">Repository-URL</string>
     <string name="script_url">Skript-URL</string>
-    <string name="source_permissions_explanation">Dies sind die Berechtigungen, die das Plugin zur Funktion benötigt</string>
+    <string name="source_permissions_explanation">Dies sind die Berechtigungen, die das Plugin zum Funktionieren benötigt</string>
     <string name="source_explain_eval_access">Das Plugin hat Zugang zur Eval-Kapazität</string>
     <string name="source_explain_script_url">Das Plugin hat Zugriff auf die folgenden Domains</string>
     <string name="scan_qr">QR-Code scannen</string>
-    <string name="scan_qr_explain">Scannen Sie einen QR-Code, um zu installieren</string>
+    <string name="scan_qr_explain">Scannen Sie zum Installieren einen QR-Code</string>
     <string name="enter_url">URL eingeben</string>
     <string name="install">Installieren</string>
     <string name="no_devices_found_it_may_take_a_while_for_your_device_to_show_up_please_be_patient">Keine Geräte gefunden. Es kann eine Weile dauern, bis Ihr Gerät angezeigt wird. Bitte haben Sie Geduld</string>
@@ -130,7 +130,7 @@
     <string name="permissions">Berechtigungen</string>
     <string name="security_warnings">Sicherheitswarnungen</string>
     <string name="these_are_warnings_of_plugin_behavior_and_implementation">Dies sind Warnungen über das Verhalten und die Implementierung von Plugins</string>
-    <string name="please_enter_the_captcha_and_close_when_finished">Bitte geben Sie das Captcha ein und schließen Sie, wenn Sie fertig sind</string>
+    <string name="please_enter_the_captcha_and_close_when_finished">Bitte das Captcha eingeben und schließen, wenn fertig</string>
     <string name="close_capitalized">SCHLIESSEN</string>
     <string name="submit">Absenden</string>
     <string name="restart">Neustart</string>
@@ -178,7 +178,7 @@
     <string name="i_already_paid">Ich habe bereits bezahlt</string>
     <string name="memberships">Mitgliedschaften</string>
     <string name="a_monthly_recurring_payment_with_often">Eine monatlich wiederkehrende Zahlung mit häufig</string>
-    <string name="additional_perks">zusätzliche Vorteile.</string>
+    <string name="additional_perks">zusätzlichen Vorteilen.</string>
     <string name="a_one_time_payment_to_support_the_creator">Eine einmalige Zahlung zur Unterstützung des Erstellers</string>
     <string name="donation">Spende</string>
     <string name="downloading">Herunterladen</string>
@@ -243,11 +243,11 @@
     <string name="announcement">Ankündigung</string>
     <string name="attempt_to_utilize_byte_ranges">Versuch, Byte-Bereiche zu nutzen</string>
     <string name="auto_update">Automatische Aktualisierung</string>
-    <string name="automatic_backup">Automatisches Backup</string>
+    <string name="automatic_backup">Automatische Sicherung</string>
     <string name="background_behavior">Hintergrundverhalten</string>
     <string name="background_update">Hintergrundaktualisierung</string>
     <string name="background_download">Hintergrunddownload</string>
-    <string name="backup">Backup</string>
+    <string name="backup">Sicherung</string>
     <string name="browsing">Browsen</string>
     <string name="byte_range_concurrency">Byte-Bereichs-Gleichzeitigkeit</string>
     <string name="byte_range_download">Byte-Bereichs-Download</string>
@@ -265,7 +265,7 @@
     <string name="clears_in_app_browser_cookies">In-App-Browser-Cookies löschen</string>
     <string name="configure_browsing_behavior">Browsing-Verhalten konfigurieren</string>
     <string name="configure_casting">Casting konfigurieren</string>
-    <string name="configure_daily_backup_in_case_of_catastrophic_failure">Tägliches Backup im Falle eines katastrophalen Ausfalls konfigurieren</string>
+    <string name="configure_daily_backup_in_case_of_catastrophic_failure">Tägliche Sicherung im Falle eines katastrophalen Ausfalls konfigurieren</string>
     <string name="configure_downloading_of_videos">Herunterladen von Videos konfigurieren</string>
     <string name="configure_how_your_home_tab_works_and_feels">Konfigurieren, wie Ihr Start-Tab funktioniert und sich anfühlt</string>
     <string name="configure_how_your_subscriptions_works_and_feels">Konfigurieren, wie Ihre Abonnements funktionieren und sich anfühlen</string>
@@ -340,7 +340,7 @@
     <string name="clear_all_downloaded">Alle Downloads löschen</string>
     <string name="clear_downloads">Downloads löschen</string>
     <string name="clear_all_cookies_from_the_cookieManager">Alle Cookies aus dem CookieManager löschen</string>
-    <string name="crash_me">Stürzen Sie mich ab</string>
+    <string name="crash_me">Anwendung abstürzen lassen</string>
     <string name="crashes_the_application_on_purpose">Absichtliches Abstürzen der Anwendung</string>
     <string name="delete_announcements">Ankündigungen löschen</string>
     <string name="delete_unresolved">Nicht gelöste löschen</string>
@@ -562,9 +562,9 @@
     <string name="signature_is_invalid">Die Signatur ist ungültig</string>
     <string name="no_signature_available">Keine Signatur verfügbar</string>
     <string name="unsubscribed_from">"Abonnement gekündigt bei "</string>
-    <string name="you_don_t_have_any_automatic_backups">Sie haben keine automatischen Backups</string>
-    <string name="an_old_backup_is_available">Ein altes Backup ist verfügbar</string>
-    <string name="would_you_like_to_restore_this_backup">Möchten Sie dieses Backup wiederherstellen?</string>
+    <string name="you_don_t_have_any_automatic_backups">Sie haben keine automatischen Sicherungen</string>
+    <string name="an_old_backup_is_available">Ein alte Sicherung ist verfügbar</string>
+    <string name="would_you_like_to_restore_this_backup">Möchten Sie diese Sicherung wiederherstellen?</string>
     <string name="override">Überschreiben</string>
     <string name="data_retry">Datenwiederholung</string>
     <string name="no_downloads_available">Keine Downloads verfügbar</string>
@@ -592,13 +592,13 @@
     <string name="the_playlist_will_restart_after_the_video_is_finished">Die Playlist wird nach dem Ende des Videos neu gestartet</string>
     <string name="end_of_playlist_reached">Ende der Playlist erreicht</string>
     <string name="enter_url_explain">Geben Sie eine URL ein, um die Plugin-Konfiguration von dort zu laden.</string>
-    <string name="buy_text">Es ist weder einfache noch günstige, eine App wie Grayjay, zu Entwikeln und zu Warten…</string>
+    <string name="buy_text">Grayjay ist nicht einfach oder billig zu entwickeln und zu warten. Wir haben Vollzeit-Ingenieure, die an der App und an den sie umgebenden Systemen arbeiten. Und wird wahrscheinlich nicht so bald wieder Geld einbringen, wenn überhaupt.\n\nFUTOs Mission ist es, dass Open-Source-Software und nicht-bösartige Software-Geschäftspraktiken eine nachhaltige Einkommensquelle für Projekte und ihre Entwickler werden. Aus diesem Grund sind wir dafür, dass die Nutzer tatsächlich für die Software bezahlen.\n\nDeshalb möchte Grayjay, dass Sie für die Software bezahlen.</string>
     <string name="an_uncaught_exception_was_thrown_we_re_sorry_for_the_inconvenience">Ein unabgefangene Ausnahme wurde ausgelöst, es tut uns leid für die Unannehmlichkeiten.</string>
-    <string name="set_a_password_for_your_daily_backup">Legen Sie ein Passwort für Ihr tägliches Backup fest</string>
-    <string name="items_require_migration_or_are_corrupted_would_you_like_to_restore_them_from_backup_now">Elemente erfordern eine Migration oder sind beschädigt. Möchten Sie sie jetzt aus dem Backup wiederherstellen?</string>
+    <string name="set_a_password_for_your_daily_backup">Ein Passwort für Ihr tägliche Sicherung festlegen</string>
+    <string name="items_require_migration_or_are_corrupted_would_you_like_to_restore_them_from_backup_now">Elemente erfordern eine Migration oder sind beschädigt. Möchten Sie sie jetzt aus der Sicherung wiederherstellen?</string>
     <string name="recently_used_playlist">Kürzlich verwendete Playlist</string>
-    <string name="make_a_backup_of_your_identity">Ein Backup Ihrer Identität erstellen</string>
-    <string name="restore_a_previous_automatic_backup">Ein vorheriges automatisches Backup wiederherstellen</string>
+    <string name="make_a_backup_of_your_identity">Eine Sicherung Ihrer Identität erstellen</string>
+    <string name="restore_a_previous_automatic_backup">Eine vorherige automatische Sicherung wiederherstellen</string>
     <string name="embedded_plugins_reinstalled_a_reboot_is_recommended">Embedded-Plugins neu installiert, ein Neustart der App ist empfohlen</string>
     <string name="injects_a_test_source_config_local_into_v8">Fügt eine Testquellenkonfiguration (lokal) in V8 ein</string>
     <string name="do_you_want_to_convert_channel_channelname_to_a_playlist">Möchten Sie den Kanal {channelName} in eine Playlist umwandeln?</string>
@@ -607,6 +607,255 @@
     <string name="failed_to_retrieve_playlists">Abrufen von Playlisten fehlgeschlagen.</string>
     <string name="subscribed_to">"Abonniert bei "</string>
     <string name="select_your_pins_in_order">Wählen Sie Ihre Pins in Reihenfolge aus</string>
+<string name="a_store_by_the_creator">Ein Shop vom Ersteller</string>
+    <string name="add_creator">Ersteller hinzufügen</string>
+    <string name="add_to_history">Zum Verlauf hinzufügen</string>
+    <string name="add_to_new_playlist">Zu neuer Playlist hinzufügen</string>
+    <string name="allow_all_certificates">Alle Zertifikate zulassen</string>
+    <string name="allow_all_certificates_warning">Dies birgt das Risiko, Ihren gesamten Grayjay-Netzwerkverkehr offenzulegen.</string>
+    <string name="allow_developer_submit">Entwickler-Übermittlungen zulassen</string>
+    <string name="allow_developer_submit_description">Erlaubt dem Entwickler, Daten an seinen Server zu senden. Seien Sie vorsichtig, da dies sensible Daten enthalten könnte.</string>
+    <string name="allow_developer_submit_warning">Stellen Sie sicher, dass Sie dem Entwickler vertrauen. Er könnte Zugriff auf sensible Daten erhalten. Aktivieren Sie dies nur, wenn Sie dem Entwickler bei der Behebung eines Fehlers helfen möchten.</string>
+    <string name="allow_full_screen_portrait">Vollbild im Hochformat beim Ansehen von horizontalen Videos erlauben</string>
+    <string name="allow_grayjay_to_handle_links">Grayjay erlauben, Links zu verarbeiten</string>
+    <string name="allow_ipv6">IPV6 erlauben</string>
+    <string name="allow_ipv6_description">Wenn das Übertragen über IPV6 erlaubt ist, kann dies in einigen Netzwerken Probleme verursachen</string>
+    <string name="allow_under_cutout">Video unter Bildschirmausschnitt erlauben</string>
+    <string name="allow_under_cutout_description">Video erlauben, im Vollbildmodus unter den Bildschirmausschnitt zu gelangen.\nNeustart möglicherweise erforderlich</string>
+    <string name="already_queued">Bereits in der Warteschlange</string>
+    <string name="always_allow_reverse_landscape_auto_rotate">Automatische Drehung ins umgekehrte Querformat immer erlauben</string>
+    <string name="always_allow_reverse_landscape_auto_rotate_description">Es erfolgt immer eine automatische Drehung zwischen den beiden Querformatausrichtungen im Vollbildmodus, auch wenn Sie die automatische Drehung in den Systemeinstellungen deaktivieren.</string>
+    <string name="always_proxy_requests">Anfragen immer über Proxy leiten</string>
+    <string name="always_proxy_requests_description">Anfragen beim Übertragen von Daten über das Gerät immer über einen Proxy leiten.</string>
+    <string name="always_reload_from_cache">Immer aus dem Cache neu laden</string>
+    <string name="always_reload_from_cache_description">Dies wird nicht empfohlen, ist aber eine mögliche Problemumgehung für einige Probleme.</string>
+    <string name="app_language">App-Sprache</string>
+    <string name="automatic_update_setting">Automatische Aktualisierung</string>
+    <string name="automatic_update_setting_description">Beim Start automatisch aktualisieren, wenn keine Berechtigungen geändert wurden und das Plugin aktiviert ist</string>
+    <string name="autoplay">Nächstes Video standardmäßig automatisch abspielen</string>
+    <string name="autoplay_description">Die automatische Wiedergabe des nächsten Videos ist standardmäßig aktiviert, wenn Sie ein Video ansehen</string>
+    <string name="background_switch_audio">Im Hintergrund zu Audio wechseln</string>
+    <string name="bad_reputation_comments_fading">Ausblenden von Kommentaren mit schlechtem Ruf</string>
+    <string name="bad_reputation_comments_fading_description">Ob Kommentare mit sehr schlechtem Ruf ausgeblendet werden sollen. Das Deaktivieren kann die Benutzererfahrung verschlechtern.</string>
+    <string name="brightness_slider">Helligkeitsregler</string>
+    <string name="brightness_slider_descr">Wischgeste zum Ändern der Helligkeit aktivieren</string>
+    <string name="broadcast">Übertragung</string>
+    <string name="broadcast_description">Gerät erlauben, Anwesenheit zu übertragen</string>
+    <string name="bypass_rotation_prevention">Drehungsverhinderung umgehen</string>
+    <string name="bypass_rotation_prevention_description">Ermöglicht Drehung in Nicht-Video-Ansichten.\nWARNUNG: Nicht dafür ausgelegt</string>
+    <string name="bypass_rotation_prevention_warning">Dies kann zu unerwartetem Verhalten führen und ist größtenteils ungetestet.</string>
+    <string name="cache">Cache</string>
+    <string name="can_be_disabled_when_you_are_experiencing_issues">Kann bei Problemen deaktiviert werden</string>
+    <string name="cd_app_icon">App-Symbol</string>
+    <string name="cd_button_add">Hinzufügen</string>
+    <string name="cd_button_add_to_watch_later">Zu „Später ansehen“ hinzufügen</string>
+    <string name="cd_button_autoplay">Autoplay</string>
+    <string name="cd_button_back">Zurück-Schaltfläche</string>
+    <string name="cd_button_clear_search">Suche löschen</string>
+    <string name="cd_button_close">Schließen</string>
+    <string name="cd_button_create_playlist">Playlist erstellen</string>
+    <string name="cd_button_delete">Löschen</string>
+    <string name="cd_button_download">Herunterladen</string>
+    <string name="cd_button_edit">Bearbeiten</string>
+    <string name="cd_button_filter">Filter</string>
+    <string name="cd_button_fullscreen">Vollbild</string>
+    <string name="cd_button_help">Hilfe</string>
+    <string name="cd_button_loop">Wiederholen</string>
+    <string name="cd_button_minimize">Minimieren</string>
+    <string name="cd_button_next">Weiter</string>
+    <string name="cd_button_pause">Pause</string>
+    <string name="cd_button_play">Wiedergabe</string>
+    <string name="cd_button_previous">Zurück</string>
+    <string name="cd_button_replies">Antworten</string>
+    <string name="cd_button_rotate_lock">Drehung sperren</string>
+    <string name="cd_button_scan_qr">QR-Code scannen</string>
+    <string name="cd_button_search">Suchen</string>
+    <string name="cd_button_settings">Einstellungen</string>
+    <string name="cd_button_share">Teilen</string>
+    <string name="cd_button_stop">Stopp</string>
+    <string name="cd_button_subscribe">Abonnieren</string>
+    <string name="cd_cast_button">Übertragen-Schaltfläche</string>
+    <string name="cd_creator_thumbnail">Ersteller-Vorschaubild</string>
+    <string name="cd_donation_amount">Spendenbetrag</string>
+    <string name="cd_donation_author_image">Bild des Spendenautors</string>
+    <string name="cd_download_indicator">Download-Anzeige</string>
+    <string name="cd_drag_drop">Ziehen und Ablegen</string>
+    <string name="cd_edit_image">Bild bearbeiten</string>
+    <string name="cd_icon_history">Verlaufssymbol</string>
+    <string name="cd_image_device">Gerätesymbol</string>
+    <string name="cd_image_dislike_icon">Nicht mögen</string>
+    <string name="cd_image_group">Gruppenbild</string>
+    <string name="cd_image_like_icon">Mögen</string>
+    <string name="cd_image_loader">Ladeanzeige</string>
+    <string name="cd_image_polycentric">Polycentric-Profilbild ändern</string>
+    <string name="cd_incognito_button">Inkognito-Schaltfläche</string>
+    <string name="cd_minimize_close">Schließen</string>
+    <string name="cd_minimize_pause">Pause</string>
+    <string name="cd_minimize_play">Wiedergabe</string>
+    <string name="cd_platform_indicator">Plattformanzeige</string>
+    <string name="cd_search_icon">Suchsymbol</string>
+    <string name="cd_thumbnail_player_unmute">Stummschaltung aufheben</string>
+    <string name="cd_update_spinner">Aktualisierungs-Ladekreis</string>
+    <string name="changelog_plugin_description">Zeigt verfügbare Änderungsprotokolle für aktuelle und frühere Versionen an</string>
+    <string name="changing_this_field_requires_restart">Das Ändern dieses Feldes erfordert einen Neustart der App.</string>
+    <string name="channel">Kanal</string>
+    <string name="chapter_update_fps_description">Genauigkeit der Kapitelaktualisierung ändern, höher könnte mehr Leistung kosten</string>
+    <string name="chapter_update_fps_title">Kapitelaktualisierungs-FPS</string>
+    <string name="chapters">Kapitel</string>
+    <string name="check_disabled_plugin_updates">Deaktivierte Plugins auf Updates prüfen</string>
+    <string name="check_disabled_plugin_updates_description">Deaktivierte Plugins auf Updates prüfen</string>
+    <string name="check_for_updates_setting">Auf Updates prüfen</string>
+    <string name="check_for_updates_setting_description">Ob ein Plugin beim Start auf Updates geprüft werden soll</string>
+    <string name="check_to_see_if_an_update_is_available">Prüfen, ob ein Update verfügbar ist.</string>
+    <string name="clear_channel_cache">Kanal-Cache leeren</string>
+    <string name="clear_channel_cache_description">Löscht alle Inhalte aus dem Cache der abonnierten Kanäle</string>
+    <string name="clear_external_downloads_directory">Externes Download-Verzeichnis leeren</string>
+    <string name="clear_hidden">Ausgeblendete Elemente löschen</string>
+    <string name="clear_hidden_description">Entfernt alle ausgeblendeten Ersteller und Videos und zeigt sie wieder an</string>
+    <string name="clear_the_external_storage_for_download_files">Externen Speicher für heruntergeladene Dateien leeren</string>
+    <string name="click_to_go_to_battery_optimization_settings_disabling_battery_optimization_will_prevent_the_os_from_killing_media_sessions">Klicken, um zu den Akkuoptimierungseinstellungen zu gelangen. Das Deaktivieren der Akkuoptimierung verhindert, dass das Betriebssystem Mediensitzungen beendet.</string>
+    <string name="comments_description">Der Kommentarbereich unter dem Inhalt</string>
+    <string name="config_url">Konfigurations-URL</string>
+    <string name="configure_if_historical_time_bar_should_be_shown">Konfigurieren, ob historische Zeitbalken angezeigt werden sollen</string>
+    <string name="connect_discovered">Gefundene verbinden</string>
+    <string name="connect_discovered_description">Gerät erlauben, nach bekannten gekoppelten Geräten zu suchen und eine Verbindung herzustellen</string>
+    <string name="connect_last">Letzte Verbindung versuchen</string>
+    <string name="connect_last_description">Gerät erlauben, sich automatisch mit dem zuletzt bekannten zu verbinden</string>
+    <string name="create_new_subgroup">Neue Gruppe erstellen</string>
+    <string name="current_promotions_by_this_creator">Aktuelle Werbeaktionen dieses Erstellers</string>
+    <string name="default_comment_section">Standard-Kommentarbereich</string>
+    <string name="default_recommendations">Empfehlungen als Standard</string>
+    <string name="default_recommendations_description">Empfehlungen standardmäßig anstelle von Kommentaren anzeigen.</string>
+    <string name="delete_watchlist_on_finish">Aus „Später ansehen“ löschen, wenn angesehen</string>
+    <string name="delete_watchlist_on_finish_description">Nachdem Sie ein Video verlassen, das Sie größtenteils angesehen haben, wird es aus „Später ansehen“ entfernt.</string>
+    <string name="dev_info_channel_cache_size">Kanal-Cache-Größe (Start)</string>
+    <string name="disable_battery_optimization">Akkuoptimierung deaktivieren</string>
+    <string name="do_not_ask_again">Nicht erneut fragen</string>
+    <string name="do_you_want_to_see_the_tutorials_you_can_find_them_at_any_time_through_the_more_button">Möchten Sie die Tutorials sehen? Sie können sie jederzeit über die Mehr-Schaltfläche finden.</string>
+    <string name="enable_polycentric">Polycentric aktivieren</string>
+    <string name="enabled_description">Funktion aktivieren</string>
+    <string name="failed_to_parse_text_file">Fehler beim Parsen der Textdatei</string>
+    <string name="failed_to_show_settings">Einstellungen konnten nicht angezeigt werden</string>
+    <string name="fcast">FCast</string>
+    <string name="fcast_technical_documentation">Technische Dokumentation für FCast</string>
+    <string name="fcast_website">FCast-Webseite</string>
+    <string name="fetch_on_tab_opened">Beim Öffnen des Tabs abrufen</string>
+    <string name="fetch_on_tab_opened_description">Neue Ergebnisse abrufen, wenn der Tab geöffnet wird (wenn noch keine Ergebnisse vorhanden sind, wird das Deaktivieren nicht empfohlen, es sei denn, Sie haben Probleme)</string>
+    <string name="full_autorotate_lock">Vollständige Sperre der automatischen Drehung</string>
+    <string name="full_autorotate_lock_description">Verhindert jede Drehung, während die Rotationssperre aktiviert ist (auch das Wechseln zwischen Querformat und umgekehrtem Querformat).</string>
+    <string name="full_screen_portrait">Vollbild Hochformat</string>
+    <string name="general">Allgemein</string>
+    <string name="gesture_controls">Gestensteuerung</string>
+    <string name="go_back_to_casting_add_dialog">Zurück zum Hinzufügen-Dialog für die Übertragung</string>
+    <string name="guide">Anleitung</string>
+    <string name="hide_creator_from_home">Ersteller auf Startseite ausblenden</string>
+    <string name="history_cache_100">Verlaufs-Cache 100</string>
+    <string name="how_to_use_fcast_guide">Anleitung zur Verwendung von FCast</string>
+    <string name="import_data">Daten importieren</string>
+    <string name="import_data_description">Datei zum Importieren auswählen, unterstützt verschiedene Dateien (Alternative zum direkten Öffnen)</string>
+    <string name="import_options">Wählen Sie eine der folgenden verfügbaren Importoptionen.</string>
+    <string name="keep_screen_on">Bildschirm eingeschaltet lassen</string>
+    <string name="keep_screen_on_while_casting">Bildschirm während der Übertragung eingeschaltet lassen</string>
+    <string name="language">Sprache</string>
+    <string name="link_handling">Link-Verarbeitung</string>
+    <string name="load_more">Mehr laden</string>
+    <string name="locked_content_description">Dieser Inhalt ist gesperrt</string>
+    <string name="login_required">Anmeldung erforderlich</string>
+    <string name="login_to_view_your_comments">Melden Sie sich an, um Ihre Kommentare anzuzeigen</string>
+    <string name="may_require_restart">Neustart möglicherweise erforderlich</string>
+    <string name="membership">Mitgliedschaft</string>
+    <string name="merchandise">Fanartikel</string>
+    <string name="networking">Netzwerk</string>
+    <string name="new_playlist">Neue Playlist</string>
+    <string name="no_sources_installed">Sie haben keine Quellen installiert. Bitte fügen Sie Quellen hinzu, um die App wie vorgesehen zu nutzen.</string>
+    <string name="not_empty_close">Kommentar ist nicht leer, trotzdem schließen?</string>
+    <string name="notifications">Benachrichtigungen</string>
+    <string name="open_the_fcast_website">Die FCast-Webseite öffnen</string>
+    <string name="pan_option">Schwenken aktivieren</string>
+    <string name="pan_option_descr">Zwei-Finger-Schwenkgeste aktivieren</string>
+    <string name="peek_channel_contents">Kanalinhalte kurz anzeigen</string>
+    <string name="peek_channel_contents_description">Kanalinhalte kurz anzeigen, wenn vom Plugin bei ratenbegrenzten Aufrufen unterstützt, kann die Ladezeit von Abonnements verlängern.</string>
+    <string name="planned_content_notifications">Benachrichtigungen für geplante Inhalte</string>
+    <string name="planned_content_notifications_description">Plant erkannte geplante Inhalte als Benachrichtigungen, was zu genaueren Benachrichtigungen für diese Inhalte führt.</string>
+    <string name="platform_url">Plattform-URL</string>
+    <string name="play_pause">Wiedergabe/Pause</string>
+    <string name="play_store_version_does_not_support_default_url_handling">Die Play Store-Version unterstützt keine standardmäßige URL-Verarbeitung.</string>
+    <string name="playlist_delete_confirmation">Bestätigung zum Löschen der Playlist</string>
+    <string name="playlist_delete_confirmation_description">Bestätigungsdialog beim Löschen von Medien aus einer Playlist anzeigen</string>
+    <string name="please_use_at_least_1_character">Bitte verwenden Sie mindestens 1 Zeichen</string>
+    <string name="plus_tax">" + Steuer"</string>
+    <string name="polycentric_is_disabled">Polycentric ist deaktiviert</string>
+    <string name="polycentric_local_cache">Lokales Caching für Polycentric aktivieren</string>
+    <string name="polycentric_local_cache_description">Speichert Polycentric-Ergebnisse auf dem Gerät zwischen, um Ladezeiten zu verkürzen. Änderung erfordert App-Neustart</string>
+    <string name="position">Position</string>
+    <string name="prefer_webm">Webm-Video-Codecs bevorzugen</string>
+    <string name="prefer_webm_audio">Webm-Audio-Codecs bevorzugen</string>
+    <string name="prefer_webm_audio_description">Ob der Player Webm-Codecs (Opus) gegenüber MP4-Codecs (AAC) bevorzugen soll, kann zu schlechterer Kompatibilität führen.</string>
+    <string name="prefer_webm_description">Ob der Player Webm-Codecs (VP9/Opus) gegenüber MP4-Codecs (H.264/AAC) bevorzugen soll, kann zu schlechterer Kompatibilität führen.</string>
+    <string name="preferred_casting_quality_description">Standardqualität beim Übertragen auf ein externes Gerät</string>
+    <string name="preferred_metered_quality_description">Standardqualität bei getakteten Verbindungen wie Mobilfunk</string>
+    <string name="preferred_preview_quality_description">Standardqualität bei der Vorschau eines Videos in einem Feed</string>
+    <string name="preferred_quality_description">Standardqualität zum Ansehen eines Videos</string>
+    <string name="preview_feed_items">Feed-Elemente vorab anzeigen</string>
+    <string name="preview_feed_items_description">Wenn der Vorschau-Feedstil verwendet wird, ob Elemente beim Darüber-Scrollen automatisch vorab angezeigt werden sollen</string>
+    <string name="privacy_mode">Privatsphärenmodus</string>
+    <string name="progress_bar">Fortschrittsbalken</string>
+    <string name="progress_bar_description">Ob ein historischer Fortschrittsbalken angezeigt werden soll</string>
+    <string name="promotions">Werbeaktionen</string>
+    <string name="ratelimit">Ratenbegrenzung</string>
+    <string name="ratelimit_description">Einstellungen zur Ratenbegrenzung des Verhaltens dieses Plugins</string>
+    <string name="ratelimit_sub_setting">Abonnements ratenbegrenzen</string>
+    <string name="ratelimit_sub_setting_description">Begrenzt die Anzahl der gestellten Abonnementanfragen</string>
+    <string name="repeat_password">Passwort wiederholen</string>
+    <string name="restart_after_audio_focus_loss">Neustart nach Verlust des Audiofokus</string>
+    <string name="restart_after_connectivity_loss">Neustart nach Verbindungsverlust</string>
+    <string name="restart_playback_when_gaining_audio_focus_after_a_loss">Wiedergabe neu starten, wenn der Audiofokus nach einem Verlust wiedererlangt wird</string>
+    <string name="restart_playback_when_gaining_connectivity_after_a_loss">Wiedergabe neu starten, wenn die Verbindung nach einem Verlust wiederhergestellt wird</string>
+    <string name="restore_system_brightness">Systemhelligkeit wiederherstellen</string>
+    <string name="restore_system_brightness_descr">Systemhelligkeit beim Verlassen des Vollbildmodus wiederherstellen</string>
+    <string name="reverse_portrait">Umgekehrtes Hochformat zulassen</string>
+    <string name="reverse_portrait_description">App erlauben, ins umgekehrte Hochformat zu wechseln</string>
+    <string name="rotation_zone">Rotationszone</string>
+    <string name="rotation_zone_description">Empfindlichkeit der Rotationszonen festlegen (verringern, um weniger empfindlich zu machen)</string>
+    <string name="scroll_to_top">Nach oben scrollen</string>
+    <string name="select">Auswählen</string>
+    <string name="send_to_device">Video synchronisieren</string>
+    <string name="show_home_filters">Startseiten-Filter anzeigen</string>
+    <string name="show_home_filters_description">Ob die Startseiten-Filter über der Startseite angezeigt werden sollen</string>
+    <string name="show_home_filters_plugin_names">Plugin-Namen der Startseiten-Filter</string>
+    <string name="show_home_filters_plugin_names_description">Ob Startseiten-Filter vollständige Plugin-Namen oder nur Symbole anzeigen sollen</string>
+    <string name="show_watch_metrics">Wiedergabemetriken anzeigen</string>
+    <string name="show_watch_metrics_description">Zeigt die Wiedergabezeit und Aufrufe jedes Erstellers im Ersteller-Tab an</string>
+    <string name="stability_threshold_time">Stabilitätsschwellenzeit</string>
+    <string name="stability_threshold_time_description">Geben Sie die Dauer an, für die die Ausrichtung gleich bleiben muss, um eine Drehung auszulösen</string>
+    <string name="stopped_after_requestcount_to_avoid_rate_limit_click_load_more_to_load_more">Nach {requestCount} gestoppt, um Ratenbegrenzung zu vermeiden. Klicken Sie auf „Mehr laden“, um mehr zu laden.</string>
+    <string name="subscription_group_menu">Gruppen</string>
+    <string name="subscriptions_cache_5000">Abonnement-Cache 5000</string>
+    <string name="sync_grayjay">Grayjay synchronisieren</string>
+    <string name="sync_grayjay_description">Synchronisieren Sie Ihre Daten über mehrere Geräte hinweg</string>
+    <string name="synchronization">Synchronisation</string>
+    <string name="system_brightness">Systemhelligkeit</string>
+    <string name="system_brightness_descr">Gestensteuerung passt Systemhelligkeit an</string>
+    <string name="system_volume">Systemlautstärke</string>
+    <string name="system_volume_descr">Gestensteuerung passt Systemlautstärke an</string>
+    <string name="test_background_worker">Hintergrund-Worker testen</string>
+    <string name="test_background_worker_description"></string>
+    <string name="these_are_all_commentcount_comments_you_have_made_in_grayjay">Dies sind alle {commentCount} Kommentare, die Sie in Grayjay gemacht haben.</string>
+    <string name="these_creators_in_group">Dies sind die Ersteller, die für diese Gruppe sichtbar sind.</string>
+    <string name="these_creators_not_in_group">Diese Ersteller sind nicht in dieser Gruppe.</string>
+    <string name="time_bar">Zeitbalken</string>
+    <string name="toggle_full_screen">Vollbild umschalten</string>
+    <string name="toggle_full_screen_descr">Wischgeste zum Umschalten des Vollbildmodus aktivieren</string>
+    <string name="update_available_exclamation">Update verfügbar!</string>
+    <string name="url_handling">URL-Verarbeitung</string>
+    <string name="view_a_video_about_how_to_cast">Video zum Übertragen ansehen</string>
+    <string name="view_the_fcast_technical_documentation">Die technische Dokumentation von FCast ansehen</string>
+    <string name="volume_slider">Lautstärkeregler</string>
+    <string name="volume_slider_descr">Wischgeste zum Ändern der Lautstärke aktivieren</string>
+    <string name="watched">Angesehen</string>
+    <string name="zoom">Zoom</string>
+    <string name="zoom_option">Zoom aktivieren</string>
+    <string name="zoom_option_descr">Zwei-Finger-Pinch-Zoom-Geste aktivieren</string>
     <string-array name="home_screen_array">
         <item>Empfehlungen</item>
         <item>Abonnements</item>
@@ -702,11 +951,33 @@
         <item>Ausführlich</item>
     </string-array>
     <string-array name="comments_sortby_array">
-        <item>Newest</item>
-        <item>Oldest</item>
+        <item>Neuste</item>
+        <item>Älteste</item>
+    </string-array>
+    <string-array name="downloads_sortby_array">
+        <item>Name (Aufsteigend)</item>
+        <item>Name (Absteigend)</item>
+        <item>Download-Datum (Älteste zuerst)</item>
+        <item>Download-Datum (Neueste zuerst)</item>
+        <item>Veröffentlichungsdatum (Älteste zuerst)</item>
+        <item>Veröffentlichungsdatum (Neueste zuerst)</item>
+        <item>Größe (Kleinste zuerst)</item>
+        <item>Größe (Größte zuerst)</item>
+        <item>Typ (Nur Audio)</item>
+        <item>Typ (Video)</item>
+    </string-array>
+    <string-array name="playlists_sortby_array">
+        <item>Name (Aufsteigend)</item>
+        <item>Name (Absteigend)</item>
+        <item>Änderungsdatum (Älteste)</item>
+        <item>Änderungsdatum (Neueste)</item>
+        <item>Erstellungsdatum (Älteste)</item>
+        <item>Erstellungsdatum (Neueste)</item>
+        <item>Wiedergabedatum (Älteste)</item>
+        <item>Wiedergabedatum (Neueste)</item>
     </string-array>
     <string-array name="app_languages">
-        <item>System</item>
+        <item>Systemsprache</item>
         <item>Englisch (EN)</item>
         <item>Deutsch (DE)</item>
         <item>Spanisch (ES)</item>
@@ -720,4 +991,51 @@
         <item>Italienisch (IT)</item>
         <item>Türkisch (TR)</item>
     </string-array>
+    <string-array name="chapter_fps">
+        <item>24</item>
+        <item>30</item>
+        <item>60</item>
+        <item>120</item>
+    </string-array>
+    <string-array name="comment_sections">
+        <item>Polycentric</item> <item>Plattform</item>
+        <item>Zuletzt ausgewählt</item>
+    </string-array>
+    <string-array name="restart_playback_after_loss">
+        <item>Nie</item>
+        <item>Innerhalb von 10 Sekunden nach Verlust</item>
+        <item>Innerhalb von 30 Sekunden nach Verlust</item>
+        <item>Immer</item>
+    </string-array>
+    <string-array name="rotation_zone">
+        <item>15</item>
+        <item>30</item>
+        <item>45</item>
+    </string-array>
+    <string-array name="rotation_threshold_time">
+        <item>100</item>
+        <item>500</item>
+        <item>750</item>
+        <item>1000</item>
+        <item>1500</item>
+        <item>2000</item>
+    </string-array>
+    <string-array name="audio_languages">
+        <item>Englisch</item>
+        <item>Spanisch</item>
+        <item>Deutsch</item>
+        <item>Französisch</item>
+        <item>Japanisch</item>
+        <item>Koreanisch</item>
+        <item>Thailändisch</item>
+        <item>Vietnamesisch</item>
+        <item>Indonesisch</item>
+        <item>Hindi</item>
+        <item>Arabisch</item>
+        <item>Türkisch</item>
+        <item>Russisch</item>
+        <item>Portugiesisch</item>
+        <item>Chinesisch</item>
+        <item>Italienisch</item>
+    </string-array>
 </resources>

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

@@ -997,6 +997,8 @@
         <item>Data di Rilascio (Più Recente)</item>
         <item>Dimensione (Più Piccola)</item>
         <item>Dimensione (Più Grande)</item>
+        <item>Tipo (Solo Audio)</item>
+        <item>Tipo (Video)</item>
     </string-array>
     <string-array name="playlists_sortby_array">
         <item>Nome (Ascending)</item>

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

@@ -960,6 +960,8 @@
         <item>Çıkış Tarihi (En Yeni)</item>
         <item>Boyut (En Küçük)</item>
         <item>Boyut (En Büyük)</item>
+        <item>Tür (Yalnızca Ses)</item>
+        <item>Tür (Video)</item>
     </string-array>
     <string-array name="feed_style">
         <item>Önizle</item>

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

@@ -1053,6 +1053,8 @@
         <item>Release Date (Newest)</item>
         <item>Size (Smallest)</item>
         <item>Size (Largest)</item>
+        <item>Type (Audio Only)</item>
+        <item>Type (Video)</item>
     </string-array>
     <string-array name="playlists_sortby_array">
         <item>Name (Ascending)</item>
@@ -1125,6 +1127,7 @@
     <string-array name="casting_device_type_array" translatable="false">
         <item>FCast</item>
         <item>ChromeCast</item>
+        <item>AirPlay</item>
     </string-array>
     <string-array name="log_levels">
         <item>None</item>

app/src/stable/res/raw/plugin_config.json

@@ -16,7 +16,10 @@
         "8d029a7f-5507-4e36-8bd8-c19a3b77d383": "sources/tedtalks/TedTalksConfig.json",
         "273b6523-5438-44e2-9f5d-78e0325a8fd9": "sources/curiositystream/CuriosityStreamConfig.json",
         "9bb33039-8580-48d4-9849-21319ae845a4": "sources/crunchyroll/CrunchyrollConfig.json",
-        "84331338-b045-419c-88e4-c86036f4cbf5": "sources/mixcloud/MixcloudConfig.json"
+        "84331338-b045-419c-88e4-c86036f4cbf5": "sources/mixcloud/MixcloudConfig.json",
+        "009775f8-9173-48a2-8df3-d730d08d198d": "sources/radiobrowser/RadioBrowserConfig.json",
+        "5f6658bb-96cc-4965-ba04-c81f8686ab67": "sources/redbull-tv/RedBullTvConfig.json",
+        "d890ff43-7d9f-4f0e-a52d-239014fd512d": "sources/fosdem/FOSDEMConfig.json"
     },
     "SOURCES_EMBEDDED_DEFAULT": [
         "35ae969a-a7db-11ed-afa1-0242ac120002"

app/src/unstable/res/raw/plugin_config.json

@@ -16,7 +16,10 @@
         "8d029a7f-5507-4e36-8bd8-c19a3b77d383": "sources/tedtalks/TedTalksConfig.json",
         "273b6523-5438-44e2-9f5d-78e0325a8fd9": "sources/curiositystream/CuriosityStreamConfig.json",
         "9bb33039-8580-48d4-9849-21319ae845a4": "sources/crunchyroll/CrunchyrollConfig.json",
-        "84331338-b045-419c-88e4-c86036f4cbf5": "sources/mixcloud/MixcloudConfig.json"
+        "84331338-b045-419c-88e4-c86036f4cbf5": "sources/mixcloud/MixcloudConfig.json",
+        "009775f8-9173-48a2-8df3-d730d08d198d": "sources/radiobrowser/RadioBrowserConfig.json",
+        "5f6658bb-96cc-4965-ba04-c81f8686ab67": "sources/redbull-tv/RedBullTvConfig.json",
+        "d890ff43-7d9f-4f0e-a52d-239014fd512d": "sources/fosdem/FOSDEMConfig.json"
     },
     "SOURCES_EMBEDDED_DEFAULT": [
         "35ae969a-a7db-11ed-afa1-0242ac120002"

build-playstore.sh

@@ -1,5 +1,13 @@
 #!/bin/sh
+set -eu
+
 DOCUMENT_ROOT=/var/www/html
+MAINT_FILE="$DOCUMENT_ROOT/maintenance.file"
+
+cleanup() {
+  rm -f "$MAINT_FILE"
+}
+trap cleanup EXIT INT TERM
 
 # Sign sources
 echo "Signing all sources..."
@@ -11,12 +19,12 @@ echo "Building content..."
 
 # Take site offline
 echo "Taking site offline..."
-touch $DOCUMENT_ROOT/maintenance.file
+touch "$MAINT_FILE"
 
 # Swap over the content
 echo "Deploying content..."
-cp ./app/build/outputs/bundle/playstoreRelease/app-playstore-release.aab $DOCUMENT_ROOT/app-playstore-release.aab
-aws s3 cp ./app/build/outputs/bundle/playstoreRelease/app-playstore-release.aab s3://artifacts-grayjay-app/app-playstore-release.aab
+cp ./app/build/outputs/bundle/playstoreRelease/app-playstore-release.aab \
+  "$DOCUMENT_ROOT/app-playstore-release.aab"
 
 # Notify Cloudflare to wipe the CDN cache
 echo "Purging Cloudflare cache for zone $CLOUDFLARE_ZONE_ID..."
@@ -29,4 +37,5 @@ sleep 30
 
 # Take site back online
 echo "Bringing site back online..."
-rm $DOCUMENT_ROOT/maintenance.file
+rm -f "$MAINT_FILE"
+trap - EXIT INT TERM

deploy-stable.sh

@@ -1,55 +1,81 @@
 #!/bin/sh
-DOCUMENT_ROOT=/var/www/html
+set -eu
+
+R2_ENDPOINT="https://$CF_R2_ACCOUNT_ID.r2.cloudflarestorage.com"
+
+r2_cp() {
+  src="$1"
+  key="$2"
+  cache_control="$3"
+  content_type="$4"
+
+  AWS_ACCESS_KEY_ID="$CF_R2_ACCESS_KEY_ID" \
+  AWS_SECRET_ACCESS_KEY="$CF_R2_SECRET_ACCESS_KEY" \
+  AWS_DEFAULT_REGION=auto \
+  aws s3 cp "$src" "s3://$CF_R2_BUCKET/$key" \
+    --endpoint-url "$R2_ENDPOINT" \
+    --only-show-errors \
+    --cache-control "$cache_control" \
+    --content-type "$content_type"
+}
+
+upload_apk_latest_and_versioned() {
+  src="$1"
+  filename="$2"
+
+  r2_cp "$src" "$VERSION/$filename" \
+    "public, max-age=31536000, immutable" \
+    "application/vnd.android.package-archive"
+
+  r2_cp "$src" "$filename" \
+    "no-store" \
+    "application/vnd.android.package-archive"
+}
 
-# Sign sources
 echo "Signing all sources..."
 /usr/bin/bash ./sign-all-sources.sh
 
-# Build content
 echo "Building content..."
 ./gradlew --stacktrace assembleStableRelease
 
-# Take site offline
-echo "Taking site offline..."
-touch $DOCUMENT_ROOT/maintenance.file
+VERSION="$(git describe --tags)"
 
-# Swap over the content
+echo "Deploying artifacts to Cloudflare R2..."
+upload_apk_latest_and_versioned "./app/build/outputs/apk/stable/release/app-stable-x86_64-release.apk" "app-x86_64-release.apk"
+upload_apk_latest_and_versioned "./app/build/outputs/apk/stable/release/app-stable-arm64-v8a-release.apk" "app-arm64-v8a-release.apk"
+upload_apk_latest_and_versioned "./app/build/outputs/apk/stable/release/app-stable-armeabi-v7a-release.apk" "app-armeabi-v7a-release.apk"
+upload_apk_latest_and_versioned "./app/build/outputs/apk/stable/release/app-stable-universal-release.apk" "app-universal-release.apk"
+upload_apk_latest_and_versioned "./app/build/outputs/apk/stable/release/app-stable-x86-release.apk" "app-x86-release.apk"
+upload_apk_latest_and_versioned "./app/build/outputs/apk/stable/release/app-stable-arm64-v8a-release.apk" "app-release.apk"
+
+tmp_version="$(mktemp)"
+printf '%s\n' "$VERSION" > "$tmp_version"
+r2_cp "$tmp_version" "$VERSION/version.txt" \
+  "public, max-age=31536000, immutable" \
+  "text/plain; charset=utf-8"
+r2_cp "$tmp_version" "version.txt" \
+  "no-store" \
+  "text/plain; charset=utf-8"
+rm -f "$tmp_version"
+
+tmp_changelog="$(mktemp)"
+git tag -l --format='%(contents)' "$VERSION" > "$tmp_changelog"
+r2_cp "$tmp_changelog" "changelogs/$VERSION" \
+  "public, max-age=31536000, immutable" \
+  "text/plain; charset=utf-8"
+rm -f "$tmp_changelog"
+
+DOCUMENT_ROOT=/var/www/html
 echo "Deploying content..."
-cp ./app/build/outputs/apk/stable/release/app-stable-x86_64-release.apk $DOCUMENT_ROOT/app-x86_64-release.apk
-cp ./app/build/outputs/apk/stable/release/app-stable-arm64-v8a-release.apk $DOCUMENT_ROOT/app-arm64-v8a-release.apk
-cp ./app/build/outputs/apk/stable/release/app-stable-armeabi-v7a-release.apk $DOCUMENT_ROOT/app-armeabi-v7a-release.apk
-cp ./app/build/outputs/apk/stable/release/app-stable-universal-release.apk $DOCUMENT_ROOT/app-universal-release.apk
-cp ./app/build/outputs/apk/stable/release/app-stable-x86-release.apk $DOCUMENT_ROOT/app-x86-release.apk
-cp ./app/build/outputs/apk/stable/release/app-stable-arm64-v8a-release.apk $DOCUMENT_ROOT/app-release.apk
+cp ./app/build/outputs/apk/stable/release/app-stable-x86_64-release.apk "$DOCUMENT_ROOT/app-x86_64-release.apk"
+cp ./app/build/outputs/apk/stable/release/app-stable-arm64-v8a-release.apk "$DOCUMENT_ROOT/app-arm64-v8a-release.apk"
+cp ./app/build/outputs/apk/stable/release/app-stable-armeabi-v7a-release.apk "$DOCUMENT_ROOT/app-armeabi-v7a-release.apk"
+cp ./app/build/outputs/apk/stable/release/app-stable-universal-release.apk "$DOCUMENT_ROOT/app-universal-release.apk"
+cp ./app/build/outputs/apk/stable/release/app-stable-x86-release.apk "$DOCUMENT_ROOT/app-x86-release.apk"
+cp ./app/build/outputs/apk/stable/release/app-stable-arm64-v8a-release.apk "$DOCUMENT_ROOT/app-release.apk"
+VERSION="$(git describe --tags)"
+echo "$VERSION" > "$DOCUMENT_ROOT/version.txt"
+mkdir -p "$DOCUMENT_ROOT/changelogs"
+git tag -l --format='%(contents)' "$VERSION" > "$DOCUMENT_ROOT/changelogs/$VERSION"
 
-VERSION=$(git describe --tags)
-echo $VERSION > $DOCUMENT_ROOT/version.txt
-mkdir -p $DOCUMENT_ROOT/changelogs
-git tag -l --format='%(contents)' $VERSION > $DOCUMENT_ROOT/changelogs/$VERSION
-
-aws s3 cp ./app/build/outputs/apk/stable/release/app-stable-x86_64-release.apk s3://artifacts-grayjay-app/app-x86_64-release.apk
-aws s3 cp ./app/build/outputs/apk/stable/release/app-stable-arm64-v8a-release.apk s3://artifacts-grayjay-app/app-arm64-v8a-release.apk
-aws s3 cp ./app/build/outputs/apk/stable/release/app-stable-armeabi-v7a-release.apk s3://artifacts-grayjay-app/app-armeabi-v7a-release.apk
-aws s3 cp ./app/build/outputs/apk/stable/release/app-stable-universal-release.apk s3://artifacts-grayjay-app/app-universal-release.apk
-aws s3 cp ./app/build/outputs/apk/stable/release/app-stable-x86-release.apk s3://artifacts-grayjay-app/app-x86-release.apk
-aws s3 cp ./app/build/outputs/apk/stable/release/app-stable-arm64-v8a-release.apk s3://artifacts-grayjay-app/app-release.apk
-
-VERSION=$(git describe --tags)
-echo $VERSION > ./version.txt
-git tag -l --format='%(contents)' $VERSION > ./changelog.txt
-
-aws s3 cp ./version.txt s3://artifacts-grayjay-app/version.txt
-aws s3 cp ./changelog.txt s3://artifacts-grayjay-app/changelogs/$VERSION
-
-# Notify Cloudflare to wipe the CDN cache
-echo "Purging Cloudflare cache for zone $CLOUDFLARE_ZONE_ID..."
-curl -X POST "https://api.cloudflare.com/client/v4/zones/$CLOUDFLARE_ZONE_ID/purge_cache" \
-     -H "Authorization: Bearer $CLOUDFLARE_API_TOKEN" \
-     -H "Content-Type: application/json" \
-     --data '{"files":["https://releases.grayjay.app/app-x86_64-release.apk", "https://releases.grayjay.app/app-arm64-v8a-release.apk", "https://releases.grayjay.app/app-armeabi-v7a-release.apk", "https://releases.grayjay.app/app-universal-release.apk", "https://releases.grayjay.app/app-x86-release.apk", "https://releases.grayjay.app/app-release.apk", "https://releases.grayjay.app/version.txt"]}'
-
-sleep 30
-
-# Take site back online
-echo "Bringing site back online..."
-rm $DOCUMENT_ROOT/maintenance.file
+echo "Done."

deploy-unstable.sh

@@ -1,47 +1,72 @@
 #!/bin/sh
-DOCUMENT_ROOT=/var/www/html
+set -eu
+
+R2_ENDPOINT="https://$CF_R2_ACCOUNT_ID.r2.cloudflarestorage.com"
+
+r2_cp() {
+  src="$1"
+  key="$2"
+  cache_control="$3"
+  content_type="$4"
+
+  AWS_ACCESS_KEY_ID="$CF_R2_ACCESS_KEY_ID" \
+  AWS_SECRET_ACCESS_KEY="$CF_R2_SECRET_ACCESS_KEY" \
+  AWS_DEFAULT_REGION=auto \
+  aws s3 cp "$src" "s3://$CF_R2_BUCKET/$key" \
+    --endpoint-url "$R2_ENDPOINT" \
+    --only-show-errors \
+    --cache-control "$cache_control" \
+    --content-type "$content_type"
+}
+
+upload_apk_latest_and_versioned() {
+  src="$1"
+  filename="$2"
+
+  r2_cp "$src" "$VERSION/$filename" \
+    "public, max-age=31536000, immutable" \
+    "application/vnd.android.package-archive"
+
+  r2_cp "$src" "$filename" \
+    "no-store" \
+    "application/vnd.android.package-archive"
+}
 
-# Sign sources
 echo "Signing all sources..."
 /usr/bin/bash ./sign-all-sources.sh
 
-# Build content
 echo "Building content..."
 ./gradlew --stacktrace assembleUnstableRelease
 
-# Take site offline
-echo "Taking site offline..."
-touch $DOCUMENT_ROOT/maintenance.file
+VERSION="$(git describe --tags)"
 
-# Swap over the content
+echo "Deploying unstable artifacts to Cloudflare R2..."
+upload_apk_latest_and_versioned "./app/build/outputs/apk/unstable/release/app-unstable-x86_64-release.apk" "app-x86_64-release-unstable.apk"
+upload_apk_latest_and_versioned "./app/build/outputs/apk/unstable/release/app-unstable-arm64-v8a-release.apk" "app-arm64-v8a-release-unstable.apk"
+upload_apk_latest_and_versioned "./app/build/outputs/apk/unstable/release/app-unstable-armeabi-v7a-release.apk" "app-armeabi-v7a-release-unstable.apk"
+upload_apk_latest_and_versioned "./app/build/outputs/apk/unstable/release/app-unstable-universal-release.apk" "app-universal-release-unstable.apk"
+upload_apk_latest_and_versioned "./app/build/outputs/apk/unstable/release/app-unstable-x86-release.apk" "app-x86-release-unstable.apk"
+upload_apk_latest_and_versioned "./app/build/outputs/apk/unstable/release/app-unstable-arm64-v8a-release.apk" "app-release-unstable.apk"
+
+tmp_version="$(mktemp)"
+printf '%s\n' "$VERSION" > "$tmp_version"
+r2_cp "$tmp_version" "$VERSION/version-unstable.txt" \
+  "public, max-age=31536000, immutable" \
+  "text/plain; charset=utf-8"
+r2_cp "$tmp_version" "version-unstable.txt" \
+  "no-store" \
+  "text/plain; charset=utf-8"
+rm -f "$tmp_version"
+
+DOCUMENT_ROOT=/var/www/html
 echo "Deploying content..."
-cp ./app/build/outputs/apk/unstable/release/app-unstable-x86_64-release.apk $DOCUMENT_ROOT/app-x86_64-release-unstable.apk
-cp ./app/build/outputs/apk/unstable/release/app-unstable-arm64-v8a-release.apk $DOCUMENT_ROOT/app-arm64-v8a-release-unstable.apk
-cp ./app/build/outputs/apk/unstable/release/app-unstable-armeabi-v7a-release.apk $DOCUMENT_ROOT/app-armeabi-v7a-release-unstable.apk
-cp ./app/build/outputs/apk/unstable/release/app-unstable-universal-release.apk $DOCUMENT_ROOT/app-universal-release-unstable.apk
-cp ./app/build/outputs/apk/unstable/release/app-unstable-x86-release.apk $DOCUMENT_ROOT/app-x86-release-unstable.apk
-cp ./app/build/outputs/apk/unstable/release/app-unstable-arm64-v8a-release.apk $DOCUMENT_ROOT/app-release-unstable.apk
-git describe --tags > $DOCUMENT_ROOT/version-unstable.txt
+cp ./app/build/outputs/apk/unstable/release/app-unstable-x86_64-release.apk "$DOCUMENT_ROOT/app-x86_64-release-unstable.apk"
+cp ./app/build/outputs/apk/unstable/release/app-unstable-arm64-v8a-release.apk "$DOCUMENT_ROOT/app-arm64-v8a-release-unstable.apk"
+cp ./app/build/outputs/apk/unstable/release/app-unstable-armeabi-v7a-release.apk "$DOCUMENT_ROOT/app-armeabi-v7a-release-unstable.apk"
+cp ./app/build/outputs/apk/unstable/release/app-unstable-universal-release.apk "$DOCUMENT_ROOT/app-universal-release-unstable.apk"
+cp ./app/build/outputs/apk/unstable/release/app-unstable-x86-release.apk "$DOCUMENT_ROOT/app-x86-release-unstable.apk"
+cp ./app/build/outputs/apk/unstable/release/app-unstable-arm64-v8a-release.apk "$DOCUMENT_ROOT/app-release-unstable.apk"
+VERSION="$(git describe --tags)"
+echo "$VERSION" > "$DOCUMENT_ROOT/version-unstable.txt"
 
-aws s3 cp ./app/build/outputs/apk/unstable/release/app-unstable-x86_64-release.apk s3://artifacts-grayjay-app/app-x86_64-release-unstable.apk
-aws s3 cp ./app/build/outputs/apk/unstable/release/app-unstable-arm64-v8a-release.apk s3://artifacts-grayjay-app/app-arm64-v8a-release-unstable.apk
-aws s3 cp ./app/build/outputs/apk/unstable/release/app-unstable-armeabi-v7a-release.apk s3://artifacts-grayjay-app/app-armeabi-v7a-release-unstable.apk
-aws s3 cp ./app/build/outputs/apk/unstable/release/app-unstable-universal-release.apk s3://artifacts-grayjay-app/app-universal-release-unstable.apk
-aws s3 cp ./app/build/outputs/apk/unstable/release/app-unstable-x86-release.apk s3://artifacts-grayjay-app/app-x86-release-unstable.apk
-aws s3 cp ./app/build/outputs/apk/unstable/release/app-unstable-arm64-v8a-release.apk s3://artifacts-grayjay-app/app-release-unstable.apk
-
-git describe --tags > ./version-unstable.txt
-aws s3 cp ./version-unstable.txt s3://artifacts-grayjay-app/version-unstable.txt
-
-# Notify Cloudflare to wipe the CDN cache
-echo "Purging Cloudflare cache for zone $CLOUDFLARE_ZONE_ID..."
-curl -X POST "https://api.cloudflare.com/client/v4/zones/$CLOUDFLARE_ZONE_ID/purge_cache" \
-     -H "Authorization: Bearer $CLOUDFLARE_API_TOKEN" \
-     -H "Content-Type: application/json" \
-     --data '{"files":["https://releases.grayjay.app/app-x86_64-release-unstable.apk", "https://releases.grayjay.app/app-arm64-v8a-release-unstable.apk", "https://releases.grayjay.app/app-armeabi-v7a-release-unstable.apk", "https://releases.grayjay.app/app-universal-release-unstable.apk", "https://releases.grayjay.app/app-x86-release-unstable.apk", "https://releases.grayjay.app/app-release-unstable.apk", "https://releases.grayjay.app/version-unstable.txt"]}'
-
-sleep 30
-
-# Take site back online
-echo "Bringing site back online..."
-rm $DOCUMENT_ROOT/maintenance.file
+echo "Done."

publish_playstore.py

@@ -0,0 +1,155 @@
+#!/usr/bin/env python3
+import argparse
+import os
+import sys
+import random
+import time
+import httplib2
+import socket
+
+from google_auth_httplib2 import AuthorizedHttp
+from google.oauth2 import service_account
+from googleapiclient.discovery import build
+from googleapiclient.http import MediaFileUpload
+from googleapiclient.errors import HttpError
+from googleapiclient.http import build_http
+
+SCOPE = "https://www.googleapis.com/auth/androidpublisher"
+socket.setdefaulttimeout(30 * 60)
+
+def die(msg: str, code: int = 1):
+    print(msg, file=sys.stderr)
+    raise SystemExit(code)
+
+def main():
+    ap = argparse.ArgumentParser()
+    ap.add_argument("--sa", required=True, help="Service account JSON file path")
+    ap.add_argument("--package", required=True, help="ApplicationId / package name")
+    ap.add_argument("--aab", required=True, help="Path to .aab file")
+    ap.add_argument("--track", default="internal", help="internal|alpha|beta|production")
+    ap.add_argument("--status", default="completed", help="draft|inProgress|halted|completed")
+    ap.add_argument("--name", default=None, help="Release name (defaults to CI_COMMIT_TAG)")
+    ap.add_argument("--rollout", type=float, default=None, help="For staged rollout: 0 < rollout < 1")
+    args = ap.parse_args()
+
+    if not os.path.isfile(args.sa):
+        die(f"Missing service account JSON: {args.sa}")
+    if not os.path.isfile(args.aab):
+        die(f"Missing AAB: {args.aab}")
+
+    release_name = args.name or os.environ.get("CI_COMMIT_TAG")
+    if not release_name:
+        die("Missing release name: pass --name or set CI_COMMIT_TAG")
+
+    staged = args.status in ("inProgress", "halted")
+    if staged:
+        if args.rollout is None:
+            die("--rollout is required when --status is inProgress or halted")
+        if not (0.0 < args.rollout < 1.0):
+            die("--rollout must satisfy 0 < rollout < 1")
+    else:
+        args.rollout = None
+
+    print(f"Loading service account")
+
+    creds = service_account.Credentials.from_service_account_file(
+        args.sa, scopes=[SCOPE]
+    )
+
+    print(f"Loaded service account")
+
+
+    print(f"Building service")
+    http = build_http()
+    authed_http = AuthorizedHttp(creds, http=http)
+    service = build("androidpublisher", "v3", http=authed_http, cache_discovery=False)
+    print(f"Built service")
+
+    try:
+        print(f"Creating edit")
+
+        edit = service.edits().insert(body={}, packageName=args.package).execute()
+        edit_id = edit["id"]
+
+        UPLOAD_CHUNK_SIZE = 10 * 1024 * 1024
+        MAX_RETRIES = 8
+
+        print(f"Media upload started")
+
+        media = MediaFileUpload(
+            args.aab,
+            mimetype="application/octet-stream",
+            resumable=True,
+            chunksize=UPLOAD_CHUNK_SIZE,
+        )
+
+        request = service.edits().bundles().upload(
+            packageName=args.package,
+            editId=edit_id,
+            media_body=media,
+        )
+
+        response = None
+        last_pct = -1
+        attempt = 0
+
+        while response is None:
+            try:
+                status, response = request.next_chunk(num_retries=3)
+                attempt = 0  # reset after any successful chunk
+
+                if status:
+                    pct = int(status.progress() * 100)
+                    if pct != last_pct:
+                        last_pct = pct
+                        print(f"Upload progress: {pct}%", flush=True)
+
+            except HttpError as e:
+                # Retry transient server-side errors with exponential backoff
+                code = getattr(getattr(e, "resp", None), "status", None)
+                if code in (500, 502, 503, 504) and attempt < MAX_RETRIES:
+                    sleep_s = min(60, (2 ** attempt)) + random.random()
+                    print(f"Transient HTTP {code}; retrying in {sleep_s:.1f}s...", flush=True)
+                    time.sleep(sleep_s)
+                    attempt += 1
+                    continue
+                raise
+
+        print("Media upload finished")
+        bundle = response
+        version_code = bundle["versionCode"]
+
+        release = {
+            "name": release_name,
+            "status": args.status,
+            "versionCodes": [str(version_code)],
+        }
+        if args.rollout is not None:
+            release["userFraction"] = args.rollout
+
+        track_body = {"releases": [release]}
+
+        print(f"Updating track")
+
+        service.edits().tracks().update(
+            packageName=args.package,
+            editId=edit_id,
+            track=args.track,
+            body=track_body,
+        ).execute()
+
+        print(f"Updated track")
+        print(f"Committing")
+
+        service.edits().commit(packageName=args.package, editId=edit_id).execute()
+        print(f"Committed")
+
+        print(f"OK: package={args.package} track={args.track} status={args.status} versionCode={version_code} name={release_name}")
+    except HttpError as e:
+        content = e.content.decode("utf-8", errors="replace") if getattr(e, "content", None) else str(e)
+        die(f"Google API error (HTTP {e.resp.status if e.resp else '??'}):\n{content}")
+    except Exception as e:
+        die(f"Unexpected error: {e}")
+
+if __name__ == "__main__":
+    main()