fix: Session not authorized showing when it shouldn't

.gitattributes

@@ -1,6 +1,2 @@
 aar/* filter=lfs diff=lfs merge=lfs -text
 app/aar/* filter=lfs diff=lfs merge=lfs -text
-app/src/main/jniLibs/arm64-v8a filter=lfs diff=lfs merge=lfs -text
-app/src/main/jniLibs/armeabi-v7a filter=lfs diff=lfs merge=lfs -text
-app/src/main/jniLibs/x86 filter=lfs diff=lfs merge=lfs -text
-app/src/main/jniLibs/x86_64 filter=lfs diff=lfs merge=lfs -text

.gitmodules

@@ -64,6 +64,12 @@
 [submodule "app/src/stable/assets/sources/bilibili"]
 	path = app/src/stable/assets/sources/bilibili
 	url = ../plugins/bilibili.git
+[submodule "app/src/stable/assets/sources/spotify"]
+	path = app/src/stable/assets/sources/spotify
+	url = ../plugins/spotify.git
+[submodule "app/src/unstable/assets/sources/spotify"]
+	path = app/src/unstable/assets/sources/spotify
+	url = ../plugins/spotify.git
 [submodule "app/src/stable/assets/sources/bitchute"]
 	path = app/src/stable/assets/sources/bitchute
 	url = ../plugins/bitchute.git

app/aar/ffmpeg-kit-full-6.0-2.LTS.aar

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

app/aar/ffmpeg-kit.aar

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:22c06ca0d1a5808b2fc0a12227d5915b3126bc0b9b1305cf6bab855f2ec6fcbb
-size 36133152

app/build.gradle

@@ -1,8 +1,8 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
-    id 'org.jetbrains.kotlin.plugin.serialization' version '2.2.21'
-    id 'org.ajoberstar.grgit' version '5.3.3'
+    id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.21'
+    id 'org.ajoberstar.grgit' version '5.2.2'
     id 'com.google.protobuf'
     id 'kotlin-parcelize'
     id 'com.google.devtools.ksp'
@@ -97,7 +97,7 @@ android {
 
     defaultConfig {
         minSdk 28
-        targetSdk 36
+        targetSdk 35
         versionCode gitVersionCode
         versionName gitVersionName
 
@@ -146,7 +146,6 @@ android {
     }
     sourceSets {
         main {
-            jniLibs.srcDirs = ['src/main/jniLibs']
             assets {
                 srcDirs 'src/main/assets', 'src/tests/assets', 'src/test/assets'
             }
@@ -156,83 +155,85 @@ android {
 
 dependencies {
     //implementation 'com.google.dagger:dagger:2.48'
-    implementation 'androidx.test:monitor:1.8.0'
-    implementation 'com.google.android.material:material:1.13.0'
+    implementation 'androidx.test:monitor:1.7.2'
+    implementation 'com.google.android.material:material:1.12.0'
     //annotationProcessor 'com.google.dagger:dagger-compiler:2.48'
 
     //Core
-    implementation 'androidx.core:core-ktx:1.17.0'
-    implementation 'androidx.appcompat:appcompat:1.7.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
-    implementation 'androidx.documentfile:documentfile:1.1.0'
+    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.11.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 
     //Images
-    annotationProcessor 'com.github.bumptech.glide:compiler:5.0.5'
-    implementation 'com.github.bumptech.glide:glide:5.0.5'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.16.0'
+    implementation 'com.github.bumptech.glide:glide:4.16.0'
 
     //Async
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"
 
     //HTTP
-    implementation "com.squareup.okhttp3:okhttp:5.3.0"
+    implementation "com.squareup.okhttp3:okhttp:4.11.0"
 
     //JSON
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0" //Used for structured json
-    implementation 'com.google.code.gson:gson:2.13.2' //Used for complex/anonymous cases like during development conversions (eg. V8RemoteObject)
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2" //Used for structured json
+    implementation 'com.google.code.gson:gson:2.10.1' //Used for complex/anonymous cases like during development conversions (eg. V8RemoteObject)
 
     //JS
-    implementation 'com.caoccao.javet:javet-v8-android:4.1.5'
+    implementation("com.caoccao.javet:javet-android:3.0.2")
+    //implementation 'com.caoccao.javet:javet-v8-android:4.1.4' //Change after extensive testing the freezing edge cases are solved.
 
     //Exoplayer
-    implementation 'androidx.media3:media3-exoplayer:1.8.0'
-    implementation 'androidx.media3:media3-exoplayer-dash:1.8.0'
-    implementation 'androidx.media3:media3-ui:1.8.0'
-    implementation 'androidx.media3:media3-exoplayer-hls:1.8.0'
-    implementation 'androidx.media3:media3-exoplayer-rtsp:1.8.0'
-    implementation 'androidx.media3:media3-exoplayer-smoothstreaming:1.8.0'
-    implementation 'androidx.media3:media3-transformer:1.8.0'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.9.6'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.9.6'
-    implementation 'androidx.media:media:1.7.1'
+    implementation 'androidx.media3:media3-exoplayer:1.2.1'
+    implementation 'androidx.media3:media3-exoplayer-dash:1.2.1'
+    implementation 'androidx.media3:media3-ui:1.2.1'
+    implementation 'androidx.media3:media3-exoplayer-hls:1.2.1'
+    implementation 'androidx.media3:media3-exoplayer-rtsp:1.2.1'
+    implementation 'androidx.media3:media3-exoplayer-smoothstreaming:1.2.1'
+    implementation 'androidx.media3:media3-transformer:1.2.1'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.7.6'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.7.6'
+    implementation 'androidx.media:media:1.7.0'
 
     //Other
-    implementation 'org.jsoup:jsoup:1.21.2'
+    implementation 'org.jsoup:jsoup:1.15.3'
     implementation 'com.google.android.flexbox:flexbox:3.0.0'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation fileTree(dir: 'aar', include: ['*.aar'])
     implementation 'com.arthenica:smart-exception-java:0.2.1'
-    implementation 'org.jetbrains.kotlin:kotlin-reflect:2.2.0'
+    implementation 'org.jetbrains.kotlin:kotlin-reflect:1.9.0'
     implementation 'com.github.dhaval2404:imagepicker:2.1'
-    implementation 'com.google.zxing:core:3.5.3'
+    implementation 'com.google.zxing:core:3.4.1'
     implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
     implementation 'com.caverock:androidsvg-aar:1.4'
 
     //Protobuf
-    implementation 'com.google.protobuf:protobuf-javalite:4.33.0'
+    implementation 'com.google.protobuf:protobuf-javalite:3.25.1'
 
     implementation 'com.polycentric.core:app:1.0'
     implementation 'com.futo.futopay:app:1.0'
-    implementation 'androidx.work:work-runtime-ktx:2.11.0'
-    implementation 'androidx.concurrent:concurrent-futures-ktx:1.3.0'
+    implementation 'androidx.work:work-runtime-ktx:2.9.0'
+    implementation 'androidx.concurrent:concurrent-futures-ktx:1.1.0'
 
     //Database
-    implementation("androidx.room:room-runtime:2.8.3")
-    ksp("androidx.room:room-compiler:2.8.3")
-    implementation("androidx.room:room-ktx:2.8.3")
+    implementation("androidx.room:room-runtime:2.6.1")
+    annotationProcessor("androidx.room:room-compiler:2.6.1")
+    ksp("androidx.room:room-compiler:2.6.1")
+    implementation("androidx.room:room-ktx:2.6.1")
 
     //Payment
-    implementation 'com.stripe:stripe-android:22.0.0'
+    implementation 'com.stripe:stripe-android:20.35.1'
 
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2'
-    testImplementation "org.jetbrains.kotlin:kotlin-test:2.0.21"
-    testImplementation "org.xmlunit:xmlunit-core:2.11.0"
-    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'
+    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
+    testImplementation "org.jetbrains.kotlin:kotlin-test:1.8.22"
+    testImplementation "org.xmlunit:xmlunit-core:2.9.1"
+    testImplementation "org.mockito:mockito-core:5.4.0"
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 
     //Rust casting SDK
-    implementation('org.futo.gitlab.videostreaming.fcast-sdk-jitpack:sender-sdk-minimal:0.4.0') {
+    implementation('org.futo.gitlab.videostreaming.fcast-sdk-jitpack:sender-sdk-minimal:0.3.1') {
         // Polycentricandroid includes this
         exclude group: 'net.java.dev.jna'
     }

app/src/main/AndroidManifest.xml

@@ -16,9 +16,6 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"/>
     <uses-permission android:name="android.permission.WRITE_SETTINGS" tools:ignore="ProtectedPermissions"/>
 
-    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
-    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
-
     <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
@@ -29,8 +26,6 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.FutoVideo"
         android:usesCleartextTraffic="true"
-        tools:replace="android:enableOnBackInvokedCallback"
-        android:enableOnBackInvokedCallback="false"
         tools:targetApi="31"
         android:largeHeap="true">
         <provider
@@ -63,7 +58,6 @@
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout|uiMode"
             android:exported="true"
             android:theme="@style/Theme.FutoVideo.NoActionBar"
-            android:windowSoftInputMode="adjustPan"
             android:launchMode="singleInstance"
             android:resizeableActivity="true"
             android:supportsPictureInPicture="true">
@@ -244,29 +238,5 @@
             android:name=".activities.SyncShowPairingCodeActivity"
             android:screenOrientation="sensorPortrait"
             android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
-        <activity
-            android:name=".activities.PolycentricModerationActivity"
-            android:exported="false"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name=".activities.QRCodeFullscreenActivity"
-            android:screenOrientation="sensorPortrait"
-            android:theme="@style/Theme.FutoVideo.NoActionBar" />
-        <service
-            android:name=".UpdateDownloadService"
-            android:exported="false"
-            android:foregroundServiceType="dataSync" />
-
-        <receiver
-            android:name=".UpdateActionReceiver"
-            android:exported="false" />
-
-        <activity
-            android:name=".activities.InstallUpdateActivity"
-            android:exported="false"
-            android:theme="@style/Theme.App.TransparentNoUi"
-            android:excludeFromRecents="true"
-            android:finishOnTaskLaunch="true" />
-
     </application>
 </manifest>

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

@@ -1025,21 +1025,18 @@
 
 				let settingsToUse = __DEV_SETTINGS ?? {};
 				if (true) {
-                    const settings = this.Plugin?.currentPlugin?.settings;
-                    if (settings) {
-                    	for (let setting of settings) {
-							if (typeof settingsToUse[setting.variable] == "undefined") {
-								switch (setting?.type?.toLowerCase()) {
-									case "boolean":
-										settingsToUse[setting.variable] = setting.default === 'true';
-										break;
-									case "dropdown":
-										let dropDownIndex = parseInt(setting.default);
-										if (dropDownIndex) {
-											settingsToUse[setting.variable] = setting.options[dropDownIndex];
-										}
-										break;
-								}
+					for (let setting of this.Plugin?.currentPlugin?.settings) {
+						if (typeof settingsToUse[setting.variable] == "undefined") {
+							switch (setting?.type?.toLowerCase()) {
+								case "boolean":
+									settingsToUse[setting.variable] = setting.default === 'true';
+									break;
+								case "dropdown":
+									let dropDownIndex = parseInt(setting.default);
+									if (dropDownIndex) {
+										settingsToUse[setting.variable] = setting.options[dropDownIndex];
+									}
+									break;
 							}
 						}
 					}

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

@@ -415,8 +415,6 @@ class VideoUrlSource {
         this.url = obj.url;
         if(obj.requestModifier)
             this.requestModifier = obj.requestModifier;
-        this.language = obj?.language;
-        this.original = obj?.original;
     }
 }
 class VideoUrlWidevineSource extends VideoUrlSource {
@@ -514,8 +512,6 @@ class HLSSource {
             this.language = obj.language;
         if(obj.requestModifier)
             this.requestModifier = obj.requestModifier;
-        this.language = obj?.language;
-        this.original = obj?.original;
     }
 }
 class DashSource {
@@ -529,8 +525,6 @@ class DashSource {
             this.language = obj.language;
         if(obj.requestModifier)
             this.requestModifier = obj.requestModifier;
-        this.language = obj?.language;
-        this.original = obj?.original;
     }
 }
 class DashWidevineSource extends DashSource {
@@ -556,7 +550,6 @@ class DashManifestRawSource {
         this.language = obj.language ?? Language.UNKNOWN;
         if(obj.requestModifier)
             this.requestModifier = obj.requestModifier;
-        this.original = obj?.original;
     }
 }
 

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

@@ -1,43 +0,0 @@
-package com.futo.platformplayer
-
-import android.content.Context
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import java.io.File
-import java.net.HttpURLConnection
-import java.net.URL
-
-object AppCaUpdater {
-    private const val CA_URL = "https://curl.se/ca/cacert.pem"
-    private const val CACHE_FILENAME = "curl-ca-bundle.pem"
-    private const val MAX_AGE_DAYS = 30
-
-    suspend fun ensureCaBundle(context: Context): File = withContext(Dispatchers.IO) {
-        val file = File(context.noBackupFilesDir, CACHE_FILENAME)
-        val needsUpdate = !file.exists() || isOlderThanDays(file, MAX_AGE_DAYS)
-        if (needsUpdate) {
-            downloadToFile(CA_URL, file)
-        }
-        return@withContext file
-    }
-
-    private fun isOlderThanDays(file: File, days: Int): Boolean {
-        val ageMs = System.currentTimeMillis() - file.lastModified()
-        return ageMs > days * 24L * 60L * 60L * 1000L
-    }
-
-    private fun downloadToFile(urlStr: String, dest: File) {
-        val conn = (URL(urlStr).openConnection() as HttpURLConnection).apply {
-            connectTimeout = 15000
-            readTimeout = 15000
-            instanceFollowRedirects = true
-        }
-        conn.inputStream.use { input ->
-            dest.parentFile?.mkdirs()
-            dest.outputStream().use { output ->
-                input.copyTo(output)
-            }
-        }
-        conn.disconnect()
-    }
-}

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

@@ -8,7 +8,6 @@ import com.caoccao.javet.values.reference.V8ValueError
 import com.caoccao.javet.values.reference.V8ValueObject
 import com.caoccao.javet.values.reference.V8ValuePromise
 import com.futo.platformplayer.api.media.platforms.js.JSClient
-import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.engine.IV8PluginConfig
 import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.engine.exceptions.ScriptExecutionException
@@ -388,15 +387,4 @@ suspend fun <T> Deferred<T>.awaitCancelConverted(): T {
         }
         throw ex;
     }
-}
-
-fun <T> IPager<T>.toList(): List<T> {
-    val list = this.getResults().toMutableList();
-
-    while(this.hasMorePages()) {
-        this.nextPage();
-        list.addAll(this.getResults());
-    }
-
-    return list.toList();
 }

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

@@ -10,11 +10,11 @@ import com.futo.platformplayer.activities.MainActivity
 import com.futo.platformplayer.activities.ManageTabsActivity
 import com.futo.platformplayer.activities.PolycentricHomeActivity
 import com.futo.platformplayer.activities.PolycentricProfileActivity
+import com.futo.platformplayer.activities.SettingsActivity
 import com.futo.platformplayer.activities.SyncHomeActivity
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.constructs.Event0
 import com.futo.platformplayer.fragment.mainactivity.bottombar.MenuBottomBarFragment
-import com.futo.platformplayer.fragment.mainactivity.main.SettingsFragment
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.serializers.FlexibleBooleanSerializer
 import com.futo.platformplayer.serializers.OffsetDateTimeSerializer
@@ -42,6 +42,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
+import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import java.io.File
 import java.time.OffsetDateTime
@@ -63,7 +64,7 @@ class Settings : FragmentedStorageFileJson() {
     @FormField(R.string.sync_grayjay, FieldForm.BUTTON, R.string.sync_grayjay_description, -8)
     @FormFieldButton(R.drawable.ic_update)
     fun syncGrayjay() {
-        StateApp?.instance?.activity?.let {
+        SettingsActivity.getActivity()?.let {
             it.startActivity(Intent(it, SyncHomeActivity::class.java))
         }
     }
@@ -72,7 +73,7 @@ class Settings : FragmentedStorageFileJson() {
     @FormField(R.string.manage_polycentric_identity, FieldForm.BUTTON, R.string.manage_your_polycentric_identity, -7)
     @FormFieldButton(R.drawable.ic_person)
     fun managePolycentricIdentity() {
-        StateApp?.instance?.activity?.let {
+        SettingsActivity.getActivity()?.let {
             if (StatePolycentric.instance.enabled) {
                 if (StatePolycentric.instance.processHandle != null) {
                     it.startActivity(Intent(it, PolycentricProfileActivity::class.java));
@@ -90,7 +91,7 @@ class Settings : FragmentedStorageFileJson() {
     fun openFAQ() {
         try {
             val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(Settings.URL_FAQ))
-            StateApp?.instance?.activity?.startActivity(browserIntent);
+            SettingsActivity.getActivity()?.startActivity(browserIntent);
         } catch (e: Throwable) {
             //Ignored
         }
@@ -100,7 +101,7 @@ class Settings : FragmentedStorageFileJson() {
     fun openIssues() {
         try {
             val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/futo-org/grayjay-android/issues"))
-            StateApp?.instance?.activity?.startActivity(browserIntent);
+            SettingsActivity.getActivity()?.startActivity(browserIntent);
         } catch (e: Throwable) {
             //Ignored
         }
@@ -131,7 +132,7 @@ class Settings : FragmentedStorageFileJson() {
     @FormFieldButton(R.drawable.ic_tabs)
     fun manageTabs() {
         try {
-            StateApp?.instance?.activity?.let {
+            SettingsActivity.getActivity()?.let {
                 it.startActivity(Intent(it, ManageTabsActivity::class.java));
             }
         } catch (e: Throwable) {
@@ -144,7 +145,7 @@ class Settings : FragmentedStorageFileJson() {
     @FormField(R.string.import_data, FieldForm.BUTTON, R.string.import_data_description, -3)
     @FormFieldButton(R.drawable.ic_move_up)
     fun import() {
-        val act = StateApp.instance.activity ?: return;
+        val act = SettingsActivity.getActivity() ?: return;
         val intent = MainActivity.getImportOptionsIntent(act);
         act.startActivity(intent);
     }
@@ -153,7 +154,7 @@ class Settings : FragmentedStorageFileJson() {
     @FormFieldButton(R.drawable.ic_link)
     fun manageLinks() {
         try {
-            StateApp.instance.activity?.let { UIDialogs.showUrlHandlingPrompt(it) }
+            SettingsActivity.getActivity()?.let { UIDialogs.showUrlHandlingPrompt(it) }
         } catch (e: Throwable) {
             Logger.e(TAG, "Failed to show url handling prompt", e)
         }
@@ -162,7 +163,7 @@ class Settings : FragmentedStorageFileJson() {
     /*@FormField(R.string.disable_battery_optimization, FieldForm.BUTTON, R.string.click_to_go_to_battery_optimization_settings_disabling_battery_optimization_will_prevent_the_os_from_killing_media_sessions, -1)
     @FormFieldButton(R.drawable.battery_full_24px)
     fun ignoreBatteryOptimization() {
-        StateApp.instance.activity?.let {
+        SettingsActivity.getActivity()?.let {
             val intent = Intent()
             val packageName = it.packageName
             val pm = it.getSystemService(POWER_SERVICE) as PowerManager;
@@ -243,7 +244,7 @@ class Settings : FragmentedStorageFileJson() {
         fun clearHidden() {
             StateMeta.instance.removeAllHiddenCreators();
             StateMeta.instance.removeAllHiddenVideos();
-            StateApp.instance.activity?.let {
+            SettingsActivity.getActivity()?.let {
                 UIDialogs.toast(it, "Creators and videos should show up again");
             }
         }
@@ -373,9 +374,9 @@ class Settings : FragmentedStorageFileJson() {
 
         @FormField(R.string.clear_channel_cache, FieldForm.BUTTON, R.string.clear_channel_cache_description, 16)
         fun clearChannelCache() {
-            UIDialogs.toast(StateApp.instance.activity!!, "Started clearing..");
+            UIDialogs.toast(SettingsActivity.getActivity()!!, "Started clearing..");
             StateCache.instance.clear();
-            UIDialogs.toast(StateApp.instance.activity!!, "Finished clearing");
+            UIDialogs.toast(SettingsActivity.getActivity()!!, "Finished clearing");
         }
     }
 
@@ -387,7 +388,7 @@ class Settings : FragmentedStorageFileJson() {
         @DropdownFieldOptionsId(R.array.audio_languages)
         var primaryLanguage: Int = 0;
 
-        fun getPrimaryLanguage(context: Context? = null): String? {
+        fun getPrimaryLanguage(context: Context): String? {
             return when(primaryLanguage) {
                 0 -> "en";
                 1 -> "es";
@@ -407,10 +408,6 @@ class Settings : FragmentedStorageFileJson() {
                 else -> null
             }
         }
-
-        @FormField(R.string.sticky_subtitles, FieldForm.TOGGLE, R.string.sticky_subtitles_description, -1)
-        var stickySubtitles: Boolean = true;
-
         @FormField(R.string.prefer_original_audio, FieldForm.TOGGLE, R.string.prefer_original_audio_description, -1)
         var preferOriginalAudio: Boolean = true;
 
@@ -429,9 +426,6 @@ class Settings : FragmentedStorageFileJson() {
             6 -> 1.75f;
             7 -> 2.0f;
             8 -> 2.25f;
-            9 -> 2.5f;
-            10 -> 2.75f;
-            11 -> 3.0f;
             else -> 1.0f;
         };
 
@@ -728,7 +722,7 @@ class Settings : FragmentedStorageFileJson() {
         @AdvancedField
         @FormField(R.string.experimental_cast, FieldForm.TOGGLE, R.string.experimental_cast_description, 6)
         @Serializable(with = FlexibleBooleanSerializer::class)
-        var experimentalCasting: Boolean = true
+        var experimentalCasting: Boolean = false
 
         /*TODO: Should we have a different casting quality?
         @FormField("Preferred Casting Quality", FieldForm.DROPDOWN, "", 3)
@@ -762,7 +756,7 @@ class Settings : FragmentedStorageFileJson() {
                 try {
                     if (!Logger.submitLogs()) {
                         withContext(Dispatchers.Main) {
-                            StateApp.instance.activity?.let { UIDialogs.toast(it, it.getString(R.string.please_enable_logging_to_submit_logs)) }
+                            SettingsActivity.getActivity()?.let { UIDialogs.toast(it, it.getString(R.string.please_enable_logging_to_submit_logs)) }
                         }
                     }
                 } catch (e: Throwable) {
@@ -779,7 +773,7 @@ class Settings : FragmentedStorageFileJson() {
         @FormField(R.string.reset_announcements, FieldForm.BUTTON, R.string.reset_hidden_announcements, 1)
         fun resetAnnouncements() {
             StateAnnouncement.instance.resetAnnouncements();
-            StateApp.instance.activity?.let { UIDialogs.toast(it, it.getString(R.string.announcements_reset)); };
+            SettingsActivity.getActivity()?.let { UIDialogs.toast(it, it.getString(R.string.announcements_reset)); };
         }
     }
 
@@ -847,13 +841,13 @@ class Settings : FragmentedStorageFileJson() {
 
         @FormField(R.string.change_external_general_directory, FieldForm.BUTTON, R.string.change_the_external_directory_for_general_files, 3)
         fun changeStorageGeneral() {
-            StateApp.instance.activity?.let {
+            SettingsActivity.getActivity()?.let {
                 StateApp.instance.changeExternalGeneralDirectory(it);
             }
         }
         @FormField(R.string.change_external_downloads_directory, FieldForm.BUTTON, R.string.change_the_external_storage_for_download_files, 4)
         fun changeStorageDownload() {
-            StateApp.instance.activity?.let {
+            SettingsActivity.getActivity()?.let {
                 StateApp.instance.changeExternalDownloadDirectory(it);
             }
         }
@@ -862,7 +856,7 @@ class Settings : FragmentedStorageFileJson() {
         fun clearStorageDownload() {
             Settings.instance.storage.storage_download = null;
             Settings.instance.save();
-            StateApp.instance.activity?.let { UIDialogs.toast(it, "Cleared download storage directory") };
+            SettingsActivity.getActivity()?.let { UIDialogs.toast(it, "Cleared download storage directory") };
         }
     }
 
@@ -875,9 +869,9 @@ class Settings : FragmentedStorageFileJson() {
         @DropdownFieldOptionsId(R.array.auto_update_when_array)
         var check: Int = 0;
 
-        @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;
+        @FormField(R.string.background_download, FieldForm.DROPDOWN, R.string.configure_if_background_download_should_be_used, 1)
+        @DropdownFieldOptionsId(R.array.background_download)
+        var backgroundDownload: Int = 0;
 
         @FormField(R.string.download_when, FieldForm.DROPDOWN, R.string.configure_when_updates_should_be_downloaded, 2)
         @DropdownFieldOptionsId(R.array.when_download)
@@ -899,13 +893,13 @@ class Settings : FragmentedStorageFileJson() {
         @FormField(R.string.manual_check, FieldForm.BUTTON, R.string.manually_check_for_updates, 3)
         fun manualCheck() {
             if (!BuildConfig.IS_PLAYSTORE_BUILD) {
-                StateApp.instance.activity?.let {
+                SettingsActivity.getActivity()?.let {
                     StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
                         StateUpdate.instance.checkForUpdates(it, true)
                     }
                 }
             } else {
-                StateApp.instance.activity?.let {
+                SettingsActivity.getActivity()?.let {
                     try {
                         it.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=${it.packageName}")))
                     } catch (e: ActivityNotFoundException) {
@@ -917,7 +911,7 @@ class Settings : FragmentedStorageFileJson() {
 
         @FormField(R.string.view_changelog, FieldForm.BUTTON, R.string.review_the_current_and_past_changelogs, 4)
         fun viewChangelog() {
-            StateApp.instance.activity?.let {
+            SettingsActivity.getActivity()?.let {
                 UIDialogs.toast(it.getString(R.string.retrieving_changelog));
 
                 StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
@@ -957,7 +951,7 @@ class Settings : FragmentedStorageFileJson() {
     class Backup {
         @Serializable(with = OffsetDateTimeSerializer::class)
         var lastAutoBackupTime: OffsetDateTime = OffsetDateTime.MIN;
-        var didAskAutoBackup: Boolean = true;
+        var didAskAutoBackup: Boolean = false;
         var autoBackupPassword: String? = null;
         fun shouldAutomaticBackup() = autoBackupPassword != null;
 
@@ -966,13 +960,13 @@ class Settings : FragmentedStorageFileJson() {
 
         @FormField(R.string.set_automatic_backup, FieldForm.BUTTON, R.string.configure_daily_backup_in_case_of_catastrophic_failure, 1)
         fun configureAutomaticBackup() {
-            UIDialogs.showAutomaticBackupDialog(StateApp.instance.activity!!, autoBackupPassword != null) {
-                SettingsFragment.currentView?.reloadSettings();
+            UIDialogs.showAutomaticBackupDialog(SettingsActivity.getActivity()!!, autoBackupPassword != null) {
+                SettingsActivity.getActivity()?.reloadSettings();
             };
         }
         @FormField(R.string.restore_automatic_backup, FieldForm.BUTTON, R.string.restore_a_previous_automatic_backup, 2)
         fun restoreAutomaticBackup() {
-            val activity = StateApp.instance.activity!!
+            val activity = SettingsActivity.getActivity()!!
 
             if(!StateBackup.hasAutomaticBackup())
                 UIDialogs.toast(activity, activity.getString(R.string.you_don_t_have_any_automatic_backups), false);
@@ -983,9 +977,8 @@ class Settings : FragmentedStorageFileJson() {
 
         @FormField(R.string.export_data, FieldForm.BUTTON, R.string.creates_a_zip_file_with_your_data_which_can_be_imported_by_opening_it_with_grayjay, 3)
         fun export() {
-            val activity = StateApp.instance.activity ?: return;
-            val fragView = SettingsFragment.currentView ?: return;
-            UISlideOverlays.showOverlay(fragView.overlay, "Select export type", null, {},
+            val activity = SettingsActivity.getActivity() ?: return;
+            UISlideOverlays.showOverlay(activity.overlay, "Select export type", null, {},
                 SlideUpMenuItem(activity, R.drawable.ic_share, "Share", "", tag = null, call = {
                     StateBackup.shareExternalBackup();
                 }),
@@ -1001,11 +994,11 @@ class Settings : FragmentedStorageFileJson() {
     @Serializable
     class Payment {
         @FormField(R.string.payment_status, FieldForm.READONLYTEXT, -1, 1)
-        val paymentStatus: String get() = StateApp.instance.activity?.let { if (StatePayment.instance.hasPaid) it.getString(R.string.paid) else it.getString(R.string.not_paid); } ?: "Unknown";
+        val paymentStatus: String get() = SettingsActivity.getActivity()?.let { if (StatePayment.instance.hasPaid) it.getString(R.string.paid) else it.getString(R.string.not_paid); } ?: "Unknown";
 
         @FormField(R.string.license_status, FieldForm.BUTTON, R.string.view_license_status, 2)
         fun viewLicenseStatus() {
-            StateApp.instance.activity?.let {
+            SettingsActivity.getActivity()?.let {
                 try {
                     if (StatePayment.instance.hasPaid) {
                         val paymentKey = StatePayment.instance.getPaymentKey()
@@ -1021,12 +1014,12 @@ class Settings : FragmentedStorageFileJson() {
 
         @FormField(R.string.clear_payment, FieldForm.BUTTON, R.string.deletes_license_keys_from_app, 3)
         fun clearPayment() {
-            StateApp.instance.activity?.let { context ->
+            SettingsActivity.getActivity()?.let { context ->
                 UIDialogs.showConfirmationDialog(context, "Are you sure you want to delete your license?", {
                     StatePayment.instance.clearLicenses();
-                    StateApp.instance.activity?.let {
+                    SettingsActivity.getActivity()?.let {
                         UIDialogs.toast(it, it.getString(R.string.licenses_cleared_might_require_app_restart));
-                        SettingsFragment.currentView?.reloadSettings();
+                        it.reloadSettings();
                     }
                 })
             }
@@ -1052,8 +1045,6 @@ class Settings : FragmentedStorageFileJson() {
 
         @FormField(R.string.polycentric_local_cache, FieldForm.TOGGLE, R.string.polycentric_local_cache_description, 7)
         var polycentricLocalCache: Boolean = true;
-
-        var showPrivacyModeDialog: Boolean = true;
     }
 
     @FormField(R.string.gesture_controls, FieldForm.GROUP, -1, 19)
@@ -1125,7 +1116,7 @@ class Settings : FragmentedStorageFileJson() {
         @AdvancedField
         @FormField(R.string.configure_sync_server, FieldForm.BUTTON, R.string.configure_sync_server_description, 7)
         fun configureSyncServer() {
-            StateApp.instance.activity?.let { context ->
+            SettingsActivity.getActivity()?.let { context ->
                 UIDialogs.showDialog(context, R.drawable.device_sync, false,
                     "Enter the url to your relay server",
                     "Using your own relay server requires a proper setup with portforwarding.\nUse at your own risk.",
@@ -1136,13 +1127,13 @@ class Settings : FragmentedStorageFileJson() {
                         UIDialogs.Action("Reset", {
                             syncServerUrl = null;
                             instance.save();
-                            SettingsFragment.currentView?.reloadSettings();
+                            context.reloadSettings();
                             UIDialogs.toast("Sync server changes require a restart");
                         }, UIDialogs.ActionStyle.ACCENT),
                         UIDialogs.Action.withInput("Configure", {
                             syncServerUrl = it?.text
                             instance.save();
-                            SettingsFragment.currentView?.reloadSettings();
+                            context.reloadSettings();
                             UIDialogs.toast("Sync server changes require a restart");
                         }, UIDialogs.ActionStyle.PRIMARY),
                     )

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

@@ -8,7 +8,9 @@ import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.WorkManager
 import com.caoccao.javet.values.primitive.V8ValueInteger
 import com.caoccao.javet.values.primitive.V8ValueString
+import com.futo.platformplayer.activities.DeveloperActivity
 import com.futo.platformplayer.activities.MainActivity
+import com.futo.platformplayer.activities.SettingsActivity
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
 import com.futo.platformplayer.api.media.models.video.IPlatformVideo
@@ -18,8 +20,6 @@ import com.futo.platformplayer.api.media.platforms.js.SourcePluginDescriptor
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.background.BackgroundWorker
 import com.futo.platformplayer.engine.V8Plugin
-import com.futo.platformplayer.fragment.mainactivity.main.DeveloperFragment
-import com.futo.platformplayer.fragment.mainactivity.main.SettingsFragment
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.serializers.FlexibleBooleanSerializer
 import com.futo.platformplayer.states.StateAnnouncement
@@ -97,10 +97,10 @@ class SettingsDev : FragmentedStorageFileJson() {
         fun subscriptionsCache5000() {
             Logger.i("SettingsDev", "Started caching 5000 sub items");
             UIDialogs.toast(
-                StateApp.instance.activity!!,
+                SettingsActivity.getActivity()!!,
                 "Started caching 5000 sub items"
             );
-            val button = DeveloperFragment.currentView?.getField("subscription_cache_button");
+            val button = DeveloperActivity.getActivity()?.getField("subscription_cache_button");
             if(button is ButtonField)
                 button.setButtonEnabled(false);
             StateApp.instance.scope.launch(Dispatchers.IO) {
@@ -121,7 +121,7 @@ class SettingsDev : FragmentedStorageFileJson() {
                                 val diff = System.currentTimeMillis() - lastToast;
                                 lastToast = System.currentTimeMillis();
                                 UIDialogs.toast(
-                                    StateApp.instance.activity!!,
+                                    SettingsActivity.getActivity()!!,
                                     "Page: ${page}, Total: ${total}, Speed: ${diff}ms"
                                 );
                             }
@@ -130,7 +130,7 @@ class SettingsDev : FragmentedStorageFileJson() {
 
                     withContext(Dispatchers.Main) {
                         UIDialogs.toast(
-                            StateApp.instance.activity!!,
+                            SettingsActivity.getActivity()!!,
                             "FINISHED Page: ${page}, Total: ${total}"
                         );
                     }
@@ -152,10 +152,10 @@ class SettingsDev : FragmentedStorageFileJson() {
         fun historyCache100() {
             Logger.i("SettingsDev", "Started caching 100 history items (from home)");
             UIDialogs.toast(
-                StateApp.instance.activity!!,
+                SettingsActivity.getActivity()!!,
                 "Started caching 100 history items (from home)"
             );
-            val button = DeveloperFragment.currentView?.getField("history_cache_button");
+            val button = DeveloperActivity.getActivity()?.getField("history_cache_button");
             if(button is ButtonField)
                 button.setButtonEnabled(false);
             StateApp.instance.scope.launch(Dispatchers.IO) {
@@ -186,7 +186,7 @@ class SettingsDev : FragmentedStorageFileJson() {
                                 val diff = System.currentTimeMillis() - lastToast;
                                 lastToast = System.currentTimeMillis();
                                 UIDialogs.toast(
-                                    StateApp.instance.activity!!,
+                                    SettingsActivity.getActivity()!!,
                                     "Page: ${page}, Total: ${total}, Speed: ${diff}ms"
                                 );
                             }
@@ -195,7 +195,7 @@ class SettingsDev : FragmentedStorageFileJson() {
 
                     withContext(Dispatchers.Main) {
                         UIDialogs.toast(
-                            StateApp.instance.activity!!,
+                            SettingsActivity.getActivity()!!,
                             "FINISHED Page: ${page}, Total: ${total}"
                         );
                     }
@@ -235,9 +235,9 @@ class SettingsDev : FragmentedStorageFileJson() {
     @FormField(R.string.test_background_worker, FieldForm.BUTTON,
         R.string.test_background_worker_description, 4)
     fun triggerBackgroundUpdate() {
-        val act = StateApp.instance.activity!!;
+        val act = SettingsActivity.getActivity()!!;
         try {
-            UIDialogs.toast(StateApp.instance.activity!!, "Starting test background worker");
+            UIDialogs.toast(SettingsActivity.getActivity()!!, "Starting test background worker");
 
             val wm = WorkManager.getInstance(act);
             val req = OneTimeWorkRequestBuilder<BackgroundWorker>()
@@ -251,9 +251,9 @@ class SettingsDev : FragmentedStorageFileJson() {
     @FormField(R.string.clear_channel_cache, FieldForm.BUTTON,
         R.string.test_background_worker_description, 4)
     fun clearChannelContentCache() {
-        UIDialogs.toast(StateApp.instance.activity!!, "Clearing cache");
+        UIDialogs.toast(SettingsActivity.getActivity()!!, "Clearing cache");
         StateCache.instance.clearToday();
-        UIDialogs.toast(StateApp.instance.activity!!, "Cleared");
+        UIDialogs.toast(SettingsActivity.getActivity()!!, "Cleared");
     }
 
 

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

@@ -370,19 +370,17 @@ class UIDialogs {
         }
 
 
-        fun showConfirmationDialog(context: Context, text: String, action: () -> Unit, cancelAction: (() -> Unit)? = null, dismissAction: (() -> Unit)? = null): AlertDialog {
+        fun showConfirmationDialog(context: Context, text: String, action: () -> Unit, cancelAction: (() -> Unit)? = null) {
             val confirmButtonAction = Action(context.getString(R.string.confirm), action, ActionStyle.PRIMARY)
             val cancelButtonAction = Action(context.getString(R.string.cancel), cancelAction ?: {}, ActionStyle.ACCENT)
-            return showDialog(context, R.drawable.ic_error, text, null, null, 0, cancelButtonAction, confirmButtonAction).apply {
-                setOnDismissListener { dismissAction?.invoke() }
-            }
+            showDialog(context, R.drawable.ic_error, text, null, null, 0, cancelButtonAction, confirmButtonAction)
         }
 
-        fun showConfirmationDialog(context: Context, text: String, action: () -> Unit, cancelAction: (() -> Unit)? = null, dismissAction: (() -> Unit)? = null, doNotAskAgainAction: (() -> Unit)? = null): AlertDialog {
+        fun showConfirmationDialog(context: Context, text: String, action: () -> Unit, cancelAction: (() -> Unit)? = null, doNotAskAgainAction: (() -> Unit)? = null) {
             val confirmButtonAction = Action(context.getString(R.string.confirm), action, ActionStyle.PRIMARY)
             val cancelButtonAction = Action(context.getString(R.string.cancel), cancelAction ?: {}, ActionStyle.ACCENT)
             val doNotAskAgain = Action(context.getString(R.string.do_not_ask_again), doNotAskAgainAction ?: {}, ActionStyle.NONE)
-            return showDialog(context, R.drawable.ic_error, text, null, null, 0, doNotAskAgain, cancelButtonAction, confirmButtonAction)
+            showDialog(context, R.drawable.ic_error, text, null, null, 0, doNotAskAgain, cancelButtonAction, confirmButtonAction)
         }
 
         fun showUpdateAvailableDialog(context: Context, lastVersion: Int, hideExceptionButtons: Boolean = false) {
@@ -405,6 +403,13 @@ class UIDialogs {
             dialog.setMaxVersion(lastVersion);
         }
 
+        fun showInstallDownloadedUpdateDialog(context: Context, apkFile: File) {
+            val dialog = AutoUpdateDialog(context);
+            registerDialogOpened(dialog);
+            dialog.setOnDismissListener { registerDialogClosed(dialog) };
+            dialog.showPredownloaded(apkFile);
+        }
+
         fun showMigrateDialog(context: Context, store: ManagedStore<*>, onConcluded: ()->Unit) {
             if(!store.hasMissingReconstructions())
                 onConcluded();

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

@@ -5,7 +5,6 @@ import android.content.ContentResolver
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
-import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.OptIn
@@ -15,6 +14,7 @@ import androidx.media3.exoplayer.hls.playlist.HlsMediaPlaylist
 import androidx.media3.exoplayer.hls.playlist.HlsMultivariantPlaylist
 import androidx.recyclerview.widget.RecyclerView
 import com.futo.platformplayer.activities.MainActivity
+import com.futo.platformplayer.activities.SettingsActivity
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.media.models.ResultCapabilities
 import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
@@ -74,9 +74,6 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.io.ByteArrayInputStream
 import androidx.core.net.toUri
-import com.futo.platformplayer.fragment.mainactivity.main.SettingsFragment
-import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuButtonList
-import kotlin.collections.toList
 
 class UISlideOverlays {
     companion object {
@@ -334,9 +331,15 @@ class UISlideOverlays {
                                             0,
                                             UIDialogs.Action("Cancel", {}),
                                             UIDialogs.Action("Configure", {
-                                                StateApp.instance.activity?.let {
-                                                    it.navigate(it.getFragment<SettingsFragment>(), mainContext.getString(R.string.background_update))
-                                                }
+                                                val intent = Intent(
+                                                    mainContext,
+                                                    SettingsActivity::class.java
+                                                );
+                                                intent.putExtra(
+                                                    "query",
+                                                    mainContext.getString(R.string.background_update)
+                                                );
+                                                mainContext.startActivity(intent);
                                             }, UIDialogs.ActionStyle.PRIMARY)
                                         );
                                     }
@@ -576,51 +579,6 @@ class UISlideOverlays {
                 return null;
             }
 
-
-            val allLanguages = videoSources?.map { it.language }?.distinct() ?: listOf();
-            val langResCombinations = if(videoSources != null) allLanguages.flatMap {
-                    lang -> videoSources
-                .filter { v -> v.language == lang }
-                .map { it.height * it.width }
-                .distinct()
-                .map { res -> Pair(res, lang) }
-            } else listOf();
-            var videoSourceItems = mutableListOf<SlideUpMenuItem>();
-            var selectedLanguage: String? = null;
-            val languageFilters = if(allLanguages.filter { it != null }.count() > 1)
-                SlideUpMenuButtonList(container.context, null, "language_filter", true).apply {
-                    var languageFilterLabels = allLanguages.filterNotNull().toList();
-                    val english = languageFilterLabels.find { it?.lowercase() == "en" };
-                    val originalLanguage = videoSources?.find { it.original == true }?.language;
-                    val primaryLanguage = Settings.instance.playback.getPrimaryLanguage();
-                    val hasPrimaryLanguage = videoSources?.any { it.language == primaryLanguage } ?: false;
-
-                    if(english != null)
-                        languageFilterLabels = listOf(english).plus(languageFilterLabels.filter { it != english }).toList();
-                    if(primaryLanguage != null && languageFilterLabels.contains(primaryLanguage))
-                        languageFilterLabels = listOf(primaryLanguage).plus(languageFilterLabels.filter { it != primaryLanguage }).toList();
-                    if(originalLanguage != null)
-                        languageFilterLabels = listOf(originalLanguage).plus(languageFilterLabels.filter { it != originalLanguage }).toList();
-                    Log.i(TAG, "Language filtesr: ${languageFilterLabels.joinToString(", ")}");
-                    selectedLanguage = originalLanguage ?: (if(hasPrimaryLanguage) primaryLanguage else null);
-                    setButtons(languageFilterLabels, selectedLanguage);
-                    onClick.subscribe { selected ->
-                        setSelected(selected);
-
-                        videoSourceItems.forEach {
-                            val item = it.itemTag;
-                            if(item is IVideoSource) {
-                                if(item.language == selected)
-                                    it.visibility = View.VISIBLE;
-                                else
-                                    it.visibility = View.GONE;
-                            }
-                        }
-                    }
-                }
-            else null;
-
-            if(languageFilters != null) items.add(languageFilters)
             items.add(SlideUpMenuGroup(container.context, container.context.getString(R.string.video), videoSources,
                 listOf((if (audioSources != null) listOf(SlideUpMenuItem(
                     container.context,
@@ -657,13 +615,7 @@ class UISlideOverlays {
                                         menu?.setOk(container.context.getString(R.string.download));
                                 },
                                 invokeParent = false
-                            ).apply {
-                                videoSourceItems.add(this);
-                                if(selectedLanguage != null) {
-                                    if(it.language != selectedLanguage)
-                                        this.visibility = View.GONE;
-                                }
-                            }
+                            )
                         }
 
                         is JSDashManifestRawSource -> {
@@ -683,13 +635,7 @@ class UISlideOverlays {
                                         menu?.setOk(container.context.getString(R.string.download));
                                 },
                                 invokeParent = false
-                            ).apply {
-                                videoSourceItems.add(this);
-                                if(selectedLanguage != null) {
-                                    if(it.language != selectedLanguage)
-                                        this.visibility = View.GONE;
-                                }
-                            }
+                            )
                         }
 
                         is IHLSManifestSource -> {
@@ -703,13 +649,7 @@ class UISlideOverlays {
                                     showHlsPicker(video, it, it.url, container)
                                 },
                                 invokeParent = false
-                            ).apply {
-                                videoSourceItems.add(this);
-                                if(selectedLanguage != null) {
-                                    if(it.language != selectedLanguage)
-                                        this.visibility = View.GONE;
-                                }
-                            }
+                            )
                         }
 
                         else -> {

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

@@ -1,63 +0,0 @@
-package com.futo.platformplayer
-
-import android.content.BroadcastReceiver
-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)
-
-        val cancelIntent = Intent(context, UpdateDownloadService::class.java).apply {
-            putExtra(UpdateDownloadService.EXTRA_CANCEL, true)
-            putExtra(UpdateDownloadService.EXTRA_VERSION, version)
-        }
-        ContextCompat.startForegroundService(context, cancelIntent)
-
-        NotificationManagerCompat.from(context).cancel(UpdateNotificationManager.NOTIF_ID_DOWNLOADING)
-    }
-}

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

@@ -1,64 +0,0 @@
-package com.futo.platformplayer
-
-import android.content.Context
-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
-
-class UpdateCheckWorker(appContext: Context, workerParams: WorkerParameters) : CoroutineWorker(appContext, workerParams) {
-
-    override suspend fun doWork(): Result {
-        if (!Settings.instance.autoUpdate.isAutoUpdateEnabled()) {
-            Logger.i(TAG, "Auto-update disabled, skipping worker run")
-            return Result.success()
-        }
-
-        return withContext(Dispatchers.IO) {
-            try {
-                val client = ManagedHttpClient()
-                val latestVersion = StateUpdate.Companion.instance.downloadVersionCode(client)
-
-                if (latestVersion == null) {
-                    Logger.w(TAG, "Failed to fetch latest version in worker")
-                    return@withContext Result.retry()
-                }
-
-                val currentVersion = BuildConfig.VERSION_CODE
-                Logger.i(TAG, "Worker check: current=$currentVersion, latest=$latestVersion")
-
-                if (latestVersion <= currentVersion) {
-                    return@withContext Result.success()
-                }
-
-                UpdateNotificationManager.showUpdateAvailableNotification(applicationContext, 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)
-                            }
-                        }
-                    }
-                }
-
-                Result.success()
-            } catch (t: Throwable) {
-                Logger.w(TAG, "Exception in UpdateCheckWorker", t)
-                Result.retry()
-            }
-        }
-    }
-
-    companion object {
-        private const val TAG = "UpdateCheckWorker"
-        const val UNIQUE_WORK_NAME = "updateCheck"
-    }
-}

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

@@ -1,261 +0,0 @@
-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 com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.states.StateApp
-import com.futo.platformplayer.states.StateUpdate
-import kotlinx.coroutines.*
-import java.io.File
-import java.io.FileOutputStream
-import java.net.HttpURLConnection
-import java.net.URL
-
-class UpdateDownloadService : Service() {
-
-    companion object {
-        private const val TAG = "UpdateDownloadService"
-        const val EXTRA_VERSION = "version"
-        const val EXTRA_CANCEL = "cancel"
-        private const val MAX_RETRIES = 5
-        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()
-    private val scope = CoroutineScope(Dispatchers.IO + job)
-
-    @Volatile
-    private var isDownloading: Boolean = false
-
-    @Volatile
-    private var cancelRequested: Boolean = false
-
-    private var lastProgressUpdateElapsedMs: Long = 0L
-
-    override fun onBind(intent: Intent?): IBinder? = null
-
-    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        if (intent == null) {
-            stopSelf()
-            return START_NOT_STICKY
-        }
-
-        if (intent.getBooleanExtra(EXTRA_CANCEL, false)) {
-            cancelRequested = true
-            Logger.i(TAG, "Download cancel requested")
-            stopForeground(Service.STOP_FOREGROUND_REMOVE)
-            stopSelf()
-            return START_NOT_STICKY
-        }
-
-        val version = intent.getIntExtra(EXTRA_VERSION, 0)
-        if (version == 0) {
-            stopSelf()
-            return START_NOT_STICKY
-        }
-
-        if (isDownloading) {
-            Logger.i(TAG, "Download already in progress, ignoring new start")
-            return START_STICKY
-        }
-
-        isDownloading = true
-        cancelRequested = false
-
-        val notification = UpdateNotificationManager.buildDownloadProgressNotification(this, version, 0, true)
-        startForeground(UpdateNotificationManager.NOTIF_ID_DOWNLOADING, notification)
-
-        scope.launch {
-            downloadApk(version)
-        }
-
-        return START_STICKY
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        job.cancel()
-    }
-
-    private fun throttledUpdateDownloadProgress(version: Int, progress: Int, indeterminate: Boolean) {
-        val now = SystemClock.elapsedRealtime()
-        val force = progress == 100 && !indeterminate
-
-        if (force || now - lastProgressUpdateElapsedMs >= MIN_PROGRESS_UPDATE_INTERVAL_MS) {
-            lastProgressUpdateElapsedMs = now
-            UpdateNotificationManager.updateDownloadProgress(this, version, progress, indeterminate)
-        }
-    }
-
-    private suspend fun downloadApk(version: Int) {
-        val apkFile = StateUpdate.getApkFile(this, version)
-        val partialFile = StateUpdate.getPartialApkFile(this, version)
-
-        try {
-            if (apkFile.exists() && apkFile.length() > 0L) {
-                Logger.i(TAG, "APK already downloaded at ${apkFile.absolutePath}")
-                onDownloadComplete(version, apkFile)
-                return
-            }
-
-            var backoffMs = INITIAL_BACKOFF_MS
-
-            for (attempt in 0 until MAX_RETRIES) {
-                if (cancelRequested) {
-                    Logger.i(TAG, "Download cancelled before attempt ${attempt + 1}")
-                    break
-                }
-
-                try {
-                    performDownload(StateUpdate.APK_URL, partialFile, version)
-
-                    if (!cancelRequested) {
-                        if (apkFile.exists()) {
-                            apkFile.delete()
-                        }
-                        if (!partialFile.renameTo(apkFile)) {
-                            throw IllegalStateException("Failed to rename partial APK file")
-                        }
-                        onDownloadComplete(version, apkFile)
-                    }
-                    break
-                } catch (t: Throwable) {
-                    if (cancelRequested) {
-                        Logger.i(TAG, "Download cancelled by user", t)
-                        break
-                    }
-
-                    if (attempt == MAX_RETRIES - 1) {
-                        Logger.e(TAG, "Download failed after ${attempt + 1} attempts", t)
-                        UpdateNotificationManager.showDownloadFailedNotification(this, version, t)
-                        break
-                    } else {
-                        Logger.w(TAG, "Download attempt ${attempt + 1} failed, retrying in ${backoffMs / 1000}s", t)
-                        delay(backoffMs)
-                        backoffMs *= 2
-                    }
-                }
-            }
-        } finally {
-            isDownloading = false
-            cancelRequested = false
-            stopForeground(Service.STOP_FOREGROUND_REMOVE)
-            stopSelf()
-        }
-    }
-
-    private fun performDownload(url: String, partialFile: File, version: Int) {
-        var startOffset = if (partialFile.exists()) partialFile.length() else 0L
-        Logger.i(TAG, "Starting download. url=$url, existingBytes=$startOffset")
-
-        var connection: HttpURLConnection? = null
-        try {
-            connection = (URL(url).openConnection() as HttpURLConnection).apply {
-                connectTimeout = 15_000
-                readTimeout = 30_000
-                if (startOffset > 0L) {
-                    setRequestProperty("Range", "bytes=$startOffset-")
-                }
-            }
-
-            connection.connect()
-            val responseCode = connection.responseCode
-
-            if (responseCode == HttpURLConnection.HTTP_OK && startOffset > 0L) {
-                Logger.w(TAG, "Server ignored Range header, restarting download from scratch")
-                partialFile.delete()
-                startOffset = 0L
-            } else if (responseCode != HttpURLConnection.HTTP_OK &&
-                responseCode != HttpURLConnection.HTTP_PARTIAL) {
-                throw IllegalStateException("Unexpected HTTP response code $responseCode")
-            }
-
-            val contentLength = connection.contentLengthLong
-            val totalBytes = if (contentLength > 0L) startOffset + contentLength else -1L
-
-            val buffer = ByteArray(BUFFER_SIZE)
-            var downloaded = 0L
-            var lastProgress = -1
-
-            connection.inputStream.use { input ->
-                FileOutputStream(partialFile, startOffset > 0L).use { output ->
-                    while (!cancelRequested) {
-                        val read = input.read(buffer)
-                        if (read == -1) {
-                            break
-                        }
-                        output.write(buffer, 0, read)
-                        downloaded += read
-
-                        if (totalBytes > 0L) {
-                            val progress = (((startOffset + downloaded) * 100L) / totalBytes).toInt()
-                            if (progress != lastProgress) {
-                                lastProgress = progress
-                                val safeProgress = when {
-                                    progress < 0 -> 0
-                                    progress > 100 -> 100
-                                    else -> progress
-                                }
-                                throttledUpdateDownloadProgress(version, safeProgress, indeterminate = false)
-                            }
-                        } else {
-                            throttledUpdateDownloadProgress(version, progress = 0, indeterminate = true)
-                        }
-                    }
-
-                    if (!cancelRequested && totalBytes > 0L) {
-                        val finalProgress = 100
-                        throttledUpdateDownloadProgress(version, finalProgress, indeterminate = false)
-                    }
-
-                    output.flush()
-                }
-            }
-
-            if (cancelRequested) {
-                throw CancellationException("Download cancelled")
-            }
-
-            if (totalBytes > 0L && startOffset + downloaded < totalBytes) {
-                throw IllegalStateException("Download incomplete: expected=$totalBytes, got=${startOffset + downloaded}")
-            }
-        } finally {
-            connection?.disconnect()
-        }
-    }
-
-    private fun onDownloadComplete(version: Int, apkFile: File) {
-        Logger.i(TAG, "Download complete for version=$version, file=${apkFile.absolutePath}")
-        UpdateNotificationManager.showDownloadCompleteNotification(this, 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));
-                    } catch (t: Throwable) {
-                        Logger.w(TAG, "Failed to show in-app update downloaded dialog", t)
-                        updateDownloadedDialog = null
-                    }
-                }
-            }
-        }
-    }
-}

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

@@ -1,122 +0,0 @@
-package com.futo.platformplayer
-
-import android.annotation.SuppressLint
-import android.app.PendingIntent.FLAG_MUTABLE
-import android.app.PendingIntent.FLAG_UPDATE_CURRENT
-import android.app.PendingIntent.getBroadcast
-import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageInstaller
-import android.graphics.drawable.Animatable
-import android.provider.Settings
-import android.view.View
-import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.receivers.InstallReceiver
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import java.io.File
-import java.io.InputStream
-import androidx.core.net.toUri
-import com.futo.platformplayer.dialogs.AutoUpdateDialog
-import com.futo.platformplayer.states.StateApp
-
-object UpdateInstaller {
-    private const val TAG = "UpdateInstaller"
-
-    @SuppressLint("RequestInstallPackagesPolicy")
-    fun startInstall(context: Context, version: Int, apkFile: File) {
-        if (!apkFile.exists()) {
-            Logger.w(TAG, "APK file does not exist: ${apkFile.absolutePath}")
-            UIDialogs.toast(context, "Update file missing")
-            UpdateNotificationManager.showInstallFailedNotification(context, version, apkFile, "APK file does not exist.")
-            return
-        }
-
-        if (BuildConfig.IS_PLAYSTORE_BUILD) {
-            UIDialogs.toast(context, "Updates are managed by the Play Store")
-            UpdateNotificationManager.showInstallFailedNotification(context, version, apkFile, "Updates are managed by the Play Store.")
-            return
-        }
-
-        try {
-            val pm = context.packageManager
-            if (!pm.canRequestPackageInstalls()) {
-                UIDialogs.toast(context, "Allow this app to install updates, then try again")
-                UpdateNotificationManager.showInstallFailedNotification(context, version, apkFile, "Install update permission was missing.")
-
-                val intent = Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES).apply {
-                    data = "package:${context.packageName}".toUri()
-                    addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                }
-                context.startActivity(intent)
-                return
-            }
-        } catch (t: Throwable) {
-            Logger.e(TAG, "Failed to check unknown sources permission", t)
-        }
-
-        GlobalScope.launch(Dispatchers.IO) {
-            var inputStream: InputStream? = null
-            var session: PackageInstaller.Session? = null
-            try {
-
-                val packageInstaller: PackageInstaller = context.packageManager.packageInstaller
-                val params = PackageInstaller.SessionParams(PackageInstaller.SessionParams.MODE_FULL_INSTALL)
-                val sessionId = packageInstaller.createSession(params)
-                session = packageInstaller.openSession(sessionId)
-
-                inputStream = apkFile.inputStream()
-                val dataLength = apkFile.length()
-
-                session.openWrite("package", 0, dataLength).use { sessionStream ->
-                    inputStream.copyToOutputStream(dataLength, sessionStream) { _ -> }
-                    session.fsync(sessionStream)
-                }
-
-                val intent = Intent(context, InstallReceiver::class.java).apply {
-                    putExtra(UpdateNotificationManager.EXTRA_VERSION, version)
-                    putExtra(UpdateNotificationManager.EXTRA_APK_PATH, apkFile.absolutePath)
-                }
-                val pendingIntent = getBroadcast(context, 0, intent, FLAG_MUTABLE or FLAG_UPDATE_CURRENT)
-                val statusReceiver = pendingIntent.intentSender
-
-                InstallReceiver.onReceiveResult.subscribe(this) { message ->
-                    InstallReceiver.onReceiveResult.clear();
-                    onReceiveResult(context, version, apkFile, message);
-                };
-                Logger.i(TAG, "Committing install session for ${apkFile.absolutePath}")
-                session.commit(statusReceiver)
-            } catch (e: Throwable) {
-                Logger.w(TAG, "Exception while installing update", e)
-                session?.abandon()
-                withContext(Dispatchers.Main) {
-                    UIDialogs.toast(context, "Failed to install update: ${e.message}")
-                }
-
-                UpdateNotificationManager.showInstallFailedNotification(context, version, apkFile, e.message)
-            } finally {
-                session?.close()
-                inputStream?.close()
-            }
-        }
-    }
-
-    private fun onReceiveResult(context: Context, version: Int, apkFile: File, result: String?) {
-        try {
-            InstallReceiver.onReceiveResult.remove(this)
-
-            if (result.isNullOrEmpty()) {
-                Logger.i(TAG, "Update install finished successfully")
-                UpdateNotificationManager.showInstallSucceededNotification(context, version)
-            } else {
-                Logger.w(TAG, "Update install failed: $result")
-                UpdateNotificationManager.showInstallFailedNotification(context, version, apkFile, result)
-                UIDialogs.showGeneralErrorDialog(context, "Install failed due to:\n$result")
-            }
-        } catch (e: Throwable) {
-            Logger.e(TAG, "Failed to handle install result", e)
-        }
-    }
-}

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

@@ -1,233 +0,0 @@
-package com.futo.platformplayer
-
-import android.Manifest
-import android.app.Notification
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.app.PendingIntent
-import android.app.PendingIntent.FLAG_MUTABLE
-import android.app.PendingIntent.FLAG_UPDATE_CURRENT
-import android.app.PendingIntent.getBroadcast
-import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageManager
-import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationManagerCompat
-import androidx.core.content.ContextCompat
-import com.futo.platformplayer.activities.InstallUpdateActivity
-import java.io.File
-
-object UpdateNotificationManager {
-    private const val CHANNEL_ID = "app_updates"
-    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
-
-    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
-    const val NOTIF_ID_INSTALL_SUCCEEDED = 2005
-
-    fun ensureChannel(context: Context) {
-        val manager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-        if (manager.getNotificationChannel(CHANNEL_ID) == null) {
-            val channel = NotificationChannel(CHANNEL_ID, CHANNEL_NAME, NotificationManager.IMPORTANCE_DEFAULT).apply {
-                description = CHANNEL_DESCRIPTION
-                enableVibration(false)
-                enableLights(false)
-                setSound(null, null)
-            }
-            manager.createNotificationChannel(channel)
-        }
-    }
-
-    fun showInstallSucceededNotification(context: Context, version: Int) {
-        if (ContextCompat.checkSelfPermission(context, Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
-            return
-        }
-
-        ensureChannel(context)
-
-        val launchIntent = context.packageManager
-            .getLaunchIntentForPackage(context.packageName)
-            ?.apply {
-                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED)
-            }
-
-        val launchPendingIntent = launchIntent?.let {
-            PendingIntent.getActivity(context, REQUEST_CODE_INSTALL, it, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
-        }
-
-        val builder = NotificationCompat.Builder(context, CHANNEL_ID)
-            .setSmallIcon(R.drawable.foreground)
-            .setContentTitle("Update installed")
-            .setContentText("Version $version installed. Tap to open.")
-            .setPriority(NotificationCompat.PRIORITY_DEFAULT)
-            .setAutoCancel(true)
-            .setSilent(true)
-
-        if (launchPendingIntent != null) {
-            builder.setContentIntent(launchPendingIntent)
-            builder.addAction(0, "Open app", launchPendingIntent)
-        }
-
-        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)
-
-        val cancelIntent = Intent(context, UpdateActionReceiver::class.java).apply {
-            action = ACTION_DOWNLOAD_CANCEL
-            putExtra(EXTRA_VERSION, version)
-        }
-        val cancelPendingIntent = getBroadcast(
-            context,
-            3,
-            cancelIntent,
-            FLAG_MUTABLE or FLAG_UPDATE_CURRENT
-        )
-
-        val builder = NotificationCompat.Builder(context, CHANNEL_ID)
-            .setSmallIcon(R.drawable.foreground)
-            .setContentTitle("Downloading update")
-            .setContentText("Downloading version $version")
-            .setPriority(NotificationCompat.PRIORITY_DEFAULT)
-            .setOngoing(true)
-            .setSilent(true)
-            .addAction(0, "Cancel", cancelPendingIntent)
-
-        if (indeterminate) {
-            builder.setProgress(0, 0, true)
-        } else {
-            builder.setProgress(100, progress, false)
-        }
-
-        return builder.build()
-    }
-
-    fun updateDownloadProgress(context: Context, version: Int, progress: Int, indeterminate: Boolean) {
-        if (ContextCompat.checkSelfPermission(context, Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
-            return
-        }
-        val notification = buildDownloadProgressNotification(context, version, progress, indeterminate)
-        NotificationManagerCompat.from(context).notify(NOTIF_ID_DOWNLOADING, notification)
-    }
-
-
-    fun showDownloadCompleteNotification(context: Context, version: Int, apkFile: File) {
-        if (ContextCompat.checkSelfPermission(context, Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
-            return
-        }
-        ensureChannel(context)
-
-        val installIntent = InstallUpdateActivity.createIntent(context, version, apkFile.absolutePath)
-        val installPendingIntent = PendingIntent.getActivity(context, REQUEST_CODE_INSTALL, installIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
-
-        val builder = NotificationCompat.Builder(context, CHANNEL_ID)
-            .setSmallIcon(R.drawable.foreground)
-            .setContentTitle("Update downloaded")
-            .setContentText("Tap to install version $version.")
-            .setPriority(NotificationCompat.PRIORITY_DEFAULT)
-            .setContentIntent(installPendingIntent)
-            .setAutoCancel(true)
-            .setSilent(true)
-            .addAction(0, "Install", installPendingIntent)
-
-        NotificationManagerCompat.from(context).notify(NOTIF_ID_READY, builder.build())
-    }
-
-
-    fun showDownloadFailedNotification(context: Context, version: Int, error: Throwable?) {
-        if (ContextCompat.checkSelfPermission(context, Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
-            return
-        }
-        ensureChannel(context)
-
-        val builder = NotificationCompat.Builder(context, CHANNEL_ID)
-            .setSmallIcon(R.drawable.foreground)
-            .setContentTitle("Failed to download update")
-            .setContentText(error?.message ?: "Unknown error")
-            .setPriority(NotificationCompat.PRIORITY_DEFAULT)
-            .setAutoCancel(true)
-            .setSilent(true)
-
-        NotificationManagerCompat.from(context).notify(NOTIF_ID_READY, builder.build())
-    }
-
-    fun showInstallFailedNotification(context: Context, version: Int, apkFile: File, error: String?) {
-        if (ContextCompat.checkSelfPermission(context, Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED)
-            return
-
-        ensureChannel(context)
-
-        val installIntent = InstallUpdateActivity.createIntent(context, version, apkFile.absolutePath)
-        val installPendingIntent = PendingIntent.getActivity(context, REQUEST_CODE_INSTALL, installIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
-        val builder = NotificationCompat.Builder(context, CHANNEL_ID)
-            .setSmallIcon(R.drawable.foreground)
-            .setContentTitle("Failed to install update")
-            .setContentText(if (error != null && error.isNotBlank()) "$error Tap to try again." else "Tap to try again.")
-            .setAutoCancel(true)
-            .setSilent(true)
-            .setContentIntent(installPendingIntent)
-            .addAction(0, "Install again", installPendingIntent)
-
-        NotificationManagerCompat.from(context).notify(NOTIF_ID_INSTALL_FAILED, builder.build())
-    }
-
-    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/Utility.kt

@@ -5,6 +5,8 @@ import android.content.Context
 import android.content.Intent
 import android.content.res.Resources
 import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.icu.util.Output
 import android.os.Build
 import android.os.Looper
 import android.os.OperationCanceledException
@@ -42,9 +44,6 @@ import java.util.*
 import java.util.concurrent.ThreadLocalRandom
 import java.util.zip.GZIPInputStream
 import java.util.zip.GZIPOutputStream
-import androidx.core.graphics.scale
-import com.bumptech.glide.RequestBuilder
-import com.bumptech.glide.load.resource.bitmap.DownsampleStrategy
 
 private val _allowedCharacters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz ";
 fun getRandomString(sizeOfRandomString: Int): String {
@@ -102,7 +101,7 @@ fun String.isHexColor(): Boolean {
 
 fun IPlatformClient.fromPool(pool: PlatformMultiClientPool) = pool.getClientPooled(this);
 
-fun IPlatformVideo.withTimestamp(sec: Long) = PlatformVideoWithTime(this, sec);
+fun IPlatformVideo.withTimestamp(sec: Long) =  PlatformVideoWithTime(this, sec);
 
 fun DocumentFile.getInputStream(context: Context) = context.contentResolver.openInputStream(this.uri);
 fun DocumentFile.getOutputStream(context: Context) = context.contentResolver.openOutputStream(this.uri);
@@ -115,6 +114,23 @@ fun DocumentFile.writeBytes(context: Context, byteArray: ByteArray) = context.co
     it.flush();
 };
 
+fun loadBitmap(url: String): Bitmap {
+    try {
+        val client = ManagedHttpClient();
+        val response = client.get(url);
+        if (response.isOk && response.body != null) {
+            val bitmapStream = response.body.byteStream();
+            val bitmap = BitmapFactory.decodeStream(bitmapStream);
+            return bitmap;
+        } else {
+            throw Exception("Failed to find data at URL.");
+        }
+    } catch (e: Throwable) {
+        Logger.w("Utility", "Exception thrown while downloading bitmap.", e);
+        throw e;
+    }
+}
+
 fun TextView.setPlatformPlayerLinkMovementMethod(context: Context) {
     this.movementMethod = PlatformLinkMovementMethod(context);
 }
@@ -442,11 +458,4 @@ fun addressScore(addr: InetAddress): Int {
     }
 }
 
-fun <T> Enumeration<T>.toList(): List<T> = Collections.list(this)
-
-fun <T> RequestBuilder<T>.withMaxSizePx(maxSizePx: Int = 1920): RequestBuilder<T> {
-    return this;
-        //.downsample(DownsampleStrategy.AT_MOST)
-        //.override(maxSizePx, maxSizePx)
-        //.centerInside()
-}
+fun <T> Enumeration<T>.toList(): List<T> = Collections.list(this)

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

@@ -107,9 +107,10 @@ class AddSourceActivity : AppCompatActivity() {
         onNewIntent(intent);
     }
 
-    override fun onNewIntent(intent: Intent) {
+    override fun onNewIntent(intent: Intent?) {
         super.onNewIntent(intent)
-        var url = intent.dataString;
+        var url = intent?.dataString;
+
         if(url == null)
             UIDialogs.showDialog(this, R.drawable.ic_error, getString(R.string.no_valid_url_provided), null, null,
                 0, UIDialogs.Action(getString(R.string.ok), { finish() }, UIDialogs.ActionStyle.PRIMARY));

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

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

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

@@ -1,49 +0,0 @@
-package com.futo.platformplayer.activities
-
-import android.content.Context
-import android.content.Intent
-import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
-import com.futo.platformplayer.UIDialogs
-import com.futo.platformplayer.UpdateInstaller
-import com.futo.platformplayer.UpdateNotificationManager
-import com.futo.platformplayer.logging.Logger
-import java.io.File
-
-class InstallUpdateActivity : AppCompatActivity() {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        UpdateNotificationManager.cancelAll(this)
-
-        val version = intent.getIntExtra(UpdateNotificationManager.EXTRA_VERSION, 0)
-        val apkPath = intent.getStringExtra(UpdateNotificationManager.EXTRA_APK_PATH)
-
-        if (version == 0 || apkPath.isNullOrEmpty()) {
-            Logger.w("InstallUpdateActivity", "Missing version or apkPath")
-            finish()
-            return
-        }
-
-        val apkFile = File(apkPath)
-        if (!apkFile.exists()) {
-            Logger.w("InstallUpdateActivity", "APK file does not exist: $apkPath")
-            UIDialogs.Companion.toast(this, "Update file missing")
-            finish()
-            return
-        }
-
-        UpdateInstaller.startInstall(this, version, apkFile)
-        finish()
-    }
-
-    companion object {
-        fun createIntent(context: Context, version: Int, apkPath: String): Intent =
-            Intent(context, InstallUpdateActivity::class.java).apply {
-                putExtra(UpdateNotificationManager.EXTRA_VERSION, version)
-                putExtra(UpdateNotificationManager.EXTRA_APK_PATH, apkPath)
-                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            }
-    }
-}

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

@@ -8,7 +8,6 @@ import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
 import android.content.pm.PackageManager
 import android.content.res.Configuration
-import android.graphics.Color
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
@@ -53,28 +52,17 @@ import com.futo.platformplayer.fragment.mainactivity.main.CommentsFragment
 import com.futo.platformplayer.fragment.mainactivity.main.ContentSearchResultsFragment
 import com.futo.platformplayer.fragment.mainactivity.main.CreatorSearchResultsFragment
 import com.futo.platformplayer.fragment.mainactivity.main.CreatorsFragment
-import com.futo.platformplayer.fragment.mainactivity.main.DeveloperFragment
 import com.futo.platformplayer.fragment.mainactivity.main.DownloadsFragment
 import com.futo.platformplayer.fragment.mainactivity.main.HistoryFragment
 import com.futo.platformplayer.fragment.mainactivity.main.HomeFragment
 import com.futo.platformplayer.fragment.mainactivity.main.ImportPlaylistsFragment
 import com.futo.platformplayer.fragment.mainactivity.main.ImportSubscriptionsFragment
-import com.futo.platformplayer.fragment.mainactivity.main.LibraryAlbumFragment
-import com.futo.platformplayer.fragment.mainactivity.main.LibraryAlbumsFragment
-import com.futo.platformplayer.fragment.mainactivity.main.LibraryArtistFragment
-import com.futo.platformplayer.fragment.mainactivity.main.LibraryArtistsFragment
-import com.futo.platformplayer.fragment.mainactivity.main.LibraryFilesFragment
-import com.futo.platformplayer.fragment.mainactivity.main.LibraryFragment
-import com.futo.platformplayer.fragment.mainactivity.main.LibrarySearchFragment
-import com.futo.platformplayer.fragment.mainactivity.main.LibraryVideosFragment
-import com.futo.platformplayer.fragment.mainactivity.main.LoginFragment
 import com.futo.platformplayer.fragment.mainactivity.main.MainFragment
 import com.futo.platformplayer.fragment.mainactivity.main.PlaylistFragment
 import com.futo.platformplayer.fragment.mainactivity.main.PlaylistSearchResultsFragment
 import com.futo.platformplayer.fragment.mainactivity.main.PlaylistsFragment
 import com.futo.platformplayer.fragment.mainactivity.main.PostDetailFragment
 import com.futo.platformplayer.fragment.mainactivity.main.RemotePlaylistFragment
-import com.futo.platformplayer.fragment.mainactivity.main.SettingsFragment
 import com.futo.platformplayer.fragment.mainactivity.main.ShortsFragment
 import com.futo.platformplayer.fragment.mainactivity.main.SourceDetailFragment
 import com.futo.platformplayer.fragment.mainactivity.main.SourcesFragment
@@ -88,7 +76,6 @@ import com.futo.platformplayer.fragment.mainactivity.main.VideoDetailFragment.St
 import com.futo.platformplayer.fragment.mainactivity.main.WatchLaterFragment
 import com.futo.platformplayer.fragment.mainactivity.main.WebDetailFragment
 import com.futo.platformplayer.fragment.mainactivity.topbar.AddTopBarFragment
-import com.futo.platformplayer.fragment.mainactivity.topbar.FilesTopBarFragment
 import com.futo.platformplayer.fragment.mainactivity.topbar.GeneralTopBarFragment
 import com.futo.platformplayer.fragment.mainactivity.topbar.ImportTopBarFragment
 import com.futo.platformplayer.fragment.mainactivity.topbar.NavigationTopBarFragment
@@ -160,7 +147,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
     lateinit var _fragTopBarNavigation: NavigationTopBarFragment;
     lateinit var _fragTopBarImport: ImportTopBarFragment;
     lateinit var _fragTopBarAdd: AddTopBarFragment;
-    lateinit var _fragTopBarFiles: FilesTopBarFragment;
 
     //Frags BotBar
     lateinit var _fragBotBarMenu: MenuBottomBarFragment;
@@ -193,17 +179,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
     lateinit var _fragBuy: BuyFragment;
     lateinit var _fragSubGroup: SubscriptionGroupFragment;
     lateinit var _fragSubGroupList: SubscriptionGroupListFragment;
-    lateinit var _fragLibrary: LibraryFragment;
-    lateinit var _fragLibraryAlbums: LibraryAlbumsFragment;
-    lateinit var _fragLibraryAlbum: LibraryAlbumFragment;
-    lateinit var _fragLibraryArtists: LibraryArtistsFragment;
-    lateinit var _fragLibraryArtist: LibraryArtistFragment;
-    lateinit var _fragLibraryVideos: LibraryVideosFragment;
-    lateinit var _fragLibrarySearch: LibrarySearchFragment;
-    lateinit var _fragLibraryFiles: LibraryFilesFragment;
-    lateinit var _fragSettings: SettingsFragment;
-    lateinit var _fragDeveloper: DeveloperFragment;
-    lateinit var _fragLogin: LoginFragment;
 
     lateinit var _fragBrowser: BrowserFragment;
 
@@ -212,7 +187,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
 
     //State
     private val _queue: LinkedList<Pair<MainFragment, Any?>> = LinkedList();
-    var fragCurrent: MainFragment? = null; private set;
+    lateinit var fragCurrent: MainFragment private set;
     private var _parameterCurrent: Any? = null;
 
     var fragBeforeOverlay: MainFragment? = null; private set;
@@ -300,7 +275,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
     @UnstableApi
     override fun onCreate(savedInstanceState: Bundle?) {
         Logger.w(TAG, "MainActivity Starting [$mainId]");
-
         StateApp.instance.setGlobalContext(this, lifecycleScope, mainId);
         StateApp.instance.mainAppStarting(this);
 
@@ -320,10 +294,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             }
         }
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            window.isNavigationBarContrastEnforced = false
-        }
-
         //Preload common files to memory
         FragmentedStorage.get<SubscriptionStorage>();
         FragmentedStorage.get<Settings>();
@@ -348,7 +318,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         _fragTopBarNavigation = NavigationTopBarFragment.newInstance();
         _fragTopBarImport = ImportTopBarFragment.newInstance();
         _fragTopBarAdd = AddTopBarFragment.newInstance();
-        _fragTopBarFiles = FilesTopBarFragment.newInstance();
 
         //BotBars
         _fragBotBarMenu = MenuBottomBarFragment.newInstance();
@@ -381,17 +350,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         _fragBuy = BuyFragment.newInstance();
         _fragSubGroup = SubscriptionGroupFragment.newInstance();
         _fragSubGroupList = SubscriptionGroupListFragment.newInstance();
-        _fragLibrary = LibraryFragment.newInstance();
-        _fragLibraryAlbums = LibraryAlbumsFragment.newInstance();
-        _fragLibraryAlbum = LibraryAlbumFragment.newInstance();
-        _fragLibraryArtists = LibraryArtistsFragment.newInstance();
-        _fragLibraryArtist = LibraryArtistFragment.newInstance();
-        _fragLibraryVideos = LibraryVideosFragment.newInstance();
-        _fragLibraryFiles = LibraryFilesFragment.newInstance();
-        _fragLibrarySearch = LibrarySearchFragment.newInstance();
-        _fragSettings = SettingsFragment.newInstance();
-        _fragDeveloper = DeveloperFragment.newInstance();
-        _fragLogin = LoginFragment.newInstance();
 
         _fragBrowser = BrowserFragment.newInstance();
 
@@ -410,17 +368,12 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             updateSegmentPaddings();
         };
         _fragVideoDetail.onTransitioning.subscribe {
-            if (it || _fragVideoDetail.state != VideoDetailFragment.State.MINIMIZED) {
-                Logger.i(TAG, "onTransition Setting elevation higher");
+            if (it || _fragVideoDetail.state != VideoDetailFragment.State.MINIMIZED)
                 _fragContainerOverlay.elevation =
                     TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 15f, resources.displayMetrics);
-            }
-            else {
-                Logger.i(TAG, "onTransition Setting elevation lower");
+            else
                 _fragContainerOverlay.elevation =
                     TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 5f, resources.displayMetrics);
-            }
-
         }
 
         _fragVideoDetail.onCloseEvent.subscribe {
@@ -528,16 +481,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         _fragImportSubscriptions.topBar = _fragTopBarImport;
         _fragImportPlaylists.topBar = _fragTopBarImport;
         _fragSubGroupList.topBar = _fragTopBarAdd;
-        _fragLibrary.topBar = _fragTopBarGeneral;
-        _fragLibraryAlbums.topBar = _fragTopBarNavigation;
-        _fragLibraryAlbum.topBar = _fragTopBarNavigation;
-        _fragLibraryArtists.topBar = _fragTopBarNavigation;
-        _fragLibraryArtist.topBar = _fragTopBarNavigation;
-        _fragLibraryVideos.topBar = _fragTopBarNavigation;
-        _fragLibraryFiles.topBar = _fragTopBarFiles;
-        _fragLibrarySearch.topBar = _fragTopBarSearch;
-        _fragSettings.topBar = _fragTopBarNavigation;
-        _fragDeveloper.topBar = _fragTopBarNavigation;
 
         _fragBrowser.topBar = _fragTopBarNavigation;
 
@@ -563,7 +506,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         defaultTab.action(_fragBotBarMenu);
         StateSubscriptions.instance;
 
-        fragCurrent?.onShown(null, false);
+        fragCurrent.onShown(null, false);
 
         //Other stuff
         rootView.progress = 0f;
@@ -618,10 +561,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             sharedPreferences.edit().putBoolean("IsFirstBoot", false).apply()
         }
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU && Settings.instance.autoUpdate.isAutoUpdateEnabled() && Settings.instance.autoUpdate.shouldBackgroundDownload) {
-            requestNotificationPermissions("You have enabled background updating.\n\nGrayjay uses notifications to inform you when a new app update is available.");
-        }
-
         val submissionStatus = FragmentedStorage.get<StringStorage>("subscriptionSubmissionStatus")
 
         val numSubscriptions = StateSubscriptions.instance.getSubscriptionCount()
@@ -769,13 +708,17 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         _wasStopped = true;
     }
 
-    override fun onNewIntent(intent: Intent) {
+    override fun onNewIntent(intent: Intent?) {
         super.onNewIntent(intent);
         handleIntent(intent);
     }
 
-    private fun handleIntent(intent: Intent) {
+    private fun handleIntent(intent: Intent?) {
+        if (intent == null)
+            return;
         Logger.i(TAG, "handleIntent started by " + intent.action);
+
+
         var targetData: String? = null;
 
         when (intent.action) {
@@ -1154,7 +1097,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         if (_fragVideoDetail.state == VideoDetailFragment.State.MAXIMIZED && _fragVideoDetail.onBackPressed())
             return;
 
-        if (!(fragCurrent?.onBackPressed() ?: true))
+        if (!fragCurrent.onBackPressed())
             closeSegment();
     }
 
@@ -1205,11 +1148,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         }
     }
 
-    inline fun <reified T : Fragment> navigate(parameter: Any? = null, withHistory: Boolean = true, isBack: Boolean = false) {
-        val segment = getFragment<T>();
-        navigate(segment as MainFragment, parameter, withHistory, isBack);
-    }
-
     /**
      * Navigate takes a MainFragment, and makes them the current main visible view
      * A parameter can be provided which becomes available in the onShow of said fragment
@@ -1232,27 +1170,27 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
                 return;
             }
 
-            fragCurrent?.onHide();
+            fragCurrent.onHide();
 
             if (segment.isMainView) {
                 var transaction = supportFragmentManager.beginTransaction();
                 if (segment.topBar != null) {
-                    if (segment.topBar != fragCurrent?.topBar) {
+                    if (segment.topBar != fragCurrent.topBar) {
                         transaction = transaction
                             .show(segment.topBar as Fragment)
                             .replace(R.id.fragment_top_bar, segment.topBar as Fragment);
-                        fragCurrent?.topBar?.onHide();
+                        fragCurrent.topBar?.onHide();
                     }
-                } else if (fragCurrent?.topBar != null)
-                    transaction.hide(fragCurrent?.topBar as Fragment);
+                } else if (fragCurrent.topBar != null)
+                    transaction.hide(fragCurrent.topBar as Fragment);
 
                 transaction = transaction.replace(R.id.fragment_main, segment);
 
                 if (segment.hasBottomBar) {
-                    if (!(fragCurrent?.hasBottomBar ?: false))
+                    if (!fragCurrent.hasBottomBar)
                         transaction = transaction.show(_fragBotBarMenu);
                 } else {
-                    if (fragCurrent?.hasBottomBar ?: false)
+                    if (fragCurrent.hasBottomBar)
                         transaction = transaction.hide(_fragBotBarMenu);
                 }
                 transaction.commitNow();
@@ -1265,10 +1203,10 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
                 }
             }
 
-            if (fragCurrent?.isHistory ?: false && withHistory && _queue.lastOrNull() != fragCurrent)
-                _queue.add(Pair(fragCurrent!!, _parameterCurrent));
+            if (fragCurrent.isHistory && withHistory && _queue.lastOrNull() != fragCurrent)
+                _queue.add(Pair(fragCurrent, _parameterCurrent));
 
-            if (segment.isOverlay && !(fragCurrent?.isOverlay ?: false) && withHistory)// && fragCurrent.isHistory)
+            if (segment.isOverlay && !fragCurrent.isOverlay && withHistory)// && fragCurrent.isHistory)
                 fragBeforeOverlay = fragCurrent;
 
             fragCurrent = segment;
@@ -1299,24 +1237,11 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
                 navigate(last.first, last.second, false, true);
             } else {
                 if (_fragVideoDetail.state == VideoDetailFragment.State.CLOSED) {
-                    Logger.i(TAG, "Closing activity because _fragVideoDetail.state == closed");
                     finish();
                 } else {
-                    //UIDialogs.toast("Grayjay continues in background because of an open video.")
-                    if(Settings.instance.playback.isBackgroundPictureInPicture()) {
-                        try {
-                            _fragVideoDetail._viewDetail?.startPictureInPicture();
-                            _fragVideoDetail?.forcePictureInPicture();
-                        } catch (ex: Throwable) {
-                        } //Fail silently
-                    }
-                    else
-                     moveTaskToBack(false);
-                    /*
                     UIDialogs.showConfirmationDialog(this, "There is a video playing, are you sure you want to exit the app?", {
                         finish();
                     })
-                    */
                 }
             }
         }
@@ -1335,7 +1260,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             VideoDetailFragment::class -> _fragVideoDetail as T;
             MenuBottomBarFragment::class -> _fragBotBarMenu as T;
             GeneralTopBarFragment::class -> _fragTopBarGeneral as T;
-            FilesTopBarFragment::class -> _fragTopBarFiles as T;
             SearchTopBarFragment::class -> _fragTopBarSearch as T;
             CreatorsFragment::class -> _fragMainSubscriptions as T;
             CommentsFragment::class -> _fragMainComments as T;
@@ -1360,17 +1284,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             BuyFragment::class -> _fragBuy as T;
             SubscriptionGroupFragment::class -> _fragSubGroup as T;
             SubscriptionGroupListFragment::class -> _fragSubGroupList as T;
-            LibraryFragment::class -> _fragLibrary as T;
-            LibraryAlbumsFragment::class -> _fragLibraryAlbums as T;
-            LibraryAlbumFragment::class -> _fragLibraryAlbum as T;
-            LibraryArtistsFragment::class -> _fragLibraryArtists as T;
-            LibraryArtistFragment::class -> _fragLibraryArtist as T;
-            LibraryVideosFragment::class -> _fragLibraryVideos as T;
-            LibraryFilesFragment::class -> _fragLibraryFiles as T;
-            LibrarySearchFragment::class -> _fragLibrarySearch as T;
-            SettingsFragment:: class -> _fragSettings as T;
-            DeveloperFragment::class -> _fragDeveloper as T;
-            LoginFragment::class -> _fragLogin as T;
             else -> throw IllegalArgumentException("Fragment type ${T::class.java.name} is not available in MainActivity");
         }
     }
@@ -1378,7 +1291,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
 
     private fun updateSegmentPaddings() {
         var paddingBottom = 0f;
-        if (fragCurrent?.hasBottomBar ?: false)
+        if (fragCurrent.hasBottomBar)
             paddingBottom += HEIGHT_MENU_DP;
 
         _fragContainerOverlay.setPadding(
@@ -1395,23 +1308,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         );
     }
 
-    var _callbackPermissionAudio: ((Boolean)->Unit)? = null;
-    var _callbackPermissionVideo: ((Boolean)->Unit)? = null;
-    val permissionReqAudio = registerForActivityResult(ActivityResultContracts.RequestPermission(), { isGranted ->
-        _callbackPermissionAudio?.invoke(isGranted);
-    });
-    val permissionReqVideo = registerForActivityResult(ActivityResultContracts.RequestPermission(), { isGranted ->
-        _callbackPermissionVideo?.invoke(isGranted);
-    });
-    fun requestPermissionAudio(cb: ((Boolean)->Unit)? = null) {
-        _callbackPermissionAudio = cb;
-        permissionReqAudio.launch(android.Manifest.permission.READ_MEDIA_AUDIO);
-    }
-    fun requestPermissionVideo(cb: ((Boolean)->Unit)? = null) {
-        _callbackPermissionVideo = cb;
-        permissionReqVideo.launch(android.Manifest.permission.READ_MEDIA_VIDEO);
-    }
-
 
     val notifPermission = "android.permission.POST_NOTIFICATIONS";
     val requestPermissionLauncher =  registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted: Boolean ->

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

@@ -13,18 +13,15 @@ import android.view.View
 import android.widget.ImageButton
 import android.widget.ImageView
 import android.widget.TextView
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.R
-import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.setNavigationBarColorAndIcons
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StateApp.Companion.withContext
 import com.futo.platformplayer.states.StatePolycentric
 import com.futo.platformplayer.views.buttons.BigButton
-import com.futo.platformplayer.activities.QRCodeFullscreenActivity
 import com.futo.polycentric.core.ContentType
 import com.futo.polycentric.core.SignedEvent
 import com.futo.polycentric.core.StorageTypeCRDTItem
@@ -32,10 +29,8 @@ import com.futo.polycentric.core.StorageTypeCRDTSetItem
 import com.futo.polycentric.core.Store
 import com.futo.polycentric.core.toBase64Url
 import com.google.zxing.BarcodeFormat
-import com.google.zxing.EncodeHintType
 import com.google.zxing.MultiFormatWriter
 import com.google.zxing.common.BitMatrix
-import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -46,27 +41,11 @@ import userpackage.Protocol.URLInfo
 class PolycentricBackupActivity : AppCompatActivity() {
     private lateinit var _buttonShare: BigButton;
     private lateinit var _buttonCopy: BigButton;
-    private lateinit var _buttonExportFile: BigButton;
     private lateinit var _imageQR: ImageView;
     private lateinit var _exportBundle: String;
     private lateinit var _textQR: TextView;
-    private lateinit var _textQRHint: TextView;
     private lateinit var _loader: View
 
-    private val _createDocumentLauncher = registerForActivityResult(ActivityResultContracts.CreateDocument("text/plain")) { uri ->
-        uri?.let { fileUri ->
-            try {
-                contentResolver.openOutputStream(fileUri)?.use { outputStream ->
-                    outputStream.write(_exportBundle.toByteArray())
-                }
-                UIDialogs.toast(this, getString(R.string.profile_saved_successfully))
-            } catch (e: Exception) {
-                Logger.e(TAG, "Failed to write to document", e)
-                UIDialogs.toast(this, "Failed to save profile: ${e.message}")
-            }
-        }
-    }
-
     override fun attachBaseContext(newBase: Context?) {
         super.attachBaseContext(StateApp.instance.getLocaleContext(newBase))
     }
@@ -78,10 +57,8 @@ class PolycentricBackupActivity : AppCompatActivity() {
 
         _buttonShare = findViewById(R.id.button_share)
         _buttonCopy = findViewById(R.id.button_copy)
-        _buttonExportFile = findViewById(R.id.button_export_file)
         _imageQR = findViewById(R.id.image_qr)
         _textQR = findViewById(R.id.text_qr)
-        _textQRHint = findViewById(R.id.text_qr_hint)
         _loader = findViewById(R.id.progress_loader)
         findViewById<ImageButton>(R.id.button_back).setOnClickListener {
             finish();
@@ -89,23 +66,14 @@ class PolycentricBackupActivity : AppCompatActivity() {
 
         _imageQR.visibility = View.INVISIBLE
         _textQR.visibility = View.INVISIBLE
-        _textQRHint.visibility = View.INVISIBLE
         _loader.visibility = View.VISIBLE
         _buttonShare.visibility = View.INVISIBLE
         _buttonCopy.visibility = View.INVISIBLE
-        _buttonExportFile.visibility = View.INVISIBLE
 
         lifecycleScope.launch {
-            val bundle = withContext(Dispatchers.IO) { createExportBundle() }
-            _exportBundle = bundle
-            Logger.i(TAG, "Export bundle created, length: ${bundle.length}")
-            
             try {
                 val pair = withContext(Dispatchers.IO) {
-                    if (!isContentSuitableForQRCode(bundle)) {
-                        throw Exception("Data too big for QR code generation")
-                    }
-                    
+                    val bundle = createExportBundle()
                     val dimension = TypedValue.applyDimension(
                         TypedValue.COMPLEX_UNIT_DIP, 200f, resources.displayMetrics
                     ).toInt()
@@ -113,35 +81,18 @@ class PolycentricBackupActivity : AppCompatActivity() {
                     Pair(bundle, qr)
                 }
 
+                _exportBundle = pair.first
                 _imageQR.setImageBitmap(pair.second)
                 _imageQR.visibility = View.VISIBLE
                 _textQR.visibility = View.VISIBLE
-                _textQRHint.visibility = View.VISIBLE
                 _buttonShare.visibility = View.VISIBLE
                 _buttonCopy.visibility = View.VISIBLE
-                
-                _imageQR.setOnClickListener {
-                    val intent = QRCodeFullscreenActivity.createIntent(this@PolycentricBackupActivity, _exportBundle)
-                    startActivity(intent)
-                }
             } catch (e: Exception) {
-                val byteSize = bundle.toByteArray(Charsets.UTF_8).size
-                Logger.e(TAG, "QR code generation failed. Bundle length: ${bundle.length} chars, ${byteSize} bytes, Error: ${e.message}", e)
-                
-                if (e.message?.contains("Data too big") == true) {
-                    _textQR.text = getString(R.string.qr_code_too_large_use_file_export)
-                    _buttonExportFile.visibility = View.VISIBLE
-                } else {
-                    _textQR.text = getString(R.string.failed_to_generate_qr_code)
-                }
-                
-                _textQR.visibility = View.VISIBLE
-                _textQRHint.visibility = View.INVISIBLE
-                _buttonShare.visibility = View.VISIBLE
-                _buttonCopy.visibility = View.VISIBLE
-                
-                // Hide QR image since generation failed
+                Logger.e(TAG, getString(R.string.failed_to_generate_qr_code), e)
                 _imageQR.visibility = View.INVISIBLE
+                _textQR.visibility = View.INVISIBLE
+                _buttonShare.visibility = View.INVISIBLE
+                _buttonCopy.visibility = View.INVISIBLE
             } finally {
                 _loader.visibility = View.GONE
             }
@@ -157,29 +108,11 @@ class PolycentricBackupActivity : AppCompatActivity() {
             val clip = ClipData.newPlainText(getString(R.string.copied_text), _exportBundle);
             clipboard.setPrimaryClip(clip);
         };
-
-        _buttonExportFile.onClick.subscribe {
-            val fileName = "polycentric_profile_${System.currentTimeMillis()}.txt"
-            _createDocumentLauncher.launch(fileName)
-        };
-    }
-
-    private fun isContentSuitableForQRCode(content: String): Boolean {
-        val bytes = content.toByteArray(Charsets.UTF_8)
-        return bytes.size <= 2300  // QR Code Version 40 with Error Correction Level M can hold ~2331 bytes
     }
 
     private fun generateQRCode(content: String, width: Int, height: Int): Bitmap {
-        if (!isContentSuitableForQRCode(content)) {
-            throw Exception("Data too big for QR code generation")
-        }
-        
-        val hints = java.util.EnumMap<EncodeHintType, Any>(EncodeHintType::class.java)
-        hints[EncodeHintType.ERROR_CORRECTION] = ErrorCorrectionLevel.M
-        hints[EncodeHintType.MARGIN] = 1
-        
-        val bitMatrix = MultiFormatWriter().encode(content, BarcodeFormat.QR_CODE, width, height, hints)
-        return bitMatrixToBitmap(bitMatrix)
+        val bitMatrix = MultiFormatWriter().encode(content, BarcodeFormat.QR_CODE, width, height);
+        return bitMatrixToBitmap(bitMatrix);
     }
 
     private fun bitMatrixToBitmap(matrix: BitMatrix): Bitmap {
@@ -270,8 +203,7 @@ class PolycentricBackupActivity : AppCompatActivity() {
             .setBody(exportBundle.toByteString())
             .build();
 
-        val data = urlInfo.toByteArray()
-        return "polycentric://" + data.toBase64Url()
+        return "polycentric://" + urlInfo.toByteArray().toBase64Url()
     }
 
     companion object {

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

@@ -32,166 +32,100 @@ import userpackage.Protocol
 import userpackage.Protocol.ExportBundle
 
 class PolycentricImportProfileActivity : AppCompatActivity() {
-    private lateinit var _buttonHelp: ImageButton
-    private lateinit var _buttonScanProfile: LinearLayout
-    private lateinit var _buttonImportFile: LinearLayout
-    private lateinit var _buttonImportProfile: LinearLayout
-    private lateinit var _editProfile: EditText
-    private lateinit var _loaderOverlay: LoaderOverlay
+    private lateinit var _buttonHelp: ImageButton;
+    private lateinit var _buttonScanProfile: LinearLayout;
+    private lateinit var _buttonImportProfile: LinearLayout;
+    private lateinit var _editProfile: EditText;
+    private lateinit var _loaderOverlay: LoaderOverlay;
 
-    private val _qrCodeResultLauncher =
-            registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-                val scanResult =
-                        IntentIntegrator.parseActivityResult(result.resultCode, result.data)
-                scanResult?.let {
-                    if (it.contents != null) {
-                        val scannedUrl = it.contents
-                        import(scannedUrl)
-                    }
-                }
-            }
-
-    private val _filePickerLauncher =
-            registerForActivityResult(ActivityResultContracts.GetContent()) { uri ->
-                uri?.let { fileUri ->
-                    try {
-                        // Check file size before reading
-                        val fileSize =
-                                contentResolver.openFileDescriptor(fileUri, "r")?.statSize ?: 0
-                        val maxFileSize = 10 * 1024 * 1024 // 10MB limit
-
-                        if (fileSize > maxFileSize) {
-                            UIDialogs.toast(this, "File too large. Maximum size is 10MB.")
-                            return@let
-                        }
-
-                        if (fileSize == 0L) {
-                            UIDialogs.toast(this, "Selected file is empty.")
-                            return@let
-                        }
-
-                        val content =
-                                contentResolver
-                                        .openInputStream(fileUri)
-                                        ?.bufferedReader()
-                                        ?.readText()
-                        content?.let { fileContent ->
-                            val trimmedContent = fileContent.trim()
-
-                            // Check if content is empty after trimming
-                            if (trimmedContent.isEmpty()) {
-                                UIDialogs.toast(this, "Selected file contains no data.")
-                                return@let
-                            }
-
-                            // Check if content looks like a valid polycentric URL
-                            if (!trimmedContent.startsWith("polycentric://")) {
-                                UIDialogs.toast(
-                                        this,
-                                        "Selected file does not contain a valid polycentric profile URL."
-                                )
-                                return@let
-                            }
-
-                            import(trimmedContent)
-                        }
-                                ?: run { UIDialogs.toast(this, "Could not read file content.") }
-                    } catch (e: SecurityException) {
-                        Logger.e(TAG, "Security exception reading file", e)
-                        UIDialogs.toast(this, "Permission denied to read file.")
-                    } catch (e: OutOfMemoryError) {
-                        Logger.e(TAG, "Out of memory reading file", e)
-                        UIDialogs.toast(this, "File too large to process.")
-                    } catch (e: Exception) {
-                        Logger.e(TAG, "Failed to read file", e)
-                        UIDialogs.toast(this, "Failed to read file: ${e.message}")
-                    }
-                }
+    private val _qrCodeResultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+        val scanResult = IntentIntegrator.parseActivityResult(result.resultCode, result.data)
+        scanResult?.let {
+            if (it.contents != null) {
+                val scannedUrl = it.contents
+                import(scannedUrl)
             }
+        }
+    }
 
     override fun attachBaseContext(newBase: Context?) {
         super.attachBaseContext(StateApp.instance.getLocaleContext(newBase))
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_polycentric_import_profile)
-        setNavigationBarColorAndIcons()
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_polycentric_import_profile);
+        setNavigationBarColorAndIcons();
 
-        _buttonHelp = findViewById(R.id.button_help)
-        _buttonScanProfile = findViewById(R.id.button_scan_profile)
-        _buttonImportFile = findViewById(R.id.button_import_file)
-        _buttonImportProfile = findViewById(R.id.button_import_profile)
-        _loaderOverlay = findViewById(R.id.loader_overlay)
-        _editProfile = findViewById(R.id.edit_profile)
-        findViewById<ImageButton>(R.id.button_back).setOnClickListener { finish() }
+        _buttonHelp = findViewById(R.id.button_help);
+        _buttonScanProfile = findViewById(R.id.button_scan_profile);
+        _buttonImportProfile = findViewById(R.id.button_import_profile);
+        _loaderOverlay = findViewById(R.id.loader_overlay);
+        _editProfile = findViewById(R.id.edit_profile);
+        findViewById<ImageButton>(R.id.button_back).setOnClickListener {
+            finish();
+        };
 
         _buttonHelp.setOnClickListener {
-            startActivity(Intent(this, PolycentricWhyActivity::class.java))
-        }
+            startActivity(Intent(this, PolycentricWhyActivity::class.java));
+        };
 
         _buttonScanProfile.setOnClickListener {
             val integrator = IntentIntegrator(this)
             integrator.setDesiredBarcodeFormats(IntentIntegrator.QR_CODE)
             integrator.setPrompt(getString(R.string.scan_a_qr_code))
-            integrator.setOrientationLocked(true)
+            integrator.setOrientationLocked(true);
             integrator.setCameraId(0)
             integrator.setBeepEnabled(false)
             integrator.setBarcodeImageEnabled(true)
-            integrator.setCaptureActivity(QRCaptureActivity::class.java)
+            integrator.setCaptureActivity(QRCaptureActivity::class.java);
             _qrCodeResultLauncher.launch(integrator.createScanIntent())
-        }
-
-        _buttonImportFile.setOnClickListener { _filePickerLauncher.launch("text/plain") }
+        };
 
         _buttonImportProfile.setOnClickListener {
             if (_editProfile.text.isEmpty()) {
-                UIDialogs.toast(this, getString(R.string.text_field_does_not_contain_any_data))
-                return@setOnClickListener
+                UIDialogs.toast(this, getString(R.string.text_field_does_not_contain_any_data));
+                return@setOnClickListener;
             }
 
-            import(_editProfile.text.toString())
-        }
+            import(_editProfile.text.toString());
+        };
 
-        val url = intent.getStringExtra("url")
+        val url = intent.getStringExtra("url");
         if (url != null) {
-            import(url)
+            import(url);
         }
     }
 
     private fun import(url: String) {
         if (!url.startsWith("polycentric://")) {
-            UIDialogs.toast(this, getString(R.string.not_a_valid_url))
-            return
+            UIDialogs.toast(this, getString(R.string.not_a_valid_url));
+            return;
         }
 
         _loaderOverlay.show()
 
         lifecycleScope.launch(Dispatchers.IO) {
             try {
-                val data = url.substring("polycentric://".length).base64UrlToByteArray()
-                val urlInfo = Protocol.URLInfo.parseFrom(data)
-
+                val data = url.substring("polycentric://".length).base64UrlToByteArray();
+                val urlInfo = Protocol.URLInfo.parseFrom(data);
                 if (urlInfo.urlType != 3L) {
                     throw Exception("Expected urlInfo struct of type ExportBundle")
                 }
 
-                val exportBundle = ExportBundle.parseFrom(urlInfo.body)
-                val keyPair = KeyPair.fromProto(exportBundle.keyPair)
+                val exportBundle = ExportBundle.parseFrom(urlInfo.body);
+                val keyPair = KeyPair.fromProto(exportBundle.keyPair);
 
-                val existingProcessSecret = Store.instance.getProcessSecret(keyPair.publicKey)
+                val existingProcessSecret = Store.instance.getProcessSecret(keyPair.publicKey);
                 if (existingProcessSecret != null) {
                     withContext(Dispatchers.Main) {
-                        UIDialogs.toast(
-                                this@PolycentricImportProfileActivity,
-                                getString(R.string.this_profile_is_already_imported)
-                        )
+                        UIDialogs.toast(this@PolycentricImportProfileActivity, getString(R.string.this_profile_is_already_imported));
                     }
-                    return@launch
+                    return@launch;
                 }
 
-                val processSecret = ProcessSecret(keyPair, Process.random())
-                Store.instance.addProcessSecret(processSecret)
+                val processSecret = ProcessSecret(keyPair, Process.random());
+                Store.instance.addProcessSecret(processSecret);
 
                 try {
                     PolycentricStorage.instance.addProcessSecret(processSecret)
@@ -199,43 +133,37 @@ class PolycentricImportProfileActivity : AppCompatActivity() {
                     Logger.e(TAG, "Failed to save process secret to secret storage.", e)
                 }
 
-                val processHandle = processSecret.toProcessHandle()
+                val processHandle = processSecret.toProcessHandle();
 
                 for (e in exportBundle.events.eventsList) {
                     try {
-                        val se = SignedEvent.fromProto(e)
-                        Store.instance.putSignedEvent(se)
+                        val se = SignedEvent.fromProto(e);
+                        Store.instance.putSignedEvent(se);
                     } catch (e: Throwable) {
-                        Logger.w(TAG, "Ignored invalid event", e)
+                        Logger.w(TAG, "Ignored invalid event", e);
                     }
                 }
 
-                StatePolycentric.instance.setProcessHandle(processHandle)
-                processHandle.fullyBackfillClient(ApiMethods.SERVER)
+                StatePolycentric.instance.setProcessHandle(processHandle);
+                processHandle.fullyBackfillClient(ApiMethods.SERVER);
                 withContext(Dispatchers.Main) {
-                    startActivity(
-                            Intent(
-                                    this@PolycentricImportProfileActivity,
-                                    PolycentricProfileActivity::class.java
-                            )
-                    )
-                    finish()
+                    startActivity(Intent(this@PolycentricImportProfileActivity, PolycentricProfileActivity::class.java));
+                    finish();
                 }
             } catch (e: Throwable) {
-                Logger.w(TAG, "Failed to import profile", e)
+                Logger.w(TAG, "Failed to import profile", e);
                 withContext(Dispatchers.Main) {
-                    UIDialogs.toast(
-                            this@PolycentricImportProfileActivity,
-                            getString(R.string.failed_to_import_profile) + " '${e.message}'"
-                    )
+                    UIDialogs.toast(this@PolycentricImportProfileActivity, getString(R.string.failed_to_import_profile) + " '${e.message}'");
                 }
             } finally {
-                withContext(Dispatchers.Main) { _loaderOverlay.hide() }
+                withContext(Dispatchers.Main) {
+                    _loaderOverlay.hide();
+                }
             }
         }
     }
 
     companion object {
-        private const val TAG = "PolycentricImportProfileActivity"
+        private const val TAG = "PolycentricImportProfileActivity";
     }
-}
+}

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

@@ -1,147 +0,0 @@
-package com.futo.platformplayer.activities
-
-import android.content.Context
-import android.os.Bundle
-import android.widget.ImageButton
-import android.widget.SeekBar
-import android.widget.TextView
-import androidx.appcompat.app.AppCompatActivity
-import com.futo.platformplayer.polycentric.ModerationsManager
-import com.futo.platformplayer.R
-import com.futo.platformplayer.states.StateApp
-import com.futo.platformplayer.setNavigationBarColorAndIcons
-
-class PolycentricModerationActivity : AppCompatActivity() {
-    private lateinit var _seekbarOffensive: SeekBar
-    private lateinit var _seekbarExplicit: SeekBar
-    private lateinit var _seekbarViolence: SeekBar
-    private lateinit var _textOffensiveDesc: TextView
-    private lateinit var _textExplicitDesc: TextView
-    private lateinit var _textViolenceDesc: TextView
-    private lateinit var _textOffensiveValue: TextView
-    private lateinit var _textExplicitValue: TextView
-    private lateinit var _textViolenceValue: TextView
-    private lateinit var _moderationsManager: ModerationsManager
-
-    override fun attachBaseContext(newBase: Context?) {
-        super.attachBaseContext(StateApp.instance.getLocaleContext(newBase))
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_polycentric_moderation)
-        setNavigationBarColorAndIcons()
-        
-        _moderationsManager = ModerationsManager.getInstance()
-        try {
-            _moderationsManager = ModerationsManager.getInstance()
-        } catch (e: IllegalStateException) {
-            finish()
-            return
-        }
-        
-        _seekbarOffensive = findViewById(R.id.seekbar_offensive)
-        _seekbarExplicit = findViewById(R.id.seekbar_explicit)
-        _seekbarViolence = findViewById(R.id.seekbar_violence)
-        _textOffensiveDesc = findViewById(R.id.text_offensive_desc)
-        _textExplicitDesc = findViewById(R.id.text_explicit_desc)
-        _textViolenceDesc = findViewById(R.id.text_violence_desc)
-        _textOffensiveValue = findViewById(R.id.text_offensive_value)
-        _textExplicitValue = findViewById(R.id.text_explicit_value)
-        _textViolenceValue = findViewById(R.id.text_violence_value)
-        
-        findViewById<ImageButton>(R.id.button_back).setOnClickListener {
-            finish()
-        }
-        
-        loadSettings()
-        setupListeners()
-    }
-    
-    private fun loadSettings() {
-        val levels = _moderationsManager.moderationLevels.value ?: mapOf()
-        
-        val offensiveLevel = levels["hate"] ?: 2
-        val explicitLevel = levels["sexual"] ?: 1
-        val violenceLevel = levels["violence"] ?: 1
-        
-        _seekbarOffensive.progress = offensiveLevel
-        _seekbarExplicit.progress = explicitLevel
-        _seekbarViolence.progress = violenceLevel
-        
-        updateDescriptionText(_seekbarOffensive, _textOffensiveDesc, _textOffensiveValue, getOffensiveDescriptions())
-        updateDescriptionText(_seekbarExplicit, _textExplicitDesc, _textExplicitValue, getExplicitDescriptions())
-        updateDescriptionText(_seekbarViolence, _textViolenceDesc, _textViolenceValue, getViolenceDescriptions())
-    }
-    
-    private fun setupListeners() {
-        _seekbarOffensive.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
-            override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
-                updateDescriptionText(seekBar, _textOffensiveDesc, _textOffensiveValue, getOffensiveDescriptions())
-                if (fromUser) {
-                    _moderationsManager.setModerationLevel("hate", progress)
-                }
-            }
-            
-            override fun onStartTrackingTouch(seekBar: SeekBar?) {}
-            override fun onStopTrackingTouch(seekBar: SeekBar?) {}
-        })
-        
-        _seekbarExplicit.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
-            override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
-                updateDescriptionText(seekBar, _textExplicitDesc, _textExplicitValue, getExplicitDescriptions())
-                if (fromUser) {
-                    _moderationsManager.setModerationLevel("sexual", progress)
-                }
-            }
-            
-            override fun onStartTrackingTouch(seekBar: SeekBar?) {}
-            override fun onStopTrackingTouch(seekBar: SeekBar?) {}
-        })
-        
-        _seekbarViolence.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
-            override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
-                updateDescriptionText(seekBar, _textViolenceDesc, _textViolenceValue, getViolenceDescriptions())
-                if (fromUser) {
-                    _moderationsManager.setModerationLevel("violence", progress)
-                }
-            }
-            
-            override fun onStartTrackingTouch(seekBar: SeekBar?) {}
-            override fun onStopTrackingTouch(seekBar: SeekBar?) {}
-        })
-    }
-    
-    private fun updateDescriptionText(seekBar: SeekBar?, textDesc: TextView, textValue: TextView, descriptions: Array<String>) {
-        val progress = seekBar?.progress ?: 0
-        textDesc.text = descriptions[progress]
-        textValue.text = progress.toString()
-    }
-    
-    private fun getOffensiveDescriptions(): Array<String> {
-        return arrayOf(
-            "Neutral, general terms, no bias or hate.",
-            "Mildly sensitive, factual.",
-            "Potentially offensive content",
-            "Offensive content"
-        )
-    }
-    
-    private fun getExplicitDescriptions(): Array<String> {
-        return arrayOf(
-            "No explicit content",
-            "Mildly suggestive, factual or educational",
-            "Moderate sexual content, non-graphic",
-            "Explicit sexual content"
-        )
-    }
-    
-    private fun getViolenceDescriptions(): Array<String> {
-        return arrayOf(
-            "Non-violent",
-            "Mild violence, factual or contextual",
-            "Moderate violence, some graphic content.",
-            "Graphic violence"
-        )
-    }
-} 

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

@@ -49,7 +49,7 @@ class PolycentricProfileActivity : AppCompatActivity() {
     private lateinit var _buttonHelp: ImageButton;
     private lateinit var _editName: EditText;
     private lateinit var _buttonExport: BigButton;
-    private lateinit var _buttonModeration: BigButton;
+    private lateinit var _buttonOpenHarborProfile: BigButton;
     private lateinit var _buttonLogout: BigButton;
     private lateinit var _buttonDelete: BigButton;
     private lateinit var _username: String;
@@ -71,7 +71,7 @@ class PolycentricProfileActivity : AppCompatActivity() {
         _imagePolycentric = findViewById(R.id.image_polycentric);
         _editName = findViewById(R.id.edit_profile_name);
         _buttonExport = findViewById(R.id.button_export);
-        _buttonModeration = findViewById(R.id.button_moderation);
+        _buttonOpenHarborProfile = findViewById(R.id.button_open_harbor_profile);
         _buttonLogout = findViewById(R.id.button_logout);
         _buttonDelete = findViewById(R.id.button_delete);
         _loaderOverlay = findViewById(R.id.loader_overlay);
@@ -99,9 +99,15 @@ class PolycentricProfileActivity : AppCompatActivity() {
             startActivity(Intent(this, PolycentricBackupActivity::class.java));
         };
 
-        _buttonModeration.onClick.subscribe {
-            startActivity(Intent(this, PolycentricModerationActivity::class.java));
-        };
+        _buttonOpenHarborProfile.onClick.subscribe {
+            val processHandle = StatePolycentric.instance.processHandle!!;
+            processHandle?.let {
+                val systemState = SystemState.fromStorageTypeSystemState(Store.instance.getSystemState(it.system));
+                val url = it.system.systemToURLInfoSystemLinkUrl(systemState.servers.asIterable());
+                val navUrl = "https://harbor.social/" + url.substring("polycentric://".length)
+                startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(navUrl)))
+            }
+        }
 
         _buttonLogout.onClick.subscribe {
             StatePolycentric.instance.setProcessHandle(null);

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

@@ -1,109 +0,0 @@
-package com.futo.platformplayer.activities
-
-import android.content.Context
-import android.graphics.Bitmap
-import android.graphics.Color
-import android.os.Bundle
-import android.util.TypedValue
-import android.view.View
-import android.widget.ImageButton
-import android.widget.ImageView
-import androidx.appcompat.app.AppCompatActivity
-import com.futo.platformplayer.R
-import com.futo.platformplayer.setNavigationBarColorAndIcons
-import com.futo.platformplayer.states.StateApp
-import com.google.zxing.BarcodeFormat
-import com.google.zxing.EncodeHintType
-import com.google.zxing.MultiFormatWriter
-import com.google.zxing.common.BitMatrix
-import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel
-
-class QRCodeFullscreenActivity : AppCompatActivity() {
-    companion object {
-        private const val EXTRA_QR_TEXT = "qr_text"
-        
-        fun createIntent(context: Context, qrText: String): android.content.Intent {
-            return android.content.Intent(context, QRCodeFullscreenActivity::class.java).apply {
-                putExtra(EXTRA_QR_TEXT, qrText)
-            }
-        }
-    }
-
-    override fun attachBaseContext(newBase: Context?) {
-        super.attachBaseContext(StateApp.instance.getLocaleContext(newBase))
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_qr_code_fullscreen)
-        setNavigationBarColorAndIcons()
-
-        val qrText = intent.getStringExtra(EXTRA_QR_TEXT)
-
-        val imageQR = findViewById<ImageView>(R.id.image_qr_fullscreen)
-        val buttonBack = findViewById<ImageButton>(R.id.button_back_fullscreen)
-        val buttonClose = findViewById<ImageButton>(R.id.button_close_fullscreen)
-
-        // Generate QR code bitmap from text
-        qrText?.let { text ->
-            try {
-                if (!isContentSuitableForQRCode(text)) {
-                    throw Exception("Data too big for QR code generation")
-                }
-                
-                val dimension = TypedValue.applyDimension(
-                    TypedValue.COMPLEX_UNIT_DIP, 300f, resources.displayMetrics
-                ).toInt()
-                val qrBitmap = generateQRCode(text, dimension, dimension)
-                imageQR.setImageBitmap(qrBitmap)
-            } catch (e: Exception) {
-                // If QR generation fails, show error or fallback
-                imageQR.setImageResource(R.drawable.ic_qr)
-            }
-        }
-
-        buttonBack.setOnClickListener {
-            finish()
-        }
-
-        buttonClose.setOnClickListener {
-            finish()
-        }
-
-        imageQR.setOnClickListener {
-            finish()
-        }
-    }
-
-    private fun isContentSuitableForQRCode(content: String): Boolean {
-        val bytes = content.toByteArray(Charsets.UTF_8)
-        return bytes.size <= 2300  // QR Code Version 40 with Error Correction Level M can hold ~2331 bytes
-    }
-
-    private fun generateQRCode(content: String, width: Int, height: Int): Bitmap {
-        if (!isContentSuitableForQRCode(content)) {
-            throw Exception("Data too big for QR code generation")
-        }
-        
-        val hints = java.util.EnumMap<EncodeHintType, Any>(EncodeHintType::class.java)
-        hints[EncodeHintType.ERROR_CORRECTION] = ErrorCorrectionLevel.M
-        hints[EncodeHintType.MARGIN] = 1
-        
-        val bitMatrix = MultiFormatWriter().encode(content, BarcodeFormat.QR_CODE, width, height, hints)
-        return bitMatrixToBitmap(bitMatrix)
-    }
-
-    private fun bitMatrixToBitmap(matrix: BitMatrix): Bitmap {
-        val width = matrix.width
-        val height = matrix.height
-        val bmp = Bitmap.createBitmap(width, height, Bitmap.Config.RGB_565)
-
-        for (x in 0 until width) {
-            for (y in 0 until height) {
-                bmp.setPixel(x, y, if (matrix[x, y]) Color.BLACK else Color.WHITE)
-            }
-        }
-        return bmp
-    }
-}
-

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

@@ -0,0 +1,208 @@
+package com.futo.platformplayer.activities
+
+import android.annotation.SuppressLint
+import android.app.NotificationManager
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.os.Bundle
+import android.view.View
+import android.widget.FrameLayout
+import android.widget.ImageButton
+import android.widget.LinearLayout
+import androidx.activity.result.ActivityResult
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
+import androidx.lifecycle.lifecycleScope
+import com.futo.platformplayer.*
+import com.futo.platformplayer.constructs.Event0
+import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.states.StateApp
+import com.futo.platformplayer.views.LoaderView
+import com.futo.platformplayer.views.fields.FieldForm
+import com.futo.platformplayer.views.fields.ReadOnlyTextField
+import com.google.android.material.button.MaterialButton
+
+class SettingsActivity : AppCompatActivity(), IWithResultLauncher {
+    private lateinit var _form: FieldForm;
+    private lateinit var _buttonBack: ImageButton;
+    private lateinit var _loaderView: LoaderView;
+
+    private lateinit var _devSets: LinearLayout;
+    private lateinit var _buttonDev: MaterialButton;
+
+    private var _isFinished = false;
+
+    lateinit var overlay: FrameLayout;
+
+    val notifPermission = "android.permission.POST_NOTIFICATIONS";
+    val requestPermissionLauncher =  registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted: Boolean ->
+        if (isGranted)
+            UIDialogs.toast(this, "Notification permission granted");
+        else
+            UIDialogs.toast(this, "Notification permission denied");
+    }
+
+    override fun attachBaseContext(newBase: Context?) {
+        Logger.i("SettingsActivity", "SettingsActivity.attachBaseContext")
+        super.attachBaseContext(StateApp.instance.getLocaleContext(newBase))
+    }
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_settings);
+        setNavigationBarColorAndIcons();
+
+        _form = findViewById(R.id.settings_form);
+        _buttonBack = findViewById(R.id.button_back);
+        _buttonDev = findViewById(R.id.button_dev);
+        _devSets = findViewById(R.id.dev_settings);
+        _loaderView = findViewById(R.id.loader);
+        overlay = findViewById(R.id.overlay_container);
+
+        _form.onChanged.subscribe { field, _ ->
+            Logger.i("SettingsActivity", "Setting [${field.field?.name}] changed, saving");
+            _form.setObjectValues();
+            Settings.instance.save();
+
+            if(field.descriptor?.id == "app_language") {
+                Logger.i("SettingsActivity", "App language change detected, propogating to shared preferences");
+                StateApp.instance.setLocaleSetting(this, Settings.instance.language.getAppLanguageLocaleString());
+            }
+
+            if(field.descriptor?.id == "background_update") {
+                Logger.i("SettingsActivity", "Detected change in background work ${field.value}");
+                if(Settings.instance.subscriptions.subscriptionsBackgroundUpdateInterval > 0) {
+                    val notifManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager;
+                    if(!notifManager.areNotificationsEnabled()) {
+                        UIDialogs.toast(this, "Notifications aren't enabled");
+
+                        when {
+                            ContextCompat.checkSelfPermission(this, notifPermission) == PackageManager.PERMISSION_GRANTED -> {
+
+                            }
+                            ActivityCompat.shouldShowRequestPermissionRationale(this, notifPermission) -> {
+                                UIDialogs.showDialog(this, R.drawable.ic_notifications, "Notifications Required",
+                                    "Notifications need to be enabled for background updating to function", null, 0,
+                                    UIDialogs.Action("Cancel", {}),
+                                    UIDialogs.Action("Enable", {
+                                        requestPermissionLauncher.launch(notifPermission);
+                                    }, UIDialogs.ActionStyle.PRIMARY));
+                            }
+                            else -> {
+                                requestPermissionLauncher.launch(notifPermission);
+                            }
+                        }
+                    }
+                }
+            }
+        };
+        _buttonBack.setOnClickListener {
+            finish();
+        }
+
+        _buttonDev.setOnClickListener {
+            startActivity(Intent(this, DeveloperActivity::class.java));
+        }
+
+        _lastActivity = this;
+
+        reloadSettings();
+    }
+
+    var isFirstLoad = true;
+    fun reloadSettings() {
+        val firstLoad = isFirstLoad;
+        isFirstLoad = false;
+        _form.setSearchVisible(false);
+        _loaderView.start();
+        _form.fromObject(lifecycleScope, Settings.instance) {
+            _loaderView.stop();
+            _form.setSearchVisible(true);
+
+            var devCounter = 0;
+            _form.findField("code")?.assume<ReadOnlyTextField>()?.setOnClickListener {
+                devCounter++;
+                if(devCounter > 5) {
+                    devCounter = 0;
+                    SettingsDev.instance.developerMode = true;
+                    SettingsDev.instance.save();
+                    updateDevMode();
+                    UIDialogs.toast(this, getString(R.string.you_are_now_in_developer_mode));
+                }
+            };
+
+            if(firstLoad) {
+                val query = intent.getStringExtra("query");
+                if(!query.isNullOrEmpty()) {
+                    _form.setSearchQuery(query);
+                }
+            }
+        };
+    }
+
+    override fun onResume() {
+        super.onResume()
+        updateDevMode();
+    }
+
+    fun updateDevMode() {
+        if(SettingsDev.instance.developerMode)
+            _devSets.visibility = View.VISIBLE;
+        else
+            _devSets.visibility = View.GONE;
+    }
+
+    override fun finish() {
+        super.finish()
+        _isFinished = true;
+        if(_lastActivity == this)
+            _lastActivity = null;
+        overridePendingTransition(R.anim.slide_lighten, R.anim.slide_out_up)
+    }
+
+
+
+
+    private var resultLauncherMap =  mutableMapOf<Int, (ActivityResult)->Unit>();
+    private var requestCode: Int? = -1;
+    private val resultLauncher: ActivityResultLauncher<Intent> = registerForActivityResult(
+        ActivityResultContracts.StartActivityForResult()) {
+            result: ActivityResult ->
+        val handler = synchronized(resultLauncherMap) {
+            resultLauncherMap.remove(requestCode);
+        }
+        if(handler != null)
+            handler(result);
+    };
+    override fun launchForResult(intent: Intent, code: Int, handler: (ActivityResult)->Unit) {
+        synchronized(resultLauncherMap) {
+            resultLauncherMap[code] = handler;
+        }
+        requestCode = code;
+        resultLauncher.launch(intent);
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        settingsActivityClosed.emit()
+    }
+
+
+    companion object {
+        //TODO: Temporary for solving Settings issues
+        @SuppressLint("StaticFieldLeak")
+        private var _lastActivity: SettingsActivity? = null;
+
+        val settingsActivityClosed = Event0()
+
+        fun getActivity(): SettingsActivity? {
+            val act = _lastActivity;
+            if(act != null && !act._isFinished)
+                return act;
+            return null;
+        }
+    }
+}

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

@@ -1,318 +0,0 @@
-package com.futo.platformplayer.api.http.server.handlers
-
-import android.content.ContentResolver
-import android.content.Context
-import android.net.Uri
-import android.provider.MediaStore
-import android.provider.OpenableColumns
-import com.futo.platformplayer.api.http.server.HttpContext
-import com.futo.platformplayer.api.http.server.HttpHeaders
-import com.futo.platformplayer.logging.Logger
-import java.io.FileNotFoundException
-import java.io.InputStream
-import java.io.OutputStream
-import java.text.SimpleDateFormat
-import java.util.*
-
-class HttpContentUriHandler(
-    method: String,
-    path: String,
-    private val contentResolver: ContentResolver,
-    private val uri: Uri,
-    private val explicitContentType: String? = null
-) : HttpHandler(method, path) {
-
-    override fun handle(httpContext: HttpContext) {
-        val resolver = contentResolver
-        val requestHeaders = httpContext.headers
-        val responseHeaders = this.headers.clone()
-
-        val meta = try {
-            queryMetadata(resolver, uri)
-        } catch (e: Exception) {
-            Logger.e(TAG, "Failed to query metadata for $uri", e)
-            httpContext.respondCode(404, responseHeaders)
-            return
-        }
-
-        val contentType = explicitContentType
-            ?: resolver.getType(uri)
-            ?: "application/octet-stream"
-        responseHeaders["Content-Type"] = contentType
-
-        meta.lastModifiedMillis?.let { lastModified ->
-            responseHeaders["Last-Modified"] = httpDateFormat.format(Date(lastModified))
-
-            val ifModifiedSinceHeader = requestHeaders["If-Modified-Since"]
-            if (ifModifiedSinceHeader != null) {
-                val ifModifiedSince = try {
-                    httpDateFormat.parse(ifModifiedSinceHeader)
-                } catch (_: Exception) {
-                    null
-                }
-
-                if (ifModifiedSince != null && lastModified <= ifModifiedSince.time) {
-                    httpContext.respondCode(304, responseHeaders)
-                    return
-                }
-            }
-        }
-
-        val safeName = (meta.displayName ?: "content.bin").replace("\"", "\\\"")
-        responseHeaders["Content-Disposition"] = "attachment; filename=\"$safeName\""
-
-        val length = meta.size
-        if (length == null) {
-            Logger.i(TAG, "Streaming $uri with unknown length; Range not supported")
-            responseHeaders.remove("Content-Length")
-            responseHeaders.remove("Content-Range")
-            responseHeaders.remove("Accept-Ranges")
-
-            stream(
-                httpContext = httpContext,
-                resolver = resolver,
-                uri = uri,
-                statusCode = 200,
-                headers = responseHeaders,
-                start = null,
-                length = null
-            )
-            return
-        }
-
-        responseHeaders["Accept-Ranges"] = "bytes"
-
-        val rangeHeader = requestHeaders["Range"]
-        if (rangeHeader.isNullOrBlank()) {
-            responseHeaders["Content-Length"] = length.toString()
-            Logger.i(TAG, "Sending full content for $uri, length=$length")
-
-            stream(
-                httpContext = httpContext,
-                resolver = resolver,
-                uri = uri,
-                statusCode = 200,
-                headers = responseHeaders,
-                start = 0L,
-                length = length
-            )
-            return
-        }
-
-        val range = parseRange(rangeHeader, length)
-        if (range == null) {
-            Logger.w(TAG, "Invalid Range '$rangeHeader' for $uri (length=$length)")
-            responseHeaders["Content-Range"] = "bytes */$length"
-            httpContext.respondCode(416, responseHeaders)
-            return
-        }
-
-        val start = range.first
-        val endInclusive = range.last
-        val bytesToSend = endInclusive - start + 1
-
-        responseHeaders["Content-Range"] = "bytes $start-$endInclusive/$length"
-        responseHeaders["Content-Length"] = bytesToSend.toString()
-        Logger.i(TAG, "Sending range $start-$endInclusive (length=$bytesToSend) of $length for $uri")
-
-        stream(
-            httpContext = httpContext,
-            resolver = resolver,
-            uri = uri,
-            statusCode = 206,
-            headers = responseHeaders,
-            start = start,
-            length = bytesToSend
-        )
-    }
-
-    data class ContentMeta(
-        val displayName: String?,
-        val size: Long?,
-        val lastModifiedMillis: Long?
-    )
-
-    private fun queryMetadata(resolver: ContentResolver, uri: Uri): ContentMeta {
-        var displayName: String? = null
-        var size: Long? = null
-        var lastModifiedMillis: Long? = null
-
-        resolver.query(uri, null, null, null, null)?.use { cursor ->
-            if (cursor.moveToFirst()) {
-                val nameIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
-                if (nameIndex != -1 && !cursor.isNull(nameIndex)) {
-                    displayName = cursor.getString(nameIndex)
-                }
-
-                val sizeIndex = cursor.getColumnIndex(OpenableColumns.SIZE)
-                if (sizeIndex != -1 && !cursor.isNull(sizeIndex)) {
-                    val s = cursor.getLong(sizeIndex)
-                    if (s >= 0) size = s   // -1 means unknown
-                }
-
-                val dateModifiedIndex = cursor.getColumnIndex(MediaStore.MediaColumns.DATE_MODIFIED)
-                if (dateModifiedIndex != -1 && !cursor.isNull(dateModifiedIndex)) {
-                    val seconds = cursor.getLong(dateModifiedIndex)
-                    if (seconds > 0) {
-                        lastModifiedMillis = seconds * 1000L
-                    }
-                }
-
-                if (lastModifiedMillis == null) {
-                    val dateAddedIndex = cursor.getColumnIndex(MediaStore.MediaColumns.DATE_ADDED)
-                    if (dateAddedIndex != -1 && !cursor.isNull(dateAddedIndex)) {
-                        val seconds = cursor.getLong(dateAddedIndex)
-                        if (seconds > 0) {
-                            lastModifiedMillis = seconds * 1000L
-                        }
-                    }
-                }
-            }
-        }
-
-        if (displayName == null) {
-            displayName = uri.lastPathSegment
-        }
-
-        if (size == null) {
-            try {
-                resolver.openAssetFileDescriptor(uri, "r")?.use { afd ->
-                    val assetLen = afd.length
-                    if (assetLen >= 0) {
-                        size = assetLen
-                    }
-                }
-            } catch (_: Exception) { }
-        }
-
-        return ContentMeta(
-            displayName = displayName,
-            size = size,
-            lastModifiedMillis = lastModifiedMillis
-        )
-    }
-
-    private fun parseRange(header: String, totalLength: Long): LongRange? {
-        if (totalLength <= 0L) return null
-
-        val prefix = "bytes="
-        if (!header.startsWith(prefix, ignoreCase = true)) return null
-
-        val spec = header.substring(prefix.length).trim()
-        if (spec.isEmpty()) return null
-
-        if (spec.contains(",")) return null
-
-        val dashIndex = spec.indexOf('-')
-        if (dashIndex < 0) return null
-
-        val startPart = spec.substring(0, dashIndex).trim()
-        val endPart = spec.substring(dashIndex + 1).trim()
-
-        return when {
-            startPart.isNotEmpty() -> {
-                val start = startPart.toLongOrNull() ?: return null
-                if (start < 0 || start >= totalLength) return null
-
-                val end = if (endPart.isNotEmpty()) {
-                    val rawEnd = endPart.toLongOrNull() ?: return null
-                    if (rawEnd < start) return null
-                    rawEnd.coerceAtMost(totalLength - 1)
-                } else {
-                    totalLength - 1
-                }
-
-                start..end
-            }
-
-            endPart.isNotEmpty() -> {
-                val suffixLen = endPart.toLongOrNull() ?: return null
-                if (suffixLen <= 0L) return null
-
-                if (suffixLen >= totalLength) {
-                    0L..(totalLength - 1)
-                } else {
-                    val start = totalLength - suffixLen
-                    val end = totalLength - 1
-                    start..end
-                }
-            }
-
-            else -> null
-        }
-    }
-
-    private fun stream(httpContext: HttpContext, resolver: ContentResolver, uri: Uri, statusCode: Int, headers: HttpHeaders, start: Long?, length: Long?) {
-        try {
-            val input = resolver.openInputStream(uri)
-            if (input == null) {
-                Logger.w(TAG, "Content not found: $uri")
-                httpContext.respondCode(404, headers)
-                return
-            }
-
-            input.use { inputStream ->
-                httpContext.respond(statusCode, headers) { outputStream ->
-                    try {
-                        val offset = start ?: 0L
-                        if (offset > 0L) {
-                            skipFully(inputStream, offset)
-                        }
-                        copyStream(inputStream, outputStream, length)
-                        outputStream.flush()
-                    } catch (e: Exception) {
-                        Logger.e(TAG, "Error while streaming $uri (start=$start, length=$length)", e)
-                    }
-                }
-            }
-        } catch (e: FileNotFoundException) {
-            Logger.w(TAG, "Content not found: $uri", e)
-            httpContext.respondCode(404, headers)
-        } catch (e: Exception) {
-            Logger.e(TAG, "Failed to open stream for $uri", e)
-            httpContext.respondCode(500, headers)
-        }
-    }
-
-    private fun copyStream(input: InputStream, output: OutputStream, limit: Long?) {
-        val buffer = ByteArray(8192)
-        if (limit == null) {
-            while (true) {
-                val read = input.read(buffer)
-                if (read < 0) break
-                output.write(buffer, 0, read)
-            }
-        } else {
-            var remaining = limit
-            while (remaining > 0L) {
-                val toRead = remaining.coerceAtMost(buffer.size.toLong()).toInt()
-                val read = input.read(buffer, 0, toRead)
-                if (read < 0) break
-                output.write(buffer, 0, read)
-                remaining -= read.toLong()
-            }
-        }
-    }
-
-    private fun skipFully(input: InputStream, bytesToSkip: Long) {
-        var remaining = bytesToSkip
-        while (remaining > 0L) {
-            val skipped = input.skip(remaining)
-            if (skipped <= 0L) {
-                val b = input.read()
-                if (b == -1) break
-                remaining -= 1L
-            } else {
-                remaining -= skipped
-            }
-        }
-    }
-
-    companion object {
-        private const val TAG = "HttpContentUriHandler"
-
-        private val httpDateFormat = SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss 'GMT'", Locale.US).apply {
-            timeZone = TimeZone.getTimeZone("GMT")
-        }
-    }
-}

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

@@ -5,7 +5,6 @@ import android.util.Log
 import com.futo.platformplayer.api.http.server.HttpContext
 import com.futo.platformplayer.api.http.server.HttpHeaders
 import com.futo.platformplayer.api.http.ManagedHttpClient
-import com.futo.platformplayer.api.media.models.modifier.IRequest
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.parsers.HttpResponseParser
 import com.futo.platformplayer.readLine
@@ -28,7 +27,6 @@ class HttpProxyHandler(method: String, path: String, val targetUrl: String, priv
     private var _injectReferer = false;
 
     private val _client = ManagedHttpClient();
-    private var _requestModifier: ((String, Map<String, String>) -> IRequest)? = null;
 
     override fun handle(context: HttpContext) {
         if (useTcp) {
@@ -45,33 +43,21 @@ class HttpProxyHandler(method: String, path: String, val targetUrl: String, priv
         for (injectHeader in _injectRequestHeader)
             proxyHeaders[injectHeader.first] = injectHeader.second;
 
-        val req = _requestModifier?.invoke(targetUrl, proxyHeaders)
-        var url = targetUrl
-        if (req != null) {
-            req.url?.let {
-                url = it
-            }
-            req.headers.let {
-                proxyHeaders.clear()
-                proxyHeaders.putAll(it)
-            }
-        }
-
-        val parsed = Uri.parse(url);
+        val parsed = Uri.parse(targetUrl);
         if(_injectHost)
             proxyHeaders.put("Host", parsed.host!!);
         if(_injectReferer)
-            proxyHeaders.put("Referer", url);
+            proxyHeaders.put("Referer", targetUrl);
 
         val useMethod = if (method == "inherit") context.method else method;
-        Logger.i(TAG, "handleWithOkHttp Proxied Request ${useMethod}: ${url}");
+        Logger.i(TAG, "handleWithOkHttp Proxied Request ${useMethod}: ${targetUrl}");
         Logger.i(TAG, "handleWithOkHttp Headers:" + proxyHeaders.map { "${it.key}: ${it.value}" }.joinToString("\n"));
 
         val resp = when (useMethod) {
-            "GET" -> _client.get(url, proxyHeaders);
-            "POST" -> _client.post(url, content ?: "", proxyHeaders);
-            "HEAD" -> _client.head(url, proxyHeaders)
-            else -> _client.requestMethod(useMethod, url, proxyHeaders);
+            "GET" -> _client.get(targetUrl, proxyHeaders);
+            "POST" -> _client.post(targetUrl, content ?: "", proxyHeaders);
+            "HEAD" -> _client.head(targetUrl, proxyHeaders)
+            else -> _client.requestMethod(useMethod, targetUrl, proxyHeaders);
         };
 
         Logger.i(TAG, "Proxied Response [${resp.code}]");
@@ -105,23 +91,11 @@ class HttpProxyHandler(method: String, path: String, val targetUrl: String, priv
         for (injectHeader in _injectRequestHeader)
             proxyHeaders[injectHeader.first] = injectHeader.second;
 
-        val req = _requestModifier?.invoke(targetUrl, proxyHeaders)
-        var url = targetUrl
-        if (req != null) {
-            req.url?.let {
-                url = it
-            }
-            req.headers.let {
-                proxyHeaders.clear()
-                proxyHeaders.putAll(it)
-            }
-        }
-
-        val parsed = Uri.parse(url);
+        val parsed = Uri.parse(targetUrl);
         if(_injectHost)
             proxyHeaders.put("Host", parsed.host!!);
         if(_injectReferer)
-            proxyHeaders.put("Referer", url);
+            proxyHeaders.put("Referer", targetUrl);
 
         val useMethod = if (method == "inherit") context.method else method;
         Logger.i(TAG, "handleWithTcp Proxied Request ${useMethod}: ${parsed}");
@@ -268,10 +242,6 @@ class HttpProxyHandler(method: String, path: String, val targetUrl: String, priv
         _ignoreRequestHeaders.add("referer");
         return this;
     }
-    fun withRequestModifier(modifier: (String, Map<String, String>) -> IRequest) : HttpProxyHandler {
-        _requestModifier = modifier;
-        return this;
-    }
 
     companion object {
         private const val TAG = "HttpProxyHandler"

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

@@ -54,16 +54,14 @@ interface IPlatformChannelContent : IPlatformContent {
     val subscribers: Long?
 }
 
-open class JSChannelContent(
-    config: SourcePluginConfig,
-    obj: V8ValueObject
-) : JSContent(config, obj), IPlatformChannelContent {
+open class JSChannelContent : JSContent, IPlatformChannelContent {
+    override val contentType: ContentType get() = ContentType.CHANNEL
+    override val thumbnail: String?
+    override val subscribers: Long?
 
-    final override val contentType: ContentType = ContentType.CHANNEL
-
-    override val thumbnail: String? =
-        _content.getOrDefault<String>(_pluginConfig, "thumbnail", "Channel", null)
-
-    override val subscribers: Long? =
-        _content.getOrDefault<Long>(_pluginConfig, "subscribers", "Channel", null)?.toLong()
-}
+    constructor(config: SourcePluginConfig, obj: V8ValueObject) : super(config, obj) {
+        val contextName = "Channel";
+        thumbnail = obj.getOrDefault<String>(config, "thumbnail", contextName, null)
+        subscribers = if(obj.has("subscribers")) obj.getOrThrow(config,"subscribers", contextName) else null
+    }
+}

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

@@ -6,15 +6,25 @@ import com.futo.platformplayer.api.media.models.ratings.IRating
 import com.futo.platformplayer.api.media.structures.IPager
 import java.time.OffsetDateTime
 
-open class PlatformComment(
-    override val contextUrl: String,
-    override val author: PlatformAuthorLink,
-    override val message: String,
-    override val rating: IRating,
-    override val date: OffsetDateTime,
-    override val replyCount: Int? = null
-) : IPlatformComment {
+open class PlatformComment : IPlatformComment {
+    override val contextUrl: String;
+    override val author: PlatformAuthorLink;
+    override val message: String;
+    override val rating: IRating;
+    override val date: OffsetDateTime;
 
-    override fun getReplies(client: IPlatformClient): IPager<IPlatformComment> =
-        NoCommentsPager()
-}
+    override val replyCount: Int?;
+
+    constructor(contextUrl: String, author: PlatformAuthorLink, msg: String, rating: IRating, date: OffsetDateTime, replyCount: Int? = null) {
+        this.contextUrl = contextUrl;
+        this.author = author;
+        this.message = msg;
+        this.rating = rating;
+        this.date = date;
+        this.replyCount = replyCount;
+    }
+
+    override fun getReplies(client: IPlatformClient): IPager<IPlatformComment> {
+        return NoCommentsPager();
+    }
+}

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

@@ -12,9 +12,6 @@ class DashManifestSource : IVideoSource, IDashManifestSource {
 
     override var priority: Boolean = false;
 
-    override val language: String? = null;
-    override val original: Boolean? = false;
-
     constructor(url : String) {
         this.url = url;
     }

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

@@ -12,9 +12,6 @@ class HLSManifestSource : IVideoSource, IHLSManifestSource {
 
     override var priority: Boolean = false;
 
-    override val language: String? = null;
-    override val original: Boolean? = false;
-
     constructor(url : String) {
         this.url = url;
     }

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

@@ -14,9 +14,6 @@ class HLSVariantVideoUrlSource(
     override val priority: Boolean,
     val url: String
 ) : IVideoUrlSource {
-    override val language: String? = null;
-    override val original: Boolean? = false;
-
     override fun getVideoUrl(): String {
         return url
     }
@@ -44,7 +41,6 @@ class HLSVariantSubtitleUrlSource(
     override val format: String,
 ) : ISubtitleSource {
     override val hasFetch: Boolean = false
-    override val language: String? = null
 
     override fun getSubtitles(): String? {
         return null

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

@@ -9,6 +9,4 @@ interface IVideoSource {
     val bitrate : Int?;
     val duration: Long;
     val priority: Boolean;
-    val language: String?;
-    val original: Boolean?;
 }

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

@@ -9,15 +9,13 @@ class LocalSubtitleSource : ISubtitleSource {
     override val name: String;
     override val url: String?;
     override val format: String?;
-    override val language: String?
     override val hasFetch: Boolean get() = false;
 
     val filePath: String;
 
-    constructor(name: String, language: String?, format: String?, filePath: String) {
+    constructor(name: String, format: String?, filePath: String) {
         this.name = name;
         this.format = format;
-        this.language = language
         this.filePath = filePath;
         this.url = Uri.fromFile(File(filePath)).toString();
     }
@@ -34,7 +32,6 @@ class LocalSubtitleSource : ISubtitleSource {
         fun fromSource(source: SubtitleRawSource, path: String): LocalSubtitleSource {
             return LocalSubtitleSource(
                 source.name,
-                source.language,
                 source.format,
                 path
             );

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

@@ -16,10 +16,6 @@ class LocalVideoSource : IVideoSource, IStreamMetaDataSource {
 
     override var priority: Boolean = false;
 
-    override val language: String? = null;
-    override val original: Boolean? = false;
-
-
     val filePath : String;
     val fileSize : Long;
 

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

@@ -6,7 +6,6 @@ import com.futo.platformplayer.api.media.models.subtitles.ISubtitleSource
 @kotlinx.serialization.Serializable
 class SubtitleRawSource(
     override val name: String,
-    override val language: String?,
     override val format: String?,
     val _subtitles: String,
     override val url: String? = null,

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

@@ -19,9 +19,6 @@ open class VideoUrlSource(
 ) : IVideoUrlSource, IStreamMetaDataSource {
     override var streamMetaData: StreamMetaData? = null;
 
-    override val language: String? = null;
-    override val original: Boolean? = false;
-
     override fun getVideoUrl() : String {
         return url;
     }

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

@@ -7,7 +7,6 @@ interface ISubtitleSource {
     val url: String?;
     val format: String?;
     val hasFetch: Boolean;
-    val language: String?
 
     fun getSubtitles(): String?;
 

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

@@ -73,10 +73,10 @@ open class LocalVideoDetails(
     override val video: IVideoSourceDescriptor = (if(mimeType?.startsWith("audio/") ?: false)
         (LocalVideoUnMuxedSourceDescriptor(
             arrayOf(),
-            arrayOf(LocalAudioContentSource(url, mimeType ?: "", name, duration))
+            arrayOf(LocalAudioContentSource(url, mimeType ?: "", name))
         ))
         else (LocalVideoMuxedSourceDescriptor(
-            LocalVideoContentSource(url, mimeType ?: "", name, duration)
+            LocalVideoContentSource(url, mimeType ?: "", name)
         ))
     );
     override val preview: ISerializedVideoSourceDescriptor? = null;

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

@@ -103,7 +103,7 @@ open class JSClient : IPlatformClient {
 
     override val id: String get() = config.id;
     override val name: String get() = config.name;
-    override val icon: ImageVariable get() = StatePlatform.instance.getPlatformIcon(config.id) ?: ImageVariable(config.absoluteIconUrl, null, null)
+    override val icon: ImageVariable;
     override var capabilities: PlatformClientCapabilities = PlatformClientCapabilities();
 
     private var _busyAction = "";
@@ -147,14 +147,15 @@ open class JSClient : IPlatformClient {
     constructor(context: Context, descriptor: SourcePluginDescriptor, saveState: String? = null) {
         this._context = context;
         this.config = descriptor.config;
+        icon = StatePlatform.instance.getPlatformIcon(config.id) ?: ImageVariable(config.absoluteIconUrl, null, null);
         this.descriptor = descriptor;
         _injectedSaveState = saveState;
         _auth = descriptor.getAuth();
         _captcha = descriptor.getCaptchaData();
         flags = descriptor.flags.toTypedArray();
 
-        _httpClient = JSHttpClient(this, null, _captcha, config);
-        _httpClientAuth = JSHttpClient(this, _auth, _captcha, config);
+        _httpClient = JSHttpClient(this, null, _captcha);
+        _httpClientAuth = JSHttpClient(this, _auth, _captcha);
         _plugin = V8Plugin(context, descriptor.config, null, _httpClient, _httpClientAuth);
         _plugin.withDependency(context, "scripts/polyfil.js");
         _plugin.withDependency(context, "scripts/source.js");
@@ -177,6 +178,7 @@ open class JSClient : IPlatformClient {
     constructor(context: Context, descriptor: SourcePluginDescriptor, saveState: String?, script: String, withoutCredentials: Boolean = false) {
         this._context = context;
         this.config = descriptor.config;
+        icon = StatePlatform.instance.getPlatformIcon(config.id) ?: ImageVariable(config.absoluteIconUrl, null, null);
         this.descriptor = descriptor;
         _injectedSaveState = saveState;
         if(!withoutCredentials)
@@ -186,8 +188,8 @@ open class JSClient : IPlatformClient {
         _captcha = descriptor.getCaptchaData();
         flags = descriptor.flags.toTypedArray();
 
-        _httpClient = JSHttpClient(this, null, _captcha, config);
-        _httpClientAuth = JSHttpClient(this, _auth, _captcha, config);
+        _httpClient = JSHttpClient(this, null, _captcha);
+        _httpClientAuth = JSHttpClient(this, _auth, _captcha);
         _plugin = V8Plugin(context, descriptor.config, script, _httpClient, _httpClientAuth);
         _plugin.withDependency(context, "scripts/polyfil.js");
         _plugin.withDependency(context, "scripts/source.js");

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

@@ -2,7 +2,6 @@ package com.futo.platformplayer.api.media.platforms.js
 
 import kotlinx.serialization.Contextual
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.Transient
 import java.util.Dictionary
 
 @Serializable
@@ -28,7 +27,7 @@ class SourcePluginAuthConfig(
         val details: String? = null,
         val once: Boolean? = true
     ) {
-        @Transient
+        @Contextual
         private var _regex: Regex? = null;
 
         fun getRegex(): Regex {

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

@@ -23,7 +23,7 @@ class SourcePluginConfig(
     //Script
     val repositoryUrl: String? = null,
     val scriptUrl: String = "",
-    var version: Int = -1,
+    val version: Int = -1,
 
     val iconUrl: String? = null,
     var id: String = UUID.randomUUID().toString(),

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

@@ -23,7 +23,6 @@ import java.util.UUID
 class JSHttpClient : ManagedHttpClient {
     private val _jsClient: JSClient?;
     private val _jsConfig: SourcePluginConfig?;
-    val config get() = _jsConfig
     private val _auth: SourceAuth?;
     private val _captcha: SourceCaptchaData?;
 
@@ -255,76 +254,6 @@ class JSHttpClient : ManagedHttpClient {
 
         return resp;
     }
-    fun processRequest(method: String, responseCode: Int, url: Uri, headers: Map<String, List<String>>) {
-        if(doUpdateCookies) {
-            val domain = url.host?.lowercase() ?: return;
-            val domainParts = domain.split(".");
-            val defaultCookieDomain =
-                "." + domainParts.drop(domainParts.size - 2).joinToString(".");
-            for (header in headers) {
-                if(header.key.lowercase() == "set-cookie") {
-                    var domainToUse = domain;
-                    val cookie = cookieStringToPair(header.value.first());
-                    var cookieValue = cookie.second;
-
-                    if (cookie.first.isNotEmpty() && cookie.second.isNotEmpty()) {
-                        val cookieParts = cookie.second.split(";");
-                        if (cookieParts.size == 0)
-                            continue;
-                        cookieValue = cookieParts[0].trim();
-
-                        val cookieVariables = cookieParts.drop(1).map {
-                            val splitIndex = it.indexOf("=");
-                            if (splitIndex < 0)
-                                return@map Pair(it.trim().lowercase(), "");
-                            return@map Pair<String, String>(
-                                it.substring(0, splitIndex).lowercase().trim(),
-                                it.substring(splitIndex + 1).trim()
-                            );
-                        }.toMap();
-                        domainToUse = if (cookieVariables.containsKey("domain"))
-                            cookieVariables["domain"]!!.lowercase();
-                        else defaultCookieDomain;
-                        //TODO: Make sure this has no negative effect besides apply cookies to root domain
-                        if(!domainToUse.startsWith("."))
-                            domainToUse = ".${domainToUse}";
-                    }
-
-                    if ((_auth != null || _currentCookieMap.isNotEmpty())) {
-                        val cookieMap = if (_currentCookieMap.containsKey(domainToUse))
-                            _currentCookieMap[domainToUse]!!;
-                        else {
-                            val newMap = hashMapOf<String, String>();
-                            _currentCookieMap[domainToUse] = newMap
-                            newMap;
-                        }
-                        if (cookieMap.containsKey(cookie.first) || doAllowNewCookies)
-                            cookieMap[cookie.first] = cookieValue;
-                    }
-                    else {
-                        val cookieMap = if (_otherCookieMap.containsKey(domainToUse))
-                            _otherCookieMap[domainToUse]!!;
-                        else {
-                            val newMap = hashMapOf<String, String>();
-                            _otherCookieMap[domainToUse] = newMap
-                            newMap;
-                        }
-                        if (cookieMap.containsKey(cookie.first) || doAllowNewCookies)
-                            cookieMap[cookie.first] = cookieValue;
-                    }
-                }
-            }
-        }
-
-        if(_jsClient is DevJSClient) {
-            //val peekBody = resp.peekBody(1000 * 1000).string();
-            StateDeveloper.instance.addDevHttpExchange(
-                StateDeveloper.DevHttpExchange(
-                    StateDeveloper.DevHttpRequest(method, url.toString(), mapOf(*headers.map { Pair(it.key, it.value.joinToString(";")) }.toTypedArray()), ""),
-                    StateDeveloper.DevHttpRequest("RESP", url.toString(), mapOf(*headers.map { Pair(it.key, it.value.joinToString(";")) }.toTypedArray()), "", responseCode)
-                ));
-        }
-    }
 
     private fun cookieStringToPair(cookie: String): Pair<String, String> {
         val cookieKey = cookie.substring(0, cookie.indexOf("="));

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

@@ -23,22 +23,17 @@ import com.futo.platformplayer.getOrThrow
 import com.futo.platformplayer.getOrThrowNullableList
 import com.futo.platformplayer.states.StateDeveloper
 
-open class JSArticle(
-    config: SourcePluginConfig,
-    obj: V8ValueObject
-) : JSContent(config, obj), IPlatformArticle, IPluginSourced {
+open class JSArticle : JSContent, IPlatformArticle, IPluginSourced {
+    final override val contentType: ContentType get() = ContentType.ARTICLE;
 
-    final override val contentType: ContentType = ContentType.ARTICLE
+    override val summary: String;
+    override val thumbnails: Thumbnails?;
 
-    override val summary: String =
-        obj.getOrDefault<String>(config, "summary", "PlatformArticle", "") ?: ""
+    constructor(config: SourcePluginConfig, obj: V8ValueObject): super(config, obj) {
+        val contextName = "PlatformArticle";
 
-    override val thumbnails: Thumbnails? =
-        if (obj.has("thumbnails"))
-            Thumbnails.fromV8(
-                config,
-                obj.getOrThrow<V8ValueObject>(config, "thumbnails", "PlatformArticle")
-            )
-        else
-            null
-}
+        summary = _content.getOrDefault(config, "summary", contextName, "") ?: "";
+        thumbnails = Thumbnails.fromV8(config, _content.getOrThrow(config, "thumbnails", contextName));
+
+    }
+}

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

@@ -24,37 +24,36 @@ import com.futo.platformplayer.getOrThrowNullableList
 import com.futo.platformplayer.invokeV8
 import com.futo.platformplayer.states.StateDeveloper
 
-open class JSArticleDetails(
-    private val client: JSClient,
-    obj: V8ValueObject
-) : JSContent(client.config, obj), IPlatformArticleDetails, IPluginSourced, IPlatformContentDetails {
+open class JSArticleDetails : JSContent, IPlatformArticleDetails, IPluginSourced, IPlatformContentDetails {
+    final override val contentType: ContentType get() = ContentType.ARTICLE;
 
-    final override val contentType: ContentType = ContentType.ARTICLE
+    private val _hasGetComments: Boolean;
+    private val _hasGetContentRecommendations: Boolean;
 
-    private val _hasGetComments: Boolean = _content.has("getComments")
-    private val _hasGetContentRecommendations: Boolean = _content.has("getContentRecommendations")
+    override val rating: IRating;
 
-    override val rating: IRating =
-        obj.getOrDefault<V8ValueObject>(client.config, "rating", "PlatformArticle", null)
-            ?.let { IRating.fromV8(client.config, it, "PlatformArticle") }
-            ?: RatingLikes(0)
+    override val summary: String;
+    override val thumbnails: Thumbnails?;
+    override val segments: List<IJSArticleSegment>;
 
-    override val summary: String =
-        _content.getOrThrow(client.config, "summary", "PlatformArticle")
+    constructor(client: JSClient, obj: V8ValueObject): super(client.config, obj) {
+        val contextName = "PlatformArticle";
 
-    override val thumbnails: Thumbnails? =
-        if (_content.has("thumbnails"))
-            Thumbnails.fromV8(
-                client.config,
-                _content.getOrThrow(client.config, "thumbnails", "PlatformArticle")
-            )
+        rating = obj.getOrDefault<V8ValueObject>(client.config, "rating", contextName, null)?.let { IRating.fromV8(client.config, it, contextName) } ?: RatingLikes(0);
+        summary = _content.getOrThrow(client.config, "summary", contextName);
+        if(_content.has("thumbnails"))
+            thumbnails = Thumbnails.fromV8(client.config, _content.getOrThrow(client.config, "thumbnails", contextName));
         else
-            null
+            thumbnails = null;
 
-    override val segments: List<IJSArticleSegment> =
-        obj.getOrThrowNullableList<V8ValueObject>(client.config, "segments", "PlatformArticle")
-            ?.mapNotNull { fromV8Segment(client, it) }
-            ?: emptyList()
+
+        segments = (obj.getOrThrowNullableList<V8ValueObject>(client.config, "segments", contextName)
+            ?.map { fromV8Segment(client, it) }
+            ?.filterNotNull() ?: listOf());
+
+        _hasGetComments = _content.has("getComments");
+        _hasGetContentRecommendations = _content.has("getContentRecommendations");
+    }
 
     override fun getComments(client: IPlatformClient): IPager<IPlatformComment>? {
         if(!_hasGetComments || _content.isClosed)

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

@@ -16,49 +16,51 @@ import java.time.LocalDateTime
 import java.time.OffsetDateTime
 import java.time.ZoneOffset
 
-open class JSContent(
-    protected val _pluginConfig: SourcePluginConfig,
-    protected val _content: V8ValueObject
-) : IPlatformContent, IPluginSourced {
+open class JSContent : IPlatformContent, IPluginSourced {
+    protected val _pluginConfig: SourcePluginConfig;
+    protected val _content : V8ValueObject;
 
-    override val contentType: ContentType = ContentType.UNKNOWN
+    protected val _hasGetDetails: Boolean;
 
-    protected val _hasGetDetails: Boolean = _content.has("getDetails")
+    override val contentType: ContentType get() = ContentType.UNKNOWN;
 
-    override val id: PlatformID =
-        PlatformID.fromV8(_pluginConfig, _content.getOrThrow(_pluginConfig, "id", CTX))
+    override val id: PlatformID;
+    override val name: String;
+    override val author: PlatformAuthorLink;
+    override val datetime: OffsetDateTime?;
 
-    override val name: String =
-        HtmlCompat.fromHtml(
-            _content.getOrThrow<String>(_pluginConfig, "name", CTX).decodeUnicode(),
-            HtmlCompat.FROM_HTML_MODE_LEGACY
-        ).toString()
+    override val url: String;
+    override val shareUrl: String;
 
-    override val author: PlatformAuthorLink =
-        _content.getOrDefault<V8ValueObject>(_pluginConfig, "author", CTX, null)
-            ?.let { PlatformAuthorLink.fromV8(_pluginConfig, it) }
-            ?: PlatformAuthorLink.UNKNOWN
+    override val sourceConfig: SourcePluginConfig get() = _pluginConfig;
 
-    private val _epoch: Long? =
-        _content.getOrDefault<Long>(_pluginConfig, "datetime", CTX, null)?.toLong()
+    constructor(config: SourcePluginConfig, obj: V8ValueObject) {
+        _pluginConfig = config;
+        _content = obj;
 
-    override val datetime: OffsetDateTime? =
-        _epoch?.takeIf { it != 0L }?.let {
-            OffsetDateTime.of(LocalDateTime.ofEpochSecond(it, 0, ZoneOffset.UTC), ZoneOffset.UTC)
-        }
+        val contextName = "PlatformContent";
 
-    override val url: String =
-        _content.getOrThrow<String>(_pluginConfig, "url", CTX)
+        id = PlatformID.fromV8(_pluginConfig, _content.getOrThrow(config, "id", contextName));
+        name = HtmlCompat.fromHtml(_content.getOrThrow<String>(config, "name", contextName).decodeUnicode(), HtmlCompat.FROM_HTML_MODE_LEGACY).toString();
 
-    override val shareUrl: String =
-        _content.getOrDefault<String>(_pluginConfig, "shareUrl", CTX, null) ?: url
+        val authorObj = _content.getOrDefault<V8ValueObject>(config, "author", contextName, null);
+        if(authorObj != null)
+            author = PlatformAuthorLink.fromV8(_pluginConfig, authorObj);
+        else
+            author = PlatformAuthorLink.UNKNOWN;
 
-    override val sourceConfig: SourcePluginConfig
-        get() = _pluginConfig
+        val datetimeInt = _content.getOrDefault<Int>(config, "datetime", contextName, null)?.toLong();
+        if(datetimeInt == null || datetimeInt == 0.toLong())
+            datetime = null;
+        else
+            datetime = OffsetDateTime.of(LocalDateTime.ofEpochSecond(datetimeInt, 0, ZoneOffset.UTC), ZoneOffset.UTC);
+        url = _content.getOrThrow(config, "url", contextName);
+        shareUrl = _content.getOrDefault<String>(config, "shareUrl", contextName, null) ?: url;
 
-    fun getUnderlyingObject(): V8ValueObject? = _content
-
-    companion object {
-        private const val CTX = "PlatformContent"
+        _hasGetDetails = _content.has("getDetails");
     }
-}
+
+    fun getUnderlyingObject(): V8ValueObject? {
+        return _content;
+    }
+}

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

@@ -6,16 +6,14 @@ import com.futo.platformplayer.api.media.models.playlists.IPlatformPlaylist
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.getOrDefault
 
-open class JSPlaylist(
-    config: SourcePluginConfig,
-    obj: V8ValueObject
-) : JSContent(config, obj), IPlatformPlaylist {
+open class JSPlaylist : JSContent, IPlatformPlaylist {
+    override val contentType: ContentType get() = ContentType.PLAYLIST;
+    override val thumbnail: String?;
+    override val videoCount: Int;
 
-    override val contentType: ContentType = ContentType.PLAYLIST
-
-    override val thumbnail: String? =
-        _content.getOrDefault<String>(_pluginConfig, "thumbnail", "Playlist", null)
-
-    override val videoCount: Int =
-        _content.getOrDefault<Int>(_pluginConfig, "videoCount", "Playlist", null)?.toInt() ?: -1
-}
+    constructor(config: SourcePluginConfig, obj: V8ValueObject) : super(config, obj) {
+        val contextName = "Playlist";
+        thumbnail = obj.getOrDefault(config, "thumbnail", contextName, null);
+        videoCount = obj.getOrDefault(config, "videoCount", contextName, -1)!!;
+    }
+}

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

@@ -17,14 +17,11 @@ import com.futo.platformplayer.getOrThrow
 import com.futo.platformplayer.invokeV8
 import com.futo.platformplayer.invokeV8Void
 import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StateDeveloper
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
 import java.util.Base64
 
-class JSRequestExecutor: AutoCloseable {
+class JSRequestExecutor {
     private val _plugin: JSClient;
     private val _config: IV8PluginConfig;
     private var _executor: V8ValueObject;
@@ -32,9 +29,6 @@ class JSRequestExecutor: AutoCloseable {
 
     private val hasCleanup: Boolean;
 
-    private var _cleanLock = Any();
-    private var _cleaned: Boolean = false;
-
     constructor(plugin: JSClient, executor: V8ValueObject) {
         this._plugin = plugin;
         this._executor = executor;
@@ -108,12 +102,8 @@ class JSRequestExecutor: AutoCloseable {
 
 
     open fun cleanup() {
-        synchronized(_cleanLock) {
-            if (!hasCleanup || _executor.isClosed || _cleaned)
-                return;
-            _cleaned = true;
-        }
-        Logger.i("JSRequestExecutor", "JSRequestExecutor cleanup requested");
+        if (!hasCleanup || _executor.isClosed)
+            return;
         _plugin.busy {
             if(_plugin is DevJSClient)
                 StateDeveloper.instance.handleDevCall(_plugin.devID, "requestExecutor.executeRequest()") {
@@ -135,25 +125,9 @@ class JSRequestExecutor: AutoCloseable {
         }
     }
 
-    override fun close() {
-        cleanup();
-    }
-
-    fun closeAsync() {
-        StateApp.instance.scopeOrNull?.launch(Dispatchers.IO){
-            try {
-                close();
-            }
-            catch(ex: Throwable) {
-                Logger.e("JSRequestExecutor", "Cleanup failed");
-            }
-        }
-    }
-
-    /*
     protected fun finalize() {
         cleanup();
-    }*/
+    }
 }
 
 //TODO: are these available..?

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

@@ -5,7 +5,6 @@ import com.caoccao.javet.values.primitive.V8ValueString
 import com.caoccao.javet.values.reference.V8ValueObject
 import com.futo.platformplayer.api.media.models.subtitles.ISubtitleSource
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
-import com.futo.platformplayer.getOrDefault
 import com.futo.platformplayer.getOrThrow
 import com.futo.platformplayer.getSourcePlugin
 import com.futo.platformplayer.invokeV8
@@ -23,7 +22,6 @@ class JSSubtitleSource : ISubtitleSource {
     override val name: String;
     override val url: String?;
     override val format: String?;
-    override val language: String?
     override val hasFetch: Boolean;
 
     constructor(config: SourcePluginConfig, v8Value: V8ValueObject) {
@@ -31,7 +29,6 @@ class JSSubtitleSource : ISubtitleSource {
 
         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");

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

@@ -8,44 +8,43 @@ import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.getOrDefault
 import com.futo.platformplayer.getOrThrow
 
-open class JSAudioUrlSource(
-    plugin: JSClient,
-    obj: V8ValueObject
-) : JSSource(TYPE_AUDIOURL, plugin, obj), IAudioUrlSource {
+open class JSAudioUrlSource : IAudioUrlSource, JSSource {
+    override val name: String;
+    override val bitrate : Int;
+    override val container : String;
+    override val codec: String;
+    private val url : String;
 
-    private val ctx = "AudioUrlSource"
-    private val cfg = plugin.config
+    override val language: String;
 
-    override val bitrate: Int =
-        _obj.getOrThrow<Int>(cfg, "bitrate", ctx)
+    override val duration: Long?;
 
-    override val container: String =
-        _obj.getOrThrow<String>(cfg, "container", ctx)
+    override var priority: Boolean = false;
 
-    override val codec: String =
-        _obj.getOrThrow<String>(cfg, "codec", ctx)
+    override var original: Boolean = false;
 
-    private val url: String =
-        _obj.getOrThrow<String>(cfg, "url", ctx)
+    constructor(plugin: JSClient, obj: V8ValueObject) : super(TYPE_AUDIOURL, plugin, obj) {
+        val contextName = "AudioUrlSource";
+        val config = plugin.config;
 
-    override val language: String =
-        _obj.getOrThrow<String>(cfg, "language", ctx)
+        bitrate = _obj.getOrThrow(config, "bitrate", contextName);
+        container = _obj.getOrThrow(config, "container", contextName);
+        codec = _obj.getOrThrow(config, "codec", contextName);
+        url = _obj.getOrThrow(config, "url", contextName);
+        language = _obj.getOrThrow(config, "language", contextName);
+        duration = _obj.getOrDefault(config, "duration", contextName, null);
 
-    override val duration: Long? =
-        _obj.getOrDefault<Long>(cfg, "duration", ctx, null)?.toLong()
+        name = _obj.getOrDefault(config, "name", contextName, "${container} ${bitrate}") ?: "${container} ${bitrate}";
 
-    override val name: String =
-        _obj.getOrDefault<String>(cfg, "name", ctx, null)
-            ?: "$container $bitrate"
+        priority = if(_obj.has("priority")) obj.getOrThrow(config, "priority", contextName) else false;
+        original =  if(_obj.has("original")) obj.getOrThrow(config, "original", contextName) else false;
+    }
 
-    override var priority: Boolean =
-        if (_obj.has("priority")) _obj.getOrThrow<Boolean>(cfg, "priority", ctx) else false
+    override fun getAudioUrl() : String {
+        return url;
+    }
 
-    override var original: Boolean =
-        if (_obj.has("original")) _obj.getOrThrow<Boolean>(cfg, "original", ctx) else false
-
-    override fun getAudioUrl(): String = url
-
-    override fun toString(): String =
-        "(name=$name, container=$container, bitrate=$bitrate, codec=$codec, url=$url, language=$language, duration=$duration)"
-}
+    override fun toString(): String {
+        return "(name=$name, container=$container, bitrate=$bitrate, codec=$codec, url=$url, language=$language, duration=$duration)";
+    }
+}

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

@@ -31,56 +31,42 @@ interface IJSDashManifestRawSource {
     fun generateAsync(scope: CoroutineScope): Deferred<String?>;
     fun generate(): String?;
 }
-open class JSDashManifestRawSource(
-    plugin: JSClient,
-    obj: V8ValueObject
-) : JSSource(TYPE_DASH_RAW, plugin, obj), IVideoSource, IJSDashManifestRawSource, IStreamMetaDataSource {
+open class JSDashManifestRawSource: JSSource, IVideoSource, IJSDashManifestRawSource, IStreamMetaDataSource {
+    override val container : String;
+    override val name : String;
+    override val width: Int;
+    override val height: Int;
+    override val codec: String;
+    override val bitrate: Int?;
+    override val duration: Long;
+    override val priority: Boolean;
 
-    private val ctx = "DashRawSource"
-    private val cfg = plugin.config
+    val url: String?;
+    override var manifest: String?;
 
-    override val language: String? = _obj.getOrDefault(cfg, "language", ctx, null);
-    override val original: Boolean? = _obj.getOrDefault(cfg, "original", ctx, null);
+    override val hasGenerate: Boolean;
+    val canMerge: Boolean;
 
+    override var streamMetaData: StreamMetaData? = null;
 
-    override val container: String =
-        _obj.getOrDefault<String>(cfg, "container", ctx, null) ?: "application/dash+xml"
+    constructor(plugin: JSClient, obj: V8ValueObject) : super(TYPE_DASH_RAW, plugin, obj) {
+        val contextName = "DashRawSource";
+        val config = plugin.config;
+        name = _obj.getOrThrow(config, "name", contextName);
+        url = _obj.getOrThrow(config, "url", contextName);
+        container = _obj.getOrDefault<String>(config, "container", contextName, null) ?: "application/dash+xml";
+        manifest = _obj.getOrDefault<String>(config, "manifest", contextName, null);
+        width = _obj.getOrDefault(config, "width", contextName, 0) ?: 0;
+        height = _obj.getOrDefault(config, "height", contextName, 0) ?: 0;
+        codec = _obj.getOrDefault(config, "codec", contextName, "") ?: "";
+        bitrate = _obj.getOrDefault(config, "bitrate", contextName, 0) ?: 0;
+        duration = _obj.getOrDefault(config, "duration", contextName, 0) ?: 0;
+        priority = _obj.getOrDefault(config, "priority", contextName, false) ?: false;
+        canMerge = _obj.getOrDefault(config, "canMerge", contextName, false) ?: false;
+        hasGenerate = _obj.has("generate");
+    }
 
-    override val name: String =
-        _obj.getOrThrow<String>(cfg, "name", ctx)
-
-    override val width: Int =
-        _obj.getOrDefault<Int>(cfg, "width", ctx, null)?.toInt() ?: 0
-
-    override val height: Int =
-        _obj.getOrDefault<Int>(cfg, "height", ctx, null)?.toInt() ?: 0
-
-    override val codec: String =
-        _obj.getOrDefault<String>(cfg, "codec", ctx, "") ?: ""
-
-    override val bitrate: Int? =
-        _obj.getOrDefault<Int>(cfg, "bitrate", ctx, null)?.toInt()
-
-    override val duration: Long =
-        _obj.getOrDefault<Long>(cfg, "duration", ctx, 0)?.toLong() ?: 0L
-
-    override val priority: Boolean =
-        _obj.getOrDefault<Boolean>(cfg, "priority", ctx, false) ?: false
-
-    val url: String? =
-        _obj.getOrDefault<String>(cfg, "url", ctx, null)
-
-    override var manifest: String? =
-        _obj.getOrDefault<String>(cfg, "manifest", ctx, null)
-
-    override val hasGenerate: Boolean = _obj.has("generate")
-
-    val canMerge: Boolean =
-        _obj.getOrDefault<Boolean>(cfg, "canMerge", ctx, false) ?: false
-
-    override var streamMetaData: StreamMetaData? = null
-
-    private var _pregenerate: V8Deferred<String?>? = null
+    private var _pregenerate: V8Deferred<String?>? = null;
     fun pregenerateAsync(scope: CoroutineScope): V8Deferred<String?>? {
         _pregenerate = generateAsync(scope);
         return _pregenerate;
@@ -189,9 +175,6 @@ class JSDashManifestMergingRawSource(
     override val priority: Boolean
         get() = video.priority;
 
-    override val language: String? get() = audio.language
-    override val original: Boolean? get() = audio.original;
-
     override fun generateAsync(scope: CoroutineScope): V8Deferred<String?> {
         val videoDashDef = video.generateAsync(scope);
         val audioDashDef = audio.generateAsync(scope);

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

@@ -21,9 +21,6 @@ class JSDashManifestSource : IVideoUrlSource, IDashManifestSource, JSSource {
 
     override var priority: Boolean = false;
 
-    override val language: String?;
-    override val original: Boolean?;
-
     constructor(plugin: JSClient, obj: V8ValueObject) : super(TYPE_DASH, plugin, obj) {
         val contextName = "DashSource";
         val config = plugin.config;
@@ -32,9 +29,6 @@ class JSDashManifestSource : IVideoUrlSource, IDashManifestSource, JSSource {
         duration = _obj.getOrThrow(config, "duration", contextName);
 
         priority = obj.getOrNull(config, "priority", contextName) ?: false;
-
-        language = obj.getOrNull(config, "language", contextName);
-        original = obj.getOrNull(config, "original", contextName);
     }
 
     override fun getVideoUrl(): String {

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

@@ -28,9 +28,6 @@ class JSDashManifestWidevineSource : IVideoUrlSource, IDashManifestSource,
     override val licenseUri: String
     override val hasLicenseRequestExecutor: Boolean
 
-    override val language: String?;
-    override val original: Boolean?;
-
     @Suppress("ConvertSecondaryConstructorToPrimary")
     constructor(plugin: JSClient, obj: V8ValueObject) : super(TYPE_DASH, plugin, obj) {
         val contextName = "DashWidevineSource"
@@ -43,9 +40,6 @@ class JSDashManifestWidevineSource : IVideoUrlSource, IDashManifestSource,
 
         licenseUri = _obj.getOrThrow(config, "licenseUri", contextName)
         hasLicenseRequestExecutor = obj.has("getLicenseRequestExecutor")
-
-        language = _obj.getOrNull(config, "language", contextName);
-        original = _obj.getOrNull(config, "original", contextName);
     }
 
     override fun getLicenseRequestExecutor(): JSRequestExecutor? {

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

@@ -21,9 +21,6 @@ class JSHLSManifestSource : IHLSManifestSource, JSSource {
 
     override var priority: Boolean = false;
 
-    override val language: String?;
-    override val original: Boolean?;
-
     constructor(plugin: JSClient, obj: V8ValueObject) : super(TYPE_HLS, plugin, obj) {
         val contextName = "HLSSource";
         val config = plugin.config;
@@ -33,8 +30,5 @@ class JSHLSManifestSource : IHLSManifestSource, JSSource {
         duration = _obj.getOrThrow<Int>(config, "duration", contextName).toLong();
 
         priority = obj.getOrNull(config, "priority", contextName) ?: false;
-
-        language = _obj.getOrNull(config, "language", contextName);
-        original = _obj.getOrNull(config, "original", contextName);
     }
 }

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

@@ -5,50 +5,42 @@ import com.futo.platformplayer.api.media.models.streams.sources.IVideoUrlSource
 import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.engine.IV8PluginConfig
 import com.futo.platformplayer.engine.V8Plugin
-import com.futo.platformplayer.getOrDefault
 import com.futo.platformplayer.getOrNull
 import com.futo.platformplayer.getOrThrow
 
-open class JSVideoUrlSource(
-    plugin: JSClient,
-    obj: V8ValueObject
-) : JSSource(TYPE_VIDEOURL, plugin, obj), IVideoUrlSource {
+open class JSVideoUrlSource : IVideoUrlSource, JSSource {
+    override val width : Int;
+    override val height : Int;
+    override val container : String;
+    override val codec: String;
+    override val name : String;
+    override val bitrate : Int;
+    override val duration: Long;
+    private val url : String;
 
-    private val ctx = "JSVideoUrlSource"
-    private val cfg = plugin.config
+    override var priority: Boolean = false;
 
-    override val width: Int =
-        _obj.getOrThrow<Int>(cfg, "width", ctx)
+    constructor(plugin: JSClient, obj: V8ValueObject): super(TYPE_VIDEOURL, plugin, obj) {
+        val contextName = "JSVideoUrlSource";
+        val config = plugin.config;
 
-    override val height: Int =
-        _obj.getOrThrow<Int>(cfg, "height", ctx)
+        width = _obj.getOrThrow(config, "width", contextName);
+        height = _obj.getOrThrow(config, "height", contextName);
+        container = _obj.getOrThrow(config, "container", contextName);
+        codec = _obj.getOrThrow(config, "codec", contextName);
+        name = _obj.getOrThrow(config, "name", contextName);
+        bitrate = _obj.getOrThrow(config, "bitrate", contextName);
+        duration = _obj.getOrThrow<Int>(config, "duration", contextName).toLong();
+        url = _obj.getOrThrow(config, "url", contextName);
 
-    override val container: String =
-        _obj.getOrThrow<String>(cfg, "container", ctx)
+        priority = obj.getOrNull(config, "priority", contextName) ?: false;
+    }
 
-    override val codec: String =
-        _obj.getOrThrow<String>(cfg, "codec", ctx)
+    override fun getVideoUrl() : String {
+        return url;
+    }
 
-    override val name: String =
-        _obj.getOrThrow<String>(cfg, "name", ctx)
-
-    override val bitrate: Int =
-        _obj.getOrThrow<Int>(cfg, "bitrate", ctx)
-
-    override val duration: Long =
-        _obj.getOrThrow<Long>(cfg, "duration", ctx)
-
-    private val url: String =
-        _obj.getOrThrow<String>(cfg, "url", ctx)
-
-    override var priority: Boolean =
-        _obj.getOrDefault<Boolean>(cfg, "priority", ctx, false) ?: false
-
-    override val language: String? = _obj.getOrDefault(cfg, "language", ctx, null);
-    override val original: Boolean? = _obj.getOrDefault(cfg, "original", ctx, null);
-
-    override fun getVideoUrl(): String = url
-
-    override fun toString(): String =
-        "(width=$width, height=$height, container=$container, codec=$codec, name=$name, bitrate=$bitrate, duration=$duration, url=$url)"
-}
+    override fun toString(): String {
+        return "(width=$width, height=$height, container=$container, codec=$codec, name=$name, bitrate=$bitrate, duration=$duration, url=$url)"
+    }
+}

app/src/main/java/com/futo/platformplayer/api/media/platforms/local/LocalClient.kt

@@ -1,160 +1,5 @@
 package com.futo.platformplayer.api.media.platforms.local
 
-import android.content.ContentResolver
-import android.net.Uri
-import android.provider.MediaStore
-import com.futo.platformplayer.R
-import com.futo.platformplayer.api.media.IPlatformClient
-import com.futo.platformplayer.api.media.PlatformClientCapabilities
-import com.futo.platformplayer.api.media.models.PlatformAuthorLink
-import com.futo.platformplayer.api.media.models.ResultCapabilities
-import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
-import com.futo.platformplayer.api.media.models.chapters.IChapter
-import com.futo.platformplayer.api.media.models.comments.IPlatformComment
-import com.futo.platformplayer.api.media.models.contents.IPlatformContent
-import com.futo.platformplayer.api.media.models.contents.IPlatformContentDetails
-import com.futo.platformplayer.api.media.models.live.ILiveChatWindowDescriptor
-import com.futo.platformplayer.api.media.models.live.IPlatformLiveEvent
-import com.futo.platformplayer.api.media.models.playback.IPlaybackTracker
-import com.futo.platformplayer.api.media.models.playlists.IPlatformPlaylist
-import com.futo.platformplayer.api.media.models.playlists.IPlatformPlaylistDetails
-import com.futo.platformplayer.api.media.models.video.IPlatformVideo
-import com.futo.platformplayer.api.media.structures.EmptyPager
-import com.futo.platformplayer.api.media.structures.IPager
-import com.futo.platformplayer.engine.exceptions.ScriptUnavailableException
-import com.futo.platformplayer.models.ImageVariable
-import com.futo.platformplayer.states.StateLibrary
-import java.net.MalformedURLException
-
-class LocalClient: IPlatformClient {
-    override val id: String  = "LOCAL"
-    override val name: String = "Local"
-    override val icon: ImageVariable? = ImageVariable.fromResource(R.drawable.ic_library)
-    override val capabilities: PlatformClientCapabilities = PlatformClientCapabilities()
-
-    override fun initialize() {}
-
-    override fun disable() {
-
-    }
-
-    override fun getHome(): IPager<IPlatformContent>
-        = EmptyPager();
-
-    override fun isContentDetailsUrl(url: String): Boolean {
-        try {
-            val uri = Uri.parse(url);
-            return ContentResolver.SCHEME_CONTENT == uri.scheme
-                    && (
-                        MediaStore.AUTHORITY == uri.authority ||
-                        uri.authority == "com.android.externalstorage.documents"
-                    )
-        }
-        catch(ex: MalformedURLException) {
-            return false;
-        }
-    }
-
-    val audioExtensions = listOf(".mp3", ".wav", ".flac", ".mp4a", ".m4a");
-    override fun getContentDetails(url: String): IPlatformContentDetails {
-        val uri = Uri.parse(url);
-
-        if("audio" in uri.pathSegments) {
-            return StateLibrary.getAudioTrack(url) ?: throw Exception("Failed to find ${url}");
-        }
-        else if("video" in uri.pathSegments) {
-            return StateLibrary.getVideoTrack(url) ?: throw Exception("Failed to find ${url}");
-        }
-        else if(uri.toString().contains("com.android.externalstorage.documents")) {
-            if(audioExtensions.any { uri.lastPathSegment?.lowercase()?.endsWith(it) ?: false })
-                return StateLibrary.getAudioTrack(url) ?: throw Exception("Failed to find ${url}");
-            else
-                return StateLibrary.getVideoTrack(url) ?: throw Exception("Failed to find ${url}");
-        }
-        else
-            throw Exception("Unknown content url [${url}]");
-    }
-
-    override fun getSearchCapabilities(): ResultCapabilities
-        = ResultCapabilities();
-    override fun search(query: String, type: String?, order: String?, filters: Map<String, List<String>>?): IPager<IPlatformContent> {
-        return EmptyPager(); //TODO
-    }
-
-    override fun getSearchChannelContentsCapabilities(): ResultCapabilities
-        = ResultCapabilities();
-    override fun searchChannelContents(channelUrl: String, query: String, type: String?, order: String?, filters: Map<String, List<String>>?): IPager<IPlatformContent> {
-        return EmptyPager(); //TODO
-    }
-
-    override fun searchChannels(query: String): IPager<PlatformAuthorLink> {
-        return EmptyPager(); //TODO
-    }
-
-    override fun searchChannelsAsContent(query: String): IPager<IPlatformContent> {
-        return EmptyPager(); //TODO
-    }
-
-    override fun isChannelUrl(url: String): Boolean {
-        return false //TODO
-    }
-
-    override fun getChannel(channelUrl: String): IPlatformChannel {
-        throw NotImplementedError();
-    }
-
-    override fun getChannelCapabilities(): ResultCapabilities
-        = ResultCapabilities();
-    override fun getChannelContents(channelUrl: String, type: String?, order: String?, filters: Map<String, List<String>>?): IPager<IPlatformContent> {
-        return EmptyPager();
-    }
-
-    override fun getChannelPlaylists(channelUrl: String): IPager<IPlatformPlaylist> {
-        return EmptyPager();
-    }
-
-    override fun getPeekChannelTypes(): List<String> = listOf();
-
-    override fun peekChannelContents(channelUrl: String, type: String?): List<IPlatformContent>
-        = listOf();
-
-    override fun getShorts(): IPager<IPlatformVideo> = EmptyPager();
-
-    override fun searchSuggestions(query: String): Array<String> = arrayOf();
-
-    override fun getChannelUrlByClaim(claimType: Int, claimValues: Map<Int, String>): String?
-            = null;
-
-    override fun getContentChapters(url: String): List<IChapter>
-        = listOf();
-
-    override fun getPlaybackTracker(url: String): IPlaybackTracker?
-        = null;
-
-    override fun getContentRecommendations(url: String): IPager<IPlatformContent>?
-        = null;
-
-    override fun getComments(url: String): IPager<IPlatformComment>
-        = EmptyPager();
-
-    override fun getSubComments(comment: IPlatformComment): IPager<IPlatformComment>
-        = EmptyPager();
-
-    override fun getLiveChatWindow(url: String): ILiveChatWindowDescriptor?
-        = null;
-
-    override fun getLiveEvents(url: String): IPager<IPlatformLiveEvent>?
-        = null;
-
-    override fun searchPlaylists(query: String, type: String?, order: String?, filters: Map<String, List<String>>?): IPager<IPlatformContent>
-        = throw NotImplementedError();
-
-    override fun isPlaylistUrl(url: String): Boolean = false;
-
-    override fun getPlaylist(url: String): IPlatformPlaylistDetails
-        = throw NotImplementedError();
-    override fun getUserPlaylists(): Array<String> = throw NotImplementedError();
-    override fun getUserSubscriptions(): Array<String> = throw NotImplementedError();
-    override fun getUserHistory(): IPager<IPlatformContent> = throw NotImplementedError();
-    override fun isClaimTypeSupported(claimType: Int): Boolean = false;
+class LocalClient {
+    //TODO
 }

app/src/main/java/com/futo/platformplayer/api/media/platforms/local/models/sources/LocalAudioContentSource.kt

@@ -23,10 +23,10 @@ class LocalAudioContentSource : IAudioSource {
 
     var contentUrl: String;
 
-    constructor(contentUrl: String, mime: String, name: String? = null, duration: Long = 0) {
+    constructor(contentUrl: String, mime: String, name: String? = null) {
         this.name = name ?: "File";
         container = mime;
-        this.duration = duration;
+        duration = 0;
 
         this.contentUrl = contentUrl;
     }

app/src/main/java/com/futo/platformplayer/api/media/platforms/local/models/sources/LocalVideoContentSource.kt

@@ -20,17 +20,14 @@ class LocalVideoContentSource: IVideoSource {
     override val duration: Long;
     override val priority: Boolean = false;
 
-    override val language: String? = null;
-    override val original: Boolean? = false;
-
     var contentUrl: String;
 
-    constructor(contentUrl: String, mime: String, name: String? = null, duration: Long = 0) {
+    constructor(contentUrl: String, mime: String, name: String? = null) {
         this.name = name ?: "File";
         width = 0;
         height = 0;
         container = mime;
-        this.duration = duration;
+        duration = 0;
         this.contentUrl = contentUrl;
     }
 }

app/src/main/java/com/futo/platformplayer/api/media/platforms/local/models/sources/LocalVideoFileSource.kt

@@ -20,9 +20,6 @@ class LocalVideoFileSource: IVideoSource {
     override val duration: Long;
     override val priority: Boolean = false;
 
-    override val language: String? = null;
-    override val original: Boolean? = null;
-
     var file: File;
 
     constructor(file: File) {

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

@@ -1,6 +1,5 @@
 package com.futo.platformplayer.casting
 
-import com.futo.platformplayer.constructs.Event0
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.models.CastingDeviceInfo
 import org.fcast.sender_sdk.Metadata
@@ -17,7 +16,6 @@ abstract class CastingDevice {
     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

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

@@ -2,14 +2,12 @@ package com.futo.platformplayer.casting
 
 import android.os.Build
 import com.futo.platformplayer.BuildConfig
-import com.futo.platformplayer.constructs.Event0
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.CastingDeviceInfo
-import com.futo.polycentric.core.Event
 import org.fcast.sender_sdk.ApplicationInfo
-import org.fcast.sender_sdk.KeyEvent
-import org.fcast.sender_sdk.MediaEvent
+import org.fcast.sender_sdk.GenericKeyEvent
+import org.fcast.sender_sdk.GenericMediaEvent
 import org.fcast.sender_sdk.PlaybackState
 import org.fcast.sender_sdk.Source
 import java.net.InetAddress
@@ -17,10 +15,8 @@ import org.fcast.sender_sdk.CastingDevice as RsCastingDevice;
 import org.fcast.sender_sdk.DeviceEventHandler as RsDeviceEventHandler;
 import org.fcast.sender_sdk.DeviceConnectionState
 import org.fcast.sender_sdk.DeviceFeature
-import org.fcast.sender_sdk.EventSubscription
 import org.fcast.sender_sdk.IpAddr
 import org.fcast.sender_sdk.LoadRequest
-import org.fcast.sender_sdk.MediaItemEventType
 import org.fcast.sender_sdk.Metadata
 import org.fcast.sender_sdk.ProtocolType
 import org.fcast.sender_sdk.urlFormatIpAddr
@@ -67,7 +63,6 @@ class CastingDeviceExp(val device: RsCastingDevice) : CastingDevice() {
         var onDurationChanged = Event1<Double>()
         var onVolumeChanged = Event1<Double>()
         var onSpeedChanged = Event1<Double>()
-        var onMediaItemEnd = Event0()
 
         override fun connectionStateChanged(state: DeviceConnectionState) {
             onConnectionStateChanged.emit(state)
@@ -97,14 +92,12 @@ class CastingDeviceExp(val device: RsCastingDevice) : CastingDevice() {
             // TODO
         }
 
-        override fun keyEvent(event: KeyEvent) {
+        override fun keyEvent(event: GenericKeyEvent) {
             // Unreachable
         }
 
-        override fun mediaEvent(event: MediaEvent) {
-            if (event.type == MediaItemEventType.END) {
-                onMediaItemEnd.emit()
-            }
+        override fun mediaEvent(event: GenericMediaEvent) {
+            // Unreachable
         }
 
         override fun playbackError(message: String) {
@@ -134,8 +127,6 @@ class CastingDeviceExp(val device: RsCastingDevice) : CastingDevice() {
         get() = eventHandler.onVolumeChanged
     override val onSpeedChanged: Event1<Double>
         get() = eventHandler.onSpeedChanged
-    override val onMediaItemEnd: Event0
-        get() = eventHandler.onMediaItemEnd
 
     override fun resumePlayback() = device.resumePlayback()
     override fun pausePlayback() = device.pausePlayback()
@@ -190,8 +181,7 @@ class CastingDeviceExp(val device: RsCastingDevice) : CastingDevice() {
             resumePosition = resumePosition,
             speed = speed,
             volume = volume,
-            metadata = metadata,
-            requestHeaders = null,
+            metadata = metadata
         )
     )
 
@@ -210,7 +200,6 @@ class CastingDeviceExp(val device: RsCastingDevice) : CastingDevice() {
             speed = speed,
             volume = volume,
             metadata = metadata,
-            requestHeaders = null,
         )
     )
 
@@ -238,13 +227,6 @@ class CastingDeviceExp(val device: RsCastingDevice) : CastingDevice() {
         eventHandler.onConnectionStateChanged.subscribe { newState ->
             when (newState) {
                 is DeviceConnectionState.Connected -> {
-                    if (device.supportsFeature(DeviceFeature.MEDIA_EVENT_SUBSCRIPTION)) {
-                        try {
-                            device.subscribeEvent(EventSubscription.MediaItemEnd)
-                        } catch (e: Exception) {
-                            Logger.e(TAG, "Failed to subscribe to MediaItemEnd events: $e")
-                        }
-                    }
                     usedRemoteAddress = ipAddrToInetAddress(newState.usedRemoteAddr)
                     localAddress = ipAddrToInetAddress(newState.localAddr)
                     connectionState = CastConnectionState.CONNECTED
@@ -257,7 +239,7 @@ class CastingDeviceExp(val device: RsCastingDevice) : CastingDevice() {
                 }
 
                 DeviceConnectionState.Disconnected -> {
-                    connectionState = CastConnectionState.DISCONNECTED
+                    connectionState = CastConnectionState.CONNECTING
                     onConnectionStateChanged.emit(CastConnectionState.DISCONNECTED)
                 }
             }
@@ -286,4 +268,4 @@ class CastingDeviceExp(val device: RsCastingDevice) : CastingDevice() {
     companion object {
         private val TAG = "CastingDeviceExp"
     }
-}
+}

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

@@ -1,6 +1,5 @@
 package com.futo.platformplayer.casting
 
-import com.futo.platformplayer.constructs.Event0
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.models.CastingDeviceInfo
 import kotlinx.serialization.KSerializer
@@ -182,7 +181,6 @@ class CastingDeviceLegacyWrapper(val inner: CastingDeviceLegacy) : CastingDevice
     override val onDurationChanged: Event1<Double> get() = inner.onDurationChanged
     override val onVolumeChanged: Event1<Double> get() = inner.onVolumeChanged
     override val onSpeedChanged: Event1<Double> get() = inner.onSpeedChanged
-    override val onMediaItemEnd: Event0 = Event0()
     override var connectionState: CastConnectionState
         get() = inner.connectionState
         set(_) = Unit

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

@@ -6,7 +6,6 @@ import android.content.Context
 import android.os.Looper
 import android.util.Log
 import androidx.annotation.OptIn
-import androidx.core.net.toUri
 import androidx.media3.common.util.UnstableApi
 import com.futo.platformplayer.R
 import com.futo.platformplayer.Settings
@@ -15,11 +14,9 @@ import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.http.server.HttpHeaders
 import com.futo.platformplayer.api.http.server.ManagedHttpServer
 import com.futo.platformplayer.api.http.server.handlers.HttpConstantHandler
-import com.futo.platformplayer.api.http.server.handlers.HttpContentUriHandler
 import com.futo.platformplayer.api.http.server.handlers.HttpFileHandler
 import com.futo.platformplayer.api.http.server.handlers.HttpFunctionHandler
 import com.futo.platformplayer.api.http.server.handlers.HttpProxyHandler
-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.IHLSManifestAudioSource
@@ -36,11 +33,8 @@ import com.futo.platformplayer.api.media.platforms.js.models.sources.JSDashManif
 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.api.media.platforms.js.models.sources.JSSource
-import com.futo.platformplayer.api.media.platforms.local.models.sources.LocalAudioContentSource
-import com.futo.platformplayer.api.media.platforms.local.models.sources.LocalVideoContentSource
 import com.futo.platformplayer.awaitCancelConverted
 import com.futo.platformplayer.builders.DashBuilder
-import com.futo.platformplayer.constructs.Event0
 import com.futo.platformplayer.models.CastingDeviceInfo
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.constructs.Event2
@@ -83,7 +77,6 @@ abstract class StateCasting {
     val onActiveDeviceTimeChanged = Event1<Double>();
     val onActiveDeviceDurationChanged = Event1<Double>();
     val onActiveDeviceVolumeChanged = Event1<Double>();
-    val onActiveDeviceMediaItemEnd = Event0()
     var activeDevice: CastingDevice? = null;
     private var _videoExecutor: JSRequestExecutor? = null
     private var _audioExecutor: JSRequestExecutor? = null
@@ -97,7 +90,8 @@ abstract class StateCasting {
     abstract fun start(context: Context)
     abstract fun stop()
 
-    abstract fun deviceFromInfo(deviceInfo: CastingDeviceInfo): CastingDevice?
+    @Throws
+    abstract fun deviceFromInfo(deviceInfo: CastingDeviceInfo): CastingDevice
     abstract fun startUpdateTimeJob(
         onTimeJobTimeChanged_s: Event1<Long>, setTime: (Long) -> Unit
     ): Job?
@@ -147,7 +141,6 @@ abstract class StateCasting {
             device.onTimeChanged.clear();
             device.onVolumeChanged.clear();
             device.onDurationChanged.clear();
-            device.onMediaItemEnd.clear();
             ad.disconnect()
         }
 
@@ -162,7 +155,6 @@ abstract class StateCasting {
                 device.onTimeChanged.clear();
                 device.onVolumeChanged.clear();
                 device.onDurationChanged.clear();
-                device.onMediaItemEnd.clear();
                 activeDevice = null;
             }
 
@@ -226,9 +218,6 @@ abstract class StateCasting {
         device.onTimeChanged.subscribe {
             invokeInMainScopeIfRequired { onActiveDeviceTimeChanged.emit(it) };
         };
-        device.onMediaItemEnd.subscribe {
-            invokeInMainScopeIfRequired { onActiveDeviceMediaItemEnd.emit() }
-        }
 
         try {
             device.connect();
@@ -239,7 +228,6 @@ abstract class StateCasting {
             device.onTimeChanged.clear();
             device.onVolumeChanged.clear();
             device.onDurationChanged.clear();
-            device.onMediaItemEnd.clear();
             return;
         }
 
@@ -247,9 +235,9 @@ abstract class StateCasting {
         Logger.i(TAG, "Connect to device ${device.name}")
     }
 
-    fun metadataFromVideo(video: IPlatformVideoDetails, videoThumbnailOverrideUrl: String? = null): Metadata {
+    fun metadataFromVideo(video: IPlatformVideoDetails): Metadata {
         return Metadata(
-            title = video.name, thumbnailUrl = videoThumbnailOverrideUrl ?: video.thumbnails.getHQThumbnail()
+            title = video.name, thumbnailUrl = video.thumbnails.getHQThumbnail()
         )
     }
 
@@ -308,63 +296,20 @@ abstract class StateCasting {
                 val url = getLocalUrl(ad);
                 val id = UUID.randomUUID();
 
-
                 if (videoSource is IVideoUrlSource) {
-                    val videoPath = "/video-$id"
-                    val upstreamUrl = videoSource.getVideoUrl()
-                    val videoUrl = if (proxyStreams) url + videoPath else upstreamUrl
-                    val jsReqMod = (videoSource as? JSSource)?.getRequestModifier()
-
-                    if (proxyStreams) {
-                        _castServer.addHandlerWithAllowAllOptions(
-                            HttpProxyHandler("GET", videoPath, upstreamUrl, true)
-                                .withIRequestModifier(jsReqMod)
-                                .withInjectedHost()
-                                .withHeader("Access-Control-Allow-Origin", "*"),
-                            true
-                        ).withTag("castSingular")
-                    }
-
-                    Logger.i(TAG, "Casting as singular video (proxy=$proxyStreams, url=$videoUrl)")
-                    ad.loadVideo(
-                        if (video.isLive) "LIVE" else "BUFFERED",
-                        videoSource.container,
-                        videoUrl,
-                        resumePosition,
-                        video.duration.toDouble(),
-                        speed,
-                        metadataFromVideo(video)
-                    )
+                    val videoPath = "/video-${id}"
+                    val videoUrl = if(proxyStreams) url + videoPath else videoSource.getVideoUrl();
+                    Logger.i(TAG, "Casting as singular video");
+                    ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", videoSource.container, videoUrl, resumePosition, video.duration.toDouble(), speed, metadataFromVideo(video));
                 } else if (audioSource is IAudioUrlSource) {
-                    val audioPath = "/audio-$id"
-                    val upstreamUrl = audioSource.getAudioUrl()
-                    val audioUrl = if (proxyStreams) url + audioPath else upstreamUrl
-                    val jsReqMod = (audioSource as? JSSource)?.getRequestModifier()
-
-                    if (proxyStreams) {
-                        _castServer.addHandlerWithAllowAllOptions(
-                            HttpProxyHandler("GET", audioPath, upstreamUrl, true)
-                                .withIRequestModifier(jsReqMod)
-                                .withInjectedHost()
-                                .withHeader("Access-Control-Allow-Origin", "*"),
-                            true
-                        ).withTag("castSingular")
-                    }
-
-                    Logger.i(TAG, "Casting as singular audio (proxy=$proxyStreams, url=$audioUrl)")
-                    ad.loadVideo(
-                        if (video.isLive) "LIVE" else "BUFFERED",
-                        audioSource.container,
-                        audioUrl,
-                        resumePosition,
-                        video.duration.toDouble(),
-                        speed,
-                        metadataFromVideo(video)
-                    )
+                    val audioPath = "/audio-${id}"
+                    val audioUrl = if(proxyStreams) url + audioPath else audioSource.getAudioUrl();
+                    Logger.i(TAG, "Casting as singular audio");
+                    ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", audioSource.container, audioUrl, resumePosition, video.duration.toDouble(), speed, metadataFromVideo(video));
                 } else if (videoSource is IHLSManifestSource) {
                     if (proxyStreams || deviceProto == CastProtocolType.CHROMECAST) {
                         Logger.i(TAG, "Casting as proxied HLS");
-                        castProxiedHls(video, videoSource.url, videoSource.codec, resumePosition, speed, (videoSource as JSSource?)?.getRequestModifier());
+                        castProxiedHls(video, videoSource.url, videoSource.codec, resumePosition, speed);
                     } else {
                         Logger.i(TAG, "Casting as non-proxied HLS");
                         ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", videoSource.container, videoSource.url, resumePosition, video.duration.toDouble(), speed, metadataFromVideo(video));
@@ -372,7 +317,7 @@ abstract class StateCasting {
                 } else if (audioSource is IHLSManifestAudioSource) {
                     if (proxyStreams || deviceProto == CastProtocolType.CHROMECAST) {
                         Logger.i(TAG, "Casting as proxied audio HLS");
-                        castProxiedHls(video, audioSource.url, audioSource.codec, resumePosition, speed, (audioSource as JSSource?)?.getRequestModifier());
+                        castProxiedHls(video, audioSource.url, audioSource.codec, resumePosition, speed);
                     } else {
                         Logger.i(TAG, "Casting as non-proxied audio HLS");
                         ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", audioSource.container, audioSource.url, resumePosition, video.duration.toDouble(), speed, metadataFromVideo(video));
@@ -383,12 +328,6 @@ abstract class StateCasting {
                 } else if (audioSource is LocalAudioSource) {
                     Logger.i(TAG, "Casting as local audio");
                     castLocalAudio(video, audioSource, resumePosition, speed);
-                } else if (videoSource is LocalVideoContentSource) {
-                    Logger.i(TAG, "Casting as local video");
-                    castLocalVideo(contentResolver, video, videoSource, resumePosition, speed);
-                } else if (audioSource is LocalAudioContentSource) {
-                    Logger.i(TAG, "Casting as local audio");
-                    castLocalAudio(contentResolver, video, audioSource, resumePosition, speed);
                 } else if (videoSource is JSDashManifestRawSource) {
                     Logger.i(TAG, "Casting as JSDashManifestRawSource video");
                     castDashRaw(contentResolver, video, videoSource as JSDashManifestRawSource?, null, null, resumePosition, speed, castId, onLoadingEstimate, onLoading);
@@ -409,11 +348,6 @@ abstract class StateCasting {
         }
     }
 
-    private fun HttpProxyHandler.withIRequestModifier(requestModifier: IRequestModifier?): HttpProxyHandler {
-        if (requestModifier == null) return this
-        return withRequestModifier { url, headers -> requestModifier.modifyRequest(url, headers) }
-    }
-
     fun resumeVideo(): Boolean {
         val ad = activeDevice ?: return false;
         try {
@@ -479,65 +413,6 @@ abstract class StateCasting {
         }
         return true;
     }
-
-    private fun castLocalVideo(contentResolver: ContentResolver, video: IPlatformVideoDetails, videoSource: LocalVideoContentSource, resumePosition: Double, speed: Double?) : List<String> {
-        val ad = activeDevice ?: return listOf();
-
-        val url = getLocalUrl(ad);
-        val id = UUID.randomUUID();
-        val videoPath = "/video-${id}"
-        val videoUrl = url + videoPath;
-        val thumbnailPath = "/thumbnail-${id}"
-        val thumbnailUrl = url + thumbnailPath;
-        val thumbnailContentUrl = video.thumbnails.getHQThumbnail()
-
-        if (thumbnailContentUrl != null) {
-            _castServer.addHandlerWithAllowAllOptions(
-                HttpContentUriHandler("GET", thumbnailPath, contentResolver, thumbnailContentUrl.toUri())
-                    .withHeader("Access-Control-Allow-Origin", "*"), true
-            ).withTag("cast");
-        }
-
-        _castServer.addHandlerWithAllowAllOptions(
-            HttpContentUriHandler("GET", videoPath, contentResolver, videoSource.contentUrl.toUri())
-                .withHeader("Access-Control-Allow-Origin", "*"), true
-        ).withTag("cast");
-
-        Logger.i(TAG, "Casting local video (videoUrl: $videoUrl).");
-        ad.loadVideo("BUFFERED", videoSource.container, videoUrl, resumePosition, video.duration.toDouble(), speed, metadataFromVideo(video, if (thumbnailContentUrl != null) thumbnailUrl else null));
-
-        return listOf(videoUrl);
-    }
-
-    private fun castLocalAudio(contentResolver: ContentResolver, video: IPlatformVideoDetails, audioSource: LocalAudioContentSource, resumePosition: Double, speed: Double?) : List<String> {
-        val ad = activeDevice ?: return listOf();
-
-        val url = getLocalUrl(ad);
-        val id = UUID.randomUUID();
-        val audioPath = "/audio-${id}"
-        val audioUrl = url + audioPath;
-        val thumbnailPath = "/thumbnail-${id}"
-        val thumbnailUrl = url + thumbnailPath;
-        val thumbnailContentUrl = video.thumbnails.getHQThumbnail()
-
-        if (thumbnailContentUrl != null) {
-            _castServer.addHandlerWithAllowAllOptions(
-                HttpContentUriHandler("GET", thumbnailPath, contentResolver, thumbnailContentUrl.toUri())
-                    .withHeader("Access-Control-Allow-Origin", "*"), true
-            ).withTag("cast");
-        }
-
-        _castServer.addHandlerWithAllowAllOptions(
-            HttpContentUriHandler("GET", audioPath, contentResolver, audioSource.contentUrl.toUri())
-                .withHeader("Access-Control-Allow-Origin", "*"), true
-        ).withTag("cast");
-
-        Logger.i(TAG, "Casting local audio (audioUrl: $audioUrl).");
-        ad.loadVideo("BUFFERED", audioSource.container, audioUrl, resumePosition, video.duration.toDouble(), speed, metadataFromVideo(video, if (thumbnailContentUrl != null) thumbnailUrl else null));
-
-        return listOf(audioUrl);
-    }
-
     private fun castLocalVideo(video: IPlatformVideoDetails, videoSource: LocalVideoSource, resumePosition: Double, speed: Double?) : List<String> {
         val ad = activeDevice ?: return listOf();
 
@@ -791,8 +666,7 @@ abstract class StateCasting {
         sourceUrl: String,
         codec: String?,
         resumePosition: Double,
-        speed: Double?,
-        requestModifier: IRequestModifier?
+        speed: Double?
     ): List<String> {
         _castServer.removeAllHandlers("castProxiedHlsMaster")
 
@@ -813,9 +687,7 @@ abstract 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)
                 check(masterPlaylistResponse.isOk) { "Failed to get master playlist: ${masterPlaylistResponse.code}" }
 
                 val masterPlaylistContent = masterPlaylistResponse.body?.string()
@@ -835,7 +707,7 @@ abstract class StateCasting {
                         val variantPlaylist =
                             HLS.parseVariantPlaylist(masterPlaylistContent, sourceUrl)
                         val proxiedVariantPlaylist =
-                            proxyVariantPlaylist(url, id, variantPlaylist,  video.isLive, requestModifier)
+                            proxyVariantPlaylist(url, id, variantPlaylist, video.isLive)
                         val proxiedVariantPlaylist_m3u8 = proxiedVariantPlaylist.buildM3U8()
                         masterContext.respondCode(200, vpHeaders, proxiedVariantPlaylist_m3u8);
                         return@HttpFunctionHandler
@@ -876,7 +748,7 @@ abstract class StateCasting {
                             val variantPlaylist =
                                 HLS.parseVariantPlaylist(vpContent, variantPlaylistRef.url)
                             val proxiedVariantPlaylist =
-                                proxyVariantPlaylist(url, playlistId, variantPlaylist, video.isLive, requestModifier)
+                                proxyVariantPlaylist(url, playlistId, variantPlaylist, video.isLive)
                             val proxiedVariantPlaylist_m3u8 = proxiedVariantPlaylist.buildM3U8()
                             vpContext.respondCode(200, vpHeaders, proxiedVariantPlaylist_m3u8);
                         }.withHeader("Access-Control-Allow-Origin", "*"), true
@@ -913,7 +785,7 @@ abstract class StateCasting {
                                 val variantPlaylist =
                                     HLS.parseVariantPlaylist(vpContent, mediaRendition.uri)
                                 val proxiedVariantPlaylist = proxyVariantPlaylist(
-                                    url, playlistId, variantPlaylist, video.isLive, requestModifier
+                                    url, playlistId, variantPlaylist, video.isLive
                                 )
                                 val proxiedVariantPlaylist_m3u8 = proxiedVariantPlaylist.buildM3U8()
                                 vpContext.respondCode(200, vpHeaders, proxiedVariantPlaylist_m3u8);
@@ -955,13 +827,13 @@ abstract class StateCasting {
         return listOf(hlsUrl);
     }
 
-    private fun proxyVariantPlaylist(url: String, playlistId: UUID, variantPlaylist: HLS.VariantPlaylist, isLive: Boolean, requestModifier: IRequestModifier?, proxySegments: Boolean = true): HLS.VariantPlaylist {
+    private fun proxyVariantPlaylist(url: String, playlistId: UUID, variantPlaylist: HLS.VariantPlaylist, isLive: Boolean, proxySegments: Boolean = true): HLS.VariantPlaylist {
         val newSegments = arrayListOf<HLS.Segment>()
 
         if (proxySegments) {
             variantPlaylist.segments.forEachIndexed { index, segment ->
                 val sequenceNumber = (variantPlaylist.mediaSequence ?: 0) + index.toLong()
-                newSegments.add(proxySegment(url, playlistId, segment, sequenceNumber, requestModifier))
+                newSegments.add(proxySegment(url, playlistId, segment, sequenceNumber))
             }
         } else {
             newSegments.addAll(variantPlaylist.segments)
@@ -979,7 +851,7 @@ abstract class StateCasting {
         )
     }
 
-    private fun proxySegment(url: String, playlistId: UUID, segment: HLS.Segment, index: Long, requestModifier: IRequestModifier?): HLS.Segment {
+    private fun proxySegment(url: String, playlistId: UUID, segment: HLS.Segment, index: Long): HLS.Segment {
         if (segment is HLS.MediaSegment) {
             val newSegmentPath = "/hls-playlist-${playlistId}-segment-${index}"
             val newSegmentUrl = url + newSegmentPath;
@@ -987,7 +859,6 @@ abstract class StateCasting {
             if (_castServer.getHandler("GET", newSegmentPath) == null) {
                 _castServer.addHandlerWithAllowAllOptions(
                     HttpProxyHandler("GET", newSegmentPath, segment.uri, true)
-                        .withIRequestModifier(requestModifier)
                         .withInjectedHost()
                         .withHeader("Access-Control-Allow-Origin", "*"), true
                 ).withTag("castProxiedHlsVariant")
@@ -1241,47 +1112,6 @@ abstract class StateCasting {
         return "http://${address.toUrlAddress().trim('/')}:${_castServer.port}";
     }
 
-    private fun escapeXml(s: String): String =
-        s.replace("&", "&amp;")
-            .replace("<", "&lt;")
-            .replace(">", "&gt;")
-            .replace("\"", "&quot;")
-            .replace("'", "&apos;")
-
-    private fun injectSubtitleAdaptationSet(
-        mpd: String,
-        subtitleUrl: String,
-        mimeType: String,
-        lang: String = "und",
-        label: String = "Subtitles"
-    ): String {
-        val mt = mimeType.lowercase()
-        val codecs = when (mt) {
-            "text/vtt", "text/webvtt" -> "wvtt"
-            "application/ttml+xml", "application/ttml" -> "stpp"
-            else -> null
-        }
-        val codecsAttr = codecs?.let { " codecs=\"${escapeXml(it)}\"" } ?: ""
-
-        val adaptation = """
-        <AdaptationSet id="subtitles-1" contentType="text" mimeType="${escapeXml(mimeType)}" lang="${escapeXml(lang)}">
-          <Role schemeIdUri="urn:mpeg:dash:role:2011" value="subtitle"/>
-          <Label>${escapeXml(label)}</Label>
-          <Representation id="subtitles-1"$codecsAttr bandwidth="256" mimeType="${escapeXml(mimeType)}">
-            <BaseURL>${escapeXml(subtitleUrl)}</BaseURL>
-          </Representation>
-        </AdaptationSet>
-    """.trimIndent()
-
-        val periodClose = Regex("</Period\\s*>", RegexOption.IGNORE_CASE)
-
-        return if (periodClose.containsMatchIn(mpd)) {
-            mpd.replaceFirst(periodClose, adaptation + "\n</Period>")
-        } else {
-            mpd
-        }
-    }
-
     @OptIn(UnstableApi::class)
     private suspend fun castDashRaw(contentResolver: ContentResolver, video: IPlatformVideoDetails, videoSource: JSDashManifestRawSource?, audioSource: JSDashManifestRawAudioSource?, subtitleSource: ISubtitleSource?, resumePosition: Double, speed: Double?, castId: Int, onLoadingEstimate: ((Int) -> Unit)? = null, onLoading: ((Boolean) -> Unit)? = null) : List<String> {
         val ad = activeDevice ?: return listOf();
@@ -1303,42 +1133,30 @@ abstract class StateCasting {
         val videoUrl = url + videoPath
         val audioUrl = url + audioPath
 
-        val subtitleMimeTypeFull = subtitleSource?.format ?: "text/vtt"
-        val subtitleMimeTypeForMpd = subtitleMimeTypeFull.substringBefore(';').trim()
-
         val subtitlesUri = if (subtitleSource != null) withContext(Dispatchers.IO) {
-            subtitleSource.getSubtitlesURI()
-        } else null
+            return@withContext subtitleSource.getSubtitlesURI();
+        } else null;
 
-        var subtitlesUrl: String? = null
+        var subtitlesUrl: String? = null;
         if (subtitlesUri != null) {
-            when (subtitlesUri.scheme) {
-                "file", "content" -> {
-                    val content = withContext(Dispatchers.IO) {
-                        contentResolver.openInputStream(subtitlesUri)?.use { stream ->
-                            stream.bufferedReader().use { it.readText() }
-                        }
-                    }
-
-                    if (!content.isNullOrEmpty()) {
-                        _castServer.addHandlerWithAllowAllOptions(
-                            HttpConstantHandler("GET", subtitlePath, content, subtitleMimeTypeFull)
-                                .withHeader("Access-Control-Allow-Origin", "*"),
-                            true
-                        ).withTag("castDashRaw")
-
-                        subtitlesUrl = url + subtitlePath
-                    }
+            if(subtitlesUri.scheme == "file") {
+                var content: String? = null;
+                val inputStream = contentResolver.openInputStream(subtitlesUri);
+                inputStream?.use { stream ->
+                    val reader = stream.bufferedReader();
+                    content = reader.use { it.readText() };
                 }
 
-                "http", "https" -> {
-                    // Receiver will fetch directly (works only if it doesn’t need auth/headers)
-                    subtitlesUrl = subtitlesUri.toString()
+                if (content != null) {
+                    _castServer.addHandlerWithAllowAllOptions(
+                        HttpConstantHandler("GET", subtitlePath, content!!, subtitleSource?.format ?: "text/vtt")
+                            .withHeader("Access-Control-Allow-Origin", "*"), true
+                    ).withTag("cast");
                 }
 
-                else -> {
-                    Logger.w(TAG, "Unsupported subtitlesUri scheme: ${subtitlesUri.scheme}")
-                }
+                subtitlesUrl = url + subtitlePath;
+            } else {
+                subtitlesUrl = subtitlesUri.toString();
             }
         }
 
@@ -1384,22 +1202,8 @@ abstract class StateCasting {
             return emptyList()
         }
 
-        if (subtitlesUrl != null) {
-            dashContent = injectSubtitleAdaptationSet(
-                dashContent,
-                subtitlesUrl!!,
-                subtitleMimeTypeForMpd
-            )
-        }
-
-        var hasAudioInDash = false
         for (representation in representationRegex.findAll(dashContent)) {
             val mediaType = representation.groups[1]?.value ?: throw Exception("Media type should be found")
-
-            if (mediaType.startsWith("audio/")) {
-                hasAudioInDash = true
-            }
-
             dashContent = mediaInitializationRegex.replace(dashContent) {
                 if (it.range.first < representation.range.first || it.range.last > representation.range.last) {
                     return@replace it.value
@@ -1423,20 +1227,12 @@ abstract class StateCasting {
             throw Exception("Audio source without request executor not supported")
         }
 
-        if (videoSource != null && videoSource.hasRequestExecutor) {
-            val oldVideoExecutor = _videoExecutor
-            oldVideoExecutor?.closeAsync()
-            _videoExecutor = videoSource.getRequestExecutor()
+        if (audioSource != null && audioSource.hasRequestExecutor) {
+            _audioExecutor = audioSource.getRequestExecutor()
         }
 
-        if (audioSource != null) {
-            val oldExecutor = _audioExecutor
-            oldExecutor?.closeAsync()
-            _audioExecutor = audioSource.getRequestExecutor()
-        } else if (hasAudioInDash && videoSource != null) {
-            val oldExecutor = _audioExecutor
-            oldExecutor?.closeAsync()
-            _audioExecutor = _videoExecutor
+        if (videoSource != null && videoSource.hasRequestExecutor) {
+            _videoExecutor = videoSource.getRequestExecutor()
         }
 
         //TOOD: Else also handle the non request executor case, perhaps add ?url=$originalUrl to the query parameters, ... propagate this for all other flows also
@@ -1467,7 +1263,7 @@ abstract class StateCasting {
                 }.withHeader("Access-Control-Allow-Origin", "*"), true
             ).withTag("castDashRaw");
         }
-        if (audioSource != null || (audioSource == null && hasAudioInDash)) {
+        if (audioSource != null) {
             _castServer.addHandlerWithAllowAllOptions(
                 HttpFunctionHandler("GET", audioPath) { httpContext ->
                     val originalUrl = httpContext.query["url"]?.let { URLDecoder.decode(it, "UTF-8") } ?: return@HttpFunctionHandler
@@ -1492,11 +1288,9 @@ abstract class StateCasting {
         return listOf()
     }
 
-    fun addRememberedDevice(deviceInfo: CastingDeviceInfo): CastingDeviceInfo? {
-        return when (val device = deviceFromInfo(deviceInfo)) {
-            null -> null
-            else -> addRememberedDevice(device)
-        }
+    fun addRememberedDevice(deviceInfo: CastingDeviceInfo): CastingDeviceInfo {
+        val device = deviceFromInfo(deviceInfo);
+        return addRememberedDevice(device);
     }
 
     fun addRememberedDevice(device: CastingDevice): CastingDeviceInfo {
@@ -1505,7 +1299,7 @@ abstract class StateCasting {
     }
 
     fun getRememberedCastingDevices(): List<CastingDevice> {
-        return _storage.getDevices().map { deviceFromInfo(it) }.filterNotNull()
+        return _storage.getDevices().map { deviceFromInfo(it) }
     }
 
     fun getRememberedCastingDeviceNames(): List<String> {

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

@@ -151,25 +151,21 @@ class StateCastingExp : StateCasting() {
         setTime: (Long) -> Unit
     ): Job? = null
 
-    override fun deviceFromInfo(deviceInfo: CastingDeviceInfo): CastingDeviceExp? {
-        try {
-            val rsAddrs =
-                deviceInfo.addresses.map { org.fcast.sender_sdk.tryIpAddrFromStr(it) }
-            val rsDeviceInfo = RsDeviceInfo(
-                name = deviceInfo.name,
-                protocol = when (deviceInfo.type) {
-                    com.futo.platformplayer.casting.CastProtocolType.CHROMECAST -> ProtocolType.CHROMECAST
-                    com.futo.platformplayer.casting.CastProtocolType.FCAST -> ProtocolType.F_CAST
-                    else -> throw IllegalArgumentException()
-                },
-                addresses = rsAddrs,
-                port = deviceInfo.port.toUShort(),
-            )
+    override fun deviceFromInfo(deviceInfo: CastingDeviceInfo): CastingDeviceExp {
+        val rsAddrs =
+            deviceInfo.addresses.map { org.fcast.sender_sdk.tryIpAddrFromStr(it) } // Throws!
+        val rsDeviceInfo = RsDeviceInfo(
+            name = deviceInfo.name,
+            protocol = when (deviceInfo.type) {
+                com.futo.platformplayer.casting.CastProtocolType.CHROMECAST -> ProtocolType.CHROMECAST
+                com.futo.platformplayer.casting.CastProtocolType.FCAST -> ProtocolType.F_CAST
+                else -> throw IllegalArgumentException()
+            },
+            addresses = rsAddrs,
+            port = deviceInfo.port.toUShort(),
+        )
 
-            return CastingDeviceExp(_context.createDeviceFromInfo(rsDeviceInfo))
-        } catch (_: Throwable) {
-            return null
-        }
+        return CastingDeviceExp(_context.createDeviceFromInfo(rsDeviceInfo))
     }
 
     companion object {

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

@@ -55,9 +55,7 @@ class StateCastingLegacy : StateCasting() {
             )
         )
 
-        if (foundInfo != null) {
-            connectDevice(deviceFromInfo(foundInfo))
-        }
+        connectDevice(deviceFromInfo(foundInfo))
     }
 
     override fun onStop() {

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

@@ -18,7 +18,6 @@ import com.futo.platformplayer.engine.dev.V8RemoteObject
 import com.futo.platformplayer.engine.dev.V8RemoteObject.Companion.gsonStandard
 import com.futo.platformplayer.engine.dev.V8RemoteObject.Companion.serialize
 import com.futo.platformplayer.engine.packages.PackageHttp
-import com.futo.platformplayer.fragment.mainactivity.main.LoginFragment
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StateAssets
@@ -29,8 +28,6 @@ import com.google.gson.FieldAttributes
 import com.google.gson.GsonBuilder
 import com.google.gson.JsonArray
 import com.google.gson.JsonParser
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import java.lang.reflect.Field
@@ -271,17 +268,11 @@ class DeveloperEndpoints(private val context: Context) {
                 context.respondCode(403, "This plugin doesn't support auth");
                 return;
             }
-            StateApp.instance.scopeOrNull?.launch(Dispatchers.Main) {
-                LoginFragment.showLogin(config){
-                    _testPluginVariables.clear();
-                    _testPlugin = V8Plugin(StateApp.instance.context, config, null, JSHttpClient(null, null, null, config), JSHttpClient(null, it, null, config));
-                };
-            }
-            /*
             LoginActivity.showLogin(StateApp.instance.context, config) {
                 _testPluginVariables.clear();
                 _testPlugin = V8Plugin(StateApp.instance.context, config, null, JSHttpClient(null, null, null, config), JSHttpClient(null, it, null, config));
-            }; */
+
+            };
             context.respondCode(200, "Login started");
         }
         catch(ex: Throwable) {

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

@@ -16,12 +16,9 @@ import android.widget.Button
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
-import androidx.core.content.ContextCompat
 import com.futo.platformplayer.R
 import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
-import com.futo.platformplayer.UpdateDownloadService
-import com.futo.platformplayer.UpdateNotificationManager
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.copyToOutputStream
 import com.futo.platformplayer.logging.Logger
@@ -37,8 +34,6 @@ import java.io.InputStream
 class AutoUpdateDialog(context: Context?) : AlertDialog(context) {
     companion object {
         private val TAG = "AutoUpdateDialog";
-
-        var currentDialog: AutoUpdateDialog? = null
     }
 
     private lateinit var _buttonNever: Button;
@@ -51,6 +46,7 @@ class AutoUpdateDialog(context: Context?) : AlertDialog(context) {
     private var _maxVersion: Int = 0;
 
     private var _updating: Boolean = false;
+    private var _apkFile: File? = null;
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState);
@@ -65,14 +61,12 @@ class AutoUpdateDialog(context: Context?) : AlertDialog(context) {
         _buttonShowChangelog = findViewById(R.id.button_show_changelog);
 
         _buttonNever.setOnClickListener {
-            UpdateNotificationManager.cancelAll(context)
             Settings.instance.autoUpdate.check = 1;
             Settings.instance.save();
             dismiss();
         };
 
         _buttonClose.setOnClickListener {
-            UpdateNotificationManager.cancelAll(context)
             dismiss();
         };
 
@@ -82,32 +76,23 @@ class AutoUpdateDialog(context: Context?) : AlertDialog(context) {
         };
 
         _buttonUpdate.setOnClickListener {
-            UpdateNotificationManager.cancelAll(context)
-
             if (_updating) {
                 return@setOnClickListener;
             }
 
-            if (Settings.instance.autoUpdate.shouldBackgroundDownload) {
-                val ctx = context.applicationContext;
-                val intent = Intent(ctx, UpdateDownloadService::class.java);
-                intent.putExtra(UpdateDownloadService.EXTRA_VERSION, _maxVersion);
-                ContextCompat.startForegroundService(ctx, intent);
-                UIDialogs.toast(context, "Downloading update in background");
-                dismiss();
-            } else {
-                _updating = true;
-                update();
-            }
+            _updating = true;
+            update();
         };
+    }
 
-        currentDialog = this
+    fun showPredownloaded(apkFile: File) {
+        _apkFile = apkFile;
+        super.show()
     }
 
     override fun dismiss() {
         super.dismiss()
         InstallReceiver.onReceiveResult.clear();
-        currentDialog = null
         Logger.i(TAG, "Cleared InstallReceiver.onReceiveResult handler.")
     }
 
@@ -133,14 +118,21 @@ class AutoUpdateDialog(context: Context?) : AlertDialog(context) {
         GlobalScope.launch(Dispatchers.IO) {
             var inputStream: InputStream? = null;
             try {
-                val client = ManagedHttpClient();
-                val response = client.get(StateUpdate.APK_URL);
-                if (response.isOk && response.body != null) {
-                    inputStream = response.body.byteStream();
-                    val dataLength = response.body.contentLength();
+                val apkFile = _apkFile;
+                if (apkFile != null) {
+                    inputStream = apkFile.inputStream();
+                    val dataLength = apkFile.length();
                     install(inputStream, dataLength);
                 } else {
-                    throw Exception("Failed to download latest version of app.");
+                    val client = ManagedHttpClient();
+                    val response = client.get(StateUpdate.APK_URL);
+                    if (response.isOk && response.body != null) {
+                        inputStream = response.body.byteStream();
+                        val dataLength = response.body.contentLength();
+                        install(inputStream, dataLength);
+                    } else {
+                        throw Exception("Failed to download latest version of app.");
+                    }
                 }
             } catch (e: Throwable) {
                 Logger.w(TAG, "Exception thrown while downloading and installing latest version of app.", e);

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

@@ -90,7 +90,6 @@ class ConnectedCastingDialog(context: Context?) : AlertDialog(context) {
         _buttonClose.setOnClickListener { dismiss(); };
         _buttonDisconnect.setOnClickListener {
             try {
-                StateCasting.instance.stopVideo()
                 StateCasting.instance.activeDevice?.disconnect()
             } catch (e: Throwable) {
                 Logger.e(TAG, "Active device failed to disconnect: $e")

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

@@ -48,7 +48,6 @@ class PluginUpdateDialog : AlertDialog {
 
     private lateinit var _buttonCancel1: Button;
     private lateinit var _buttonCancel2: Button;
-    private lateinit var _buttonAlways: LinearLayout;
     private lateinit var _buttonUpdate: LinearLayout;
 
     private lateinit var _buttonOk: LinearLayout;
@@ -59,7 +58,6 @@ class PluginUpdateDialog : AlertDialog {
     private lateinit var _textProgres: TextView;
     private lateinit var _textError: TextView;
     private lateinit var _textResult: TextView;
-    private lateinit var _textChangelogResult: TextView;
 
     private lateinit var _uiChoiceTop: FrameLayout;
     private lateinit var _uiProgressTop: FrameLayout;
@@ -91,7 +89,6 @@ class PluginUpdateDialog : AlertDialog {
 
         _buttonCancel1 = findViewById(R.id.button_cancel_1);
         _buttonCancel2 = findViewById(R.id.button_cancel_2);
-        _buttonAlways = findViewById(R.id.button_always);
         _buttonUpdate = findViewById(R.id.button_update);
 
         _buttonOk = findViewById(R.id.button_ok);
@@ -102,7 +99,6 @@ class PluginUpdateDialog : AlertDialog {
         _textProgres = findViewById(R.id.text_progress);
         _textError = findViewById(R.id.text_error);
         _textResult = findViewById(R.id.text_result);
-        _textChangelogResult = findViewById(R.id.text_changelog_result);
 
         _uiChoiceTop = findViewById(R.id.dialog_ui_choice_top);
         _uiProgressTop = findViewById(R.id.dialog_ui_progress_top);
@@ -123,24 +119,17 @@ class PluginUpdateDialog : AlertDialog {
                 val changelog = _newConfig.changelog!![changelogVersion]!!;
                 if(changelog.size > 1) {
                     _textChangelog.text = "Changelog (${_newConfig.version})\n" + changelog.map { " - " + it.trim() }.joinToString("\n");
-                    _textChangelogResult.text = _textChangelog.text;
                 }
                 else if(changelog.size == 1) {
                     _textChangelog.text = "Changelog (${_newConfig.version})\n" + changelog[0].trim();
-                    _textChangelogResult.text = _textChangelog.text;
                 }
-                else {
+                else
                     _textChangelog.visibility = View.GONE;
-                    _textChangelogResult.visibility = View.GONE;
-                }
-            } else {
-                    _textChangelog.visibility = View.GONE;
-                    _textChangelogResult.visibility = View.GONE;
-            }
+            } else
+                _textChangelog.visibility = View.GONE;
         }
         catch(ex: Throwable) {
             _textChangelog.visibility = View.GONE;
-            _textChangelogResult.visibility = View.GONE;
             Logger.e(TAG, "Invalid changelog? ", ex);
         }
 
@@ -156,18 +145,6 @@ class PluginUpdateDialog : AlertDialog {
             _isUpdating = true;
             update();
         };
-        _buttonAlways.setOnClickListener {
-            if (_isUpdating)
-                return@setOnClickListener;
-            val plugin = StatePlugins.instance.getPlugin(_oldConfig.id);
-            if(plugin != null) {
-                plugin.appSettings.automaticUpdate = true;
-                StatePlugins.instance.savePlugin(_oldConfig.id);
-                UIDialogs.appToast("Automatic update enabled, can be disabled in plugin settings");
-            }
-            _isUpdating = true;
-            update();
-        };
 
         Glide.with(_iconPlugin)
             .load(_oldConfig.absoluteIconUrl)
@@ -181,8 +158,7 @@ class PluginUpdateDialog : AlertDialog {
                 if (_isUpdating)
                     return;
                 _isUpdating = true;
-
-                update(true);
+                update();
             }
         }
     }
@@ -191,7 +167,7 @@ class PluginUpdateDialog : AlertDialog {
         super.dismiss();
     }
 
-    private fun update(automatic: Boolean = false) {
+    private fun update() {
         _uiChoiceTop.visibility = View.GONE;
         _uiRiskTop.visibility = View.GONE;
         _uiChoiceBot.visibility = View.GONE;
@@ -211,16 +187,9 @@ class PluginUpdateDialog : AlertDialog {
         val scope = StateApp.instance.scopeOrNull;
         scope?.launch(Dispatchers.IO) {
             try {
-                withContext(Dispatchers.Main) {
-                    _textProgres.setText("Loading current script file...");
-                }
                 val client = ManagedHttpClient();
-                client.setTimeout(10000);
                 val script = StatePlugins.instance.getScript(_oldConfig.id) ?: "";
 
-                withContext(Dispatchers.Main) {
-                    _textProgres.setText("Requesting new script file...");
-                }
                 val newScript = client.get(_newConfig.absoluteScriptUrl)?.body?.string();
                 if(newScript.isNullOrEmpty())
                     throw IllegalStateException("No script found");

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

@@ -1,19 +1,13 @@
 package com.futo.platformplayer.downloads
 
 import android.content.Context
-import android.media.MediaCodec
-import android.media.MediaExtractor
-import android.media.MediaMuxer
 import android.util.Log
 import com.arthenica.ffmpegkit.FFmpegKit
 import com.arthenica.ffmpegkit.ReturnCode
 import com.arthenica.ffmpegkit.StatisticsCallback
 import com.futo.platformplayer.Settings
-import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.api.http.ManagedHttpClient
-import com.futo.platformplayer.api.media.IPlatformClient
 import com.futo.platformplayer.api.media.PlatformID
-import com.futo.platformplayer.api.media.models.modifier.IRequestModifier
 import com.futo.platformplayer.api.media.models.streams.VideoUnMuxedSourceDescriptor
 import com.futo.platformplayer.api.media.models.streams.sources.AudioUrlSource
 import com.futo.platformplayer.api.media.models.streams.sources.IAudioSource
@@ -42,13 +36,10 @@ import com.futo.platformplayer.api.media.platforms.js.models.sources.JSDashManif
 import com.futo.platformplayer.api.media.platforms.js.models.sources.JSDashManifestRawSource
 import com.futo.platformplayer.api.media.platforms.js.models.sources.JSSource
 import com.futo.platformplayer.constructs.Event1
-import com.futo.platformplayer.engine.exceptions.ScriptException
-import com.futo.platformplayer.engine.exceptions.ScriptReloadRequiredException
 import com.futo.platformplayer.exceptions.DownloadException
 import com.futo.platformplayer.helpers.FileHelper.Companion.sanitizeFileName
 import com.futo.platformplayer.helpers.VideoHelper
 import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.others.Language
 import com.futo.platformplayer.parsers.HLS
 import com.futo.platformplayer.serializers.OffsetDateTimeNullableSerializer
 import com.futo.platformplayer.states.StateDownloads
@@ -91,9 +82,6 @@ import kotlin.time.times
 class VideoDownload {
     var state: State = State.QUEUED;
 
-    @Contextual
-    @Transient
-    var plugin: IPlatformClient? = null;
     var video: SerializedPlatformVideo? = null;
     var videoDetails: SerializedPlatformVideoDetails? = null;
 
@@ -109,7 +97,6 @@ class VideoDownload {
 
     var videoSource: VideoUrlSource?;
     var audioSource: AudioUrlSource?;
-    var overrideResultAudioSource: IAudioSource? = null;
     @Contextual
     @Transient
     val videoSourceToUse: IVideoSource? get () = if(requiresLiveVideoSource) videoSourceLive as IVideoSource? else videoSource as IVideoSource?;
@@ -149,8 +136,6 @@ class VideoDownload {
 
     var hasVideoRequestExecutor: Boolean = false;
     var hasAudioRequestExecutor: Boolean = false;
-    var hasVideoRequestModifier: Boolean = false;
-    var hasAudioRequestModifier: Boolean = false;
 
     var progress: Double = 0.0;
     var isCancelled = false;
@@ -218,10 +203,8 @@ class VideoDownload {
         this.prepareTime = OffsetDateTime.now();
         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);
+        this.requiresLiveVideoSource = this.hasVideoRequestExecutor || (videoSource is JSDashManifestRawSource && videoSource.hasGenerate);
+        this.requiresLiveAudioSource = 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;
@@ -279,7 +262,7 @@ class VideoDownload {
 
         //Fetch full video object and determine source
         if(video != null && videoDetails == null) {
-            val original = if (plugin != null) plugin!!.getContentDetails(video!!.url) else StatePlatform.instance.getContentDetails(video!!.url)?.await();
+            val original = StatePlatform.instance.getContentDetails(video!!.url).await();
             if(original !is IPlatformVideoDetails)
                 throw IllegalStateException("Original content is not media?");
 
@@ -446,11 +429,6 @@ class VideoDownload {
             videoFileNameBase = "${videoDetails!!.id.value!!} [${actualVideoSource!!.width}x${actualVideoSource!!.height}]".sanitizeFileName();
             videoFileNameExt = videoContainerToExtension(actualVideoSource!!.container);
             videoFilePath = File(downloadDir, videoFileName!!).absolutePath;
-            if(actualVideoSource is JSDashManifestRawSource && actualAudioSource == null) {
-                audioFileNameBase = "${videoDetails!!.id.value!!}-[unknown]".sanitizeFileName();
-                audioFileNameExt = videoAudioContainerToExtension(actualVideoSource!!.container);
-                audioFilePath = File(downloadDir, audioFileName!!).absolutePath;
-            }
         }
         if(actualAudioSource != null) {
             audioFileNameBase = "${videoDetails!!.id.value!!} [${actualAudioSource!!.language}-${actualAudioSource!!.bitrate}]".sanitizeFileName();
@@ -500,15 +478,11 @@ class VideoDownload {
 
                 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" -> downloadHlsSource(context, "Video", client, videoSource!!.getVideoUrl(), File(downloadDir, videoFileName!!), progressCallback)
+                        else -> downloadFileSource("Video", client, videoSource!!.getVideoUrl(), File(downloadDir, videoFileName!!), progressCallback)
                     }
                 else if(actualVideoSource is JSDashManifestRawSource) {
-                    if(actualAudioSource == null)
-                        videoFileSize = downloadDashFileSource("Video", client, actualVideoSource, File(downloadDir, videoFileName!!), progressCallback, 3,
-                            File(downloadDir, audioFileName!!));
-                    else
-                        videoFileSize = downloadDashFileSource("Video", client, actualVideoSource, File(downloadDir, videoFileName!!), progressCallback, 1);
+                    videoFileSize = downloadDashFileSource("Video", client, actualVideoSource, File(downloadDir, videoFileName!!), progressCallback);
                 }
                 else throw NotImplementedError("NotImplemented video download: " + actualVideoSource.javaClass.name);
             });
@@ -544,11 +518,11 @@ class VideoDownload {
 
                 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" -> downloadHlsSource(context, "Audio", client, audioSource!!.getAudioUrl(), File(downloadDir, audioFileName!!), progressCallback)
+                        else -> downloadFileSource("Audio", client, audioSource!!.getAudioUrl(), File(downloadDir, audioFileName!!), progressCallback)
                     }
                 else if(actualAudioSource is JSDashManifestRawAudioSource) {
-                    audioFileSize = downloadDashFileSource("Audio", client, actualAudioSource, File(downloadDir, audioFileName!!), progressCallback, 2);
+                    audioFileSize = downloadDashFileSource("Audio", client, actualAudioSource, File(downloadDir, audioFileName!!), progressCallback);
                 }
                 else throw NotImplementedError("NotImplemented audio download: " + actualAudioSource.javaClass.name);
             });
@@ -606,305 +580,121 @@ class VideoDownload {
         return cipher.doFinal(encryptedSegment)
     }
 
-    private suspend fun combineSegments(context: Context, segmentFiles: List<File>, targetFile: File) = withContext(Dispatchers.IO) {
-        require(segmentFiles.isNotEmpty()) { "segmentFiles must not be empty" }
-
-        suspendCancellableCoroutine { continuation ->
-            val concatInput = buildString {
-                append("concat:")
-                append(
-                    segmentFiles.joinToString("|") { file ->
-                        file.absolutePath
-                    }
-                )
-            }
-
-            val cmd = "-i \"$concatInput\" -c copy \"${targetFile.absolutePath}\""
-
-            val statisticsCallback = StatisticsCallback { _ ->
-                //No callback
-            }
-
-            val executorService = Executors.newSingleThreadExecutor()
-
-            val session = FFmpegKit.executeAsync(
-                cmd,
-                { completedSession ->
-                    executorService.shutdown()
-
-                    if (ReturnCode.isSuccess(completedSession.returnCode)) {
-                        continuation.resumeWith(Result.success(Unit))
-                    } else {
-                        val errorMessage = if (ReturnCode.isCancel(completedSession.returnCode)) {
-                            "Command cancelled"
-                        } else {
-                            "Command failed with state '${completedSession.state}' " +
-                                    "and return code ${completedSession.returnCode}, " +
-                                    "stack trace ${completedSession.failStackTrace}"
-                        }
-                        continuation.resumeWithException(RuntimeException(errorMessage))
-                    }
-                },
-                { log ->
-                    Logger.v(TAG, log.message)
-                },
-                statisticsCallback,
-                executorService
-            )
-
-            continuation.invokeOnCancellation {
-                session.cancel()
-                executorService.shutdownNow()
-            }
-        }
-    }
-
-    private suspend fun downloadHlsSource(context: Context, name: String, client: ManagedHttpClient, source: JSSource?, hlsUrl: String, targetFile: File, onProgress: (Long, Long, Long) -> Unit): Long {
-        if (targetFile.exists())
-            targetFile.delete()
+    private suspend fun downloadHlsSource(context: Context, name: String, client: ManagedHttpClient, hlsUrl: String, targetFile: File, onProgress: (Long, Long, Long) -> Unit): Long {
+        if(targetFile.exists())
+            targetFile.delete();
 
         var downloadedTotalLength = 0L
-        val 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>()
-
-            if (rangeStart != null) {
-                if (rangeLength != null && rangeLength > 0) {
-                    val end = rangeStart + rangeLength - 1
-                    headers["Range"] = "bytes=$rangeStart-$end"
-                } else {
-                    headers["Range"] = "bytes=$rangeStart-"
-                }
-            }
-
-            val modified = modifier?.modifyRequest(url, headers)
-            val finalUrl = modified?.url ?: url
-            val finalHeaders = modified?.headers?.toMutableMap() ?: headers
-
-            val resp = client.get(finalUrl, finalHeaders)
-            if (!resp.isOk) {
-                resp.body?.close()
-                throw IllegalStateException("Failed to download HLS resource ($finalUrl): HTTP ${resp.code}")
-            }
-
-            val body = resp.body ?: throw IllegalStateException("Failed to download HLS resource ($finalUrl): Empty body")
-            val bytes = body.bytes()
-            body.close()
-            return bytes
-        }
-
-        fun buildSequenceIv(sequenceNumber: Long): ByteArray {
-            return ByteBuffer.allocate(16)
-                .putLong(0L)
-                .putLong(sequenceNumber)
-                .array()
-        }
 
         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 response = client.get(hlsUrl)
+            check(response.isOk) { "Failed to get variant playlist: ${response.code}" }
 
-            check(playlistResp.isOk) { "Failed to get variant playlist: ${playlistResp.code}" }
-
-            val vpContent = playlistResp.body?.string()
-                ?: throw IllegalStateException("Variant playlist content is empty")
+            val vpContent = response.body?.string()
+                ?: throw Exception("Variant playlist content is empty")
 
             val variantPlaylist = HLS.parseVariantPlaylist(vpContent, hlsUrl)
-            val hlsDec = variantPlaylist.decryptionInfo
-            val useDecryption = hlsDec != null && !hlsDec.method.equals("NONE", ignoreCase = true)
-            var keyBytes: ByteArray? = null
-            var staticIvBytes: ByteArray? = null
-
-            if (useDecryption) {
-                if (!hlsDec.method.equals("AES-128", ignoreCase = true)) {
-                    throw UnsupportedOperationException("HLS decryption method '${hlsDec.method}' is not supported.")
-                }
-
-                val keyUrl = hlsDec.keyUrl ?: throw IllegalStateException("Encrypted HLS playlist without key URI is not supported.")
-
-                keyBytes = downloadBytes(keyUrl)
-                if (!hlsDec.iv.isNullOrEmpty()) {
-                    staticIvBytes = hlsDec.iv.hexStringToByteArray()
-                }
+            val decryptionInfo: DecryptionInfo? = if (variantPlaylist.decryptionInfo != null) {
+                val keyResponse = client.get(variantPlaylist.decryptionInfo.keyUrl)
+                check(keyResponse.isOk) { "HLS request failed for decryption key: ${keyResponse.code}" }
+                DecryptionInfo(keyResponse.body!!.bytes(), variantPlaylist.decryptionInfo.iv?.hexStringToByteArray())
+            } else {
+                null
             }
 
-            val mediaSequence = variantPlaylist.mediaSequence ?: 0L
-            val rangeOffsets = mutableMapOf<String, Long>()
-
-            if (!variantPlaylist.mapUrl.isNullOrEmpty()) {
-                if (isCancelled) throw CancellationException("Cancelled")
-
-                Logger.i(TAG, "Downloading HLS initialization map")
-
-                var mapRangeStart: Long? = null
-                var mapRangeLength: Long? = null
-
-                if (variantPlaylist.mapBytesLength > 0) {
-                    mapRangeLength = variantPlaylist.mapBytesLength
-
-                    val mapUrl = variantPlaylist.mapUrl
-                    if (variantPlaylist.mapBytesStart >= 0) {
-                        mapRangeStart = variantPlaylist.mapBytesStart
-                        rangeOffsets[mapUrl] =
-                            variantPlaylist.mapBytesStart + variantPlaylist.mapBytesLength
-                    } else {
-                        val offset = rangeOffsets[mapUrl] ?: 0L
-                        mapRangeStart = offset
-                        rangeOffsets[mapUrl] = offset + variantPlaylist.mapBytesLength
-                    }
-                }
-
-                var mapBytes = downloadBytes(variantPlaylist.mapUrl!!, mapRangeStart, mapRangeLength)
-
-                if (useDecryption) {
-                    val kb = keyBytes ?: throw IllegalStateException("Decryption key bytes are missing.")
-                    val iv = staticIvBytes
-                        ?: throw UnsupportedOperationException("Encrypted EXT-X-MAP without explicit IV is not supported.")
-                    mapBytes = decryptSegment(mapBytes, kb, iv)
-                }
-
-                if (mapBytes.size.toLong() > Int.MAX_VALUE) {
-                    throw IllegalStateException("HLS MAP segment too large to handle.")
-                }
-
-                val segmentFile = File(context.cacheDir, "segment-${UUID.randomUUID()}")
-                val outStr = segmentFile.outputStream()
-                try {
-                    segmentFiles.add(segmentFile)
-                    outStr.write(mapBytes)
-                    outStr.flush()
-                } finally {
-                    outStr.close()
-                }
-                downloadedTotalLength += mapBytes.size
-            }
-
-            val totalSegments = variantPlaylist.segments.size
-            var mediaSegmentIndex = 0
-
-            var bytesSinceLastSpeedUpdate = 0L
-            var lastSpeedUpdateTime = System.currentTimeMillis()
-            var lastSpeed = 0L
-
             variantPlaylist.segments.forEachIndexed { index, segment ->
-                if (segment !is HLS.MediaSegment) return@forEachIndexed
-                if (isCancelled) throw CancellationException("Cancelled")
-
-                Logger.i(TAG, "Download '$name' segment $index sequential")
-
-                var rangeStart: Long? = null
-                var rangeLength: Long? = null
-
-                if (segment.bytesLength > 0) {
-                    rangeLength = segment.bytesLength
-
-                    val urlKey = segment.uri
-                    if (segment.bytesStart >= 0) {
-                        rangeStart = segment.bytesStart
-                        rangeOffsets[urlKey] = segment.bytesStart + segment.bytesLength
-                    } else {
-                        val offset = rangeOffsets[urlKey] ?: 0L
-                        rangeStart = offset
-                        rangeOffsets[urlKey] = offset + segment.bytesLength
-                    }
+                if (segment !is HLS.MediaSegment) {
+                    return@forEachIndexed
                 }
 
-                var segmentBytes = downloadBytes(segment.uri, rangeStart, rangeLength)
-
-                if (useDecryption) {
-                    val kb = keyBytes ?: throw IllegalStateException("Decryption key bytes are missing.")
-                    val ivBytes = if (staticIvBytes != null) {
-                        staticIvBytes
-                    } else {
-                        val sequenceNumber = mediaSequence + mediaSegmentIndex
-                        buildSequenceIv(sequenceNumber)
-                    }
-
-                    segmentBytes = decryptSegment(segmentBytes, kb, ivBytes)
-                }
-
-                val segmentLength = segmentBytes.size.toLong()
-                if (segmentLength > Int.MAX_VALUE) {
-                    throw IllegalStateException("HLS media segment too large to handle.")
-                }
-
-                val avgLen = if (index == 0) {
-                    segmentLength
-                } else {
-                    if (index > 0) downloadedTotalLength / index else segmentLength
-                }
-                val expectedTotal = avgLen * (totalSegments - 1) + segmentLength
-
+                Logger.i(TAG, "Download '$name' segment $index Sequential");
                 val segmentFile = File(context.cacheDir, "segment-${UUID.randomUUID()}")
-                val outStr = segmentFile.outputStream()
+                val outputStream = segmentFile.outputStream()
                 try {
                     segmentFiles.add(segmentFile)
-                    outStr.write(segmentBytes)
+
+                    val segmentLength = downloadSource_Sequential(client, outputStream, segment.uri, if (index == 0) null else decryptionInfo, index) { segmentLength, totalRead, lastSpeed ->
+                        val averageSegmentLength = if (index == 0) segmentLength else downloadedTotalLength / index
+                        val expectedTotalLength = averageSegmentLength * (variantPlaylist.segments.size - 1) + segmentLength
+                        onProgress(expectedTotalLength, downloadedTotalLength + totalRead, lastSpeed)
+                    }
+
+                    downloadedTotalLength += segmentLength
                 } finally {
-                    outStr.close()
+                    outputStream.close()
                 }
-                downloadedTotalLength += segmentLength
-
-                bytesSinceLastSpeedUpdate += segmentLength
-                val now = System.currentTimeMillis()
-                val elapsed = now - lastSpeedUpdateTime
-                if (elapsed >= 500 && bytesSinceLastSpeedUpdate > 0) {
-                    lastSpeed = (bytesSinceLastSpeedUpdate * 1000L / elapsed)
-                    bytesSinceLastSpeedUpdate = 0
-                    lastSpeedUpdateTime = now
-                }
-
-                onProgress(expectedTotal, downloadedTotalLength, lastSpeed)
-                mediaSegmentIndex++
             }
 
+            Logger.i(TAG, "Combining segments into $targetFile");
             combineSegments(context, segmentFiles, targetFile)
-            Logger.i(TAG, "Finished HLS Source for $name")
-        } catch (ioex: IOException) {
-            if (targetFile.exists())
-                targetFile.delete()
-            if (ioex.message?.contains("ENOSPC") == true)
-                throw Exception("Not enough space on device", ioex)
+
+            Logger.i(TAG, "${name} downloadSource Finished");
+        }
+        catch(ioex: IOException) {
+            if(targetFile.exists())
+                targetFile.delete();
+            if(ioex.message?.contains("ENOSPC") ?: false)
+                throw Exception("Not enough space on device", ioex);
             else
-                throw ioex
-        } catch (ex: Throwable) {
-            if (targetFile.exists())
-                targetFile.delete()
-            throw ex
+                throw ioex;
+        }
+        catch(ex: Throwable) {
+            if(targetFile.exists())
+                targetFile.delete();
+            throw ex;
         }
         finally {
             for (segmentFile in segmentFiles) {
                 segmentFile.delete()
             }
         }
-
-        return downloadedTotalLength
+        return downloadedTotalLength;
     }
 
-    private fun downloadDashFileSource(name: String, client: ManagedHttpClient, source: IJSDashManifestRawSource, targetFile: File, onProgress: (Long, Long, Long) -> Unit, downloadType: Int = 0, targetFileAudio: File? = null): Long {
+    private suspend fun combineSegments(context: Context, segmentFiles: List<File>, targetFile: File) = withContext(Dispatchers.IO) {
+        suspendCancellableCoroutine { continuation ->
+            val cmd =
+                "-i \"concat:${segmentFiles.joinToString("|")}\" -c copy \"${targetFile.absolutePath}\""
+
+            val statisticsCallback = StatisticsCallback { _ ->
+                //TODO: Show progress?
+            }
+
+            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"
+                        } else {
+                            "Command failed with state '${session.state}' and return code ${session.returnCode}, stack trace ${session.failStackTrace}"
+                        }
+                        continuation.resumeWithException(RuntimeException(errorMessage))
+                    }
+                },
+                { Logger.v(TAG, it.message) },
+                statisticsCallback,
+                executorService
+            )
+
+            continuation.invokeOnCancellation {
+                session.cancel()
+            }
+        }
+    }
+
+    private fun downloadDashFileSource(name: String, client: ManagedHttpClient, source: IJSDashManifestRawSource, targetFile: File, onProgress: (Long, Long, Long) -> Unit): Long {
         if(targetFile.exists())
             targetFile.delete();
-        if(targetFileAudio?.exists() ?: false)
-            targetFileAudio.delete();
 
         targetFile.createNewFile();
-        targetFileAudio?.createNewFile();
 
         val sourceLength: Long?;
-        val sourceLengthAudio: Long?;
         val fileStream = FileOutputStream(targetFile);
-        val fileStream2 = if(targetFileAudio != null) FileOutputStream(targetFileAudio) else null;
 
-        var executor: JSRequestExecutor? = null;
         try{
             var manifest = source.manifest;
             if(source.hasGenerate)
@@ -913,59 +703,35 @@ class VideoDownload {
                 throw IllegalStateException("No manifest after generation");
 
             //TODO: Temporary naive assume single-sourced dash
-            val foundTemplates = REGEX_DASH_TEMPLATE_WITH_MIME.findAll(manifest);
-            val foundTemplate = when(downloadType) {
-                1 -> foundTemplates.find({ it.groupValues[1].contains("video/") });
-                2 -> foundTemplates.find({ it.groupValues[1].contains("audio/") });
-                else -> foundTemplates.find({ it.groupValues[1].contains("video/") });
-            }
-            if(foundTemplate == null || foundTemplate.groupValues.size != 4)
+            val foundTemplate = REGEX_DASH_TEMPLATE.find(manifest);
+            if(foundTemplate == null || foundTemplate.groupValues.size != 3)
                 throw IllegalStateException("No SegmentTemplate found in manifest (unsupported dash?)");
-            val foundTemplateUrl = foundTemplate.groupValues[2];
-            val foundCues = REGEX_DASH_CUE.findAll(foundTemplate.groupValues[3]).toList();
+            val foundTemplateUrl = foundTemplate.groupValues[1];
+            val foundCues = REGEX_DASH_CUE.findAll(foundTemplate.groupValues[2]);
             if(foundCues.count() <= 0)
                 throw IllegalStateException("No Cues found in manifest (unsupported dash?)");
 
-            val foundTemplate2 = if(downloadType == 3) foundTemplates.find({ it.groupValues[1].contains("audio/") }); else null;
-            val foundTemplateUrl2 = if(foundTemplate2 != null) foundTemplate2.groupValues[2] else null;
-            val foundCues2 = if(foundTemplate2 != null) REGEX_DASH_CUE.findAll(foundTemplate2.groupValues[3]).toList() else null;
-            val foundCues2Downloaded = hashSetOf<MatchResult>();
-
-            if(foundTemplate2 != null)
-                overrideResultAudioSource = LocalAudioSource((videoSource?.name)?.let { it + " [audio]" } ?: "audio", "", 0, 0, foundTemplate2.groupValues[1], REGEX_CODECS.find(foundTemplate2.groupValues[0])?.groupValues?.get(1) ?: "", Language.UNKNOWN);
-
-            executor = if(source is JSSource && source.hasRequestExecutor)
+            val executor = if(source is JSSource && source.hasRequestExecutor)
                 source.getRequestExecutor();
             else
                 null;
-
-            val modifier = if (source is JSSource && source.hasRequestModifier)
-                source.getRequestModifier();
-            else
-                null;
             val speedTracker = SpeedTracker(1000);
 
             Logger.i(TAG, "Download $name Dash, CueCount: " + foundCues.count().toString());
 
             var written: Long = 0;
-            var written2: Long = 0;
             var indexCounter = 0;
-            var indexCounter2 = 0;
             onProgress(foundCues.count().toLong(), 0, 0);
-            val totalCues = foundCues.count().toLong() + (foundCues2?.count()?.toLong() ?: 0)
-            val lastCue = foundCues.lastOrNull();
             for(cue in foundCues) {
                 val t = cue.groupValues[1];
                 val d = cue.groupValues[2];
 
-                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());
+                    executor.executeRequest("GET", url, null, mapOf());
                 else {
-                    val resp = client.get(modified?.url ?: url, modified?.headers?.toMutableMap() ?: mutableMapOf());
+                    val resp = client.get(url, mutableMapOf());
                     if(!resp.isOk)
                         throw IllegalStateException("Dash request failed for index " + indexCounter.toString() + ", with code: " + resp.code.toString());
                     resp.body!!.bytes()
@@ -974,60 +740,17 @@ class VideoDownload {
                 speedTracker.addWork(data.size.toLong());
                 written += data.size;
 
-                onProgress(totalCues, indexCounter.toLong() + indexCounter2.toLong(), speedTracker.lastSpeed);
-
+                onProgress(foundCues.count().toLong(), indexCounter.toLong(), speedTracker.lastSpeed);
 
                 indexCounter++;
-
-                if(foundCues2 != null && foundTemplateUrl2 != null && fileStream2 != null) {
-                    val toDownload = if(lastCue != null && cue == lastCue)
-                        foundCues2.filter { !foundCues2Downloaded.contains(it) }.toList() else
-                        foundCues2.filter { !foundCues2Downloaded.contains(it) && (it.groupValues[1].toLong()) < t.toLong() }.toList();
-                    Logger.i(TAG, "Downloading audio cues (${toDownload.size})")
-                    for(cue2 in toDownload) {
-                        val index2 = foundCues2.indexOf(cue2);
-                        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()
-                        }
-                        fileStream2.write(data, 0, data.size);
-                        speedTracker.addWork(data.size.toLong());
-                        written2 += data.size;
-                        indexCounter2++;
-
-                        foundCues2Downloaded.add(cue2);
-                        onProgress(totalCues, indexCounter.toLong() + indexCounter2.toLong(), speedTracker.lastSpeed);
-                    }
-                }
             }
             sourceLength = written;
-            sourceLengthAudio = written2;
 
             Logger.i(TAG, "$name downloadSource Finished");
         }
-        catch(scriptEx: ScriptReloadRequiredException) {
-            if(targetFile.exists() ?: false)
-                targetFile.delete();
-            if(targetFileAudio?.exists() ?: false)
-                targetFileAudio.delete();
-
-            createNewPluginClient();
-            throw scriptEx;
-        }
         catch(ioex: IOException) {
             if(targetFile.exists() ?: false)
                 targetFile.delete();
-            if(targetFileAudio?.exists() ?: false)
-                targetFileAudio.delete();
             if(ioex.message?.contains("ENOSPC") ?: false)
                 throw Exception("Not enough space on device", ioex);
             else
@@ -1036,38 +759,14 @@ class VideoDownload {
         catch(ex: Throwable) {
             if(targetFile.exists() ?: false)
                 targetFile.delete();
-            if(targetFileAudio?.exists() ?: false)
-                targetFileAudio.delete();
             throw ex;
         }
         finally {
             fileStream.close();
-            fileStream2?.close();
-            executor?.closeAsync()
         }
-        if(sourceLengthAudio != null && sourceLengthAudio > 0)
-            audioFileSize = sourceLengthAudio
         return sourceLength!!;
     }
-
-    fun createNewPluginClient() {
-        UIDialogs.appToast("Download creating new client at request of plugin");
-        cleanupPluginClient();
-        plugin = (video?.url ?: videoDetails?.url)?.let { StatePlatform.instance.getContentClient(it) }?.let { if(it is JSClient) it else null }?.getCopy(false, true);
-        plugin?.initialize();
-    }
-    fun cleanupPluginClient() {
-        val oldPlugin = plugin;
-        plugin = null;
-        try {
-            oldPlugin?.disable();
-        }
-        catch(ex: Throwable) {
-            Logger.e(TAG, "Failed to dispose download client: ${ex.message}" , ex);
-        }
-    }
-
-    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, videoUrl: String, targetFile: File, onProgress: (Long, Long, Long) -> Unit): Long {
         if(targetFile.exists())
             targetFile.delete();
 
@@ -1076,12 +775,7 @@ class VideoDownload {
         val sourceLength: Long?;
         val fileStream = FileOutputStream(targetFile);
 
-        val modifier = if (source is JSSource && source.hasRequestModifier)
-            source.getRequestModifier();
-        else
-            null;
-
-        try {
+        try{
             val head = client.tryHead(videoUrl);
             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"))
@@ -1092,12 +786,12 @@ class VideoDownload {
                 Logger.i(TAG, "Download $name ByteRange Parallel (${concurrency}): " + videoUrl);
                 sourceLength = head["content-length"]!!.toLong();
                 onProgress(sourceLength, 0, 0);
-                downloadSource_Ranges(name, client, modifier, fileStream, videoUrl, sourceLength, 1024*512, concurrency, onProgress);
+                downloadSource_Ranges(name, client, fileStream, videoUrl, sourceLength, 1024*512, concurrency, onProgress);
             }
             else {
                 Logger.i(TAG, "Download $name Sequential");
                 try {
-                    sourceLength = downloadSource_Sequential(client, modifier, fileStream, videoUrl, null, 0, onProgress);
+                    sourceLength = downloadSource_Sequential(client, fileStream, videoUrl, null, 0, onProgress);
                 } catch (e: Throwable) {
                     Logger.w(TAG, "Failed to download sequentially (url = $videoUrl)")
                     throw e
@@ -1148,7 +842,7 @@ class VideoDownload {
         }
     }
 
-    private fun downloadSource_Sequential(client: ManagedHttpClient, modifier: IRequestModifier? = null, fileStream: FileOutputStream, url: String, decryptionInfo: DecryptionInfo?, index: Int, onProgress: (Long, Long, Long) -> Unit): Long {
+    private fun downloadSource_Sequential(client: ManagedHttpClient, fileStream: FileOutputStream, url: String, decryptionInfo: DecryptionInfo?, index: Int, onProgress: (Long, Long, Long) -> Unit): Long {
         val progressRate: Int = 4096 * 5;
         var lastProgressCount: Int = 0;
         val speedRate: Int = 4096 * 5;
@@ -1157,12 +851,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);
         if (!result.isOk) {
             result.body?.close()
             throw IllegalStateException("Failed to download source. Web[${result.code}] Error");
@@ -1299,7 +988,7 @@ class VideoDownload {
         onProgress(sourceLength, totalRead, 0)
         return sourceLength
     }*/
-    private fun downloadSource_Ranges(name: String, client: ManagedHttpClient, modifier: IRequestModifier?, fileStream: FileOutputStream, url: String, sourceLength: Long, rangeSize: Int, concurrency: Int = 1, onProgress: (Long, Long, Long) -> Unit) {
+    private fun downloadSource_Ranges(name: String, client: ManagedHttpClient, fileStream: FileOutputStream, url: String, sourceLength: Long, rangeSize: Int, concurrency: Int = 1, onProgress: (Long, Long, Long) -> Unit) {
         val progressRate: Int = 4096 * 5;
         var lastProgressCount: Int = 0;
         val speedRate: Int = 4096 * 5;
@@ -1318,7 +1007,7 @@ class VideoDownload {
 
             Logger.i(TAG, "Download ${name} Batch #${reqCount} [${concurrency}] (${lastSpeed.toHumanBytesSpeed()})");
 
-            val byteRangeResults = requestByteRangeParallel(client, pool, modifier, url, sourceLength, concurrency, totalRead,
+            val byteRangeResults = requestByteRangeParallel(client, pool, url, sourceLength, concurrency, totalRead,
                 rangeSize, 1024 * 64);
 
             for(byteRange in byteRangeResults) {
@@ -1349,7 +1038,7 @@ class VideoDownload {
         onProgress(sourceLength, totalRead, 0);
     }
 
-    private fun requestByteRangeParallel(client: ManagedHttpClient, pool: ForkJoinPool, modifier: IRequestModifier?, url: String, totalLength: Long, concurrency: Int, rangePosition: Long, rangeSize: Int, rangeVariance: Int = -1): List<Triple<ByteArray, Long, Long>> {
+    private fun requestByteRangeParallel(client: ManagedHttpClient, pool: ForkJoinPool, url: String, totalLength: Long, concurrency: Int, rangePosition: Long, rangeSize: Int, rangeVariance: Int = -1): List<Triple<ByteArray, Long, Long>> {
         val tasks = mutableListOf<ForkJoinTask<Triple<ByteArray, Long, Long>>>();
         var readPosition = rangePosition;
         for(i in 0 until concurrency) {
@@ -1363,25 +1052,21 @@ class VideoDownload {
             else readPosition + toRead;
 
             tasks.add(pool.submit<Triple<ByteArray, Long, Long>> {
-                return@submit requestByteRange(client, modifier, url, rangeStart, rangeEnd);
+                return@submit requestByteRange(client, url, rangeStart, rangeEnd);
             });
             readPosition = rangeEnd + 1;
         }
 
         return tasks.map { it.get() };
     }
-    private fun requestByteRange(client: ManagedHttpClient, modifier: IRequestModifier?, url: String, rangeStart: Long, rangeEnd: Long): Triple<ByteArray, Long, Long> {
+    private fun requestByteRange(client: ManagedHttpClient, url: String, rangeStart: Long, rangeEnd: Long): Triple<ByteArray, Long, Long> {
         var retryCount = 0
-        var lastException: Throwable? = null;
-
-        val headers = mutableMapOf(Pair("Range", "bytes=${rangeStart}-${rangeEnd}"));
-        val modified = modifier?.modifyRequest(url, headers);
+        var lastException: Throwable? = null
 
         while (retryCount <= 3) {
             try {
                 val toRead = rangeEnd - rangeStart;
-
-                val req = client.get(modified?.url ?: url, modified?.headers?.toMutableMap() ?: headers);
+                val req = client.get(url, mutableMapOf(Pair("Range", "bytes=${rangeStart}-${rangeEnd}")));
                 if (!req.isOk) {
                     val bodyString = req.body?.string()
                     req.body?.close()
@@ -1426,7 +1111,7 @@ class VideoDownload {
                     throw IllegalStateException("Expected size [${videoFileSize}], but found ${expectedFile.length()}");
             }
         }
-        if(audioSourceToUse != null || (videoSourceToUse is IJSDashManifestRawSource)) {
+        if(audioSourceToUse != null) {
             if(audioFilePath == null)
                 throw IllegalStateException("Missing audio file name after download");
             val expectedFile = File(audioFilePath!!);
@@ -1449,7 +1134,7 @@ class VideoDownload {
         Logger.i(TAG, "VideoDownload Complete [${name}]");
         val existing = StateDownloads.instance.getCachedVideo(id);
         val localVideoSource = videoFilePath?.let { LocalVideoSource.fromSource(videoSourceToUse!!, it, videoFileSize ?: 0, videoOverrideContainer) };
-        val localAudioSource = audioFilePath?.let { LocalAudioSource.fromSource(overrideResultAudioSource ?: audioSourceToUse!!, it, audioFileSize ?: 0, audioOverrideContainer) };
+        val localAudioSource = audioFilePath?.let { LocalAudioSource.fromSource(audioSourceToUse!!, it, audioFileSize ?: 0, audioOverrideContainer) };
         val localSubtitleSource = subtitleFilePath?.let { LocalSubtitleSource.fromSource(subtitleSource!!, it) };
 
         if(localVideoSource != null && videoSourceToUse != null && videoSourceToUse is IStreamMetaDataSource)
@@ -1491,10 +1176,6 @@ class VideoDownload {
         }
     }
 
-    fun cleanup(){
-        cleanupPluginClient()
-    }
-
     enum class State {
         QUEUED,
         PREPARING,
@@ -1518,8 +1199,6 @@ class VideoDownload {
         const val GROUP_WATCHLATER= "WatchLater";
 
         val REGEX_DASH_TEMPLATE = Regex("<SegmentTemplate .*?media=\"(.*?)\".*?>(.*?)<\\/SegmentTemplate>", RegexOption.DOT_MATCHES_ALL);
-        val REGEX_DASH_TEMPLATE_WITH_MIME = Regex("<Representation.*?mimeType=\\\"(.*?)\\\".*?>.*?<SegmentTemplate .*?media=\\\"(.*?)\\\".*?>(.*?)<\\/SegmentTemplate>", RegexOption.DOT_MATCHES_ALL);
-        val REGEX_CODECS = Regex("codecs=\\\"(.*?)\\\"")
         val REGEX_DASH_CUE = Regex("<S .*?t=\"([0-9]*?)\".*?d=\"([0-9]*?)\".*?\\/>", RegexOption.DOT_MATCHES_ALL);
 
         fun videoContainerToExtension(container: String): String? {
@@ -1539,16 +1218,6 @@ class VideoDownload {
                 return "video";//throw IllegalStateException("Unknown container: " + container)
         }
 
-        //TODO: Change usages of this to an accurate container instead of infering it.
-        fun videoAudioContainerToExtension(container: String): String? {
-            if (container.contains("video/mp4") || container == "application/vnd.apple.mpegurl")
-                return "mp4a";
-            else if (container.contains("video/webm"))
-                return "webm";
-            else
-                return "mp4a";//throw IllegalStateException("Unknown container: " + container)
-        }
-
         fun audioContainerToExtension(container: String): String {
             if (container.contains("audio/mp4"))
                 return "mp4a";

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

@@ -4,8 +4,6 @@ import android.content.Context
 import com.caoccao.javet.exceptions.JavetCompilationException
 import com.caoccao.javet.exceptions.JavetException
 import com.caoccao.javet.exceptions.JavetExecutionException
-import com.caoccao.javet.interfaces.IJavetEntityError
-import com.caoccao.javet.interfaces.IJavetEntityMap
 import com.caoccao.javet.interop.V8Host
 import com.caoccao.javet.interop.V8Runtime
 import com.caoccao.javet.values.V8Value
@@ -36,7 +34,6 @@ import com.futo.platformplayer.engine.internal.V8Converter
 import com.futo.platformplayer.engine.packages.PackageBridge
 import com.futo.platformplayer.engine.packages.PackageDOMParser
 import com.futo.platformplayer.engine.packages.PackageHttp
-import com.futo.platformplayer.engine.packages.PackageHttpImp
 import com.futo.platformplayer.engine.packages.PackageJSDOM
 import com.futo.platformplayer.engine.packages.PackageUtilities
 import com.futo.platformplayer.engine.packages.V8Package
@@ -384,7 +381,6 @@ class V8Plugin {
         return when(packageName) {
             "DOMParser" -> PackageDOMParser(this)
             "Http" -> PackageHttp(this, config)
-            "HttpImp" -> PackageHttpImp(this, config)
             "Utilities" -> PackageUtilities(this, config)
             "JSDOM" -> PackageJSDOM(this, config)
             else -> if(allowNull) null else throw ScriptCompilationException(config, "Unknown package [${packageName}] required for plugin ${config.name}");
@@ -413,12 +409,6 @@ class V8Plugin {
             return _runtimeMap.getOrDefault(runtime, null);
         }
 
-        private fun ctxString(ctx: Any?, key: String): String? = when (ctx) {
-            is Map<*, *> -> ctx[key]?.toString()
-            is V8ValueObject -> if (ctx.has(key)) ctx.getString(key) else null
-            else -> null
-        }
-
         fun <T: Any?> catchScriptErrors(config: IV8PluginConfig, context: String, code: String? = null, handle: ()->T): T {
             var codeStripped = code;
             if(codeStripped != null) { //TODO: Improve code stripped
@@ -452,6 +442,37 @@ class V8Plugin {
                 throw ScriptCompilationException(config, "Compilation: [${context}]: ${scriptEx.message}\n(${scriptEx.scriptingError.lineNumber})[${scriptEx.scriptingError.startColumn}-${scriptEx.scriptingError.endColumn}]: ${scriptEx.scriptingError.sourceLine}", null, codeStripped);
             }
             catch(executeEx: JavetExecutionException) {
+                val obj = executeEx.scriptingError?.context
+                if(obj != null && obj.containsKey("plugin_type") == true) {
+                    val pluginType = obj["plugin_type"].toString();
+
+                    //Captcha
+                    if (pluginType == "CaptchaRequiredException") {
+                        throw ScriptCaptchaRequiredException(config,
+                            obj["url"]?.toString(),
+                            obj["body"]?.toString(),
+                            executeEx, executeEx.scriptingError?.stack, codeStripped);
+                    }
+
+                    //Reload Required
+                    if (pluginType == "ReloadRequiredException") {
+                        throw ScriptReloadRequiredException(config,
+                            obj["msg"]?.toString(),
+                            obj["reloadData"]?.toString(),
+                            executeEx, executeEx.scriptingError?.stack, codeStripped);
+                    }
+
+                    //Others
+                    throwExceptionFromV8(
+                        config,
+                        pluginType,
+                        (extractJSExceptionMessage(executeEx) ?: ""),
+                        executeEx,
+                        executeEx.scriptingError?.stack,
+                        codeStripped
+                    );
+                }
+                /* //Required for newer V8 versions
                 if(executeEx.scriptingError?.context is IJavetEntityError) {
                     val obj = executeEx.scriptingError?.context as IJavetEntityError
                     if(obj.context.containsKey("plugin_type") == true) {
@@ -485,6 +506,7 @@ class V8Plugin {
                     }
 
                 }
+                */
                 throw ScriptExecutionException(config, extractJSExceptionMessage(executeEx) ?: "", null, executeEx.scriptingError?.stack, codeStripped);
             }
             catch(ex: Exception) {

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

@@ -1,208 +0,0 @@
-package com.curlbind
-
-import androidx.annotation.Keep
-import java.io.ByteArrayOutputStream
-import java.nio.charset.Charset
-import kotlin.collections.iterator
-import kotlin.math.min
-
-@Keep
-object Libcurl {
-    init {
-        System.loadLibrary("curl-impersonate")
-        System.loadLibrary("curl-impersonate-jni")
-        // CURL_GLOBAL_ALL = 3
-        require(ce_global_init(3) == CURLcode.CURLE_OK) { "curl_global_init failed" }
-    }
-
-    @Keep
-    data class Request(
-        var url: String,
-        var method: String = "GET",
-        var headers: Map<String, String> = emptyMap(),
-        var body: ByteArray? = null,
-        var impersonateTarget: String = "chrome136",
-        var useBuiltInHeaders: Boolean = true,
-        var timeoutMs: Int = 30_000
-    )
-
-    @Keep
-    data class Response(
-        val status: Int,
-        val effectiveUrl: String,
-        val bodyBytes: ByteArray,
-        val headers: Map<String, List<String>>
-    )
-
-    object CURLcode {
-        const val CURLE_OK = 0
-        const val CURLE_UNKNOWN_OPTION = 48
-    }
-
-    object CurlInfoConsts {
-        const val CURLINFO_STRING = 0x100000
-        const val CURLINFO_LONG = 0x200000
-        const val CURLINFO_DOUBLE = 0x300000
-        const val CURLINFO_SLIST = 0x400000
-        const val CURLINFO_PTR = 0x400000
-        const val CURLINFO_SOCKET = 0x500000
-        const val CURLINFO_OFF_T = 0x600000
-        const val CURLINFO_MASK = 0x0fffff
-        const val CURLINFO_TYPEMASK = 0xf00000
-    }
-
-    object CURLINFO {
-        const val NONE = 0
-        const val EFFECTIVE_URL = CurlInfoConsts.CURLINFO_STRING + 1
-        const val RESPONSE_CODE = CurlInfoConsts.CURLINFO_LONG + 2
-    }
-
-    object CURLOPT {
-        const val URL = 10002
-        const val FOLLOWLOCATION = 52
-        const val MAXREDIRS = 68
-        const val CONNECTTIMEOUT_MS = 156
-        const val TIMEOUT_MS = 155
-        const val HTTP_VERSION = 84
-        const val ACCEPT_ENCODING = 10102
-        const val HTTPHEADER = 10023
-        const val COOKIEFILE = 10031
-        const val COOKIEJAR = 10082
-        const val CUSTOMREQUEST = 10036
-        const val IPRESOLVE = 113
-        const val POSTFIELDS = 10015
-        const val POSTFIELDSIZE = 60
-        const val WRITEFUNCTION = 20011
-        const val HEADERFUNCTION = 20079
-        const val WRITEDATA = 10001
-        const val HEADERDATA = 10029
-        const val COPYPOSTFIELDS = 10165
-        const val CURLOPT_DNS_SERVERS = 10211
-        const val CAPATH = 10097
-        const val CAINFO = 10065
-    }
-
-    object CURL_HTTP_VERSION { const val TWO_TLS = 4 }
-    object CURL_IPRESOLVE { const val WHATEVER = 0; const val V4 = 1; const val V6 = 2 }
-
-    @Keep interface WriteCallback { fun onWrite(chunk: ByteArray): Int }
-    @Keep interface HeaderCallback { fun onHeader(line: ByteArray): Int }
-
-    @Volatile private var defaultCAPath: String? = null
-    @Keep fun setDefaultCAPath(path: String) { defaultCAPath = path }
-
-    fun perform(req: Request): Response {
-        val easy = ce_easy_init()
-        require(easy != 0L) { "curl_easy_init failed" }
-
-        var slist: Long = 0L
-        val bodySink = ByteArrayOutputStream(64 * 1024)
-        val rawHeaderLines = ArrayList<String>(64)
-
-        try {
-            val imp = ce_easy_impersonate(easy, req.impersonateTarget, req.useBuiltInHeaders)
-            if (imp != CURLcode.CURLE_OK && imp != CURLcode.CURLE_UNKNOWN_OPTION) {
-                error("curl_easy_impersonate failed: ${ce_easy_strerror(imp)}")
-            }
-
-            checkOK(ce_setopt_str(easy, CURLOPT.URL, req.url))
-            checkOK(ce_setopt_long(easy, CURLOPT.FOLLOWLOCATION, 1))
-            checkOK(ce_setopt_long(easy, CURLOPT.MAXREDIRS, 10))
-            checkOK(ce_setopt_long(easy, CURLOPT.CONNECTTIMEOUT_MS, req.timeoutMs.toLong()))
-            checkOK(ce_setopt_long(easy, CURLOPT.TIMEOUT_MS, req.timeoutMs.toLong()))
-            checkOK(ce_setopt_long(easy, CURLOPT.HTTP_VERSION, CURL_HTTP_VERSION.TWO_TLS.toLong()))
-            checkOK(ce_setopt_str(easy, CURLOPT.ACCEPT_ENCODING, "")) // enable auto-decompress
-
-            if (req.headers.isNotEmpty()) {
-                for ((k, v) in req.headers) slist = ce_slist_append(slist, "$k: $v")
-                if (slist != 0L) checkOK(ce_setopt_ptr(easy, CURLOPT.HTTPHEADER, slist))
-            }
-
-            val method = req.method
-            if (!method.equals("GET", ignoreCase = true)) {
-                checkOK(ce_setopt_str(easy, CURLOPT.CUSTOMREQUEST, method))
-                val body = req.body
-                if (body != null && body.isNotEmpty()) {
-                    checkOK(ce_set_postfields(easy, body))
-                }
-            }
-
-            checkOK(ce_set_write_callback(easy, object : WriteCallback {
-                override fun onWrite(chunk: ByteArray): Int {
-                    bodySink.write(chunk)
-                    return chunk.size
-                }
-            }))
-            checkOK(ce_set_header_callback(easy, object : HeaderCallback {
-                override fun onHeader(line: ByteArray): Int {
-                    // Keep raw but trim CRLF for convenience
-                    val s = line.toString(Charset.forName("ISO-8859-1")).trimEnd('\r', '\n')
-                    if (s.isNotBlank()) rawHeaderLines.add(s)
-                    return line.size
-                }
-            }))
-
-            checkOK(ce_setopt_str(easy, CURLOPT.CURLOPT_DNS_SERVERS, "1.1.1.1,8.8.8.8"));
-            defaultCAPath?.let { checkOK(ce_setopt_str(easy, CURLOPT.CAINFO, it)) }
-
-            val rc = ce_easy_perform(easy)
-            if (rc != CURLcode.CURLE_OK) error("curl_easy_perform failed: ${ce_easy_strerror(rc)}")
-
-            val codeArr = longArrayOf(0)
-            checkOK(ce_easy_getinfo_long(easy, CURLINFO.RESPONSE_CODE, codeArr))
-            val effective = ce_easy_getinfo_string(easy, CURLINFO.EFFECTIVE_URL) ?: req.url
-
-            return Response(
-                status = codeArr[0].toInt(),
-                effectiveUrl = effective,
-                bodyBytes = bodySink.toByteArray(),
-                headers = parseHeaders(rawHeaderLines)
-            )
-        } finally {
-            if (slist != 0L) ce_slist_free_all(slist)
-            ce_easy_cleanup(easy)
-        }
-    }
-
-    private fun defaultCookieJarPath(): String {
-        val tmp = System.getProperty("java.io.tmpdir") ?: "/data/local/tmp"
-        return if (tmp.endsWith("/")) "${tmp}imphttp.cookies.txt" else "$tmp/imphttp.cookies.txt"
-    }
-
-    private fun checkOK(code: Int) {
-        if (code != CURLcode.CURLE_OK) throw IllegalStateException("libcurl error: ${ce_easy_strerror(code)}")
-    }
-
-    private fun parseHeaders(lines: List<String>): Map<String, List<String>> {
-        val map = linkedMapOf<String, MutableList<String>>()
-        for (line in lines) {
-            val idx = line.indexOf(':')
-            if (idx <= 0) continue
-            val name = line.substring(0, idx).trim()
-            val value = line.substring(min(idx + 1, line.length)).trim()
-            map.getOrPut(name) { mutableListOf() }.add(value)
-        }
-        return map
-    }
-
-    @JvmStatic external fun ce_set_write_callback(easy: Long, cb: WriteCallback?): Int
-    @JvmStatic external fun ce_set_header_callback(easy: Long, cb: HeaderCallback?): Int
-
-    @JvmStatic external fun ce_global_init(flags: Long): Int
-    @JvmStatic external fun ce_global_cleanup()
-    @JvmStatic external fun ce_easy_init(): Long
-    @JvmStatic external fun ce_easy_cleanup(easy: Long)
-    @JvmStatic external fun ce_easy_perform(easy: Long): Int
-
-    @JvmStatic external fun ce_easy_impersonate(easy: Long, target: String, defaultHeaders: Boolean): Int
-    @JvmStatic external fun ce_setopt_long(easy: Long, opt: Int, value: Long): Int
-    @JvmStatic external fun ce_setopt_str(easy: Long, opt: Int, value: String): Int
-    @JvmStatic external fun ce_setopt_ptr(easy: Long, opt: Int, ptr: Long): Int
-    @JvmStatic external fun ce_slist_append(list: Long, header: String): Long
-    @JvmStatic external fun ce_slist_free_all(list: Long)
-    @JvmStatic external fun ce_easy_getinfo_long(easy: Long, info: Int, outVal: LongArray): Int
-    @JvmStatic external fun ce_easy_getinfo_string(easy: Long, info: Int): String?
-
-    @JvmStatic external fun ce_set_postfields(easy: Long, body: ByteArray): Int
-    @JvmStatic external fun ce_easy_strerror(code: Int): String
-}

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

@@ -55,7 +55,7 @@ class PackageDOMParser : V8Package {
         }
         @V8Property
         fun lastChild(): DOMNode? {
-            val result = _element.lastElementChild()?.let { DOMNode(_package, it) };
+            val result = _element.firstElementChild()?.let { DOMNode(_package, it) };
             if(result != null)
                 _children.add(result);
             return result;

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

@@ -6,7 +6,7 @@ import com.futo.platformplayer.activities.MainActivity
 import com.futo.platformplayer.fragment.mainactivity.main.MainFragment
 
 open class MainActivityFragment : Fragment() {
-    protected val currentMain : MainFragment?
+    protected val currentMain : MainFragment
         get() {
         isValidMainActivity();
         return (activity as MainActivity).fragCurrent;

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

@@ -8,25 +8,19 @@ import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.content.res.Configuration
-import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.*
-import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.animation.doOnEnd
-import androidx.core.view.isVisible
-import androidx.core.view.updateLayoutParams
 import androidx.lifecycle.lifecycleScope
 import androidx.media3.common.util.UnstableApi
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.RecyclerView
 import com.futo.platformplayer.R
 import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.activities.MainActivity
-import com.futo.platformplayer.constructs.Event1
+import com.futo.platformplayer.activities.SettingsActivity
 import com.futo.platformplayer.dp
 import com.futo.platformplayer.fragment.mainactivity.MainActivityFragment
 import com.futo.platformplayer.fragment.mainactivity.main.*
@@ -34,10 +28,6 @@ import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StatePayment
 import com.futo.platformplayer.states.StateSubscriptions
-import com.futo.platformplayer.views.AnyAdapterView
-import com.futo.platformplayer.views.AnyAdapterView.Companion.asAny
-import com.futo.platformplayer.views.adapters.AnyAdapter
-import com.futo.platformplayer.views.pills.RoundButton
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlin.math.floor
@@ -80,15 +70,9 @@ class MenuBottomBarFragment : MainActivityFragment() {
         private val _inflater: LayoutInflater;
         private val _subscribedActivity: MainActivity?;
 
-        private val _containerMoreHeader: ConstraintLayout;
-        private val _toggleAirplaneMode: LinearLayout;
-        private val _togglePrivacy: LinearLayout;
-
         private var _overlayMore: FrameLayout;
         private var _overlayMoreBackground: FrameLayout;
-        private var _layoutMoreButtons: RecyclerView;
-        private val _layoutMoreButtonItems = arrayListOf<MenuButtonItem>();
-        private var _layoutMoreButtonsAdapter: AnyAdapterView<MenuButtonItem, MenuButtonItemViewHolder>;
+        private var _layoutMoreButtons: LinearLayout;
         private var _layoutBottomBarButtons: LinearLayout;
 
         private var _moreVisible = false;
@@ -102,90 +86,15 @@ class MenuBottomBarFragment : MainActivityFragment() {
 
         private var currentButtonDefinitions: List<ButtonDefinition>? = null;
 
-        private var moreColumns = 3;
-
         constructor(fragment: MenuBottomBarFragment, inflater: LayoutInflater) : super(inflater.context) {
             _fragment = fragment;
             _inflater = inflater;
             inflater.inflate(R.layout.fragment_overview_bottom_bar, this);
 
-            _containerMoreHeader = findViewById(R.id.container_more_options);
-            _toggleAirplaneMode = findViewById(R.id.container_toggle_airplane);
-            _togglePrivacy = findViewById(R.id.container_toggle_privacy);
-
-            _toggleAirplaneMode.isVisible = false //TODO: Remove when airplane mode implemented
-
-            StateApp.instance.airplaneModeChanged.subscribe {
-                if(!StateApp.instance.airplaneMode)
-                    _toggleAirplaneMode.setBackgroundResource(R.drawable.background_menu_toggle)
-                else
-                    _toggleAirplaneMode.setBackgroundResource(R.drawable.background_menu_toggle_active)
-            }
-            if(!StateApp.instance.airplaneMode)
-                _toggleAirplaneMode.setBackgroundResource(R.drawable.background_menu_toggle)
-            else
-                _toggleAirplaneMode.setBackgroundResource(R.drawable.background_menu_toggle_active)
-            _toggleAirplaneMode.setOnClickListener {
-                if(StateApp.instance.airplaneMode) {
-                    StateApp.instance.setAirMode(false);
-                    UIDialogs.appToast("Airplane mode disabled");
-                }
-                else {
-                    StateApp.instance.setAirMode(true);
-                    UIDialogs.appToast("Airplane mode enabled");
-                }
-            }
-
-            StateApp.instance.privateModeChanged.subscribe {
-                if(!StateApp.instance.privateMode)
-                    _togglePrivacy.setBackgroundResource(R.drawable.background_menu_toggle)
-                else
-                    _togglePrivacy.setBackgroundResource(R.drawable.background_menu_toggle_active)
-            }
-            if(!StateApp.instance.privateMode)
-                _togglePrivacy.setBackgroundResource(R.drawable.background_menu_toggle)
-            else
-                _togglePrivacy.setBackgroundResource(R.drawable.background_menu_toggle_active)
-            _togglePrivacy.setOnClickListener {
-                if(StateApp.instance.privateMode) {
-                    StateApp.instance.setPrivacyMode(false);
-                    UIDialogs.appToast("Privacy mode disabled");
-                }
-                else {
-                    StateApp.instance.setPrivacyMode(true);
-                    UIDialogs.appToast("Privacy mode enabled");
-
-                    if(Settings.instance.other.showPrivacyModeDialog)
-                        UIDialogs.showDialog(it.context ?: return@setOnClickListener, R.drawable.incognito, "Privacy Mode",
-                            "All requests will be processed anonymously (any logins will be disabled except for the personalized home page), local playback and history tracking will also be disabled.\n\nTap the icon to disable.", null, 0,
-                            UIDialogs.Action("Don't show again", {
-                                Settings.instance.other.showPrivacyModeDialog = false;
-                                Settings.instance.save();
-                            }, UIDialogs.ActionStyle.NONE),
-                            UIDialogs.Action("Understood", {
-
-                            }, UIDialogs.ActionStyle.PRIMARY));
-                }
-            }
-
             _overlayMore = findViewById(R.id.more_overlay);
             _overlayMoreBackground = findViewById(R.id.more_overlay_background);
             _layoutMoreButtons = findViewById(R.id.more_menu_buttons);
-            _layoutBottomBarButtons = findViewById(R.id.bottom_bar_buttons);
-
-            val totalWidthDp = resources.displayMetrics.widthPixels / resources.displayMetrics.density;
-            val columns = MenuButtonItemViewHolder.getAutoSizeColumns(totalWidthDp);
-            _layoutMoreButtonsAdapter = _layoutMoreButtons.asAny<MenuButtonItem, MenuButtonItemViewHolder>(_layoutMoreButtonItems,
-                RecyclerView.VERTICAL, false, { button ->
-                button.setAutoSize(totalWidthDp);
-                button.parentFragment = this@MenuBottomBarView._fragment;
-                button.onClick.subscribe {
-                    setMoreVisible(false);
-                }
-            })
-            moreColumns = columns;
-            val layoutManager = GridLayoutManager(context, columns, GridLayoutManager.VERTICAL, true);
-            _layoutMoreButtons.layoutManager = layoutManager;
+            _layoutBottomBarButtons = findViewById(R.id.bottom_bar_buttons)
 
             _overlayMoreBackground.setOnClickListener { setMoreVisible(false); };
 
@@ -212,8 +121,6 @@ class MenuBottomBarFragment : MainActivityFragment() {
         }
 
         private fun setMoreVisible(visible: Boolean) {
-
-            //TODO: issues with these bools
             if (_moreVisibleAnimating) {
                 return
             }
@@ -222,12 +129,9 @@ class MenuBottomBarFragment : MainActivityFragment() {
                 return
             }
 
-
-/*
             val height = _moreButtons.firstOrNull()?.let {
                 it.height.toFloat() + (it.layoutParams as MarginLayoutParams).bottomMargin
             } ?: return
-            */
 
             _moreVisibleAnimating = true
             val moreOverlayBackground = _overlayMoreBackground
@@ -239,17 +143,10 @@ class MenuBottomBarFragment : MainActivityFragment() {
                 moreOverlay.visibility = VISIBLE
                 val animations = arrayListOf<Animator>()
                 animations.add(ObjectAnimator.ofFloat(moreOverlayBackground, "alpha", 0.0f, 1.0f).setDuration(duration))
-                animations.add(ObjectAnimator.ofFloat(_layoutMoreButtons, "alpha", 0.0f, 1.0f).setDuration(duration))
-                animations.add(ObjectAnimator.ofFloat(_containerMoreHeader, "alpha", 0.0f, 1.0f).setDuration(duration))
-                _bottomButtons.find { it.definition.id == 99 }?.let {
-                    animations.add(ObjectAnimator.ofFloat(it, "alpha", 0.5f, 1.0f)
-                        .setDuration(duration));
-                }
 
-                animations.add(ObjectAnimator.ofFloat(_layoutMoreButtons, "translationY", resources.displayMetrics.heightPixels.toFloat(), 0.0f).setDuration(duration))
                 for ((index, button) in _moreButtons.withIndex()) {
                     val i = _moreButtons.size - index
-                    //animations.add(ObjectAnimator.ofFloat(button, "translationY", height * staggerFactor * (i + 1), 0.0f).setDuration(duration))
+                    animations.add(ObjectAnimator.ofFloat(button, "translationY", height * staggerFactor * (i + 1), 0.0f).setDuration(duration))
                 }
 
                 val animatorSet = AnimatorSet()
@@ -261,24 +158,11 @@ class MenuBottomBarFragment : MainActivityFragment() {
                 animatorSet.start()
             } else {
                 val animations = arrayListOf<Animator>()
-                animations
-                    .add(ObjectAnimator.ofFloat(moreOverlayBackground, "alpha", 1.0f, 0.0f)
-                    .setDuration(duration))
-                animations
-                    .add(ObjectAnimator.ofFloat(_layoutMoreButtons, "alpha", 1.0f, 0.0f)
-                        .setDuration(duration))
-                animations
-                    .add(ObjectAnimator.ofFloat(_containerMoreHeader, "alpha", 1.0f, 0.0f)
-                        .setDuration(duration))
-                _bottomButtons.find { it.definition.id == 99 }?.let {
-                    animations.add(ObjectAnimator.ofFloat(it, "alpha", 1.0f, 0.5f)
-                        .setDuration(duration));
-                }
+                animations.add(ObjectAnimator.ofFloat(moreOverlayBackground, "alpha", 1.0f, 0.0f).setDuration(duration))
 
-                animations.add(ObjectAnimator.ofFloat(_layoutMoreButtons, "translationY", 0.0f, resources.displayMetrics.heightPixels.toFloat()).setDuration(duration))
                 for ((index, button) in _moreButtons.withIndex()) {
                     val i = _moreButtons.size - index
-                    //animations.add(ObjectAnimator.ofFloat(button, "translationY", 0.0f, height * staggerFactor * (i + 1)).setDuration(duration))
+                    animations.add(ObjectAnimator.ofFloat(button, "translationY", 0.0f, height * staggerFactor * (i + 1)).setDuration(duration))
                 }
 
                 val animatorSet = AnimatorSet()
@@ -290,12 +174,11 @@ class MenuBottomBarFragment : MainActivityFragment() {
                 animatorSet.playTogether(animations)
                 animatorSet.start()
             }
-
         }
 
         private fun updateBottomMenuButtons(buttons: MutableList<ButtonDefinition>, hasMore: Boolean) {
             if (hasMore) {
-                buttons.add(ButtonDefinition(99, R.drawable.ic_more, R.drawable.ic_more, R.string.more, canToggle = false, { false }, { setMoreVisible(!_moreVisible) }))
+                buttons.add(ButtonDefinition(99, R.drawable.ic_more, R.drawable.ic_more, R.string.more, canToggle = false, { false }, { setMoreVisible(true) }))
             }
 
             _bottomButtons.clear();
@@ -335,42 +218,32 @@ class MenuBottomBarFragment : MainActivityFragment() {
             _layoutMoreButtons.removeAllViews();
 
             var insertedButtons = 0;
-            //Force settings to be first
-            val settingsIndex = buttons.indexOfFirst { b -> b.id == 7 };
-            if (settingsIndex != -1) {
-                val button = buttons[settingsIndex]
-                buttons.removeAt(settingsIndex)
-                buttons.add(0, button)
-                //insertedButtons++;
-            }
             //Force buy to be on top for more buttons
             val buyIndex = buttons.indexOfFirst { b -> b.id == 98 };
             if (buyIndex != -1) {
                 val button = buttons[buyIndex]
                 buttons.removeAt(buyIndex)
-                buttons.add(button)
-                //insertedButtons++;
+                buttons.add(0, button)
+                insertedButtons++;
             }
             //Force faq to be second
             val faqIndex = buttons.indexOfFirst { b -> b.id == 97 };
             if (faqIndex != -1) {
                 val button = buttons[faqIndex]
                 buttons.removeAt(faqIndex)
-                buttons.add(button)
-                //insertedButtons++;
+                buttons.add(if (insertedButtons == 1) 1 else 0, button)
+                insertedButtons++;
             }
             //Force privacy to be third
             val privacyIndex = buttons.indexOfFirst { b -> b.id == 96 };
             if (privacyIndex != -1) {
                 val button = buttons[privacyIndex]
                 buttons.removeAt(privacyIndex)
-                buttons.add(button)
-                //insertedButtons++;
+                buttons.add(if (insertedButtons == 2) 2 else (if(insertedButtons == 1) 1 else 0), button)
+                insertedButtons++;
             }
 
-            val newButtons = mutableListOf<MenuButtonItem>();
             for (data in buttons) {
-                /*
                 val button = MenuButton(context, data, _fragment, true);
                 button.setOnClickListener {
                     updateMenuIcons()
@@ -380,19 +253,14 @@ class MenuBottomBarFragment : MainActivityFragment() {
 
                 _moreButtons.add(button);
                 _layoutMoreButtons.addView(button);
-                */
-                val buttonItem = MenuButtonItem(data);
-                newButtons.add(buttonItem);
             }
-            _layoutMoreButtonsAdapter.setData(newButtons);
-            _layoutMoreButtonsAdapter.notifyContentChanged();
         }
 
         private fun updateMenuIcons() {
             for(button in _bottomButtons.toList())
                 button.updateActive(_fragment);
             for(button in _moreButtons.toList())
-                button.updateActive(_fragment, true);
+                button.updateActive(_fragment);
         }
 
         override fun onConfigurationChanged(newConfig: Configuration?) {
@@ -473,71 +341,6 @@ class MenuBottomBarFragment : MainActivityFragment() {
         }
 
 
-        class MenuButtonItem(val def: ButtonDefinition);
-        class MenuButtonItemViewHolder(private val _viewGroup: ViewGroup): AnyAdapter.AnyViewHolder<MenuButtonItem>(
-            LayoutInflater.from(_viewGroup.context).inflate(R.layout.list_menu_tile,
-                _viewGroup, false)) {
-
-            val onClick = Event1<MenuButtonItem>();
-
-            val root: ConstraintLayout;
-            val imageIcon: ImageView;
-            val textName: TextView;
-
-
-            var button: MenuButtonItem? = null;
-
-            var parentFragment: MenuBottomBarFragment? = null;
-
-            init {
-                root = _view.findViewById(R.id.root);
-                imageIcon = _view.findViewById(R.id.image_icon);
-                textName = _view.findViewById(R.id.text_name);
-
-                root.setOnClickListener {
-                    button?.let {
-                        it.def.action(parentFragment ?: return@let);
-                        onClick.emit(it);
-                    }
-                }
-            }
-
-
-            override fun bind(value: MenuButtonItem) {
-                button = value;
-                textName.text = _view.context.getString(value.def.string);
-                imageIcon.setImageResource(value.def.iconActive);
-            }
-
-
-            fun setWidth(dp: Int) {
-                root.updateLayoutParams {
-                    this.width = (dp - 6).dp(_viewGroup.context.resources);
-                    this.height = (dp - 6).dp(_viewGroup.context.resources);
-                }
-                imageIcon.updateLayoutParams {
-                    this.width = (dp - 54).dp(_viewGroup.context.resources);
-                    this.height = (dp - 54).dp(_viewGroup.context.resources);
-                }
-            }
-
-            fun setAutoSize(totalWidth: Float) {
-                val dpWidth = totalWidth;
-                val columns = Math.max(((dpWidth) / viewWidthDp).toInt(), 1);
-                val remainder = dpWidth - columns * viewWidthDp;
-                val targetSize = viewWidthDp + (remainder / columns).toInt();
-                setWidth(targetSize);
-            }
-
-            companion object {
-                val viewWidthDp = 90;
-                fun getAutoSizeColumns(totalWidth: Float): Int {
-                    val dpWidth = totalWidth;
-                    val columns = Math.max(((dpWidth) / viewWidthDp).toInt(), 1);
-                    return columns;
-                }
-            }
-        }
         class MenuButton: LinearLayout {
             val definition: ButtonDefinition;
 
@@ -551,14 +354,7 @@ class MenuBottomBarFragment : MainActivityFragment() {
                 this.definition = def;
 
                 _buttonImage = findViewById(R.id.image_button);
-                //_buttonImage.setImageResource(if (def.isActive(fragment)) def.iconActive else def.icon);
-                _buttonImage.setImageResource(definition.iconActive);
-                if(definition.isActive(fragment) || isMore) {
-                    this.alpha = 1f;
-                }
-                else {
-                    this.alpha = 0.5f;
-                }
+                _buttonImage.setImageResource(if (def.isActive(fragment)) def.iconActive else def.icon);
 
                 _textButton = findViewById(R.id.text_button);
                 _textButton.text = resources.getString(def.string);
@@ -569,16 +365,8 @@ class MenuBottomBarFragment : MainActivityFragment() {
                 }
             }
 
-            fun updateActive(fragment: MenuBottomBarFragment, isMore: Boolean = false, overrideValue: Boolean? = null) {
-                //_buttonImage.setImageResource(if (definition.isActive(fragment)) definition.iconActive else definition.icon);
-                _buttonImage.setImageResource(definition.iconActive);
-                val isActive = overrideValue ?: definition.isActive(fragment) || isMore
-                if(isActive) {
-                    this.alpha = 1f;
-                }
-                else {
-                    this.alpha = 0.5f;
-                }
+            fun updateActive(fragment: MenuBottomBarFragment) {
+                _buttonImage.setImageResource(if (definition.isActive(fragment)) definition.iconActive else definition.icon);
             }
         }
     }
@@ -601,9 +389,6 @@ class MenuBottomBarFragment : MainActivityFragment() {
                 }
             }),
             ButtonDefinition(1, R.drawable.ic_subscriptions, R.drawable.ic_subscriptions_filled, R.string.subscriptions, canToggle = true, { it.currentMain is SubscriptionsFeedFragment }, { it.navigate<SubscriptionsFeedFragment>(withHistory = false) }),
-            //if(Build.VERSION.SDK_INT > Build.VERSION_CODES.P)
-                ButtonDefinition(12, R.drawable.ic_library, R.drawable.ic_library, R.string.library, canToggle = false, { it.currentMain is LibraryFragment }, { it.navigate<LibraryFragment>(withHistory = false) })
-            ,//else null,
             ButtonDefinition(2, R.drawable.ic_creators, R.drawable.ic_creators_filled, R.string.creators, canToggle = false, { it.currentMain is CreatorsFragment }, { it.navigate<CreatorsFragment>(withHistory = false) }),
             ButtonDefinition(3, R.drawable.ic_sources, R.drawable.ic_sources_filled, R.string.sources, canToggle = false, { it.currentMain is SourcesFragment }, { it.navigate<SourcesFragment>(withHistory = false) }),
             ButtonDefinition(4, R.drawable.ic_playlist, R.drawable.ic_playlist_filled, R.string.playlists, canToggle = false, { it.currentMain is PlaylistsFragment }, { it.navigate<PlaylistsFragment>(withHistory = false) }),
@@ -613,9 +398,7 @@ class MenuBottomBarFragment : MainActivityFragment() {
             ButtonDefinition(8, R.drawable.ic_chat, R.drawable.ic_chat_filled, R.string.comments, canToggle = true, { it.currentMain is CommentsFragment }, { it.navigate<CommentsFragment>(withHistory = false) }),
             ButtonDefinition(9, R.drawable.ic_subscriptions, R.drawable.ic_subscriptions_filled, R.string.subscription_group_menu, canToggle = true, { it.currentMain is SubscriptionGroupListFragment }, { it.navigate<SubscriptionGroupListFragment>(withHistory = false) }),
             ButtonDefinition(10, R.drawable.ic_help_square, R.drawable.ic_help_square_fill, R.string.tutorials, canToggle = true, { it.currentMain is TutorialFragment }, { it.navigate<TutorialFragment>(withHistory = false) }),
-            ButtonDefinition(7, R.drawable.ic_settings, R.drawable.ic_settings_filled, R.string.settings, canToggle = false, { it.currentMain is SettingsFragment }, {
-                it.navigate<SettingsFragment>();
-                /*
+            ButtonDefinition(7, R.drawable.ic_settings, R.drawable.ic_settings_filled, R.string.settings, canToggle = false, { false }, {
                 val c = it.context ?: return@ButtonDefinition;
                 Logger.i(TAG, "settings preventPictureInPicture()");
                 it.requireFragment<VideoDetailFragment>().preventPictureInPicture();
@@ -623,8 +406,8 @@ class MenuBottomBarFragment : MainActivityFragment() {
                 c.startActivity(intent);
                 if (c is Activity) {
                     c.overridePendingTransition(R.anim.slide_in_up, R.anim.slide_darken);
-                }*/
-            }),/*
+                }
+            }),
             ButtonDefinition(96, R.drawable.ic_disabled_visible, R.drawable.ic_disabled_visible, R.string.privacy_mode, canToggle = true, { false }, {
                 UIDialogs.showDialog(it.context ?: return@ButtonDefinition, R.drawable.ic_disabled_visible_purple, "Privacy Mode",
                     "All requests will be processed anonymously (any logins will be disabled except for the personalized home page), local playback and history tracking will also be disabled.\n\nTap the icon to disable.", null, 0,
@@ -634,14 +417,14 @@ class MenuBottomBarFragment : MainActivityFragment() {
                     UIDialogs.Action("Enable", {
                         StateApp.instance.setPrivacyMode(true);
                     }, UIDialogs.ActionStyle.PRIMARY));
-            }),*/
+            }),
             ButtonDefinition(97, R.drawable.ic_quiz, R.drawable.ic_quiz_fill, R.string.faq, canToggle = true, { false }, {
                 it.navigate<BrowserFragment>(Settings.URL_FAQ, withHistory = false);
             })
             //96 is reserved for privacy button
             //98 is reserved for buy button
             //99 is reserved for more button
-        ).filterNotNull();
+        );
     }
 
     data class ButtonDefinition(

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

@@ -1,88 +0,0 @@
-package com.futo.platformplayer.fragment.mainactivity.main
-
-import android.Manifest
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.os.Bundle
-import android.provider.MediaStore
-import android.util.AttributeSet
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.LinearLayout
-import android.widget.TextView
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.app.ActivityCompat
-import androidx.core.content.ContextCompat
-import androidx.core.view.isVisible
-import androidx.core.view.updateLayoutParams
-import androidx.recyclerview.widget.RecyclerView
-import com.futo.platformplayer.R
-import com.futo.platformplayer.UIDialogs
-import com.futo.platformplayer.activities.MainActivity
-import com.futo.platformplayer.api.media.models.contents.IPlatformContent
-import com.futo.platformplayer.api.media.models.video.IPlatformVideo
-import com.futo.platformplayer.dp
-import com.futo.platformplayer.states.Album
-import com.futo.platformplayer.states.Artist
-import com.futo.platformplayer.states.ArtistOrdering
-import com.futo.platformplayer.states.FileEntry
-import com.futo.platformplayer.states.StateApp
-import com.futo.platformplayer.states.StateLibrary
-import com.futo.platformplayer.views.AnyAdapterView.Companion.asAny
-import com.futo.platformplayer.views.AnyInsertedAdapterView
-import com.futo.platformplayer.views.AnyInsertedAdapterView.Companion.asAnyWithTop
-import com.futo.platformplayer.views.AnyInsertedAdapterView.Companion.asAnyWithViews
-import com.futo.platformplayer.views.LibrarySection
-import com.futo.platformplayer.views.adapters.AnyAdapter
-import com.futo.platformplayer.views.adapters.InsertedViewAdapter
-import com.futo.platformplayer.views.adapters.viewholders.AlbumTileViewHolder
-import com.futo.platformplayer.views.adapters.viewholders.ArtistTileViewHolder
-import com.futo.platformplayer.views.adapters.viewholders.FileViewHolder
-import com.futo.platformplayer.views.adapters.viewholders.LocalVideoTileViewHolder
-import com.futo.platformplayer.views.buttons.BigButton
-
-
-class BaseFragment : MainFragment() {
-    override val isMainView : Boolean = true;
-    override val isTab: Boolean = true;
-    override val hasBottomBar: Boolean get() = true;
-
-    private var view: FragView? = null;
-
-
-    override fun onCreateMainView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        val newView = FragView(this);
-        view = newView;
-        return newView;
-    }
-
-    override fun onShownWithView(parameter: Any?, isBack: Boolean) {
-        super.onShownWithView(parameter, isBack);
-        view?.onShown();
-    }
-
-    override fun onDestroyMainView() {
-        view = null;
-        super.onDestroyMainView();
-    }
-
-    companion object {
-        fun newInstance() = BaseFragment().apply {}
-    }
-
-
-    class FragView: ConstraintLayout {
-        val fragment: BaseFragment;
-
-        constructor(fragment: BaseFragment) : super(fragment.requireContext()) {
-            inflate(context, R.layout.fragview_library, this);
-            this.fragment = fragment;
-        }
-
-
-        fun onShown() {
-        }
-    }
-}

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

@@ -20,7 +20,6 @@ import androidx.lifecycle.lifecycleScope
 import androidx.viewpager2.widget.ViewPager2
 import com.bumptech.glide.Glide
 import com.futo.platformplayer.R
-import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.UISlideOverlays
 import com.futo.platformplayer.api.media.PlatformID
@@ -56,7 +55,6 @@ import com.futo.platformplayer.views.adapters.ChannelViewPagerAdapter
 import com.futo.platformplayer.views.others.CreatorThumbnail
 import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuOverlay
 import com.futo.platformplayer.views.subscriptions.SubscribeButton
-import com.futo.platformplayer.withTimestamp
 import com.futo.polycentric.core.ApiMethods
 import com.futo.polycentric.core.PolycentricProfile
 import com.futo.polycentric.core.toURLInfoSystemLinkUrl
@@ -200,12 +198,8 @@ class ChannelFragment : MainFragment() {
             adapter.onContentClicked.subscribe { v, _ ->
                 when (v) {
                     is IPlatformVideo -> {
-                        //StatePlayer.instance.clearQueue()
-                        if (StatePlayer.instance.hasQueue) {
-                            StatePlayer.instance.insertToQueue(v, true);
-                        } else {
-                            fragment.navigate<VideoDetailFragment>(v).maximizeVideoDetail();
-                        }
+                        StatePlayer.instance.clearQueue()
+                        fragment.navigate<VideoDetailFragment>(v).maximizeVideoDetail()
                     }
 
                     is IPlatformPlaylist -> {
@@ -250,7 +244,7 @@ class ChannelFragment : MainFragment() {
             adapter.onContentUrlClicked.subscribe { url, contentType ->
                 when (contentType) {
                     ContentType.MEDIA -> {
-                        StatePlayer.instance.clearQueue();
+                        StatePlayer.instance.clearQueue()
                         fragment.navigate<VideoDetailFragment>(url).maximizeVideoDetail()
                     }
 
@@ -409,7 +403,7 @@ class ChannelFragment : MainFragment() {
             _fragment.topBar?.onShown(channel)
 
             val buttons = arrayListOf(Pair(R.drawable.ic_playlist_add) {
-                val dialog = UIDialogs.showConfirmationDialog(context,
+                UIDialogs.showConfirmationDialog(context,
                     context.getString(R.string.do_you_want_to_convert_channel_channelname_to_a_playlist)
                         .replace("{channelName}", channel.name),
                     {

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

@@ -64,7 +64,7 @@ abstract class ContentFeedView<TFragment> : FeedView<TFragment, IPlatformContent
         player.modifyState("ThumbnailPlayer") { state -> state.muted = true };
         _exoPlayer = player;
 
-        return PreviewContentListAdapter(fragment.lifecycleScope, context, feedStyle ?: FeedStyle.THUMBNAIL, dataset, player, _previewsEnabled, arrayListOf(), arrayListOf(), shouldShowTimeBar).apply {
+        return PreviewContentListAdapter(fragment.lifecycleScope, context, feedStyle, dataset, player, _previewsEnabled, arrayListOf(), arrayListOf(), shouldShowTimeBar).apply {
             attachAdapterEvents(this);
         }
     }

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

@@ -1,91 +0,0 @@
-package com.futo.platformplayer.fragment.mainactivity.main
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.FrameLayout
-import android.widget.ImageButton
-import android.widget.LinearLayout
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.view.isVisible
-import com.futo.platformplayer.R
-import com.futo.platformplayer.SettingsDev
-import com.futo.platformplayer.views.fields.FieldForm
-import com.futo.platformplayer.views.fields.IField
-
-
-class DeveloperFragment : MainFragment() {
-    override val isMainView : Boolean = true;
-    override val isTab: Boolean = true;
-    override val hasBottomBar: Boolean get() = true;
-
-    private var view: FragView? = null;
-
-
-    override fun onCreateMainView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        val newView = FragView(this);
-        view = newView;
-        _currentView = view;
-        return newView;
-    }
-
-    override fun onShownWithView(parameter: Any?, isBack: Boolean) {
-        super.onShownWithView(parameter, isBack);
-        view?.onShown();
-    }
-
-    override fun onDestroyMainView() {
-        view = null;
-        _currentView = null;
-        super.onDestroyMainView();
-    }
-
-    companion object {
-        fun newInstance() = DeveloperFragment().apply {}
-
-        private var _currentView: FragView? = null;
-        val currentView: FragView?
-            get() = _currentView;
-    }
-
-
-    class FragView: ConstraintLayout {
-        val fragment: DeveloperFragment;
-
-        private lateinit var _form: FieldForm;
-        private lateinit var _buttonBack: ImageButton;
-
-        private var _isFinished = false;
-
-        lateinit var overlay: FrameLayout;
-
-        val notifPermission = "android.permission.POST_NOTIFICATIONS";
-
-        constructor(fragment: DeveloperFragment) : super(fragment.requireContext()) {
-            inflate(context, R.layout.activity_dev, this);
-            this.fragment = fragment;
-
-            val activity = fragment.activity;
-            findViewById<LinearLayout>(R.id.container_topbar).isVisible = false;
-
-            _buttonBack = findViewById(R.id.button_back);
-            _form = findViewById(R.id.settings_form);
-
-            _form.fromObject(SettingsDev.instance);
-            _form.onChanged.subscribe { _, _ ->
-                _form.setObjectValues();
-                SettingsDev.instance.save();
-            };
-        }
-
-        fun getField(id: String): IField? {
-            return _form.findField(id);
-        }
-
-        fun onShown() {
-
-        }
-
-    }
-}

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

@@ -9,7 +9,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.*
-import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -40,7 +39,6 @@ import java.time.OffsetDateTime
 import kotlin.math.max
 
 abstract class FeedView<TFragment, TResult, TConverted, TPager, TViewHolder> : LinearLayout where TPager : IPager<TResult>, TViewHolder : RecyclerView.ViewHolder, TFragment : MainFragment {
-    protected val _feedRoot: ConstraintLayout;
     protected val  _recyclerResults: RecyclerView;
     protected val _overlayContainer: FrameLayout;
     protected val _swipeRefresh: SwipeRefreshLayout;
@@ -53,9 +51,8 @@ abstract class FeedView<TFragment, TResult, TConverted, TPager, TViewHolder> : L
     private val _emptyPagerContainer: FrameLayout;
 
     protected val _toolbarContentView: LinearLayout;
-    protected val _bottomContentView: LinearLayout;
 
-    private var _loading: Boolean = false;
+    private var _loading: Boolean = true;
 
     private val _pagerLock = Object();
     private var _cache: ItemCache<TResult>? = null;
@@ -70,7 +67,7 @@ abstract class FeedView<TFragment, TResult, TConverted, TPager, TViewHolder> : L
     private var _sortByOptions: List<String>? = null;
     private var _activeTags: List<String>? = null;
 
-    private var _nextPageHandler: TaskHandler<TPager, Pair<TPager, List<TResult>>>;
+    private var _nextPageHandler: TaskHandler<TPager, List<TResult>>;
     val recyclerData: RecyclerData<InsertedViewAdapterWithLoader<TViewHolder>, GridLayoutManager, TPager, TResult, TConverted, InsertedViewHolder<TViewHolder>>;
 
     val fragment: TFragment;
@@ -83,7 +80,6 @@ abstract class FeedView<TFragment, TResult, TConverted, TPager, TViewHolder> : L
         this.fragment = fragment;
         inflater.inflate(R.layout.fragment_feed, this);
 
-        _feedRoot = findViewById(R.id.feed_root);
         _textCentered = findViewById(R.id.text_centered);
         _emptyPagerContainer = findViewById(R.id.empty_pager_container);
         _progressBar = findViewById(R.id.progress_bar);
@@ -138,29 +134,24 @@ abstract class FeedView<TFragment, TResult, TConverted, TPager, TViewHolder> : L
         setActiveTags(null);
 
         _toolbarContentView = findViewById(R.id.container_toolbar_content);
-        _bottomContentView = findViewById(R.id.container_bottom);
 
-        _nextPageHandler = TaskHandler<TPager, Pair<TPager, List<TResult>>>({fragment.lifecycleScope}, {
+        _nextPageHandler = TaskHandler<TPager, List<TResult>>({fragment.lifecycleScope}, {
             if (it is IAsyncPager<*>)
                 it.nextPageAsync();
             else
                 it.nextPage();
 
             processPagerExceptions(it);
-            return@TaskHandler Pair(it, it.getResults());
+            return@TaskHandler it.getResults();
         }).success {
-            val pager = it.first;
-            val results = it.second
-
             setLoading(false);
 
             val posBefore = recyclerData.results.size;
-            val filteredResults = filterResults(results);
+            val filteredResults = filterResults(it);
             recyclerData.results.addAll(filteredResults);
-            recyclerData.resultsUnfiltered.addAll(results);
+            recyclerData.resultsUnfiltered.addAll(it);
             recyclerData.adapter.notifyItemRangeInserted(recyclerData.adapter.childToParentPosition(posBefore), filteredResults.size);
-            if(pager.hasMorePages())
-                ensureEnoughContentVisible(filteredResults)
+            ensureEnoughContentVisible(filteredResults)
         }.exception<Throwable> {
             Logger.w(TAG, "Failed to load next page.", it);
             UIDialogs.showGeneralRetryErrorDialog(context, context.getString(R.string.failed_to_load_next_page), it, {
@@ -180,9 +171,10 @@ abstract class FeedView<TFragment, TResult, TConverted, TPager, TViewHolder> : L
 
                 val visibleItemCount = _recyclerResults.childCount;
                 val firstVisibleItem = recyclerData.layoutManager.findFirstVisibleItemPosition()
-                //Logger.i(TAG, "onScrolled loadNextPage(): firstVisibleItem=$firstVisibleItem visibleItemCount=$visibleItemCount visibleThreshold=$visibleThreshold recyclerData.results.size=${recyclerData.results.size}")
+                //Logger.i(TAG, "onScrolled loadNextPage visibleItemCount=$visibleItemCount firstVisibleItem=$visibleItemCount")
 
-                if (!_loading && firstVisibleItem + visibleItemCount + visibleThreshold >= recyclerData.results.size) {
+                if (!_loading && firstVisibleItem + visibleItemCount + visibleThreshold >= recyclerData.results.size && firstVisibleItem > 0) {
+                    //Logger.i(TAG, "onScrolled loadNextPage(): firstVisibleItem=$firstVisibleItem visibleItemCount=$visibleItemCount visibleThreshold=$visibleThreshold recyclerData.results.size=${recyclerData.results.size}")
                     loadNextPage();
                 }
             }
@@ -196,44 +188,57 @@ abstract class FeedView<TFragment, TResult, TConverted, TPager, TViewHolder> : L
     }
 
     private fun ensureEnoughContentVisible(filteredResults: List<TConverted>) {
-        _recyclerResults.post {
-            val canScroll = _recyclerResults.canScrollVertically(1)
-            Logger.i(
-                TAG,
-                "ensureEnoughContentVisible loadNextPage canScroll=$canScroll _automaticNextPageCounter=$_automaticNextPageCounter"
-            )
-            if (!canScroll || filteredResults.isEmpty()) {
-                _automaticNextPageCounter++
-                if (_automaticNextPageCounter < _automaticBackoff.size) {
-                    if (_automaticNextPageCounter > 0) {
-                        val automaticNextPageCounterSaved = _automaticNextPageCounter;
-                        fragment.lifecycleScope.launch(Dispatchers.Default) {
-                            val backoff = _automaticBackoff[Math.min(
-                                _automaticBackoff.size - 1,
-                                _automaticNextPageCounter
-                            )];
+        val canScroll = if (recyclerData.results.isEmpty()) false else {
+            val height = resources.displayMetrics.heightPixels;
 
+            val layoutManager = recyclerData.layoutManager
+            val firstVisibleItemPosition = layoutManager.findFirstVisibleItemPosition()
+            val firstVisibleItemView = if(firstVisibleItemPosition != RecyclerView.NO_POSITION) layoutManager.findViewByPosition(firstVisibleItemPosition) else null;
+            val lastVisibleItemPosition = layoutManager.findLastCompletelyVisibleItemPosition();
+            val lastVisibleItemView = if(lastVisibleItemPosition != RecyclerView.NO_POSITION) layoutManager.findViewByPosition(lastVisibleItemPosition) else null;
+            val rows = if(recyclerData.layoutManager is GridLayoutManager) Math.max(1, recyclerData.results.size / recyclerData.layoutManager.spanCount) else 1;
+            val rowsHeight = (firstVisibleItemView?.height ?: 0) * rows;
+            if(lastVisibleItemView != null && lastVisibleItemPosition == (recyclerData.results.size - 1)) {
+                false;
+            }
+            else if (firstVisibleItemView != null && height != null && rowsHeight < height) {
+                false;
+            } else {
+                true;
+            }
+        }
+
+        Logger.i(TAG, "ensureEnoughContentVisible loadNextPage canScroll=$canScroll _automaticNextPageCounter=$_automaticNextPageCounter")
+        if (!canScroll || filteredResults.isEmpty()) {
+            _automaticNextPageCounter++
+            if(_automaticNextPageCounter < _automaticBackoff.size) {
+                if(_automaticNextPageCounter > 0) {
+                    val automaticNextPageCounterSaved = _automaticNextPageCounter;
+                    fragment.lifecycleScope.launch(Dispatchers.Default) {
+                        val backoff = _automaticBackoff[Math.min(_automaticBackoff.size - 1, _automaticNextPageCounter)];
+
+                        withContext(Dispatchers.Main) {
+                            setLoading(true);
+                        }
+                        delay(backoff.toLong());
+                        if(automaticNextPageCounterSaved == _automaticNextPageCounter) {
                             withContext(Dispatchers.Main) {
-                                setLoading(true);
-                            }
-                            delay(backoff.toLong());
-                            if (automaticNextPageCounterSaved == _automaticNextPageCounter) {
-                                withContext(Dispatchers.Main) {
-                                    loadNextPage();
-                                }
-                            } else {
-                                withContext(Dispatchers.Main) {
-                                    setLoading(false);
-                                }
+                                loadNextPage();
                             }
                         }
-                    } else
-                        loadNextPage();
+                        else {
+                            withContext(Dispatchers.Main) {
+                                setLoading(false);
+                            }
+                        }
+                    }
                 }
-            } else {
-                Logger.i(TAG, "ensureEnoughContentVisible automaticNextPageCounter reset");
-                _automaticNextPageCounter = 0;
+                else
+                    loadNextPage();
             }
+        } else {
+            Logger.i(TAG, "ensureEnoughContentVisible automaticNextPageCounter reset");
+            _automaticNextPageCounter = 0;
         }
     }
     fun resetAutomaticNextPageCounter(){
@@ -385,9 +390,6 @@ abstract class FeedView<TFragment, TResult, TConverted, TPager, TViewHolder> : L
     protected fun finishRefreshLayoutLoader() {
         _swipeRefresh.isRefreshing = false;
     }
-    protected fun disableRefreshLayout() {
-        _swipeRefresh.isEnabled = false;
-    }
 
     fun clearResults(){
         setPager(EmptyPager<TResult>() as TPager);
@@ -470,9 +472,7 @@ abstract class FeedView<TFragment, TResult, TConverted, TPager, TViewHolder> : L
         recyclerData.resultsUnfiltered.addAll(toAdd);
         recyclerData.adapter.notifyDataSetChanged();
         recyclerData.loadedFeedStyle = feedStyle;
-        setLoading(false)
-        if(pager.hasMorePages())
-            ensureEnoughContentVisible(filteredResults)
+        ensureEnoughContentVisible(filteredResults)
     }
 
     private fun detachPagerEvents() {

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

@@ -26,7 +26,6 @@ import com.futo.platformplayer.models.HistoryVideo
 import com.futo.platformplayer.states.StateHistory
 import com.futo.platformplayer.states.StatePlatform
 import com.futo.platformplayer.states.StatePlayer
-import com.futo.platformplayer.states.StatePlaylists
 import com.futo.platformplayer.states.StatePlugins
 import com.futo.platformplayer.views.ToggleBar
 import com.futo.platformplayer.views.adapters.HistoryListViewHolder
@@ -244,23 +243,12 @@ class HistoryFragment : MainFragment() {
                 return;
             }
 
+            val inputMethodManager = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager;
             val diff = v.video.duration - v.position;
             val vid: Any = if (diff > 5) { v.video.withTimestamp(v.position) } else { v.video };
-
-            val playlistId = v.playlistId
-            val playlist = playlistId?.let { StatePlaylists.instance.getPlaylist(it) }
-            val playlistIndex = playlist?.videos?.indexOfFirst { it.url == v.video.url }
-            if (playlist != null && playlistIndex != null && playlistIndex >= 0) {
-                _fragment.navigate<VideoDetailFragment>(vid).maximizeVideoDetail();
-                StatePlayer.instance.setPlaylist(playlist, playlistIndex)
-
-            } else {
-                StatePlayer.instance.clearQueue();
-                _fragment.navigate<VideoDetailFragment>(vid).maximizeVideoDetail();
-            }
-
+            StatePlayer.instance.clearQueue();
+            _fragment.navigate<VideoDetailFragment>(vid).maximizeVideoDetail();
             _editSearch.clearFocus();
-            val inputMethodManager = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager;
             inputMethodManager.hideSoftInputFromWindow(_editSearch.windowToken, 0);
 
             _fragment.lifecycleScope.launch(Dispatchers.Main) {

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

@@ -365,10 +365,8 @@ class HomeFragment : MainFragment() {
             finishRefreshLayoutLoader();
             setLoading(false);
             setPager(pager);
-            if(pager.getResults().isEmpty() && !pager.hasMorePages()) {
-                setLoading(false);
+            if(pager.getResults().isEmpty() && !pager.hasMorePages())
                 setEmptyPager(true);
-            }
         }
     }
 

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

@@ -1,159 +0,0 @@
-package com.futo.platformplayer.fragment.mainactivity.main
-
-import android.content.Context
-import android.os.Bundle
-import android.util.TypedValue
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import android.widget.FrameLayout
-import android.widget.LinearLayout
-import androidx.core.view.updateLayoutParams
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.futo.platformplayer.UISlideOverlays
-import com.futo.platformplayer.api.media.models.video.IPlatformVideo
-import com.futo.platformplayer.api.media.structures.AdhocPager
-import com.futo.platformplayer.api.media.structures.EmptyPager
-import com.futo.platformplayer.api.media.structures.IPager
-import com.futo.platformplayer.dp
-import com.futo.platformplayer.fragment.mainactivity.topbar.NavigationTopBarFragment
-import com.futo.platformplayer.states.Album
-import com.futo.platformplayer.states.StateLibrary
-import com.futo.platformplayer.states.StatePlayer
-import com.futo.platformplayer.toHumanDuration
-import com.futo.platformplayer.views.AlbumHeaderView
-import com.futo.platformplayer.views.FeedStyle
-import com.futo.platformplayer.views.adapters.InsertedViewAdapterWithLoader
-import com.futo.platformplayer.views.adapters.viewholders.TrackViewHolder
-
-
-class LibraryAlbumFragment : MainFragment() {
-    override val isMainView : Boolean = true;
-    override val isTab: Boolean = true;
-    override val hasBottomBar: Boolean get() = true;
-
-    private var view: FragView? = null;
-
-
-    override fun onCreateMainView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): android.view.View {
-        val newView = FragView(this, inflater);
-        view = newView;
-        return newView;
-    }
-
-    override fun onShownWithView(parameter: Any?, isBack: Boolean) {
-        super.onShownWithView(parameter, isBack);
-        view?.onShown(parameter);
-    }
-
-    override fun onDestroyMainView() {
-        view = null;
-        super.onDestroyMainView();
-    }
-
-    companion object {
-        fun newInstance() = LibraryAlbumFragment().apply {}
-    }
-
-
-    class FragView : FeedView<LibraryAlbumFragment, IPlatformVideo, IPlatformVideo, IPager<IPlatformVideo>, TrackViewHolder> {
-        override val feedStyle: FeedStyle = FeedStyle.THUMBNAIL; //R.layout.list_creator;
-
-        private val _header: AlbumHeaderView;
-
-        private var _album: Album? = null;
-        private var _tracks: List<IPlatformVideo>? = null;
-        private var _url: String? = null;
-
-        constructor(fragment: LibraryAlbumFragment, inflater: LayoutInflater) : super(fragment, inflater) {
-            _header = AlbumHeaderView(context);
-            _toolbarContentView.addView(_header);
-
-            _header.onPlayAll.subscribe {
-                val playlist = _album?.toPlaylist(_tracks);
-                if (playlist != null) {
-                    StatePlayer.instance.setPlaylist(playlist, focus = true);
-                }
-            }
-            _header.onShuffle.subscribe {
-                val playlist = _album?.toPlaylist(_tracks);
-                if (playlist != null) {
-                    StatePlayer.instance.setPlaylist(playlist, focus = true, shuffle = true);
-                }
-            }
-
-            /*
-            _feedRoot.updateLayoutParams<LinearLayout.LayoutParams> {
-                this.setMargins(0,-50.dp(resources),0,0)
-            } */
-        }
-
-        fun onShown(parameter: Any?) {
-            val album = if(parameter is String)
-                StateLibrary.instance.getAlbum(parameter);
-            else if(parameter is Long)
-                StateLibrary.instance.getAlbum(parameter);
-            else if(parameter is Album)
-                parameter;
-            else null;
-            if(album == null) {
-                _album = null;
-                _tracks = null;
-                setPager(EmptyPager());
-                return;
-            }
-            _header.setName(album.name);
-            _header.setThumbnail(album.thumbnail);
-            val tracks = album.getTracks();
-            _album = album;
-            _tracks = tracks;
-            _header.setMetadata("${tracks.size} tracks" +  if(tracks.size > 0) (" • " + tracks.sumOf { it.duration }.toHumanDuration(false)) else "");
-            setPager(AdhocPager({listOf()}, tracks));
-        }
-
-        override fun createAdapter(recyclerResults: RecyclerView, context: Context, dataset: ArrayList<IPlatformVideo>): InsertedViewAdapterWithLoader<TrackViewHolder> {
-            return InsertedViewAdapterWithLoader(context, arrayListOf(), arrayListOf(),
-                childCountGetter = { dataset.size },
-                childViewHolderBinder = { viewHolder, position -> viewHolder.bind(dataset[position]); },
-                childViewHolderFactory = { viewGroup, _ ->
-                    val holder = TrackViewHolder(viewGroup);
-                    holder.onClick.subscribe { c ->
-
-                        val playlist = _album?.toPlaylist(_tracks);
-                        val index = playlist?.videos?.indexOfFirst { it.name == c.name } ?: -1;
-                        if (playlist != null) {
-                            if (index == -1)
-                                return@subscribe;
-
-                            StatePlayer.instance.setPlaylist(playlist, index, true);
-                        }
-                    };
-                    holder.onOptions.subscribe {
-                        if(it is IPlatformVideo)
-                            UISlideOverlays.showVideoOptionsOverlay(it, _overlayContainer);
-                    }
-                    return@InsertedViewAdapterWithLoader holder;
-                }
-            );
-        }
-
-        override fun updateSpanCount(){ }
-
-        override fun createLayoutManager(recyclerResults: RecyclerView, context: Context): GridLayoutManager {
-            val glmResults = GridLayoutManager(context, 1)
-
-            _swipeRefresh.layoutParams = (_swipeRefresh.layoutParams as MarginLayoutParams?)?.apply {
-                rightMargin = TypedValue.applyDimension(
-                    TypedValue.COMPLEX_UNIT_DIP,
-                    8.0f,
-                    context.resources.displayMetrics
-                ).toInt()
-            }
-            return glmResults
-        }
-
-        companion object {
-            private const val TAG = "LibraryArtistsFragmentsView";
-        }
-    }
-}

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

@@ -1,185 +0,0 @@
-package com.futo.platformplayer.fragment.mainactivity.main
-
-import android.content.Context
-import android.os.Bundle
-import android.util.TypedValue
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import android.widget.EditText
-import android.widget.FrameLayout
-import android.widget.ImageButton
-import android.widget.ImageView
-import android.widget.LinearLayout.GONE
-import android.widget.LinearLayout.VISIBLE
-import android.widget.Spinner
-import android.widget.TextView
-import androidx.core.widget.addTextChangedListener
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.bumptech.glide.Glide
-import com.futo.platformplayer.R
-import com.futo.platformplayer.UISlideOverlays
-import com.futo.platformplayer.api.media.models.PlatformAuthorLink
-import com.futo.platformplayer.api.media.models.playlists.IPlatformPlaylist
-import com.futo.platformplayer.api.media.structures.AdhocPager
-import com.futo.platformplayer.api.media.structures.IPager
-import com.futo.platformplayer.constructs.Event0
-import com.futo.platformplayer.constructs.Event1
-import com.futo.platformplayer.images.GlideHelper.Companion.crossfade
-import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.states.Album
-import com.futo.platformplayer.states.StateLibrary
-import com.futo.platformplayer.stores.FragmentedStorage
-import com.futo.platformplayer.stores.StringStorage
-import com.futo.platformplayer.views.FeedStyle
-import com.futo.platformplayer.views.LibraryTypeHeaderView
-import com.futo.platformplayer.views.adapters.AnyAdapter
-import com.futo.platformplayer.views.adapters.InsertedViewAdapterWithLoader
-import com.futo.platformplayer.views.adapters.SubscriptionAdapter
-import com.futo.platformplayer.views.adapters.viewholders.AlbumTileViewHolder
-import com.futo.platformplayer.views.adapters.viewholders.SelectablePlaylist
-import com.futo.platformplayer.views.others.CreatorThumbnail
-import com.futo.platformplayer.views.platform.PlatformIndicator
-
-class LibraryAlbumsFragment : MainFragment() {
-    override val isMainView : Boolean = true;
-    override val isTab: Boolean = true;
-    override val hasBottomBar: Boolean get() = true;
-
-
-    var view: FragView? = null;
-
-    override fun onCreateMainView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        val view = FragView(this, inflater);
-        this.view = view;
-        return view;
-    }
-
-    override fun onShown(parameter: Any?, isBack: Boolean) {
-        super.onShown(parameter, isBack)
-    }
-
-    override fun onShownWithView(parameter: Any?, isBack: Boolean) {
-        super.onShownWithView(parameter, isBack);
-        view?.onShown();
-    }
-
-    override fun onDestroyMainView() {
-        view = null;
-        super.onDestroyMainView();
-    }
-
-    companion object {
-        fun newInstance() = LibraryAlbumsFragment().apply {}
-    }
-
-    class FragView : FeedView<LibraryAlbumsFragment, Album, Album, IPager<Album>, AlbumTileViewHolder> {
-        override val feedStyle: FeedStyle = FeedStyle.THUMBNAIL; //R.layout.list_creator;
-
-        val libraryTypeHeader: LibraryTypeHeaderView;
-
-        constructor(fragment: LibraryAlbumsFragment, inflater: LayoutInflater) : super(fragment, inflater) {
-            libraryTypeHeader = LibraryTypeHeaderView(context);
-            libraryTypeHeader.setSelectedType(LibraryTypeHeaderView.SelectedType.Albums);
-            libraryTypeHeader.setMetadata("");
-
-            libraryTypeHeader.onSelectedChanged.subscribe {
-                when(it) {
-                    LibraryTypeHeaderView.SelectedType.Artists -> fragment.navigate<LibraryArtistsFragment>();
-                    else -> {}
-                }
-            }
-
-            _toolbarContentView.addView(libraryTypeHeader);
-            disableRefreshLayout();
-        }
-
-        fun onShown() {
-            val initialAlbums = StateLibrary.instance.getAlbums();
-            Logger.i(TAG, "Initial album count: " + initialAlbums.size);
-
-            libraryTypeHeader.setMetadata("${initialAlbums.size} albums");
-            setPager(AdhocPager<Album>({ listOf(); }, initialAlbums));
-        }
-
-        override fun reload() {
-            super.reload();
-            finishRefreshLayoutLoader();
-        }
-
-        override fun createAdapter(recyclerResults: RecyclerView, context: Context, dataset: ArrayList<Album>): InsertedViewAdapterWithLoader<AlbumTileViewHolder> {
-            return InsertedViewAdapterWithLoader(context, arrayListOf(), arrayListOf(),
-                childCountGetter = { dataset.size },
-                childViewHolderBinder = { viewHolder, position -> viewHolder.bind(dataset[position]); },
-                childViewHolderFactory = { viewGroup, _ ->
-                    val holder = AlbumTileViewHolder(viewGroup);
-                    holder.setAutoSize(resources.displayMetrics.widthPixels / resources.displayMetrics.density)
-                    holder.onClick.subscribe { c -> fragment.navigate<LibraryAlbumFragment>(c) };
-                    return@InsertedViewAdapterWithLoader holder;
-                }
-            );
-        }
-
-        override fun updateSpanCount(){ }
-
-        override fun createLayoutManager(recyclerResults: RecyclerView, context: Context): GridLayoutManager {
-            val glmResults = GridLayoutManager(context, AlbumTileViewHolder.getAutoSizeColumns(resources.displayMetrics.widthPixels / resources.displayMetrics.density))
-
-            _swipeRefresh.layoutParams = (_swipeRefresh.layoutParams as MarginLayoutParams?)?.apply {
-                leftMargin = TypedValue.applyDimension(
-                    TypedValue.COMPLEX_UNIT_DIP,
-                    3f,
-                    context.resources.displayMetrics
-                ).toInt()
-            }
-
-            return glmResults
-        }
-
-        companion object {
-            private const val TAG = "LibraryAlbumsFragmentsView";
-        }
-    }
-
-    class AlbumViewHolder(private val _viewGroup: ViewGroup) : AnyAdapter.AnyViewHolder<Album>(
-        LayoutInflater.from(_viewGroup.context).inflate(R.layout.list_album,
-            _viewGroup, false)) {
-
-        val onClick = Event1<Album?>();
-
-        protected var _album: Album? = null;
-        protected val _imageThumbnail: ImageView
-        protected val _textName: TextView
-        protected val _textMetadata: TextView
-
-        init {
-            _imageThumbnail = _view.findViewById(R.id.image_thumbnail);
-            _textName = _view.findViewById(R.id.text_name);
-            _textMetadata = _view.findViewById(R.id.text_metadata);
-
-            _view.setOnClickListener { onClick.emit(_album) };
-        }
-
-
-        override fun bind(album: Album) {
-            _album = album;
-            _imageThumbnail?.let {
-                if (album.thumbnail != null)
-                    Glide.with(it)
-                        .load(album.thumbnail)
-                        .placeholder(R.drawable.placeholder_channel_thumbnail)
-                        .into(it)
-                else
-                    Glide.with(it).load(R.drawable.placeholder_channel_thumbnail).into(it);
-            };
-
-            _textName.text = album.name;
-            _textMetadata.text = album.artist ?: "";
-        }
-
-    }
-}

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

@@ -1,634 +0,0 @@
-package com.futo.platformplayer.fragment.mainactivity.main
-
-import android.content.Context
-import android.graphics.drawable.Animatable
-import android.net.Uri
-import android.os.Bundle
-import android.util.TypedValue
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.FrameLayout
-import android.widget.ImageButton
-import android.widget.ImageView
-import android.widget.LinearLayout
-import android.widget.TextView
-import androidx.appcompat.widget.AppCompatImageView
-import androidx.core.view.isVisible
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentManager
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import androidx.viewpager2.adapter.FragmentStateAdapter
-import androidx.viewpager2.widget.ViewPager2
-import com.bumptech.glide.Glide
-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.contents.ContentType
-import com.futo.platformplayer.api.media.models.contents.IPlatformContent
-import com.futo.platformplayer.api.media.models.playlists.IPlatformPlaylist
-import com.futo.platformplayer.api.media.models.post.IPlatformPost
-import com.futo.platformplayer.api.media.models.video.IPlatformVideo
-import com.futo.platformplayer.api.media.models.video.SerializedPlatformVideo
-import com.futo.platformplayer.api.media.structures.AdhocPager
-import com.futo.platformplayer.api.media.structures.IPager
-import com.futo.platformplayer.assume
-import com.futo.platformplayer.constructs.Event1
-import com.futo.platformplayer.constructs.Event2
-import com.futo.platformplayer.constructs.Event3
-import com.futo.platformplayer.fragment.mainactivity.main.LibraryAlbumsFragment.AlbumViewHolder
-import com.futo.platformplayer.fragment.mainactivity.topbar.NavigationTopBarFragment
-import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.models.SearchType
-import com.futo.platformplayer.states.Album
-import com.futo.platformplayer.states.Artist
-import com.futo.platformplayer.states.StateLibrary
-import com.futo.platformplayer.states.StatePlatform
-import com.futo.platformplayer.states.StatePlayer
-import com.futo.platformplayer.states.StatePlaylists
-import com.futo.platformplayer.states.StateSubscriptions
-import com.futo.platformplayer.views.FeedStyle
-import com.futo.platformplayer.views.adapters.InsertedViewAdapterWithLoader
-import com.futo.platformplayer.views.adapters.viewholders.AlbumTileViewHolder
-import com.futo.platformplayer.views.adapters.viewholders.TrackViewHolder
-import com.futo.platformplayer.views.others.CreatorThumbnail
-import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuOverlay
-import com.futo.platformplayer.views.subscriptions.SubscribeButton
-import com.google.android.material.tabs.TabLayout
-import com.google.android.material.tabs.TabLayoutMediator
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-
-class LibraryArtistFragment : MainFragment() {
-    override val isMainView : Boolean = true;
-    override val isTab: Boolean = true;
-    override val hasBottomBar: Boolean get() = true;
-
-    private var _textMeta: TextView? = null;
-
-    var view: FragView? = null;
-
-    override fun onCreateMainView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        val view = FragView(this, inflater);
-        this.view = view;
-        return view;
-    }
-
-    override fun onShown(parameter: Any?, isBack: Boolean) {
-        super.onShown(parameter, isBack)
-    }
-
-    override fun onShownWithView(parameter: Any?, isBack: Boolean) {
-        super.onShownWithView(parameter, isBack);
-        view?.onShown(parameter, isBack);
-    }
-
-    override fun onDestroyMainView() {
-        view = null;
-        super.onDestroyMainView();
-    }
-
-    companion object {
-        fun newInstance() = LibraryArtistFragment().apply {}
-    }
-
-    class FragView(fragment: LibraryArtistFragment, inflater: LayoutInflater) : LinearLayout(inflater.context) {
-        private val _fragment: LibraryArtistFragment = fragment
-
-        private var _textChannel: TextView
-        private var _textChannelSub: TextView
-        private var _creatorThumbnail: CreatorThumbnail
-        private var _imageBanner: AppCompatImageView
-
-        private var _tabs: TabLayout
-        private var _viewPager: ViewPager2
-
-        //        private var _adapter: ChannelViewPagerAdapter;
-        private var _tabLayoutMediator: TabLayoutMediator
-        private var _buttonSubscribe: SubscribeButton
-        private var _buttonSubscriptionSettings: ImageButton
-
-        private var _overlayContainer: FrameLayout
-        private var _overlayLoading: LinearLayout
-        private var _overlayLoadingSpinner: ImageView
-
-        private var _slideUpOverlay: SlideUpMenuOverlay? = null
-
-        private var _isLoading: Boolean = false
-        private var _selectedTabIndex: Int = -1
-        var channel: Artist? = null
-            private set
-        private var _url: String? = null
-
-        private val _onPageChangeCallback = object : ViewPager2.OnPageChangeCallback() {}
-
-        init {
-            inflater.inflate(R.layout.fragment_artist, this)
-
-            val tabs: TabLayout = findViewById(R.id.tabs)
-            val viewPager: ViewPager2 = findViewById(R.id.view_pager)
-            _textChannel = findViewById(R.id.text_channel_name)
-            _textChannelSub = findViewById(R.id.text_metadata)
-            _creatorThumbnail = findViewById(R.id.creator_thumbnail)
-            _imageBanner = findViewById(R.id.image_channel_banner)
-            _buttonSubscribe = findViewById(R.id.button_subscribe)
-            _buttonSubscriptionSettings = findViewById(R.id.button_sub_settings)
-            _overlayLoading = findViewById(R.id.channel_loading_overlay)
-            _overlayLoadingSpinner = findViewById(R.id.channel_loader_frag)
-            _overlayContainer = findViewById(R.id.overlay_container)
-            _buttonSubscribe.onSubscribed.subscribe {
-                UISlideOverlays.showSubscriptionOptionsOverlay(it, _overlayContainer)
-                _buttonSubscriptionSettings.visibility =
-                    if (_buttonSubscribe.isSubscribed) View.VISIBLE else View.GONE
-            }
-            _buttonSubscribe.onUnSubscribed.subscribe {
-                _buttonSubscriptionSettings.visibility =
-                    if (_buttonSubscribe.isSubscribed) View.VISIBLE else View.GONE
-            }
-            _buttonSubscriptionSettings.setOnClickListener {
-                val url = channel?.contentUrl ?: _url ?: return@setOnClickListener
-                val sub =
-                    StateSubscriptions.instance.getSubscription(url) ?: return@setOnClickListener
-                UISlideOverlays.showSubscriptionOptionsOverlay(sub, _overlayContainer)
-            }
-
-            //TODO: Determine if this is really the only solution (isSaveEnabled=false)
-            viewPager.isSaveEnabled = false
-            viewPager.registerOnPageChangeCallback(_onPageChangeCallback)
-            val adapter = ArtistViewPagerAdapter(fragment, fragment.childFragmentManager, fragment.lifecycle)
-            adapter.onChannelClicked.subscribe { c -> fragment.navigate<ChannelFragment>(c) }
-            adapter.onContentClicked.subscribe { v, _ ->
-                when (v) {
-                    is IPlatformVideo -> {
-                        StatePlayer.instance.clearQueue()
-                        fragment.navigate<VideoDetailFragment>(v).maximizeVideoDetail()
-                    }
-
-                    is IPlatformPlaylist -> {
-                        fragment.navigate<RemotePlaylistFragment>(v)
-                    }
-
-                    is IPlatformPost -> {
-                        fragment.navigate<PostDetailFragment>(v)
-                    }
-                }
-            }
-            adapter.onShortClicked.subscribe { v, _, pagerPair ->
-                when (v) {
-                    is IPlatformVideo -> {
-                        StatePlayer.instance.clearQueue()
-                        fragment.navigate<ShortsFragment>(Triple(v, pagerPair!!.first, pagerPair.second))
-                    }
-                }
-            }
-            adapter.onAddToClicked.subscribe { content ->
-                _overlayContainer.let {
-                    if (content is IPlatformVideo) _slideUpOverlay =
-                        UISlideOverlays.showVideoOptionsOverlay(content, it)
-                }
-            }
-            adapter.onAddToQueueClicked.subscribe { content ->
-                if (content is IPlatformVideo) {
-                    StatePlayer.instance.addToQueue(content)
-                }
-            }
-            adapter.onAddToWatchLaterClicked.subscribe { content ->
-                if (content is IPlatformVideo) {
-                    if(StatePlaylists.instance.addToWatchLater(SerializedPlatformVideo.fromVideo(content), true))
-                        UIDialogs.toast("Added to watch later\n[${content.name}]")
-                    else
-                        UIDialogs.toast(context.getString(R.string.already_in_watch_later))
-                }
-            }
-            adapter.onUrlClicked.subscribe { url ->
-                fragment.navigate<BrowserFragment>(url)
-            }
-            adapter.onContentUrlClicked.subscribe { url, contentType ->
-                when (contentType) {
-                    ContentType.MEDIA -> {
-                        StatePlayer.instance.clearQueue()
-                        fragment.navigate<VideoDetailFragment>(url).maximizeVideoDetail()
-                    }
-
-                    ContentType.URL -> fragment.navigate<BrowserFragment>(url)
-                    else -> {}
-                }
-            }
-            adapter.onLongPress.subscribe { content ->
-                _overlayContainer.let {
-                    if (content is IPlatformVideo) _slideUpOverlay =
-                        UISlideOverlays.showVideoOptionsOverlay(content, it)
-                }
-            }
-            viewPager.adapter = adapter
-            val tabLayoutMediator = TabLayoutMediator(
-                tabs, viewPager, (viewPager.adapter as ArtistViewPagerAdapter)::getTabNames
-            )
-            tabLayoutMediator.attach()
-
-            _tabLayoutMediator = tabLayoutMediator
-            _tabs = tabs
-            _viewPager = viewPager
-            if (_selectedTabIndex != -1) {
-                selectTab(_selectedTabIndex)
-            }
-            setLoading(true)
-        }
-
-        fun selectTab(tab: ArtistTab) {
-            (_viewPager.adapter as ArtistViewPagerAdapter).getTabPosition(tab)
-        }
-
-        fun cleanup() {
-            _tabLayoutMediator.detach()
-            _viewPager.unregisterOnPageChangeCallback(_onPageChangeCallback)
-            hideSlideUpOverlay()
-            (_overlayLoadingSpinner.drawable as Animatable?)?.stop()
-        }
-
-        fun onShown(parameter: Any?, isBack: Boolean) {
-            hideSlideUpOverlay()
-            _selectedTabIndex = -1
-
-            if (!isBack || _url == null) {
-                _imageBanner.setImageDrawable(null)
-
-                when (parameter) {
-                    is String -> {
-                        _buttonSubscribe.setSubscribeChannel(parameter)
-                        _buttonSubscriptionSettings.visibility =
-                            if (_buttonSubscribe.isSubscribed) View.VISIBLE else View.GONE
-
-                        _url = parameter
-
-                        val parsed = Uri.parse(parameter);
-                        val idLong = parsed.lastPathSegment?.toLongOrNull();
-                        if(idLong != null) {
-                            val artist = StateLibrary.instance.getArtist(idLong) ?: return;
-                            showArtist(artist);
-                        }
-                    }
-
-                    is Artist -> {
-                        showArtist(parameter)
-                        _url = parameter.contentUrl
-                    }
-                }
-            }
-        }
-
-        private fun selectTab(selectedTabIndex: Int) {
-            _selectedTabIndex = selectedTabIndex
-            _tabs.selectTab(_tabs.getTabAt(selectedTabIndex))
-        }
-
-        private fun setLoading(isLoading: Boolean) {
-            if (_isLoading == isLoading) {
-                return
-            }
-
-            _isLoading = isLoading
-            if (isLoading) {
-                _overlayLoading.visibility = View.VISIBLE
-                (_overlayLoadingSpinner.drawable as Animatable?)?.start()
-            } else {
-                (_overlayLoadingSpinner.drawable as Animatable?)?.stop()
-                _overlayLoading.visibility = View.GONE
-            }
-        }
-
-        fun onBackPressed(): Boolean {
-            if (_slideUpOverlay != null) {
-                hideSlideUpOverlay()
-                return true
-            }
-
-            return false
-        }
-
-        private fun hideSlideUpOverlay() {
-            _slideUpOverlay?.hide(false)
-            _slideUpOverlay = null
-        }
-
-        private fun showArtist(channel: Artist) {
-            setLoading(false)
-
-            _fragment.topBar?.onShown(channel)
-
-            val buttons = arrayListOf<Pair<Int, ()->Unit>>();
-
-            _fragment.lifecycleScope.launch(Dispatchers.IO) {
-                val plugin = StatePlatform.instance.getChannelClientOrNull(channel.contentUrl ?: return@launch)
-                withContext(Dispatchers.Main) {
-                    buttons.add(Pair(R.drawable.ic_search) {
-                        _fragment.navigate<SuggestionsFragment>(
-                            SuggestionsFragmentData(
-                                "", SearchType.VIDEO
-                            )
-                        )
-                    })
-                    _fragment.topBar?.assume<NavigationTopBarFragment>()?.setMenuItems(buttons)
-                }
-            }
-
-            _buttonSubscribe.visibility = GONE;
-            _buttonSubscriptionSettings.visibility = View.GONE
-            _textChannel.text = channel.name
-            _textChannelSub.text = "${channel.countTracks} songs, ${channel.countAlbums} albums";
-
-            var supportsPlaylists = false;
-            val playlistPosition = 1
-            // keep the current tab selected
-            if (_viewPager.currentItem >= playlistPosition) {
-                _viewPager.setCurrentItem(_viewPager.currentItem + 1, false)
-            }
-            (_viewPager.adapter as ArtistViewPagerAdapter).insert(
-                playlistPosition,
-                ArtistTab.ALBUMS
-            )
-
-            // sets the channel for each tab
-            for (fragment in _fragment.childFragmentManager.fragments) {
-                (fragment as IArtistTabFragment).setArtist(channel)
-            }
-
-            (_viewPager.adapter as ArtistViewPagerAdapter).artist = channel
-
-
-            _viewPager.adapter!!.notifyDataSetChanged();
-
-            val artistThumbnail = channel.getThumbnailOrAlbum();
-            if(artistThumbnail != null) {
-                _creatorThumbnail.isVisible = true;
-                _creatorThumbnail.setThumbnail(channel.getThumbnailOrAlbum(), true, true);
-                Glide.with(_imageBanner)
-                    .load(artistThumbnail)
-                    .into(_imageBanner);
-            }
-            else {
-                _creatorThumbnail.isVisible = false;
-                Glide.with(_imageBanner).clear(_imageBanner);
-            }
-
-
-            this.channel = channel
-        }
-
-
-        companion object {
-            private const val TAG = "LibraryArtistFragmentsView";
-        }
-    }
-    enum class ArtistTab {
-        SONGS, ALBUMS
-    }
-
-    class ArtistViewPagerAdapter(private val fragment: LibraryArtistFragment, fragmentManager: FragmentManager, lifecycle: Lifecycle) :
-        FragmentStateAdapter(fragmentManager, lifecycle) {
-        private val _supportedFragments = mutableMapOf(
-            ArtistTab.SONGS.ordinal to ArtistTab.SONGS
-        )
-        private val _tabs = arrayListOf(ArtistTab.SONGS, ArtistTab.ALBUMS)
-
-        var artist: Artist? = null
-
-        val onContentUrlClicked = Event2<String, ContentType>()
-        val onUrlClicked = Event1<String>()
-        val onContentClicked = Event2<IPlatformContent, Long>()
-        val onShortClicked = Event3<IPlatformContent, Long, Pair<IPager<IPlatformContent>, ArrayList<IPlatformContent>>?>()
-        val onChannelClicked = Event1<PlatformAuthorLink>()
-        val onAddToClicked = Event1<IPlatformContent>()
-        val onAddToQueueClicked = Event1<IPlatformContent>()
-        val onAddToWatchLaterClicked = Event1<IPlatformContent>()
-        val onLongPress = Event1<IPlatformContent>()
-
-        override fun getItemId(position: Int): Long {
-            return _tabs[position].ordinal.toLong()
-        }
-
-        override fun containsItem(itemId: Long): Boolean {
-            return _supportedFragments.containsKey(itemId.toInt())
-        }
-
-        override fun getItemCount(): Int {
-            return _supportedFragments.size
-        }
-
-        fun getTabPosition(tab: ArtistTab): Int {
-            return _tabs.indexOf(tab)
-        }
-
-        fun getTabNames(tab: TabLayout.Tab, position: Int) {
-            tab.text = _tabs[position].name
-        }
-
-        fun insert(position: Int, tab: ArtistTab) {
-            _supportedFragments[tab.ordinal] = tab
-            _tabs.add(position, tab)
-            notifyItemInserted(position)
-        }
-
-        fun remove(position: Int) {
-            _supportedFragments.remove(_tabs[position].ordinal)
-            _tabs.removeAt(position)
-            notifyItemRemoved(position)
-        }
-
-        override fun createFragment(position: Int): Fragment {
-            val fragment: Fragment
-            when (_tabs[position]) {
-                ArtistTab.SONGS -> {
-                    fragment = ChannelContentsFragment(this.fragment).apply {
-
-                    }
-                }
-
-                ArtistTab.ALBUMS -> {
-                    fragment = ArtistAlbumsFragment(this.fragment).apply {
-
-                    }
-                }
-            }
-            artist?.let { (fragment as IArtistTabFragment).setArtist(it) }
-
-            return fragment
-        }
-    }
-
-    interface IArtistTabFragment {
-        fun setArtist(artist: Artist);
-    }
-
-    class ChannelContentsFragment(private val frag: LibraryArtistFragment) : Fragment(), IArtistTabFragment {
-
-        var view: ArtistContentView? = null;
-
-        private var _lastArtist: Artist? = null;
-
-        override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-            view = ArtistContentView(frag, inflater);
-            _lastArtist?.let {
-                view?.setArtist(it);
-            }
-            return view;
-        }
-
-        override fun onDestroyView() {
-            view = null;
-            super.onDestroyView()
-        }
-
-        override fun setArtist(artist: Artist) {
-            view?.setArtist(artist);
-            _lastArtist = artist;
-        }
-    }
-    class ArtistContentView : FeedView<LibraryArtistFragment, IPlatformContent, IPlatformVideo, IPager<IPlatformContent>, TrackViewHolder> {
-        override val feedStyle: FeedStyle = FeedStyle.THUMBNAIL; //R.layout.list_creator;
-
-        protected var _artist: Artist? = null;
-
-        constructor(fragment: LibraryArtistFragment, inflater: LayoutInflater) : super(fragment, inflater) {
-
-        }
-
-        fun setArtist(artist: Artist) {
-            this._artist = artist;
-            val tracks = artist.getAudioTracks();
-            if(tracks.getResults().isEmpty())
-                UIDialogs.appToast("No tracks found");
-            setPager(tracks);
-        }
-
-        override fun filterResults(results: List<IPlatformContent>): List<IPlatformVideo> {
-            return results.filter { it is IPlatformVideo }.map { it as IPlatformVideo };
-        }
-
-        override fun createAdapter(recyclerResults: RecyclerView, context: Context, dataset: ArrayList<IPlatformVideo>): InsertedViewAdapterWithLoader<TrackViewHolder> {
-            return InsertedViewAdapterWithLoader(context, arrayListOf(), arrayListOf(),
-                childCountGetter = { dataset.size },
-                childViewHolderBinder = { viewHolder, position -> viewHolder.bind(dataset[position]); },
-                childViewHolderFactory = { viewGroup, _ ->
-                    val holder = TrackViewHolder(viewGroup);
-                    holder.onClick.subscribe { c ->
-
-                        val playlist = _artist?.toPlaylist();
-                        if (playlist != null) {
-                            val sameVideo = playlist.videos.find { it.name == c.name };
-                            val index = sameVideo?.let {
-                                playlist.videos.indexOf(sameVideo)
-                            } ?: -1;
-                            if (index == -1)
-                                return@subscribe;
-
-                            StatePlayer.instance.setPlaylist(playlist, index, true);
-                        }
-                    };
-                    holder.onOptions.subscribe {
-                        if(it is IPlatformVideo)
-                            UISlideOverlays.showVideoOptionsOverlay(it, _overlayContainer);
-                    }
-                    return@InsertedViewAdapterWithLoader holder;
-                }
-            );
-        }
-
-        override fun createLayoutManager(recyclerResults: RecyclerView, context: Context): GridLayoutManager {
-            val glmResults = GridLayoutManager(context, 1)
-
-            _swipeRefresh.layoutParams = (_swipeRefresh.layoutParams as MarginLayoutParams?)?.apply {
-                rightMargin = TypedValue.applyDimension(
-                    TypedValue.COMPLEX_UNIT_DIP,
-                    8.0f,
-                    context.resources.displayMetrics
-                ).toInt()
-            }
-            return glmResults
-        }
-
-        override fun updateSpanCount(){ }
-
-
-        companion object {
-            private const val TAG = "LibraryAlbumsFragmentsView";
-        }
-    }
-    class ArtistAlbumsFragment(private val frag: LibraryArtistFragment) : Fragment(), IArtistTabFragment {
-
-        var view: ArtistAlbumsView? = null;
-
-        private var _lastArtist: Artist? = null;
-
-        override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-            view = ArtistAlbumsView(frag, inflater);
-            _lastArtist?.let {
-                view?.setArtist(it);
-            }
-            return view;
-        }
-
-        override fun onDestroyView() {
-            view = null;
-            super.onDestroyView()
-        }
-
-        override fun setArtist(artist: Artist) {
-            view?.setArtist(artist);
-            _lastArtist = artist;
-        }
-    }
-    class ArtistAlbumsView : FeedView<LibraryArtistFragment, Album, Album, IPager<Album>, AlbumTileViewHolder> {
-        override val feedStyle: FeedStyle = FeedStyle.THUMBNAIL; //R.layout.list_creator;
-
-        constructor(fragment: LibraryArtistFragment, inflater: LayoutInflater) : super(fragment, inflater)
-
-        fun onShown() {
-        }
-
-        fun setArtist(artist: Artist) {
-            val initialAlbums = artist.getAlbums();
-            Logger.i(TAG, "Initial album count: " + initialAlbums.size);
-
-            setPager(AdhocPager({ listOf() }, initialAlbums));
-        }
-
-        override fun createAdapter(recyclerResults: RecyclerView, context: Context, dataset: ArrayList<Album>): InsertedViewAdapterWithLoader<AlbumTileViewHolder> {
-            return InsertedViewAdapterWithLoader(context, arrayListOf(), arrayListOf(),
-                childCountGetter = { dataset.size },
-                childViewHolderBinder = { viewHolder, position -> viewHolder.bind(dataset[position]); },
-                childViewHolderFactory = { viewGroup, _ ->
-                    val holder = AlbumTileViewHolder(viewGroup);
-                    holder.setAutoSize(resources.displayMetrics.widthPixels / resources.displayMetrics.density)
-                    holder.onClick.subscribe { c -> fragment.navigate<LibraryAlbumFragment>(c) };
-                    return@InsertedViewAdapterWithLoader holder;
-                }
-            );
-        }
-
-        override fun updateSpanCount(){ }
-
-        override fun createLayoutManager(recyclerResults: RecyclerView, context: Context): GridLayoutManager {
-            val glmResults = GridLayoutManager(context, AlbumTileViewHolder.getAutoSizeColumns(resources.displayMetrics.widthPixels / resources.displayMetrics.density))
-
-            _swipeRefresh.layoutParams = (_swipeRefresh.layoutParams as MarginLayoutParams?)?.apply {
-                rightMargin = TypedValue.applyDimension(
-                    TypedValue.COMPLEX_UNIT_DIP,
-                    8.0f,
-                    context.resources.displayMetrics
-                ).toInt()
-            }
-
-            return glmResults
-        }
-
-        companion object {
-            private const val TAG = "LibraryAlbumsFragmentsView";
-        }
-    }
-}

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

@@ -1,200 +0,0 @@
-package com.futo.platformplayer.fragment.mainactivity.main
-
-import android.content.Context
-import android.os.Bundle
-import android.util.TypedValue
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import android.widget.EditText
-import android.widget.FrameLayout
-import android.widget.ImageButton
-import android.widget.ImageView
-import android.widget.LinearLayout
-import android.widget.LinearLayout.GONE
-import android.widget.LinearLayout.VISIBLE
-import android.widget.Spinner
-import android.widget.TextView
-import androidx.core.widget.addTextChangedListener
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.bumptech.glide.Glide
-import com.futo.platformplayer.R
-import com.futo.platformplayer.UISlideOverlays
-import com.futo.platformplayer.api.media.models.PlatformAuthorLink
-import com.futo.platformplayer.api.media.models.playlists.IPlatformPlaylist
-import com.futo.platformplayer.api.media.structures.AdhocPager
-import com.futo.platformplayer.api.media.structures.IPager
-import com.futo.platformplayer.constructs.Event1
-import com.futo.platformplayer.images.GlideHelper.Companion.crossfade
-import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.states.Album
-import com.futo.platformplayer.states.Artist
-import com.futo.platformplayer.states.ArtistOrdering
-import com.futo.platformplayer.states.StateLibrary
-import com.futo.platformplayer.stores.FragmentedStorage
-import com.futo.platformplayer.stores.StringStorage
-import com.futo.platformplayer.views.FeedStyle
-import com.futo.platformplayer.views.LibraryTypeHeaderView
-import com.futo.platformplayer.views.adapters.AnyAdapter
-import com.futo.platformplayer.views.adapters.InsertedViewAdapterWithLoader
-import com.futo.platformplayer.views.adapters.SubscriptionAdapter
-import com.futo.platformplayer.views.adapters.viewholders.SelectablePlaylist
-import com.futo.platformplayer.views.others.CreatorThumbnail
-import com.futo.platformplayer.views.platform.PlatformIndicator
-
-class LibraryArtistsFragment : MainFragment() {
-    override val isMainView : Boolean = true;
-    override val isTab: Boolean = true;
-    override val hasBottomBar: Boolean get() = true;
-
-    private var _textMeta: TextView? = null;
-
-    var view: FragView? = null;
-
-    override fun onCreateMainView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        val view = FragView(this, inflater);
-        this.view = view;
-        return view;
-    }
-
-    override fun onShown(parameter: Any?, isBack: Boolean) {
-        super.onShown(parameter, isBack)
-    }
-
-    override fun onShownWithView(parameter: Any?, isBack: Boolean) {
-        super.onShownWithView(parameter, isBack);
-        view?.onShown();
-    }
-
-    override fun onDestroyMainView() {
-        view = null;
-        super.onDestroyMainView();
-    }
-
-    companion object {
-        fun newInstance() = LibraryArtistsFragment().apply {}
-    }
-
-    class FragView : FeedView<LibraryArtistsFragment, Artist, Artist, IPager<Artist>, ArtistViewHolder> {
-        override val feedStyle: FeedStyle = FeedStyle.THUMBNAIL; //R.layout.list_creator;
-
-        val libraryTypeHeader: LibraryTypeHeaderView;
-
-        constructor(fragment: LibraryArtistsFragment, inflater: LayoutInflater) : super(fragment, inflater) {
-            libraryTypeHeader = LibraryTypeHeaderView(context);
-            libraryTypeHeader.setSelectedType(LibraryTypeHeaderView.SelectedType.Artists);
-            libraryTypeHeader.setMetadata("");
-
-            libraryTypeHeader.onSelectedChanged.subscribe {
-                when(it) {
-                    LibraryTypeHeaderView.SelectedType.Albums -> fragment.navigate<LibraryAlbumsFragment>();
-                    else -> {}
-                }
-            }
-
-            _toolbarContentView.addView(libraryTypeHeader);
-            disableRefreshLayout();
-        }
-
-        fun onShown() {
-            reload();
-        }
-
-
-        override fun reload() {
-            try {
-                setLoading(true);
-                val intialArtists = StateLibrary.instance.getArtists(ArtistOrdering.Alphabethic);
-                Logger.i(TAG, "Initial album count: " + intialArtists.size);
-
-                libraryTypeHeader.setMetadata("${intialArtists.size} artists");
-                setPager(AdhocPager<Artist>({ listOf(); }, intialArtists));
-            }
-            finally {
-                setLoading(false);
-            }
-        }
-
-        override fun createAdapter(recyclerResults: RecyclerView, context: Context, dataset: ArrayList<Artist>): InsertedViewAdapterWithLoader<ArtistViewHolder> {
-            return InsertedViewAdapterWithLoader(context, arrayListOf(), arrayListOf(),
-                childCountGetter = { dataset.size },
-                childViewHolderBinder = { viewHolder, position -> viewHolder.bind(dataset[position]); },
-                childViewHolderFactory = { viewGroup, _ ->
-                    val holder = ArtistViewHolder(viewGroup);
-                    holder.onClick.subscribe { c ->
-                        fragment.navigate<LibraryArtistFragment>(c)
-                    };
-                    return@InsertedViewAdapterWithLoader holder;
-                }
-            );
-        }
-
-        override fun updateSpanCount(){ }
-
-        override fun createLayoutManager(recyclerResults: RecyclerView, context: Context): GridLayoutManager {
-            val glmResults = GridLayoutManager(context, 1)
-
-            _swipeRefresh.layoutParams = (_swipeRefresh.layoutParams as MarginLayoutParams?)?.apply {
-                rightMargin = TypedValue.applyDimension(
-                    TypedValue.COMPLEX_UNIT_DIP,
-                    8.0f,
-                    context.resources.displayMetrics
-                ).toInt()
-            }
-            return glmResults
-        }
-
-        companion object {
-            private const val TAG = "LibraryArtistsFragmentsView";
-        }
-    }
-
-    class ArtistViewHolder(private val _viewGroup: ViewGroup) : AnyAdapter.AnyViewHolder<Artist>(
-        LayoutInflater.from(_viewGroup.context).inflate(R.layout.list_artist,
-            _viewGroup, false)) {
-
-        val onClick = Event1<Artist>();
-
-        protected var _artist: Artist? = null;
-        //protected val _imageThumbnail: ImageView
-        protected val _textName: TextView
-        protected val _textMetadata: TextView
-
-        init {
-            //_imageThumbnail = _view.findViewById(R.id.image_thumbnail);
-            _textName = _view.findViewById(R.id.text_name);
-            _textMetadata = _view.findViewById(R.id.text_metadata);
-
-            _view.setOnClickListener { _artist?.let { onClick.emit(it) } };
-        }
-
-        override fun bind(artist: Artist) {
-            _artist = artist;
-            /*
-            _imageThumbnail?.let {
-                if (artist.thumbnail != null)
-                    Glide.with(it)
-                        .load(artist.thumbnail)
-                        .placeholder(R.drawable.placeholder_channel_thumbnail)
-                        .into(it)
-                else
-                    Glide.with(it).load(R.drawable.placeholder_channel_thumbnail).into(it);
-            };
-            */
-
-            _textName.text = artist.name;
-
-            val metaComps = listOf(
-                artist.countTracks?.let { "${it} tracks" },
-                artist.countAlbums?.let { "${it} albums" }
-            ).filterNotNull();
-
-            _textMetadata.text = metaComps.joinToString(", ");
-        }
-
-    }
-}

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

@@ -1,264 +0,0 @@
-package com.futo.platformplayer.fragment.mainactivity.main
-
-import android.content.Context
-import android.os.Bundle
-import android.util.TypedValue
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageButton
-import android.widget.ImageView
-import android.widget.LinearLayout
-import android.widget.TextView
-import androidx.core.net.toUri
-import androidx.core.view.isVisible
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.bumptech.glide.Glide
-import com.futo.platformplayer.R
-import com.futo.platformplayer.api.media.models.video.LocalVideoDetails
-import com.futo.platformplayer.api.media.models.video.SerializedPlatformVideo
-import com.futo.platformplayer.api.media.structures.AdhocPager
-import com.futo.platformplayer.api.media.structures.EmptyPager
-import com.futo.platformplayer.api.media.structures.IPager
-import com.futo.platformplayer.constructs.Event1
-import com.futo.platformplayer.fragment.mainactivity.topbar.FilesTopBarFragment
-import com.futo.platformplayer.models.Playlist
-import com.futo.platformplayer.states.FileEntry
-import com.futo.platformplayer.states.StateLibrary
-import com.futo.platformplayer.states.StatePlayer
-import com.futo.platformplayer.views.FeedStyle
-import com.futo.platformplayer.views.NoResultsView
-import com.futo.platformplayer.views.adapters.AnyAdapter
-import com.futo.platformplayer.views.adapters.InsertedViewAdapterWithLoader
-import com.futo.platformplayer.views.adapters.viewholders.FileViewHolder
-import com.futo.platformplayer.views.buttons.BigButton
-import com.futo.platformplayer.views.buttons.ButtonsContainer
-
-class LibraryFilesFragment : MainFragment() {
-    override val isMainView : Boolean = true;
-    override val isTab: Boolean = true;
-    override val hasBottomBar: Boolean get() = true;
-
-
-    var view: FragView? = null;
-
-    override fun onCreateMainView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        val view = FragView(this, inflater);
-        this.view = view;
-        return view;
-    }
-
-    override fun onShown(parameter: Any?, isBack: Boolean) {
-        super.onShown(parameter, isBack)
-    }
-
-    override fun onShownWithView(parameter: Any?, isBack: Boolean) {
-        super.onShownWithView(parameter, isBack);
-        view?.onShown(parameter);
-    }
-
-    override fun onDestroyMainView() {
-        view = null;
-        super.onDestroyMainView();
-    }
-
-    companion object {
-        fun newInstance() = LibraryFilesFragment().apply {}
-    }
-
-    class FragView : FeedView<LibraryFilesFragment, FileEntry, FileEntry, IPager<FileEntry>, FileViewHolder> {
-        override val feedStyle: FeedStyle = FeedStyle.THUMBNAIL; //R.layout.list_creator;
-
-        val navStack = mutableListOf<FileStack>()
-        var buttonUp: BigButton? = null;
-        var buttonAdd: BigButton? = null;
-
-        private var root: FileEntry? = null;
-
-        constructor(fragment: LibraryFilesFragment, inflater: LayoutInflater) : super(fragment, inflater) {
-            disableRefreshLayout();
-        }
-
-        fun onShown(parameter: Any? = null) {
-            this.root = if(parameter is FileEntry) parameter else null;
-            loadTop();
-        }
-        fun loadTop() {
-            var initialDirectories = listOf<FileEntry>();
-            var path = "";
-            if(root == null) {
-                initialDirectories = StateLibrary.instance.getFileDirectories();
-                if (initialDirectories.size == 0) {
-                    setEmptyPager(true);
-                    setPager(EmptyPager());
-                    buttonAdd?.let {
-                        it.isVisible = false;
-                    }
-                    buttonUp?.let {
-                        it.isVisible = false;
-                    }
-                    return;
-                } else
-                    setEmptyPager(false);
-            }
-            else {
-                buttonAdd?.let {
-                    it.isVisible = false;
-                }
-                buttonUp?.let {
-                    it.isVisible = false;
-                }
-                initialDirectories = root?.getSubFiles() ?: listOf();
-                path = root?.path ?: "";
-            }
-            navStack.clear();
-            val entry = FileStack(path, initialDirectories);
-            navStack.add(entry);
-            openDirectory(navStack.last());
-            fragment.topBar?.let {
-                if(it is FilesTopBarFragment) {
-                    it.setUpNavigate(null);
-                    it.setTitle(entry);
-                }
-            }
-        }
-        fun leaveDirectory() {
-            if (navStack.size > 1) {
-                navStack.removeAt(navStack.size - 1)
-                openDirectory(navStack.last())
-            }
-        }
-        fun openDirectory(stack: FileStack, addToStack: Boolean = false) {
-            if(addToStack)
-                navStack.add(stack);
-
-            fragment.topBar?.let {
-                if(it is FilesTopBarFragment) {
-                    it.setTitle(stack);
-                }
-            }
-
-            buttonAdd?.let {
-                it.isVisible = navStack.size < 2
-            }
-            buttonUp?.let {
-                it.isVisible = navStack.size > 1;
-            }
-            setPager(AdhocPager<FileEntry>({ listOf(); }, stack.files));
-            setLoading(false);
-
-            val allSongs = stack.files.filter { !it.isDirectory };
-            if(allSongs.any()) {
-                _bottomContentView.addView(ButtonsContainer(context,
-                    listOf(
-                        ButtonsContainer.Button("Play All", R.drawable.background_button_primary) {
-                            StatePlayer.instance.setPlaylist(Playlist(stack.path.toUri().lastPathSegment ?: "", allSongs.map {
-                                SerializedPlatformVideo.fromVideo(LocalVideoDetails.fromContent(it.path))
-                            }), focus = true, shuffle = false)
-                        },
-                        ButtonsContainer.Button("Shuffle", R.drawable.background_button_accent) {
-                            StatePlayer.instance.setPlaylist(Playlist(stack.path.toUri().lastPathSegment ?: "", allSongs.map {
-                                SerializedPlatformVideo.fromVideo(LocalVideoDetails.fromContent(it.path))
-                            }), focus = true, shuffle = true)
-                        }
-                    )).apply {
-                        this.layoutParams = LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)
-                })
-            }
-            else
-                _bottomContentView.removeAllViews();
-
-            fragment.topBar?.let {
-                if(it is FilesTopBarFragment) {
-                    if(navStack.size > 1)
-                        it.setUpNavigate{
-                          leaveDirectory();
-                        };
-                    else it.setUpNavigate(null);
-                    it.setTitle(stack);
-                }
-            }
-        }
-
-        fun setBack() {
-            fragment.topBar?.view
-        }
-
-        override fun getEmptyPagerView(): View? {
-            return NoResultsView(context, "No Directories Added",
-                "To see files in Grayjay you have to add directories to view",
-                R.drawable.ic_library, listOf(
-                    BigButton(context, "Add Directory", "Select a directory to add", R.drawable.ic_add, {
-                        StateLibrary.instance.addFileDirectory({
-                            loadTop();
-                        }, true);
-                    })
-                ))
-        }
-
-        override fun createAdapter(recyclerResults: RecyclerView, context: Context, dataset: ArrayList<FileEntry>): InsertedViewAdapterWithLoader<FileViewHolder> {
-            /*
-            val buttonUp = BigButton(fragment.requireContext(), "Go up", "Go up a directory", R.drawable.ic_move_up) {
-                if(navStack.size > 1)
-                    leaveDirectory();
-            }
-            val buttonAdd = BigButton(fragment.requireContext(), "Add Directory", "Select a directory to add", R.drawable.ic_add) {
-                StateLibrary.instance.addFileDirectory {
-                    loadTop();
-                };
-            }
-            */
-            //this.buttonUp = buttonUp;
-            //this.buttonAdd = buttonAdd;
-            return InsertedViewAdapterWithLoader(context, arrayListOf(), arrayListOf(),
-                childCountGetter = { dataset.size },
-                childViewHolderBinder = { viewHolder, position -> viewHolder.bind(dataset[position]); },
-                childViewHolderFactory = { viewGroup, _ ->
-                    val holder = FileViewHolder(viewGroup);
-                    holder.onClick.subscribe { c ->
-                        if (c != null) {
-                            if(c.isDirectory) {
-                                openDirectory(FileStack(c.path, c.getSubFiles()), true);
-                            } else {
-                                fragment.navigate<VideoDetailFragment>(c.path)
-                            }
-                        }
-                    };
-                    holder.onDelete.subscribe { c ->
-                        if(c != null) {
-                            StateLibrary.instance.deleteFileDirectory(c.path);
-                            loadTop();
-                        }
-                    }
-                    return@InsertedViewAdapterWithLoader holder;
-                }
-            );
-        }
-
-        override fun updateSpanCount(){ }
-
-        override fun createLayoutManager(recyclerResults: RecyclerView, context: Context): GridLayoutManager {
-            val glmResults = GridLayoutManager(context, 1)
-
-            _swipeRefresh.layoutParams = (_swipeRefresh.layoutParams as MarginLayoutParams?)?.apply {
-                rightMargin = TypedValue.applyDimension(
-                    TypedValue.COMPLEX_UNIT_DIP,
-                    8.0f,
-                    context.resources.displayMetrics
-                ).toInt()
-            }
-
-            return glmResults
-        }
-
-        companion object {
-            private const val TAG = "LibraryAlbumsFragmentsView";
-        }
-    }
-    class FileStack(
-        val path: String,
-        val files: List<FileEntry>
-    )
-
-}

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

@@ -1,393 +0,0 @@
-package com.futo.platformplayer.fragment.mainactivity.main
-
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.os.Build
-import android.os.Bundle
-import android.provider.MediaStore
-import android.util.AttributeSet
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.LinearLayout
-import android.widget.TextView
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.collection.emptyLongSet
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.app.ActivityCompat
-import androidx.core.content.ContextCompat
-import androidx.core.view.isVisible
-import androidx.core.view.updateLayoutParams
-import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.RecyclerView
-import com.futo.platformplayer.R
-import com.futo.platformplayer.UIDialogs
-import com.futo.platformplayer.activities.MainActivity
-import com.futo.platformplayer.api.media.models.contents.IPlatformContent
-import com.futo.platformplayer.api.media.models.video.IPlatformVideo
-import com.futo.platformplayer.dp
-import com.futo.platformplayer.states.Album
-import com.futo.platformplayer.states.Artist
-import com.futo.platformplayer.states.ArtistOrdering
-import com.futo.platformplayer.states.FileEntry
-import com.futo.platformplayer.states.StateApp
-import com.futo.platformplayer.states.StateLibrary
-import com.futo.platformplayer.views.AnyAdapterView.Companion.asAny
-import com.futo.platformplayer.views.AnyInsertedAdapterView
-import com.futo.platformplayer.views.AnyInsertedAdapterView.Companion.asAnyWithTop
-import com.futo.platformplayer.views.AnyInsertedAdapterView.Companion.asAnyWithViews
-import com.futo.platformplayer.views.LibrarySection
-import com.futo.platformplayer.views.NoResultsView
-import com.futo.platformplayer.views.adapters.AnyAdapter
-import com.futo.platformplayer.views.adapters.InsertedViewAdapter
-import com.futo.platformplayer.views.adapters.viewholders.AlbumTileViewHolder
-import com.futo.platformplayer.views.adapters.viewholders.ArtistTileViewHolder
-import com.futo.platformplayer.views.adapters.viewholders.FileViewHolder
-import com.futo.platformplayer.views.adapters.viewholders.LocalVideoTileViewHolder
-import com.futo.platformplayer.views.buttons.BigButton
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import okhttp3.Dispatcher
-
-
-class LibraryFragment : MainFragment() {
-    override val isMainView : Boolean = true;
-    override val isTab: Boolean = true;
-    override val hasBottomBar: Boolean get() = true;
-
-    private var view: FragView? = null;
-
-    private var allowedMusic = false;
-    private var allowedVideo = false;
-
-
-    override fun onCreateMainView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): android.view.View {
-        val newView = FragView(this, allowedMusic, allowedVideo);
-        view = newView;
-        return newView;
-    }
-
-    override fun onShownWithView(parameter: Any?, isBack: Boolean) {
-        super.onShownWithView(parameter, isBack);
-        view?.onShown();
-
-        requestPermissionMusic();
-        requestPermissionVideo();
-    }
-
-    override fun onDestroyMainView() {
-        view = null;
-        super.onDestroyMainView();
-    }
-
-    fun setPermissionResultAudio(access: Boolean) {
-        allowedMusic = access;
-        view?.setMusicPermissions(access);
-        StateApp.instance.hasMediaStoreAudioPermission = (access);
-    }
-    fun setPermissionResultVideo(access: Boolean) {
-        allowedVideo = access;
-        view?.setVideoPermissions(access);
-        StateApp.instance.hasMediaStoreVideoPermission = (access);
-    }
-
-    fun requestPermissionMusic() {
-        when {
-            ContextCompat.checkSelfPermission(requireContext(), android.Manifest.permission.READ_MEDIA_AUDIO) == PackageManager.PERMISSION_GRANTED -> {
-                setPermissionResultAudio(true);
-            }
-            ActivityCompat.shouldShowRequestPermissionRationale(requireActivity(), android.Manifest.permission.READ_MEDIA_AUDIO) -> {
-                UIDialogs.showDialog(requireContext(), R.drawable.ic_library,
-                    "Music permissions", "We require permissions to see your on-device music, denying this will hide the option to see local music.", null, 1,
-                    UIDialogs.Action("Ok", {
-                        StateApp?.instance?.activity?.requestPermissionAudio {
-                            setPermissionResultAudio(it);
-                        }
-                    }, UIDialogs.ActionStyle.PRIMARY),
-                    UIDialogs.Action("Cancel", {
-
-                    }, UIDialogs.ActionStyle.NONE));
-            }
-            else -> {
-                StateApp?.instance?.activity?.requestPermissionAudio {
-                    setPermissionResultAudio(it);
-                }
-            }
-        }
-    }
-    fun requestPermissionVideo() {
-        when {
-            ContextCompat.checkSelfPermission(requireContext(), android.Manifest.permission.READ_MEDIA_VIDEO) == PackageManager.PERMISSION_GRANTED -> {
-                setPermissionResultVideo(true);
-            }
-            ActivityCompat.shouldShowRequestPermissionRationale(requireActivity(), android.Manifest.permission.READ_MEDIA_VIDEO) -> {
-                UIDialogs.showDialog(requireContext(), R.drawable.ic_library, false,
-                    "Videos permissions", "We require permissions to see your on-device videos, denying this will hide the option to see local videos.", null, 1,
-                    UIDialogs.Action("Ok", {
-                        StateApp?.instance?.activity?.requestPermissionVideo {
-                            setPermissionResultVideo(it);
-                        }
-                    }, UIDialogs.ActionStyle.PRIMARY),
-                    UIDialogs.Action("Cancel", {
-
-                    }, UIDialogs.ActionStyle.NONE));
-            }
-            else -> {
-                StateApp?.instance?.activity?.requestPermissionVideo {
-                    setPermissionResultVideo(it);
-                }
-            }
-        }
-    }
-
-
-    companion object {
-        fun newInstance() = LibraryFragment().apply {}
-    }
-
-
-    class FragView: ConstraintLayout {
-        val fragment: LibraryFragment;
-
-        var sectionArtists: LibrarySection;
-        var sectionAlbums: LibrarySection;
-        var sectionVideos: LibrarySection;
-        var sectionFiles: LibrarySection;
-        var noContent: NoResultsView;
-        //var buttonFiles: BigButton;
-
-        val recycler: RecyclerView;
-
-        var adapterFiles: AnyInsertedAdapterView<FileEntry, FileViewHolder>? = null;
-
-        //var metaInfo: TextView;
-
-        var allowMusic: Boolean = false;
-        var allowVideo: Boolean = false;
-
-        constructor(fragment: LibraryFragment, allowMusic: Boolean?, allowVideo: Boolean?) : super(fragment.requireContext()) {
-            inflate(context, R.layout.fragview_library, this);
-            this.fragment = fragment;
-            recycler = findViewById(R.id.recycler);
-            sectionArtists = LibrarySection(context)//findViewById<LibrarySection>(R.id.section_artists);
-            sectionArtists.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 140.dp(resources)).apply {
-                this.setMargins(0,10.dp(resources), 0, 0);
-            }
-            sectionAlbums = LibrarySection(context)//findViewById(R.id.section_albums);
-            sectionAlbums.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 185.dp(resources)).apply {
-                this.setMargins(0,0, 0, 0);
-            }
-            sectionVideos = LibrarySection(context)//findViewById(R.id.section_videos);
-            sectionVideos.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 170.dp(resources)).apply {
-                this.setMargins(0,0, 0, 0);
-            }
-            sectionFiles = LibrarySection(context)//findViewById(R.id.section_videos);
-            sectionFiles.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 40.dp(resources)).apply {
-                this.setMargins(0,0, 0, 0);
-            }
-            sectionFiles.setSection("Directories") {
-                StateLibrary.instance.addFileDirectory({
-                    reloadFiles();
-                }, true)
-            }
-            sectionFiles.setNavIcon(R.drawable.ic_add);
-            //buttonFiles = findViewById<BigButton>(R.id.button_files);
-            //metaInfo = findViewById(R.id.meta_info);
-
-            noContent = NoResultsView(context, "No directories", "No directories have been added.\nAdd them using the (+) icon.", -1, listOf());
-            noContent.isVisible = false;
-
-            this.allowMusic = allowMusic ?: false;
-            this.allowVideo = allowVideo ?: false;
-
-            sectionArtists.setSection("Artists", {
-                if(this.allowMusic)
-                    fragment.navigate<LibraryArtistsFragment>();
-                else
-                    fragment.requestPermissionMusic();
-            });
-
-            sectionAlbums.setSection("Albums", {
-                if(this.allowMusic)
-                    fragment.navigate<LibraryAlbumsFragment>();
-                else
-                    fragment.requestPermissionMusic();
-            });
-
-
-            sectionVideos.setSection("Videos", {
-                if(this.allowVideo)
-                    fragment.navigate<LibraryVideosFragment>();
-                else
-                    fragment.requestPermissionVideo();
-            });
-
-            reloadLibraryUI();
-
-
-            /*
-            buttonFiles.onClick.subscribe {
-                fragment.navigate<LibraryFilesFragment>()
-            } */
-            //buttonFiles.setButtonEnabled(false);
-            setMusicPermissions(allowMusic ?: false);
-            setVideoPermissions(allowVideo ?: false);
-        }
-
-        fun reloadFiles() {
-            val files = StateLibrary.instance.getFileDirectories();
-            adapterFiles?.setData(files);
-            if(files.size == 0) {
-                noContent.isVisible = true;
-            }
-            else
-                noContent.isVisible = false;
-        }
-
-        fun reloadLibraryUI() {
-
-            val adapterAlbums = sectionAlbums.getAnyAdapter<Album, AlbumTileViewHolder>({
-                it.onClick.subscribe {
-                    if(it != null)
-                        fragment.navigate<LibraryAlbumFragment>(it);
-                }
-            });
-            val adapterArtists = sectionArtists.getAnyAdapter<Artist, ArtistTileViewHolder>({
-                it.onClick.subscribe {
-                    if(it != null)
-                        fragment.navigate<LibraryArtistFragment>(it);
-                }
-            });
-            val adapterVideos = sectionVideos.getAnyAdapter<IPlatformVideo, LocalVideoTileViewHolder>({
-                it.onClick.subscribe {
-                    if(it != null)
-                        fragment.navigate<VideoDetailFragment>(it);
-                }
-            });
-
-            if(this.allowMusic) {
-                val artists = StateLibrary.instance.getArtists(ArtistOrdering.TrackCount);
-                adapterArtists.setData(artists);
-                if (artists.size == 0)
-                    sectionArtists.setEmpty(
-                        "No artists",
-                        "No artists were found on your device",
-                        -1
-                    );
-                else
-                    sectionArtists.clearEmpty();
-            }
-            else if(Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
-                sectionAlbums.isVisible = false;
-            }
-            else {
-                sectionArtists.setEmpty(
-                    "No Music Permissions",
-                    "You have not granted music access permissions to Grayjay",
-                    -1
-                );
-            }
-
-            if(this.allowMusic) {
-                val albums = StateLibrary.instance.getAlbums();
-                adapterAlbums.setData(albums);
-                if (albums.size == 0)
-                    sectionAlbums.setEmpty("No albums", "No albums were found on your device", -1);
-                else
-                    sectionAlbums.clearEmpty();
-            }
-            else if(Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
-                sectionArtists.isVisible = false;
-            }
-            else {
-                sectionAlbums.setEmpty(
-                    "No Music Permissions",
-                    "You have not granted music access permissions to Grayjay",
-                    -1
-                );
-            }
-
-            if(this.allowVideo) {
-                val videos = StateLibrary.instance.getRecentVideos(null, 20);
-                adapterVideos.setData(videos);
-                if (videos.size == 0)
-                    sectionVideos.setEmpty("No videos", "No videos were found on your device", -1);
-                else
-                    sectionVideos.clearEmpty();
-            }
-            else if(Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
-                sectionVideos.isVisible = false;
-            }
-            else {
-                sectionVideos.setEmpty(
-                    "No Video Permissions",
-                    "You have not granted video access permissions to Grayjay",
-                    -1
-                );
-            }
-
-            adapterFiles = recycler.asAnyWithViews<FileEntry, FileViewHolder>(
-                arrayListOf(
-                    sectionArtists,
-                    sectionAlbums,
-                    sectionVideos,
-                    sectionFiles,
-                    noContent
-                ),
-                arrayListOf(View(context).apply { this.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 20.dp(resources)) }),
-                RecyclerView.VERTICAL, false, {
-                    it.onClick.subscribe {
-                        if(it != null)
-                            fragment.navigate<LibraryFilesFragment>(it);
-                    }
-                    it.onDelete.subscribe {
-                        if(it != null) {
-                            StateLibrary.instance.deleteFileDirectory(it.path);
-                            reloadFiles();
-                        }
-                    }
-                }
-            );
-            reloadFiles();
-        }
-
-        fun setMusicPermissions(access: Boolean) {
-            allowMusic = access;
-            sectionAlbums.setContentEmptyMessage(R.drawable.ic_library, "No mediastore permissions");
-            sectionArtists.setContentEmptyMessage(R.drawable.ic_library, "No mediastore permissions");
-            //buttonArtists.setButtonEnabled(access);
-            //metaInfo.text = listOf(
-            //    if(!allowMusic) "You did not give access to local music, so these options are disabled" else null,
-            //    if(!allowVideo) "You did not give access to local videos, so these options are disabled" else null
-            //).filterNotNull().joinToString("\n");
-
-            fragment.lifecycleScope.launch(Dispatchers.Main) {
-                reloadLibraryUI();
-            }
-        }
-        fun setVideoPermissions(access: Boolean) {
-            allowVideo = access;
-            sectionVideos.setContentEmptyMessage(R.drawable.ic_library, "No video permissions");
-            //metaInfo.text = listOf(
-            //    if(!allowMusic) "You did not give access to local music, so these options are disabled" else null,
-            //    if(!allowVideo) "You did not give access to local videos, so these options are disabled" else null
-            //).filterNotNull().joinToString("\n");
-            // }
-
-            fragment.lifecycleScope.launch(Dispatchers.Main) {
-                reloadLibraryUI();
-            }
-        }
-
-        fun onShown() {
-            if(didShowAlpha)
-               return;
-            didShowAlpha = true;
-            UIDialogs.appToast("Library is in alpha\nImprovements are coming to local media playback.")
-        }
-        companion object {
-            var didShowAlpha: Boolean = false;
-        }
-    }
-
-}

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

@@ -1,233 +0,0 @@
-package com.futo.platformplayer.fragment.mainactivity.main
-
-import android.content.Context
-import android.os.Bundle
-import android.util.TypedValue
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import android.widget.EditText
-import android.widget.FrameLayout
-import android.widget.ImageButton
-import android.widget.ImageView
-import android.widget.LinearLayout
-import android.widget.LinearLayout.GONE
-import android.widget.LinearLayout.VISIBLE
-import android.widget.Spinner
-import android.widget.TextView
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.widget.addTextChangedListener
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.bumptech.glide.Glide
-import com.futo.platformplayer.R
-import com.futo.platformplayer.UISlideOverlays
-import com.futo.platformplayer.api.media.models.PlatformAuthorLink
-import com.futo.platformplayer.api.media.models.contents.IPlatformContent
-import com.futo.platformplayer.api.media.models.playlists.IPlatformPlaylist
-import com.futo.platformplayer.api.media.models.video.IPlatformVideo
-import com.futo.platformplayer.api.media.structures.AdhocPager
-import com.futo.platformplayer.api.media.structures.IPager
-import com.futo.platformplayer.constructs.Event0
-import com.futo.platformplayer.constructs.Event1
-import com.futo.platformplayer.dp
-import com.futo.platformplayer.fragment.mainactivity.topbar.SearchTopBarFragment
-import com.futo.platformplayer.images.GlideHelper.Companion.crossfade
-import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.states.Album
-import com.futo.platformplayer.states.Artist
-import com.futo.platformplayer.states.ArtistOrdering
-import com.futo.platformplayer.states.FileEntry
-import com.futo.platformplayer.states.StateLibrary
-import com.futo.platformplayer.stores.FragmentedStorage
-import com.futo.platformplayer.stores.StringStorage
-import com.futo.platformplayer.views.AnyAdapterView
-import com.futo.platformplayer.views.AnyAdapterView.Companion.asAny
-import com.futo.platformplayer.views.AnyInsertedAdapterView
-import com.futo.platformplayer.views.AnyInsertedAdapterView.Companion.asAnyWithViews
-import com.futo.platformplayer.views.FeedStyle
-import com.futo.platformplayer.views.LibrarySection
-import com.futo.platformplayer.views.LibraryTypeHeaderView
-import com.futo.platformplayer.views.LibraryTypeHeaderView.SelectedType
-import com.futo.platformplayer.views.PillV2
-import com.futo.platformplayer.views.adapters.AnyAdapter
-import com.futo.platformplayer.views.adapters.InsertedViewAdapterWithLoader
-import com.futo.platformplayer.views.adapters.SubscriptionAdapter
-import com.futo.platformplayer.views.adapters.viewholders.AlbumTileViewHolder
-import com.futo.platformplayer.views.adapters.viewholders.ArtistTileViewHolder
-import com.futo.platformplayer.views.adapters.viewholders.FileViewHolder
-import com.futo.platformplayer.views.adapters.viewholders.LocalVideoTileViewHolder
-import com.futo.platformplayer.views.adapters.viewholders.SelectablePlaylist
-import com.futo.platformplayer.views.adapters.viewholders.TrackViewHolder
-import com.futo.platformplayer.views.others.CreatorThumbnail
-import com.futo.platformplayer.views.platform.PlatformIndicator
-
-class LibrarySearchFragment : MainFragment() {
-    override val isMainView : Boolean = true;
-    override val isTab: Boolean = true;
-    override val hasBottomBar: Boolean get() = true;
-
-
-    var view: FragView? = null;
-
-    override fun onCreateMainView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        val view = FragView(this);
-        this.view = view;
-        return view;
-    }
-
-    override fun onShown(parameter: Any?, isBack: Boolean) {
-        super.onShown(parameter, isBack)
-    }
-
-    override fun onShownWithView(parameter: Any?, isBack: Boolean) {
-        super.onShownWithView(parameter, isBack);
-        view?.onShown();
-    }
-
-    override fun onDestroyMainView() {
-        view = null;
-        super.onDestroyMainView();
-    }
-
-    companion object {
-        fun newInstance() = LibrarySearchFragment().apply {}
-    }
-
-
-    class FragView: ConstraintLayout {
-        val fragment: LibrarySearchFragment;
-
-        val pillArtist: PillV2;
-        val pillAlbums: PillV2;
-        val pillSongs: PillV2;
-        val pills: List<PillV2>;
-
-        val textMetadata: TextView;
-
-        val recycler: RecyclerView;
-
-        val adapterArtists: AnyAdapterView<Artist, LibraryArtistsFragment.ArtistViewHolder>;
-        val adapterSongs: AnyAdapterView<IPlatformContent, TrackViewHolder>;
-        val adapterAlbums: AnyAdapterView<Album, LibraryAlbumsFragment.AlbumViewHolder>;
-
-
-
-        constructor(fragment: LibrarySearchFragment) : super(fragment.requireContext()) {
-            inflate(context, R.layout.fragview_library_search, this);
-            this.fragment = fragment;
-
-            pillArtist = findViewById(R.id.pill_artist);
-            pillAlbums = findViewById(R.id.pill_albums);
-            pillSongs = findViewById(R.id.pill_songs);
-            pills = listOf(pillArtist, pillAlbums, pillSongs);
-
-            textMetadata = findViewById(R.id.text_metadata);
-
-            pillArtist.onClick.subscribe {
-                pills.forEach { it.setIsEnabled(false) };
-                pillArtist.setIsEnabled(true);
-                loadArtists();
-            }
-            pillAlbums.onClick.subscribe {
-                pills.forEach { it.setIsEnabled(false) };
-                pillAlbums.setIsEnabled(true);
-                loadAlbums();
-            }
-            pillSongs.onClick.subscribe {
-                pills.forEach { it.setIsEnabled(false) };
-                pillSongs.setIsEnabled(true);
-                loadSongs();
-            }
-
-            recycler = findViewById(R.id.recycler);
-            adapterArtists = recycler.asAny<Artist, LibraryArtistsFragment.ArtistViewHolder>(RecyclerView.VERTICAL, false, {
-                it.onClick.subscribe {
-                    if(it != null)
-                        fragment.navigate<LibraryArtistFragment>(it);
-                }
-            });
-            adapterAlbums = recycler.asAny<Album, LibraryAlbumsFragment.AlbumViewHolder>(RecyclerView.VERTICAL, false, {
-                it.onClick.subscribe {
-                    if(it != null)
-                        fragment.navigate<LibraryAlbumFragment>(it);
-                }
-            });
-            adapterSongs = recycler.asAny<IPlatformContent, TrackViewHolder>(RecyclerView.VERTICAL, false, {
-                it.onClick.subscribe {
-                    if(it != null && it is IPlatformVideo)
-                        fragment.navigate<VideoDetailFragment>(it);
-                }
-            });
-
-            fragment.topBar?.let {
-                if(it is SearchTopBarFragment) {
-                    it.onSearch.subscribe {
-                        search(it);
-                    }
-                }
-            }
-
-            pillArtist.setIsEnabled(true);
-            loadArtists();
-        }
-
-        fun loadArtists(){
-            recycler.adapter = adapterArtists.adapter.adapter;
-            fragment.topBar?.let {
-                if(it is SearchTopBarFragment)
-                    search(it.getSearchText());
-            }
-        }
-        fun loadAlbums() {
-            recycler.adapter = adapterAlbums.adapter.adapter;
-            fragment.topBar?.let {
-                if(it is SearchTopBarFragment)
-                    search(it.getSearchText());
-            }
-        }
-        fun loadSongs() {
-            recycler.adapter = adapterSongs.adapter.adapter;
-            fragment.topBar?.let {
-                if(it is SearchTopBarFragment)
-                    search(it.getSearchText());
-            }
-        }
-
-        fun search(str: String) {
-            if(recycler.adapter == adapterArtists.adapter.adapter) {
-                val data = if(!str.isNullOrBlank())
-                    StateLibrary.instance.searchArtists(str)
-                else listOf();
-                adapterArtists.setData(data);
-                textMetadata.text = "${data.size} artists";
-            }
-            else if(recycler.adapter == adapterAlbums.adapter.adapter) {
-                val data = if(!str.isNullOrBlank())
-                    StateLibrary.instance.searchAlbums(str)
-                else listOf();
-                adapterAlbums.setData(data);
-                textMetadata.text = "${data.size} albums";
-            }
-            else if(recycler.adapter == adapterSongs.adapter.adapter) {
-                val data = if(!str.isNullOrBlank())
-                    StateLibrary.instance.searchTracks(str)
-                else listOf();
-
-                adapterSongs.setData(data);
-                textMetadata.text = "${data.size} songs";
-            }
-        }
-
-
-        fun onShown() {
-            fragment.topBar?.let {
-                if(it is SearchTopBarFragment)
-                    it.focus();
-            }
-        }
-    }
-}

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

@@ -1,169 +0,0 @@
-package com.futo.platformplayer.fragment.mainactivity.main
-
-import android.content.Context
-import android.os.Bundle
-import android.util.TypedValue
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import android.widget.EditText
-import android.widget.FrameLayout
-import android.widget.ImageButton
-import android.widget.ImageView
-import android.widget.LinearLayout.GONE
-import android.widget.LinearLayout.VISIBLE
-import android.widget.Spinner
-import android.widget.TextView
-import androidx.core.view.allViews
-import androidx.core.widget.addTextChangedListener
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.bumptech.glide.Glide
-import com.futo.platformplayer.R
-import com.futo.platformplayer.Settings
-import com.futo.platformplayer.UIDialogs
-import com.futo.platformplayer.UISlideOverlays
-import com.futo.platformplayer.UISlideOverlays.Companion.showOrderOverlay
-import com.futo.platformplayer.api.media.models.PlatformAuthorLink
-import com.futo.platformplayer.api.media.models.playlists.IPlatformPlaylist
-import com.futo.platformplayer.api.media.models.video.IPlatformVideo
-import com.futo.platformplayer.api.media.platforms.js.JSClient
-import com.futo.platformplayer.api.media.structures.AdhocPager
-import com.futo.platformplayer.api.media.structures.IPager
-import com.futo.platformplayer.images.GlideHelper.Companion.crossfade
-import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.states.Album
-import com.futo.platformplayer.states.StateLibrary
-import com.futo.platformplayer.states.StatePlatform
-import com.futo.platformplayer.stores.FragmentedStorage
-import com.futo.platformplayer.stores.StringArrayStorage
-import com.futo.platformplayer.stores.StringStorage
-import com.futo.platformplayer.views.FeedStyle
-import com.futo.platformplayer.views.ToggleBar
-import com.futo.platformplayer.views.adapters.AnyAdapter
-import com.futo.platformplayer.views.adapters.InsertedViewAdapterWithLoader
-import com.futo.platformplayer.views.adapters.SubscriptionAdapter
-import com.futo.platformplayer.views.adapters.viewholders.SelectablePlaylist
-import com.futo.platformplayer.views.others.CreatorThumbnail
-import com.futo.platformplayer.views.platform.PlatformIndicator
-
-class LibraryVideosFragment : MainFragment() {
-    override val isMainView : Boolean = true;
-    override val isTab: Boolean = true;
-    override val hasBottomBar: Boolean get() = true;
-
-    private var _toggleBuckets = StateLibrary.instance.getVideoBucketNames().map { it.name }.toMutableList();
-
-    var view: FragView? = null;
-
-    override fun onCreateMainView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        val view = FragView(this, inflater);
-        this.view = view;
-        return view;
-    }
-
-    override fun onShown(parameter: Any?, isBack: Boolean) {
-        super.onShown(parameter, isBack)
-    }
-
-    override fun onShownWithView(parameter: Any?, isBack: Boolean) {
-        super.onShownWithView(parameter, isBack);
-        view?.onShown();
-    }
-
-    override fun onDestroyMainView() {
-        view = null;
-        super.onDestroyMainView();
-    }
-
-    companion object {
-        fun newInstance() = LibraryVideosFragment().apply {}
-    }
-
-    class FragView : ContentFeedView<LibraryVideosFragment> {
-        override val feedStyle: FeedStyle = FeedStyle.THUMBNAIL; //R.layout.list_creator;
-
-        private var _toggleBar: ToggleBar? = null;
-
-        constructor(fragment: LibraryVideosFragment, inflater: LayoutInflater) : super(fragment, inflater) {
-            initializeToolbarContent();
-            disableRefreshLayout();
-        }
-
-        fun onShown() {
-            val initialAlbums = StateLibrary.instance.getAlbums();
-            Logger.i(TAG, "Initial album count: " + initialAlbums.size);
-            setPager(StateLibrary.instance.getVideos(fragment._toggleBuckets));
-        }
-
-
-        private val _filterLock = Object();
-        fun initializeToolbarContent() {
-            if(_toolbarContentView.allViews.any { it is ToggleBar })
-                _toolbarContentView.removeView(_toolbarContentView.allViews.find { it is ToggleBar });
-            _toggleBar = ToggleBar(context).apply {
-                layoutParams =
-                    LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
-            }
-
-            synchronized(_filterLock) {
-                var buttonsPlugins: List<ToggleBar.Toggle> = listOf()
-                buttonsPlugins =
-                    (StateLibrary.instance.getVideoBucketNames()
-                        .map { bucket ->
-                            ToggleBar.Toggle(bucket.name, null, fragment._toggleBuckets.contains(bucket.name), { view, active ->
-                                var dontSwap = false;
-                                if (!active) {
-                                    if (fragment._toggleBuckets.contains(bucket.name))
-                                        fragment._toggleBuckets.remove(bucket.name);
-                                } else {
-                                    if (!fragment._toggleBuckets.contains(bucket.name)) {
-                                        val enabledClients = StatePlatform.instance.getEnabledClients();
-                                        val availableAfterDisable = enabledClients.count { !fragment._toggleBuckets.contains(it.id) && it.id != bucket.name };
-                                        if(availableAfterDisable > 0)
-                                            fragment._toggleBuckets.add(bucket.name);
-                                        else {
-                                            UIDialogs.appToast("Select atleast 1 bucket");
-                                            dontSwap = true;
-                                        }
-                                    }
-                                }
-                                if(!dontSwap)
-                                    reloadForFilters();
-                                else {
-                                    view.setToggle(active);
-                                }
-                            }, { view, views, enabled ->
-                                val toDisable = views.filter { it != view && it.tag == "plugins" };
-                                if(!view.isActive)
-                                    view.handleClick();
-                                for(tag in toDisable) {
-                                    if(tag.isActive)
-                                        tag.handleClick();
-                                }
-                            }).withTag("plugins")
-                        })
-                val buttons = (buttonsPlugins)
-                    .sortedBy { it.name }.toTypedArray()
-
-                _toggleBar?.setToggles(*buttons);
-            }
-
-            _toolbarContentView.addView(_toggleBar, 0);
-        }
-
-        fun reloadForFilters() {
-            setPager(StateLibrary.instance.getVideos(fragment._toggleBuckets));
-        }
-
-        override fun updateSpanCount(){ }
-
-
-        companion object {
-            private const val TAG = "LibraryAlbumsFragmentsView";
-        }
-    }
-}

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

@@ -1,160 +0,0 @@
-package com.futo.platformplayer.fragment.mainactivity.main
-
-import android.content.Context
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.webkit.CookieManager
-import android.webkit.WebView
-import android.widget.ImageButton
-import android.widget.TextView
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.lifecycle.lifecycleScope
-import com.futo.platformplayer.R
-import com.futo.platformplayer.UIDialogs
-import com.futo.platformplayer.api.media.platforms.js.SourceAuth
-import com.futo.platformplayer.api.media.platforms.js.SourcePluginAuthConfig
-import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
-import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.others.LoginWebViewClient
-import com.futo.platformplayer.states.StateApp
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlin.text.matches
-
-
-class LoginFragment : MainFragment() {
-    override val isMainView : Boolean = true;
-    override val isTab: Boolean = true;
-    override val hasBottomBar: Boolean get() = true;
-
-    private var view: FragView? = null;
-
-
-    override fun onCreateMainView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        val newView = FragView(this);
-        view = newView;
-        return newView;
-    }
-
-    override fun onShownWithView(parameter: Any?, isBack: Boolean) {
-        super.onShownWithView(parameter, isBack);
-        view?.onShown(parameter ?: throw IllegalArgumentException("No parameter for login"));
-    }
-
-    override fun onDestroyMainView() {
-        view = null;
-        super.onDestroyMainView();
-    }
-
-    companion object {
-        fun newInstance() = LoginFragment().apply {}
-
-        private var _callback: ((SourceAuth?) -> Unit)? = null;
-        fun showLogin(config: SourcePluginConfig, callback: ((SourceAuth?) -> Unit)? = null) {
-            if(_callback != null) _callback?.invoke(null);
-            _callback = callback;
-            StateApp.instance.activity?.navigate<LoginFragment>(config, true);
-        }
-    }
-
-
-    class FragView: ConstraintLayout {
-        val fragment: LoginFragment;
-
-        private val _webView: WebView;
-        private val _textUrl: TextView;
-        private val _buttonClose: ImageButton;
-
-        constructor(fragment: LoginFragment) : super(fragment.requireContext()) {
-            inflate(context, R.layout.activity_login, this);
-            this.fragment = fragment;
-
-            _textUrl = findViewById(R.id.text_url);
-            _buttonClose = findViewById(R.id.button_close);
-            _buttonClose.setOnClickListener {
-                UIDialogs.toast("Login cancelled", false);
-                fragment.close(true);
-            }
-
-
-            _webView = findViewById(R.id.web_view);
-            _webView.settings.javaScriptEnabled = true;
-            CookieManager.getInstance().setAcceptCookie(true);
-        }
-
-        fun onShown(parameter: Any) {
-
-
-            val config = parameter as? SourcePluginConfig;
-
-            val authConfig = if(config != null)
-                config.authentication ?: throw IllegalStateException("Plugin has no authentication support");
-            else if(parameter is SourcePluginAuthConfig)
-                parameter
-            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";
-            _webView.settings.useWideViewPort = true;
-            _webView.settings.loadWithOverviewMode = true;
-
-            val webViewClient = if(config != null) LoginWebViewClient(config) else LoginWebViewClient(authConfig);
-
-            webViewClient.onLogin.subscribe { auth ->
-                _callback?.let {
-                    _callback = null;
-                    it.invoke(auth);
-                }
-                fragment.lifecycleScope.launch(Dispatchers.Main) {
-                    try {
-                        fragment.close(true);
-                    }catch (ex: Throwable) {
-                        Logger.e(TAG, "Failed to close login", ex);
-                    }
-                }
-            };
-            var isFirstLoad = true;
-            val loginWarnings = authConfig.loginWarnings?.toMutableList() ?: mutableListOf<SourcePluginAuthConfig.Warning>();
-            val uiMods = authConfig.uiMods?.toMutableList() ?: mutableListOf<SourcePluginAuthConfig.UIMod>();
-            var currentScale = 100;
-            var currentDesktop = false;
-            webViewClient.onPageLoaded.subscribe { view, url ->
-                _textUrl.setText(url ?: "");
-
-                if(loginWarnings.size > 0 && url != null) {
-                    synchronized(loginWarnings) {
-                        val warning = loginWarnings.find { url.matches(it.getRegex()) };
-                        if(warning != null) {
-                            if(warning.once == true)
-                                loginWarnings.remove(warning);
-                            UIDialogs.showDialog(context, R.drawable.ic_warning_yellow, warning.text ?: "", warning.details ?: "", null, 0,
-                                UIDialogs.Action("Understood", {
-                                }, UIDialogs.ActionStyle.PRIMARY));
-                        }
-                    }
-                }
-
-                if(!isFirstLoad)
-                    return@subscribe;
-                isFirstLoad = false;
-
-                if(!authConfig.loginButton.isNullOrEmpty() && authConfig.loginButton.matches(REGEX_LOGIN_BUTTON)) {
-                    Logger.i(TAG, "Clicking login button [${authConfig.loginButton}]");
-                    //TODO: Find most reliable way to wait for page js to finish
-                    view?.evaluateJavascript("setTimeout(()=> document.querySelector(\"${authConfig.loginButton}\")?.click(), 1000)", {});
-                }
-            }
-            _webView.settings.domStorageEnabled = true;
-
-            _webView.webViewClient = webViewClient;
-            _webView.loadUrl(authConfig.loginUrl);
-        }
-
-        companion object {
-            private val TAG = "LoginFragment";
-            private val REGEX_LOGIN_BUTTON = Regex("[a-zA-Z\\-\\.#:_ ]*");
-        }
-    }
-}

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

@@ -1,52 +0,0 @@
-package com.futo.platformplayer.fragment.mainactivity.main
-
-import android.content.Context
-import android.os.Bundle
-import android.util.AttributeSet
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.EditText
-import android.widget.FrameLayout
-import android.widget.ImageButton
-import android.widget.Spinner
-import android.widget.TextView
-import androidx.constraintlayout.widget.ConstraintLayout
-import com.futo.platformplayer.R
-import com.futo.platformplayer.stores.FragmentedStorage
-import com.futo.platformplayer.stores.StringStorage
-
-class RecyclerFragment : MainFragment(){
-    override val isMainView : Boolean = true;
-    override val isTab: Boolean = true;
-    override val hasBottomBar: Boolean get() = true;
-
-    private var view: View? = null;
-
-
-    override fun onCreateMainView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): android.view.View {
-        val newView = RecyclerFragment.View(inflater.context);
-        view = newView;
-        return newView;
-    }
-
-    override fun onDestroyMainView() {
-        view = null;
-        super.onDestroyMainView();
-    }
-
-    companion object {
-        fun newInstance() = RecyclerFragment().apply {}
-    }
-
-
-    class View: ConstraintLayout {
-        constructor(context: Context, attrs : AttributeSet? = null) : super(context, attrs) {
-            inflate(context, R.layout.fragview_filter_recycler, this);
-        }
-
-
-
-    }
-}

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

@@ -16,7 +16,6 @@ import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
-import com.bumptech.glide.load.resource.bitmap.DownsampleStrategy
 import com.futo.platformplayer.*
 import com.futo.platformplayer.api.media.models.playlists.IPlatformPlaylist
 import com.futo.platformplayer.api.media.models.playlists.IPlatformPlaylistDetails
@@ -364,7 +363,6 @@ class RemotePlaylistFragment : MainFragment() {
                 _imagePlaylistThumbnail.let {
                     Glide.with(it)
                         .load(video.thumbnails.getHQThumbnail())
-                        .withMaxSizePx()
                         .placeholder(R.drawable.placeholder_video_thumbnail)
                         .crossfade()
                         .into(it);

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

@@ -1,184 +0,0 @@
-package com.futo.platformplayer.fragment.mainactivity.main
-
-import android.app.NotificationManager
-import android.content.Context
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.FrameLayout
-import android.widget.ImageButton
-import android.widget.LinearLayout
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.view.isVisible
-import androidx.lifecycle.lifecycleScope
-import com.futo.platformplayer.R
-import com.futo.platformplayer.Settings
-import com.futo.platformplayer.SettingsDev
-import com.futo.platformplayer.UIDialogs
-import com.futo.platformplayer.activities.MainActivity
-import com.futo.platformplayer.assume
-import com.futo.platformplayer.constructs.Event0
-import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.states.StateApp
-import com.futo.platformplayer.views.LoaderView
-import com.futo.platformplayer.views.fields.FieldForm
-import com.futo.platformplayer.views.fields.ReadOnlyTextField
-import com.google.android.material.button.MaterialButton
-
-
-class SettingsFragment : MainFragment() {
-    override val isMainView : Boolean = true;
-    override val isTab: Boolean = true;
-    override val hasBottomBar: Boolean get() = true;
-
-    private var view: FragView? = null;
-
-    override fun onCreateMainView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): android.view.View {
-        val newView = FragView(this);
-        view = newView;
-        return newView;
-    }
-
-    override fun onShownWithView(parameter: Any?, isBack: Boolean) {
-        super.onShownWithView(parameter, isBack);
-        _currentView = view;
-        view?.onShown(parameter);
-    }
-
-    override fun onHide() {
-        super.onHide();
-        onClosed.emit();
-    }
-
-    override fun onDestroyMainView() {
-        view = null;
-        _currentView = null;
-        super.onDestroyMainView();
-    }
-
-    companion object {
-        fun newInstance() = SettingsFragment().apply {}
-
-        val onClosed = Event0();
-
-        private var _currentView: FragView? = null;
-        val currentView: FragView?
-            get() = _currentView;
-
-    }
-
-
-    class FragView: ConstraintLayout {
-        val fragment: SettingsFragment;
-
-        private val _form: FieldForm;
-        private val _buttonBack: ImageButton;
-        private val _loaderView: LoaderView;
-
-        private val _devSets: LinearLayout;
-        private val _buttonDev: MaterialButton;
-
-        private var _isFinished = false;
-
-        lateinit var overlay: FrameLayout;
-
-        val notifPermission = "android.permission.POST_NOTIFICATIONS";
-
-        constructor(fragment: SettingsFragment) : super(fragment.requireContext()) {
-            inflate(context, R.layout.activity_settings, this);
-            this.fragment = fragment;
-
-            val activity = fragment.activity;
-
-            findViewById<LinearLayout>(R.id.container_topbar).isVisible = false;
-            _form = findViewById(R.id.settings_form);
-            _buttonBack = findViewById(R.id.button_back);
-            _buttonDev = findViewById(R.id.button_dev);
-            _devSets = findViewById(R.id.dev_settings);
-            _loaderView = findViewById(R.id.loader);
-            overlay = findViewById(R.id.overlay_container);
-
-            _form.onChanged.subscribe { field, _ ->
-                Logger.i("SettingsActivity", "Setting [${field.field?.name}] changed, saving");
-                _form.setObjectValues();
-                Settings.instance.save();
-
-                if(field.descriptor?.id == "app_language") {
-                    Logger.i("SettingsActivity", "App language change detected, propogating to shared preferences");
-                    StateApp.instance.setLocaleSetting(context, Settings.instance.language.getAppLanguageLocaleString());
-                }
-
-                if(field.descriptor?.id == "background_update" && activity is MainActivity) {
-                    Logger.i("SettingsActivity", "Detected change in background work ${field.value}");
-                    if(Settings.instance.subscriptions.subscriptionsBackgroundUpdateInterval > 0) {
-                        val notifManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager;
-                        if(!notifManager.areNotificationsEnabled()) {
-                            UIDialogs.toast(context, "Notifications aren't enabled");
-                            activity.requestNotificationPermissions("Notifications need to be enabled for background updating to function")
-                        }
-                    }
-                }
-            };
-            _buttonBack.setOnClickListener {
-                //finish();
-            }
-
-            _buttonDev.setOnClickListener {
-                //startActivity(Intent(this, DeveloperActivity::class.java));
-                fragment.navigate<DeveloperFragment>(null, true);
-            }
-
-            //_lastActivity = this;
-
-            reloadSettings();
-        }
-
-        var isFirstLoad = true;
-        fun reloadSettings() {
-            val firstLoad = isFirstLoad;
-            isFirstLoad = false;
-            _form.setSearchVisible(false);
-            _loaderView.start();
-            _form.fromObject(fragment.lifecycleScope, Settings.instance) {
-                _loaderView.stop();
-                _form.setSearchVisible(true);
-
-                var devCounter = 0;
-                _form.findField("code")?.assume<ReadOnlyTextField>()?.setOnClickListener {
-                    devCounter++;
-                    if(devCounter > 5) {
-                        devCounter = 0;
-                        SettingsDev.instance.developerMode = true;
-                        SettingsDev.instance.save();
-                        updateDevMode();
-                        UIDialogs.toast(context, fragment.getString(R.string.you_are_now_in_developer_mode));
-                    }
-                };
-
-                /*
-                if(firstLoad) {
-                    val query = intent.getStringExtra("query");
-                    if(!query.isNullOrEmpty()) {
-                        _form.setSearchQuery(query);
-                    }
-                }*/
-            };
-        }
-
-
-        fun onShown(str: Any? = null) {
-            updateDevMode();
-            if(str is String)
-                _form.setSearchQuery(str);
-        }
-
-        fun updateDevMode() {
-            if(SettingsDev.instance.developerMode)
-                _devSets.visibility = View.VISIBLE;
-            else
-                _devSets.visibility = View.GONE;
-        }
-
-    }
-}