Fix ui offset issue when opening video through search url

Experimental Subs Exchange

See merge request videostreaming/grayjay!91

.gitmodules

@@ -83,8 +83,14 @@
 	path = app/src/stable/assets/sources/dailymotion
 	url = ../plugins/dailymotion.git
 [submodule "app/src/stable/assets/sources/apple-podcast"]
-	path = app/src/stable/assets/sources/apple-podcast
+	path = app/src/stable/assets/sources/apple-podcasts
 	url = ../plugins/apple-podcasts.git
 [submodule "app/src/unstable/assets/sources/apple-podcasts"]
 	path = app/src/unstable/assets/sources/apple-podcasts
 	url = ../plugins/apple-podcasts.git
+[submodule "app/src/stable/assets/sources/tedtalks"]
+	path = app/src/stable/assets/sources/tedtalks
+	url = ../plugins/tedtalks.git
+[submodule "app/src/unstable/assets/sources/tedtalks"]
+	path = app/src/unstable/assets/sources/tedtalks
+	url = ../plugins/tedtalks.git

app/build.gradle

@@ -197,7 +197,7 @@ dependencies {
     implementation 'org.jsoup:jsoup:1.15.3'
     implementation 'com.google.android.flexbox:flexbox:3.0.0'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-    implementation 'com.arthenica:ffmpeg-kit-full:5.1'
+    implementation 'com.arthenica:ffmpeg-kit-full:6.0-2.LTS'
     implementation 'org.jetbrains.kotlin:kotlin-reflect:1.9.0'
     implementation 'com.github.dhaval2404:imagepicker:2.1'
     implementation 'com.google.zxing:core:3.4.1'

app/src/main/AndroidManifest.xml

@@ -156,7 +156,6 @@
             android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.SettingsActivity"
-            android:screenOrientation="sensorPortrait"
             android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.DeveloperActivity"

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

@@ -263,6 +263,10 @@ class PlatformVideoDetails extends PlatformVideo {
         this.rating = obj.rating ?? null; //IRating
         this.subtitles = obj.subtitles ?? [];
         this.isShort = !!obj.isShort ?? false;
+
+        if (obj.getContentRecommendations) {
+            this.getContentRecommendations = obj.getContentRecommendations
+        }
     }
 }
 

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

@@ -1,13 +1,13 @@
 package com.futo.platformplayer
 
 import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.polycentric.PolycentricCache
 import com.futo.platformplayer.states.AnnouncementType
 import com.futo.platformplayer.states.StateAnnouncement
 import com.futo.platformplayer.states.StatePlatform
 import com.futo.polycentric.core.ProcessHandle
 import com.futo.polycentric.core.Store
 import com.futo.polycentric.core.SystemState
+import com.futo.polycentric.core.base64UrlToByteArray
 import userpackage.Protocol
 import kotlin.math.abs
 import kotlin.math.min
@@ -40,33 +40,25 @@ fun Protocol.ImageBundle?.selectHighestResolutionImage(): Protocol.ImageManifest
     return imageManifestsList.filter { it.byteCount < maximumFileSize }.maxByOrNull { abs(it.width * it.height) }
 }
 
+fun String.getDataLinkFromUrl(): Protocol.URLInfoDataLink? {
+    val urlData = if (this.startsWith("polycentric://")) {
+        this.substring("polycentric://".length)
+    } else this;
+
+    val urlBytes = urlData.base64UrlToByteArray();
+    val urlInfo = Protocol.URLInfo.parseFrom(urlBytes);
+    if (urlInfo.urlType != 4L) {
+        return null
+    }
+
+    val dataLink = Protocol.URLInfoDataLink.parseFrom(urlInfo.body);
+    return dataLink
+}
+
 fun Protocol.Claim.resolveChannelUrl(): String? {
     return StatePlatform.instance.resolveChannelUrlByClaimTemplates(this.claimType.toInt(), this.claimFieldsList.associate { Pair(it.key.toInt(), it.value) })
 }
 
 fun Protocol.Claim.resolveChannelUrls(): List<String> {
     return StatePlatform.instance.resolveChannelUrlsByClaimTemplates(this.claimType.toInt(), this.claimFieldsList.associate { Pair(it.key.toInt(), it.value) })
-}
-
-suspend fun ProcessHandle.fullyBackfillServersAnnounceExceptions() {
-    val systemState = SystemState.fromStorageTypeSystemState(Store.instance.getSystemState(system))
-    if (!systemState.servers.contains(PolycentricCache.SERVER)) {
-        Logger.w("Backfill", "Polycentric prod server not added, adding it.")
-        addServer(PolycentricCache.SERVER)
-    }
-
-    val exceptions = fullyBackfillServers()
-    for (pair in exceptions) {
-        val server = pair.key
-        val exception = pair.value
-
-        StateAnnouncement.instance.registerAnnouncement(
-            "backfill-failed",
-            "Backfill failed",
-            "Failed to backfill server $server. $exception",
-            AnnouncementType.SESSION_RECURRING
-        );
-
-        Logger.e("Backfill", "Failed to backfill server $server.", exception)
-    }
 }

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

@@ -294,6 +294,9 @@ class Settings : FragmentedStorageFileJson() {
         @FormField(R.string.show_subscription_group, FieldForm.TOGGLE, R.string.show_subscription_group_description, 5)
         var showSubscriptionGroups: Boolean = true;
 
+        @FormField(R.string.use_subscription_exchange, FieldForm.TOGGLE, R.string.use_subscription_exchange_description, 6)
+        var useSubscriptionExchange: Boolean = false;
+
         @FormField(R.string.preview_feed_items, FieldForm.TOGGLE, R.string.preview_feed_items_description, 6)
         var previewFeedItems: Boolean = true;
 
@@ -356,7 +359,7 @@ class Settings : FragmentedStorageFileJson() {
     var playback = PlaybackSettings();
     @Serializable
     class PlaybackSettings {
-        @FormField(R.string.primary_language, FieldForm.DROPDOWN, -1, -1)
+        @FormField(R.string.primary_language, FieldForm.DROPDOWN, -1, -2)
         @DropdownFieldOptionsId(R.array.audio_languages)
         var primaryLanguage: Int = 0;
 
@@ -380,6 +383,8 @@ class Settings : FragmentedStorageFileJson() {
                 else -> null
             }
         }
+        @FormField(R.string.prefer_original_audio, FieldForm.TOGGLE, R.string.prefer_original_audio_description, -1)
+        var preferOriginalAudio: Boolean = true;
 
         //= context.resources.getStringArray(R.array.audio_languages)[primaryLanguage];
 
@@ -644,6 +649,9 @@ class Settings : FragmentedStorageFileJson() {
     @Serializable
     class Plugins {
 
+        @FormField(R.string.check_disabled_plugin_updates, FieldForm.TOGGLE, R.string.check_disabled_plugin_updates_description, -1)
+        var checkDisabledPluginsForUpdates: Boolean = false;
+
         @FormField(R.string.clear_cookies_on_logout, FieldForm.TOGGLE, R.string.clears_cookies_when_you_log_out, 0)
         var clearCookiesOnLogout: Boolean = true;
 

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

@@ -28,9 +28,6 @@ import com.futo.platformplayer.api.media.models.video.SerializedPlatformVideo
 import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.platforms.js.models.sources.JSDashManifestRawAudioSource
 import com.futo.platformplayer.api.media.platforms.js.models.sources.JSDashManifestRawSource
-import com.futo.platformplayer.api.media.platforms.js.models.sources.JSHLSManifestAudioSource
-import com.futo.platformplayer.api.media.platforms.js.models.sources.JSHLSManifestSource
-import com.futo.platformplayer.api.media.platforms.js.models.sources.JSSource
 import com.futo.platformplayer.downloads.VideoLocal
 import com.futo.platformplayer.fragment.mainactivity.main.SubscriptionGroupFragment
 import com.futo.platformplayer.helpers.VideoHelper
@@ -82,6 +79,36 @@ class UISlideOverlays {
             return menu;
         }
 
+        fun showQueueOptionsOverlay(context: Context, container: ViewGroup) {
+            UISlideOverlays.showOverlay(container, "Queue options", null, {
+
+            }, SlideUpMenuItem(context, R.drawable.ic_playlist, "Save as playlist", "", "Creates a new playlist with queue as videos", null, {
+                val nameInput = SlideUpMenuTextInput(container.context, container.context.getString(R.string.name));
+                val addPlaylistOverlay = SlideUpMenuOverlay(container.context, container, container.context.getString(R.string.create_new_playlist), container.context.getString(R.string.ok), false, nameInput);
+
+                addPlaylistOverlay.onOK.subscribe {
+                    val text = nameInput.text.trim()
+                    if (text.isBlank()) {
+                        return@subscribe;
+                    }
+
+                    addPlaylistOverlay.hide();
+                    nameInput.deactivate();
+                    nameInput.clear();
+                    StatePlayer.instance.saveQueueAsPlaylist(text);
+                    UIDialogs.appToast("Playlist [${text}] created");
+                };
+
+                addPlaylistOverlay.onCancel.subscribe {
+                    nameInput.deactivate();
+                    nameInput.clear();
+                };
+
+                addPlaylistOverlay.show();
+                nameInput.activate();
+            }, false));
+        }
+
         fun showSubscriptionOptionsOverlay(subscription: Subscription, container: ViewGroup): SlideUpMenuOverlay {
             val items = arrayListOf<View>();
 
@@ -272,17 +299,12 @@ class UISlideOverlays {
 
         }
 
-        fun showHlsPicker(video: IPlatformVideoDetails, source: JSSource, sourceUrl: String, container: ViewGroup): SlideUpMenuOverlay {
+        fun showHlsPicker(video: IPlatformVideoDetails, source: Any, sourceUrl: String, container: ViewGroup): SlideUpMenuOverlay {
             val items = arrayListOf<View>(LoaderView(container.context))
             val slideUpMenuOverlay = SlideUpMenuOverlay(container.context, container, container.context.getString(R.string.download_video), null, true, items)
 
             StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
-                val masterPlaylistResponse = if (source.hasRequestModifier) {
-                    val request = source.getRequestModifier()!!.modifyRequest(sourceUrl, mapOf())
-                    ManagedHttpClient().get(request.url!!, request.headers.toMutableMap())
-                } else {
-                    ManagedHttpClient().get(sourceUrl)
-                }
+                val masterPlaylistResponse = ManagedHttpClient().get(sourceUrl)
                 check(masterPlaylistResponse.isOk) { "Failed to get master playlist: ${masterPlaylistResponse.code}" }
 
                 val masterPlaylistContent = masterPlaylistResponse.body?.string()
@@ -343,7 +365,9 @@ class UISlideOverlays {
                             call = {
                                 selectedVideoVariant = it
                                 slideUpMenuOverlay.selectOption(videoButtons, it)
-                                slideUpMenuOverlay.setOk(container.context.getString(R.string.download))
+                                if (audioButtons.isEmpty()){
+                                    slideUpMenuOverlay.setOk(container.context.getString(R.string.download))
+                                }
                             },
                             invokeParent = false
                         ))
@@ -363,7 +387,7 @@ class UISlideOverlays {
 
                     slideUpMenuOverlay.onOK.subscribe {
                         //TODO: Fix SubtitleRawSource issue
-                        StateDownloads.instance.download(video, selectedVideoVariant, selectedAudioVariant, null, if (source is JSSource) source.hasRequestModifier else false);
+                        StateDownloads.instance.download(video, selectedVideoVariant, selectedAudioVariant, null);
                         slideUpMenuOverlay.hide()
                     }
 
@@ -378,7 +402,7 @@ class UISlideOverlays {
                                 UIDialogs.toast(container.context, "Variant video HLS playlist download started")
                                 slideUpMenuOverlay.hide()
                             } else if (source is IHLSManifestAudioSource) {
-                                StateDownloads.instance.download(video, null, HLSVariantAudioUrlSource("variant", 0, "application/vnd.apple.mpegurl", "", "", null, false, sourceUrl), null)
+                                StateDownloads.instance.download(video, null, HLSVariantAudioUrlSource("variant", 0, "application/vnd.apple.mpegurl", "", "", null, false, false, sourceUrl), null)
                                 UIDialogs.toast(container.context, "Variant audio HLS playlist download started")
                                 slideUpMenuOverlay.hide()
                             } else {
@@ -425,7 +449,7 @@ class UISlideOverlays {
             }
 
             items.add(SlideUpMenuGroup(container.context, container.context.getString(R.string.video), videoSources,
-                listOf(listOf(SlideUpMenuItem(
+                listOf((if (audioSources != null) listOf(SlideUpMenuItem(
                     container.context,
                     R.drawable.ic_movie,
                     container.context.getString(R.string.none),
@@ -438,7 +462,7 @@ class UISlideOverlays {
                             menu?.setOk(container.context.getString(R.string.download));
                     },
                     invokeParent = false
-                )) +
+                )) else listOf()) +
                 videoSources
                 .filter { it.isDownloadable() }
                 .map {
@@ -483,7 +507,7 @@ class UISlideOverlays {
                             )
                         }
 
-                        is JSHLSManifestSource -> {
+                        is IHLSManifestSource -> {
                             SlideUpMenuItem(
                                 container.context,
                                 R.drawable.ic_movie,
@@ -557,7 +581,7 @@ class UISlideOverlays {
                                 );
                             }
 
-                            is JSHLSManifestAudioSource -> {
+                            is IHLSManifestAudioSource -> {
                                 SlideUpMenuItem(
                                     container.context,
                                     R.drawable.ic_movie,
@@ -622,13 +646,13 @@ class UISlideOverlays {
 
             menu.onOK.subscribe {
                 val sv = selectedVideo
-                if (sv is JSHLSManifestSource) {
+                if (sv is IHLSManifestSource) {
                     showHlsPicker(video, sv, sv.url, container)
                     return@subscribe
                 }
 
                 val sa = selectedAudio
-                if (sa is JSHLSManifestAudioSource) {
+                if (sa is IHLSManifestAudioSource) {
                     showHlsPicker(video, sa, sa.url, container)
                     return@subscribe
                 }
@@ -915,7 +939,7 @@ class UISlideOverlays {
             val watchLater = StatePlaylists.instance.getWatchLater();
             items.add(SlideUpMenuGroup(container.context, container.context.getString(R.string.actions), "actions",
                 (listOf(
-                    if(!isLimited)
+                    if(!isLimited && !video.isLive)
                         SlideUpMenuItem(
                             container.context,
                             R.drawable.ic_download,
@@ -1051,8 +1075,9 @@ class UISlideOverlays {
                         StatePlayer.TYPE_WATCHLATER,
                         "${watchLater.size} " + container.context.getString(R.string.videos),
                         tag = "watch later",
-                        call = { StatePlaylists.instance.addToWatchLater(SerializedPlatformVideo.fromVideo(video), true);
-                            UIDialogs.appToast("Added to watch later", false);
+                        call = {
+                            if(StatePlaylists.instance.addToWatchLater(SerializedPlatformVideo.fromVideo(video), true))
+                                UIDialogs.appToast("Added to watch later", false);
                         }),
                     )
             );

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

@@ -10,11 +10,13 @@ import androidx.appcompat.app.AppCompatActivity
 import com.futo.platformplayer.*
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.views.buttons.BigButton
+import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuTextInput
 import com.google.zxing.integration.android.IntentIntegrator
 
 class AddSourceOptionsActivity : AppCompatActivity() {
     lateinit var _buttonBack: ImageButton;
 
+    lateinit var _overlayContainer: FrameLayout;
     lateinit var _buttonQR: BigButton;
     lateinit var _buttonBrowse: BigButton;
     lateinit var _buttonURL: BigButton;
@@ -54,6 +56,7 @@ class AddSourceOptionsActivity : AppCompatActivity() {
         setContentView(R.layout.activity_add_source_options);
         setNavigationBarColorAndIcons();
 
+        _overlayContainer = findViewById(R.id.overlay_container);
         _buttonBack = findViewById(R.id.button_back);
 
         _buttonQR = findViewById(R.id.option_qr);
@@ -81,7 +84,25 @@ class AddSourceOptionsActivity : AppCompatActivity() {
         }
 
         _buttonURL.onClick.subscribe {
-            UIDialogs.toast(this, getString(R.string.not_implemented_yet));
+            val nameInput = SlideUpMenuTextInput(this, "ex. https://yourplugin.com/config.json");
+            UISlideOverlays.showOverlay(_overlayContainer, "Enter your url", "Install", {
+
+                val content = nameInput.text;
+
+                val url = if (content.startsWith("https://")) {
+                    content
+                } else if (content.startsWith("grayjay://plugin/")) {
+                    content.substring("grayjay://plugin/".length)
+                } else {
+                    UIDialogs.toast(this, getString(R.string.not_a_plugin_url))
+                    return@showOverlay;
+                }
+
+                val intent = Intent(this, AddSourceActivity::class.java).apply {
+                    data = Uri.parse(url);
+                };
+                startActivity(intent);
+            }, nameInput)
         }
     }
 }

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

@@ -113,7 +113,7 @@ class LoginActivity : AppCompatActivity() {
 
     companion object {
         private val TAG = "LoginActivity";
-        private val REGEX_LOGIN_BUTTON = Regex("[a-zA-Z\\-\\.#_ ]*");
+        private val REGEX_LOGIN_BUTTON = Regex("[a-zA-Z\\-\\.#:_ ]*");
 
         private var _callback: ((SourceAuth?) -> Unit)? = null;
 

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

@@ -11,16 +11,16 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.R
 import com.futo.platformplayer.UIDialogs
-import com.futo.platformplayer.fullyBackfillServersAnnounceExceptions
 import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.polycentric.PolycentricCache
 import com.futo.platformplayer.polycentric.PolycentricStorage
 import com.futo.platformplayer.setNavigationBarColorAndIcons
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StatePolycentric
 import com.futo.platformplayer.views.LoaderView
+import com.futo.polycentric.core.ApiMethods
 import com.futo.polycentric.core.ProcessHandle
 import com.futo.polycentric.core.Store
+import com.futo.polycentric.core.fullyBackfillServersAnnounceExceptions
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -87,7 +87,7 @@ class PolycentricCreateProfileActivity : AppCompatActivity() {
                                 Logger.e(TAG, "Failed to save process secret to secret storage.", e)
                             }
 
-                            processHandle.addServer(PolycentricCache.SERVER);
+                            processHandle.addServer(ApiMethods.SERVER);
                             processHandle.setUsername(username);
                             StatePolycentric.instance.setProcessHandle(processHandle);
                         } catch (e: Throwable) {

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

@@ -12,12 +12,12 @@ import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.R
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.polycentric.PolycentricCache
 import com.futo.platformplayer.polycentric.PolycentricStorage
 import com.futo.platformplayer.setNavigationBarColorAndIcons
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StatePolycentric
 import com.futo.platformplayer.views.overlays.LoaderOverlay
+import com.futo.polycentric.core.ApiMethods
 import com.futo.polycentric.core.KeyPair
 import com.futo.polycentric.core.Process
 import com.futo.polycentric.core.ProcessSecret
@@ -145,7 +145,7 @@ class PolycentricImportProfileActivity : AppCompatActivity() {
                 }
 
                 StatePolycentric.instance.setProcessHandle(processHandle);
-                processHandle.fullyBackfillClient(PolycentricCache.SERVER);
+                processHandle.fullyBackfillClient(ApiMethods.SERVER);
                 withContext(Dispatchers.Main) {
                     startActivity(Intent(this@PolycentricImportProfileActivity, PolycentricProfileActivity::class.java));
                     finish();

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

@@ -21,10 +21,8 @@ import com.bumptech.glide.Glide
 import com.futo.platformplayer.R
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.dp
-import com.futo.platformplayer.fullyBackfillServersAnnounceExceptions
 import com.futo.platformplayer.images.GlideHelper.Companion.crossfade
 import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.polycentric.PolycentricCache
 import com.futo.platformplayer.polycentric.PolycentricStorage
 import com.futo.platformplayer.selectBestImage
 import com.futo.platformplayer.setNavigationBarColorAndIcons
@@ -32,8 +30,10 @@ import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StatePolycentric
 import com.futo.platformplayer.views.buttons.BigButton
 import com.futo.platformplayer.views.overlays.LoaderOverlay
+import com.futo.polycentric.core.ApiMethods
 import com.futo.polycentric.core.Store
 import com.futo.polycentric.core.SystemState
+import com.futo.polycentric.core.fullyBackfillServersAnnounceExceptions
 import com.futo.polycentric.core.systemToURLInfoSystemLinkUrl
 import com.futo.polycentric.core.toBase64Url
 import com.futo.polycentric.core.toURLInfoSystemLinkUrl
@@ -145,7 +145,7 @@ class PolycentricProfileActivity : AppCompatActivity() {
 
             lifecycleScope.launch(Dispatchers.IO) {
                 try {
-                    processHandle.fullyBackfillClient(PolycentricCache.SERVER)
+                    processHandle.fullyBackfillClient(ApiMethods.SERVER)
 
                     withContext(Dispatchers.Main) {
                         updateUI();

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

@@ -101,7 +101,8 @@ class SyncHomeActivity : AppCompatActivity() {
     private fun updateDeviceView(syncDeviceView: SyncDeviceView, publicKey: String, session: SyncSession?): SyncDeviceView {
         val connected = session?.connected ?: false
         syncDeviceView.setLinkType(if (connected) LinkType.Local else LinkType.None)
-            .setName(publicKey)
+            .setName(session?.displayName ?: StateSync.instance.getCachedName(publicKey) ?: publicKey)
+            //TODO: also display public key?
             .setStatus(if (connected) "Connected" else "Disconnected")
         return syncDeviceView
     }

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

@@ -73,7 +73,7 @@ class HttpFileHandler(method: String, path: String, private val contentType: Str
                         Logger.v(TAG, "Sent bytes $current-${current + bytesToSend}, totalBytesSent=$totalBytesSent")
 
                         current += bytesToSend.toLong()
-                        if (current >= end) {
+                        if (current > end) {
                             Logger.i(TAG, "Expected amount of bytes sent")
                             break
                         }

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

@@ -2,6 +2,7 @@ package com.futo.platformplayer.api.media.models.contents
 
 import com.futo.platformplayer.api.media.PlatformID
 import com.futo.platformplayer.api.media.models.PlatformAuthorLink
+import kotlinx.serialization.Serializable
 import java.time.OffsetDateTime
 
 interface IPlatformContent {

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

@@ -3,7 +3,7 @@ package com.futo.platformplayer.api.media.models.streams
 import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
 import com.futo.platformplayer.downloads.VideoLocal
 
-class LocalVideoMuxedSourceDescriptor(
+class DownloadedVideoMuxedSourceDescriptor(
         private val video: VideoLocal
     ) : VideoMuxedSourceDescriptor() {
     override val videoSources: Array<IVideoSource> get() = video.videoSource.toTypedArray();

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

@@ -13,7 +13,8 @@ class AudioUrlSource(
     override val codec: String = "",
     override val language: String = Language.UNKNOWN,
     override val duration: Long? = null,
-    override var priority: Boolean = false
+    override var priority: Boolean = false,
+    override var original: Boolean = false
 ) : IAudioUrlSource, IStreamMetaDataSource{
     override var streamMetaData: StreamMetaData? = null;
 
@@ -36,7 +37,9 @@ class AudioUrlSource(
                 source.container,
                 source.codec,
                 source.language,
-                source.duration
+                source.duration,
+                source.priority,
+                source.original
             );
             ret.streamMetaData = streamData;
 

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

@@ -2,7 +2,6 @@ package com.futo.platformplayer.api.media.models.streams.sources
 
 import android.net.Uri
 import com.futo.platformplayer.api.media.models.subtitles.ISubtitleSource
-import com.futo.platformplayer.api.media.platforms.js.models.sources.JSSource
 
 class HLSVariantVideoUrlSource(
     override val name: String,
@@ -13,8 +12,7 @@ class HLSVariantVideoUrlSource(
     override val bitrate: Int?,
     override val duration: Long,
     override val priority: Boolean,
-    val url: String,
-    val jsSource: JSSource? = null,
+    val url: String
 ) : IVideoUrlSource {
     override fun getVideoUrl(): String {
         return url
@@ -29,8 +27,8 @@ class HLSVariantAudioUrlSource(
     override val language: String,
     override val duration: Long?,
     override val priority: Boolean,
-    val url: String,
-    val jsSource: JSSource? = null,
+    override val original: Boolean,
+    val url: String
 ) : IAudioUrlSource {
     override fun getAudioUrl(): String {
         return url

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

@@ -8,4 +8,5 @@ interface IAudioSource {
     val language : String;
     val duration : Long?;
     val priority: Boolean;
+    val original: Boolean;
 }

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

@@ -15,6 +15,7 @@ class LocalAudioSource : IAudioSource, IStreamMetaDataSource {
     override val duration: Long? = null;
 
     override var priority: Boolean = false;
+    override val original: Boolean = false;
 
     val filePath : String;
     val fileSize: Long;
@@ -33,13 +34,13 @@ class LocalAudioSource : IAudioSource, IStreamMetaDataSource {
     }
 
     companion object {
-        fun fromSource(source: IAudioSource, path: String, fileSize: Long): LocalAudioSource {
+        fun fromSource(source: IAudioSource, path: String, fileSize: Long, overrideContainer: String? = null): LocalAudioSource {
             return LocalAudioSource(
                 source.name,
                 path,
                 fileSize,
                 source.bitrate,
-                source.container,
+                overrideContainer ?: source.container,
                 source.codec,
                 source.language
             );

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

@@ -35,7 +35,7 @@ class LocalVideoSource : IVideoSource, IStreamMetaDataSource {
     }
 
     companion object {
-        fun fromSource(source: IVideoSource, path: String, fileSize: Long): LocalVideoSource {
+        fun fromSource(source: IVideoSource, path: String, fileSize: Long, overrideContainer: String? = null): LocalVideoSource {
             return LocalVideoSource(
                 source.name,
                 path,
@@ -43,7 +43,7 @@ class LocalVideoSource : IVideoSource, IStreamMetaDataSource {
                 source.width,
                 source.height,
                 source.duration,
-                source.container,
+                overrideContainer ?: source.container,
                 source.codec,
                 source.bitrate?:0
             );

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

@@ -14,6 +14,7 @@ import java.time.OffsetDateTime
 
 @kotlinx.serialization.Serializable
 open class SerializedPlatformVideo(
+    override val contentType: ContentType = ContentType.MEDIA,
     override val id: PlatformID,
     override val name: String,
     override val thumbnails: Thumbnails,
@@ -27,7 +28,6 @@ open class SerializedPlatformVideo(
     override val viewCount: Long,
     override val isShort: Boolean = false
 ) : IPlatformVideo, SerializedPlatformContent {
-    override val contentType: ContentType = ContentType.MEDIA;
 
     override val isLive: Boolean = false;
 
@@ -44,6 +44,7 @@ open class SerializedPlatformVideo(
     companion object {
         fun fromVideo(video: IPlatformVideo) : SerializedPlatformVideo {
             return SerializedPlatformVideo(
+                ContentType.MEDIA,
                 video.id,
                 video.name,
                 video.thumbnails,

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

@@ -21,6 +21,8 @@ open class JSAudioUrlSource : IAudioUrlSource, JSSource {
 
     override var priority: Boolean = false;
 
+    override var original: Boolean = false;
+
     constructor(plugin: JSClient, obj: V8ValueObject) : super(TYPE_AUDIOURL, plugin, obj) {
         val contextName = "AudioUrlSource";
         val config = plugin.config;
@@ -35,6 +37,7 @@ open class JSAudioUrlSource : IAudioUrlSource, JSSource {
         name = _obj.getOrDefault(config, "name", contextName, "${container} ${bitrate}") ?: "${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 fun getAudioUrl() : String {

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

@@ -4,6 +4,8 @@ import com.caoccao.javet.values.reference.V8ValueObject
 import com.futo.platformplayer.api.media.models.streams.sources.IAudioSource
 import com.futo.platformplayer.api.media.models.streams.sources.IDashManifestSource
 import com.futo.platformplayer.api.media.models.streams.sources.IVideoUrlSource
+import com.futo.platformplayer.api.media.models.streams.sources.other.IStreamMetaDataSource
+import com.futo.platformplayer.api.media.models.streams.sources.other.StreamMetaData
 import com.futo.platformplayer.api.media.platforms.js.DevJSClient
 import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.engine.IV8PluginConfig
@@ -14,13 +16,14 @@ import com.futo.platformplayer.getOrThrow
 import com.futo.platformplayer.others.Language
 import com.futo.platformplayer.states.StateDeveloper
 
-class JSDashManifestRawAudioSource : JSSource, IAudioSource, IJSDashManifestRawSource {
-    override val container : String = "application/dash+xml";
+class JSDashManifestRawAudioSource : JSSource, IAudioSource, IJSDashManifestRawSource, IStreamMetaDataSource {
+    override val container : String;
     override val name : String;
     override val codec: String;
     override val bitrate: Int;
     override val duration: Long;
     override val priority: Boolean;
+    override var original: Boolean = false;
 
     override val language: String;
 
@@ -29,17 +32,21 @@ class JSDashManifestRawAudioSource : JSSource, IAudioSource, IJSDashManifestRawS
 
     override val hasGenerate: Boolean;
 
+    override var streamMetaData: StreamMetaData? = null;
+
     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.getOrThrow(config, "manifest", contextName);
         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;
         language = _obj.getOrDefault(config, "language", contextName, Language.UNKNOWN) ?: Language.UNKNOWN;
+        original =  if(_obj.has("original")) obj.getOrThrow(config, "original", contextName) else false;
         hasGenerate = _obj.has("generate");
     }
 
@@ -50,15 +57,28 @@ class JSDashManifestRawAudioSource : JSSource, IAudioSource, IJSDashManifestRawS
             throw IllegalStateException("Source object already closed");
 
         val plugin = _plugin.getUnderlyingPlugin();
+
+        var result: String? = null;
         if(_plugin is DevJSClient)
-            return StateDeveloper.instance.handleDevCall(_plugin.devID, "DashManifestRaw", false) {
+            result = StateDeveloper.instance.handleDevCall(_plugin.devID, "DashManifestRaw", false) {
                 _plugin.getUnderlyingPlugin().catchScriptErrors("DashManifestRaw", "dashManifestRaw.generate()") {
                     _obj.invokeString("generate");
                 }
             }
         else
-            return _plugin.getUnderlyingPlugin().catchScriptErrors("DashManifestRaw", "dashManifestRaw.generate()") {
+            result = _plugin.getUnderlyingPlugin().catchScriptErrors("DashManifestRaw", "dashManifestRaw.generate()") {
                 _obj.invokeString("generate");
             }
+
+        if(result != null){
+            val initStart = _obj.getOrDefault<Int>(_config, "initStart", "JSDashManifestRawSource", null) ?: 0;
+            val initEnd = _obj.getOrDefault<Int>(_config, "initEnd", "JSDashManifestRawSource", null) ?: 0;
+            val indexStart = _obj.getOrDefault<Int>(_config, "indexStart", "JSDashManifestRawSource", null) ?: 0;
+            val indexEnd = _obj.getOrDefault<Int>(_config, "indexEnd", "JSDashManifestRawSource", null) ?: 0;
+            if(initEnd > 0 && indexStart > 0 && indexEnd > 0) {
+                streamMetaData = StreamMetaData(initStart, initEnd, indexStart, indexEnd);
+            }
+        }
+        return result;
     }
 }

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

@@ -6,6 +6,8 @@ import com.caoccao.javet.values.reference.V8ValueObject
 import com.futo.platformplayer.api.media.models.streams.sources.IDashManifestSource
 import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
 import com.futo.platformplayer.api.media.models.streams.sources.IVideoUrlSource
+import com.futo.platformplayer.api.media.models.streams.sources.other.IStreamMetaDataSource
+import com.futo.platformplayer.api.media.models.streams.sources.other.StreamMetaData
 import com.futo.platformplayer.api.media.platforms.js.DevJSClient
 import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.engine.IV8PluginConfig
@@ -20,8 +22,8 @@ interface IJSDashManifestRawSource {
     var manifest: String?;
     fun generate(): String?;
 }
-open class JSDashManifestRawSource: JSSource, IVideoSource, IJSDashManifestRawSource {
-    override val container : String = "application/dash+xml";
+open class JSDashManifestRawSource: JSSource, IVideoSource, IJSDashManifestRawSource, IStreamMetaDataSource {
+    override val container : String;
     override val name : String;
     override val width: Int;
     override val height: Int;
@@ -36,11 +38,14 @@ open class JSDashManifestRawSource: JSSource, IVideoSource, IJSDashManifestRawSo
     override val hasGenerate: Boolean;
     val canMerge: Boolean;
 
+    override var streamMetaData: StreamMetaData? = null;
+
     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;
@@ -57,17 +62,30 @@ open class JSDashManifestRawSource: JSSource, IVideoSource, IJSDashManifestRawSo
             return manifest;
         if(_obj.isClosed)
             throw IllegalStateException("Source object already closed");
+
+        var result: String? = null;
         if(_plugin is DevJSClient) {
-            return StateDeveloper.instance.handleDevCall(_plugin.devID, "DashManifestRawSource.generate()") {
+            result = StateDeveloper.instance.handleDevCall(_plugin.devID, "DashManifestRawSource.generate()") {
                 _plugin.getUnderlyingPlugin().catchScriptErrors("DashManifestRaw.generate", "generate()", {
                     _obj.invokeString("generate");
                 });
             }
         }
         else
-            return _plugin.getUnderlyingPlugin().catchScriptErrors("DashManifestRaw.generate", "generate()", {
+            result = _plugin.getUnderlyingPlugin().catchScriptErrors("DashManifestRaw.generate", "generate()", {
                 _obj.invokeString("generate");
             });
+
+        if(result != null){
+            val initStart = _obj.getOrDefault<Int>(_config, "initStart", "JSDashManifestRawSource", null) ?: 0;
+            val initEnd = _obj.getOrDefault<Int>(_config, "initEnd", "JSDashManifestRawSource", null) ?: 0;
+            val indexStart = _obj.getOrDefault<Int>(_config, "indexStart", "JSDashManifestRawSource", null) ?: 0;
+            val indexEnd = _obj.getOrDefault<Int>(_config, "indexEnd", "JSDashManifestRawSource", null) ?: 0;
+            if(initEnd > 0 && indexStart > 0 && indexEnd > 0) {
+                streamMetaData = StreamMetaData(initStart, initEnd, indexStart, indexEnd);
+            }
+        }
+        return result;
     }
 }
 
@@ -100,12 +118,16 @@ class JSDashManifestMergingRawSource(
         if(videoDash == null) return null;
 
         //TODO: Temporary simple solution..make more reliable version
+
+        var result: String? = null;
         val audioAdaptationSet = adaptationSetRegex.find(audioDash!!);
         if(audioAdaptationSet != null) {
-            return videoDash.replace("</AdaptationSet>", "</AdaptationSet>\n" + audioAdaptationSet.value)
+            result = videoDash.replace("</AdaptationSet>", "</AdaptationSet>\n" + audioAdaptationSet.value)
         }
         else
-            return videoDash;
+            result = videoDash;
+
+        return result;
     }
 
     companion object {

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

@@ -21,6 +21,7 @@ class JSHLSManifestAudioSource : IHLSManifestAudioSource, JSSource {
     override val language: String;
 
     override var priority: Boolean = false;
+    override var original: Boolean = false;
 
     constructor(plugin: JSClient, obj: V8ValueObject) : super(TYPE_HLS, plugin, obj) {
         val contextName = "HLSAudioSource";
@@ -32,6 +33,7 @@ class JSHLSManifestAudioSource : IHLSManifestAudioSource, JSSource {
         language = _obj.getOrThrow(config, "language", contextName);
 
         priority = obj.getOrNull(config, "priority", contextName) ?: false;
+        original =  if(_obj.has("original")) obj.getOrThrow(config, "original", contextName) else false;
     }
 
 

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

@@ -0,0 +1,5 @@
+package com.futo.platformplayer.api.media.platforms.local
+
+class LocalClient {
+    //TODO
+}

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

@@ -0,0 +1,85 @@
+package com.futo.platformplayer.api.media.platforms.local.models
+
+import com.futo.platformplayer.api.media.IPlatformClient
+import com.futo.platformplayer.api.media.PlatformID
+import com.futo.platformplayer.api.media.models.PlatformAuthorLink
+import com.futo.platformplayer.api.media.models.Thumbnails
+import com.futo.platformplayer.api.media.models.comments.IPlatformComment
+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.playback.IPlaybackTracker
+import com.futo.platformplayer.api.media.models.ratings.IRating
+import com.futo.platformplayer.api.media.models.ratings.RatingLikes
+import com.futo.platformplayer.api.media.models.streams.IVideoSourceDescriptor
+import com.futo.platformplayer.api.media.models.streams.DownloadedVideoMuxedSourceDescriptor
+import com.futo.platformplayer.api.media.models.streams.sources.IDashManifestSource
+import com.futo.platformplayer.api.media.models.streams.sources.IHLSManifestSource
+import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
+import com.futo.platformplayer.api.media.models.subtitles.ISubtitleSource
+import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
+import com.futo.platformplayer.api.media.platforms.local.models.sources.LocalVideoFileSource
+import com.futo.platformplayer.api.media.structures.IPager
+import com.futo.platformplayer.downloads.VideoLocal
+import java.io.File
+import java.time.Instant
+import java.time.OffsetDateTime
+import java.time.ZoneId
+
+class LocalVideoDetails: IPlatformVideoDetails {
+
+    override val contentType: ContentType get() = ContentType.UNKNOWN;
+
+    override val id: PlatformID;
+    override val name: String;
+    override val author: PlatformAuthorLink;
+
+    override val datetime: OffsetDateTime?;
+
+    override val url: String;
+    override val shareUrl: String;
+    override val rating: IRating = RatingLikes(0);
+    override val description: String = "";
+
+    override val video: IVideoSourceDescriptor;
+    override val preview: IVideoSourceDescriptor? = null;
+    override val live: IVideoSource? = null;
+    override val dash: IDashManifestSource? = null;
+    override val hls: IHLSManifestSource? = null;
+    override val subtitles: List<ISubtitleSource> = listOf()
+
+    override val thumbnails: Thumbnails;
+    override val duration: Long;
+    override val viewCount: Long = 0;
+    override val isLive: Boolean = false;
+    override val isShort: Boolean = false;
+
+    constructor(file: File) {
+        id = PlatformID("Local", file.path, "LOCAL")
+        name = file.name;
+        author = PlatformAuthorLink.UNKNOWN;
+
+        url = file.canonicalPath;
+        shareUrl = "";
+
+        duration = 0;
+        thumbnails = Thumbnails(arrayOf());
+
+        datetime = OffsetDateTime.ofInstant(
+            Instant.ofEpochMilli(file.lastModified()),
+            ZoneId.systemDefault()
+        );
+        video = LocalVideoMuxedSourceDescriptor(LocalVideoFileSource(file));
+    }
+
+    override fun getComments(client: IPlatformClient): IPager<IPlatformComment>? {
+        return null;
+    }
+
+    override fun getPlaybackTracker(): IPlaybackTracker? {
+        return null;
+    }
+
+    override fun getContentRecommendations(client: IPlatformClient): IPager<IPlatformContent>? {
+        return null;
+    }
+}

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

@@ -0,0 +1,13 @@
+package com.futo.platformplayer.api.media.platforms.local.models
+
+import com.futo.platformplayer.api.media.models.streams.VideoMuxedSourceDescriptor
+import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
+import com.futo.platformplayer.api.media.models.streams.sources.LocalVideoSource
+import com.futo.platformplayer.api.media.platforms.local.models.sources.LocalVideoFileSource
+import com.futo.platformplayer.downloads.VideoLocal
+
+class LocalVideoMuxedSourceDescriptor(
+    private val video: LocalVideoFileSource
+) : VideoMuxedSourceDescriptor() {
+    override val videoSources: Array<IVideoSource> get() = arrayOf(video);
+}

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

@@ -0,0 +1,25 @@
+package com.futo.platformplayer.api.media.platforms.local.models
+
+import android.content.Context
+import android.database.Cursor
+import android.provider.MediaStore
+import android.provider.MediaStore.Video
+
+class MediaStoreVideo {
+
+
+    companion object {
+        val URI = MediaStore.Files.getContentUri("external");
+        val PROJECTION = arrayOf(Video.Media._ID, Video.Media.TITLE, Video.Media.DURATION, Video.Media.HEIGHT, Video.Media.WIDTH, Video.Media.MIME_TYPE);
+        val ORDER = MediaStore.Video.Media.TITLE;
+
+        fun readMediaStoreVideo(cursor: Cursor) {
+
+        }
+
+        fun query(context: Context, selection: String, args: Array<String>, order: String? = null): Cursor? {
+            val cursor = context.contentResolver.query(URI, PROJECTION, selection, args, order ?: ORDER, null);
+            return cursor;
+        }
+    }
+}

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

@@ -0,0 +1,31 @@
+package com.futo.platformplayer.api.media.platforms.local.models.sources
+
+import android.content.Context
+import android.provider.MediaStore
+import android.provider.MediaStore.Video
+import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
+import com.futo.platformplayer.api.media.models.streams.sources.VideoUrlSource
+import com.futo.platformplayer.helpers.VideoHelper
+import java.io.File
+
+class LocalVideoFileSource: IVideoSource {
+
+
+    override val name: String;
+    override val width: Int;
+    override val height: Int;
+    override val container: String;
+    override val codec: String = ""
+    override val bitrate: Int = 0
+    override val duration: Long;
+    override val priority: Boolean = false;
+
+    constructor(file: File) {
+        name = file.name;
+        width = 0;
+        height = 0;
+        container = VideoHelper.videoExtensionToMimetype(file.extension) ?: "";
+        duration = 0;
+    }
+
+}

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

@@ -64,7 +64,7 @@ class StateCasting {
     private val _scopeMain = CoroutineScope(Dispatchers.Main);
     private val _storage: CastingDeviceInfoStorage = FragmentedStorage.get();
 
-    private val _castServer = ManagedHttpServer(9999);
+    private val _castServer = ManagedHttpServer();
     private var _started = false;
 
     var devices: HashMap<String, CastingDevice> = hashMapOf();

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

@@ -22,7 +22,6 @@ import com.futo.platformplayer.api.media.models.comments.PolycentricPlatformComm
 import com.futo.platformplayer.api.media.models.ratings.RatingLikeDislikes
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.dp
-import com.futo.platformplayer.fullyBackfillServersAnnounceExceptions
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.selectBestImage
 import com.futo.platformplayer.states.StateApp
@@ -30,6 +29,7 @@ import com.futo.platformplayer.states.StatePolycentric
 import com.futo.polycentric.core.ClaimType
 import com.futo.polycentric.core.Store
 import com.futo.polycentric.core.SystemState
+import com.futo.polycentric.core.fullyBackfillServersAnnounceExceptions
 import com.futo.polycentric.core.systemToURLInfoSystemLinkUrl
 import com.futo.polycentric.core.toURLInfoSystemLinkUrl
 import com.google.android.material.button.MaterialButton

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

@@ -10,10 +10,11 @@ import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.media.PlatformID
 import com.futo.platformplayer.api.media.models.streams.VideoUnMuxedSourceDescriptor
 import com.futo.platformplayer.api.media.models.streams.sources.AudioUrlSource
-import com.futo.platformplayer.api.media.models.streams.sources.HLSVariantAudioUrlSource
-import com.futo.platformplayer.api.media.models.streams.sources.HLSVariantVideoUrlSource
 import com.futo.platformplayer.api.media.models.streams.sources.IAudioSource
 import com.futo.platformplayer.api.media.models.streams.sources.IAudioUrlSource
+import com.futo.platformplayer.api.media.models.streams.sources.IDashManifestSource
+import com.futo.platformplayer.api.media.models.streams.sources.IHLSManifestAudioSource
+import com.futo.platformplayer.api.media.models.streams.sources.IHLSManifestSource
 import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
 import com.futo.platformplayer.api.media.models.streams.sources.IVideoUrlSource
 import com.futo.platformplayer.api.media.models.streams.sources.LocalAudioSource
@@ -27,11 +28,12 @@ import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
 import com.futo.platformplayer.api.media.models.video.SerializedPlatformVideo
 import com.futo.platformplayer.api.media.models.video.SerializedPlatformVideoDetails
 import com.futo.platformplayer.api.media.platforms.js.JSClient
+import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
+import com.futo.platformplayer.api.media.platforms.js.models.JSRequestExecutor
+import com.futo.platformplayer.api.media.platforms.js.models.JSVideo
 import com.futo.platformplayer.api.media.platforms.js.models.sources.IJSDashManifestRawSource
 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.JSHLSManifestAudioSource
-import com.futo.platformplayer.api.media.platforms.js.models.sources.JSHLSManifestSource
 import com.futo.platformplayer.api.media.platforms.js.models.sources.JSSource
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.exceptions.DownloadException
@@ -42,9 +44,9 @@ import com.futo.platformplayer.parsers.HLS
 import com.futo.platformplayer.serializers.OffsetDateTimeNullableSerializer
 import com.futo.platformplayer.states.StateDownloads
 import com.futo.platformplayer.states.StatePlatform
+import com.futo.platformplayer.states.StatePlugins
 import com.futo.platformplayer.toHumanBitrate
 import com.futo.platformplayer.toHumanBytesSpeed
-import com.futo.polycentric.core.hexStringToByteArray
 import hasAnySource
 import isDownloadable
 import kotlinx.coroutines.CancellationException
@@ -57,7 +59,6 @@ import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.Contextual
 import kotlinx.serialization.Transient
-import java.io.ByteArrayOutputStream
 import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
@@ -68,10 +69,8 @@ import java.util.concurrent.Executors
 import java.util.concurrent.ForkJoinPool
 import java.util.concurrent.ForkJoinTask
 import java.util.concurrent.ThreadLocalRandom
-import javax.crypto.Cipher
-import javax.crypto.spec.IvParameterSpec
-import javax.crypto.spec.SecretKeySpec
 import kotlin.coroutines.resumeWithException
+import kotlin.time.times
 
 @kotlinx.serialization.Serializable
 class VideoDownload {
@@ -94,10 +93,10 @@ class VideoDownload {
     var audioSource: AudioUrlSource?;
     @Contextual
     @Transient
-    val videoSourceToUse: IVideoSource? get () = if (videoSource?.container == "application/vnd.apple.mpegurl") videoSource else if(requiresLiveVideoSource) videoSourceLive as IVideoSource? else videoSource as IVideoSource?;
+    val videoSourceToUse: IVideoSource? get () = if(requiresLiveVideoSource) videoSourceLive as IVideoSource? else videoSource as IVideoSource?;
     @Contextual
     @Transient
-    val audioSourceToUse: IAudioSource? get () = if (audioSource?.container == "application/vnd.apple.mpegurl") audioSource else if(requiresLiveAudioSource) audioSourceLive as IAudioSource? else audioSource as IAudioSource?;
+    val audioSourceToUse: IAudioSource? get () = if(requiresLiveAudioSource) audioSourceLive as IAudioSource? else audioSource as IAudioSource?;
 
     var requireVideoSource: Boolean = false;
     var requireAudioSource: Boolean = false;
@@ -132,9 +131,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;
 
@@ -145,11 +141,17 @@ class VideoDownload {
     var error: String? = null;
 
     var videoFilePath: String? = null;
-    var videoFileName: String? = null;
+    var videoFileNameBase: String? = null;
+    var videoFileNameExt: String? = null;
+    val videoFileName: String? get() = if(videoFileNameBase.isNullOrEmpty()) null else videoFileNameBase + (if(!videoFileNameExt.isNullOrEmpty()) "." + videoFileNameExt else "");
+    var videoOverrideContainer: String? = null;
     var videoFileSize: Long? = null;
 
     var audioFilePath: String? = null;
-    var audioFileName: String? = null;
+    var audioFileNameBase: String? = null;
+    var audioFileNameExt: String? = null;
+    val audioFileName: String? get() = if(audioFileNameBase.isNullOrEmpty()) null else audioFileNameBase + (if(!audioFileNameExt.isNullOrEmpty()) "." + audioFileNameExt else "");
+    var audioOverrideContainer: String? = null;
     var audioFileSize: Long? = null;
 
     var subtitleFilePath: String? = null;
@@ -184,7 +186,7 @@ class VideoDownload {
         this.requireAudioSource = targetBitrate != null; //TODO: May not be a valid check.. can only be determined after live fetch?
         this.requiredCheck = optionalSources;
     }
-    constructor(video: IPlatformVideoDetails, videoSource: IVideoSource?, audioSource: IAudioSource?, subtitleSource: SubtitleRawSource?, hasHLSRequestModifier: Boolean = false) {
+    constructor(video: IPlatformVideoDetails, videoSource: IVideoSource?, audioSource: IAudioSource?, subtitleSource: SubtitleRawSource?) {
         this.video = SerializedPlatformVideo.fromVideo(video);
         this.videoDetails = SerializedPlatformVideoDetails.fromVideo(video, if (subtitleSource != null) listOf(subtitleSource) else listOf());
         this.videoSource = if(videoSource is IVideoUrlSource) VideoUrlSource.fromUrlSource(videoSource) else null;
@@ -195,10 +197,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 || hasHLSRequestModifier
-        this.hasAudioRequestModifier = audioSource is JSSource && audioSource.hasRequestModifier || hasHLSRequestModifier
-        this.requiresLiveVideoSource = this.hasVideoRequestExecutor || this.hasVideoRequestModifier || (videoSource is JSDashManifestRawSource && videoSource.hasGenerate);
-        this.requiresLiveAudioSource = this.hasAudioRequestExecutor || this.hasAudioRequestModifier || (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;
@@ -241,11 +241,13 @@ class VideoDownload {
             videoDetails = null;
             videoSource = null;
             videoSourceLive = null;
+            videoOverrideContainer = null;
         }
         if(requiresLiveAudioSource && !isLiveAudioSourceValid) {
             videoDetails = null;
             audioSource = null;
             videoSourceLive = null;
+            audioOverrideContainer = null;
         }
         if(video == null && videoDetails == null)
             throw IllegalStateException("Missing information for download to complete");
@@ -291,14 +293,9 @@ class VideoDownload {
             if(videoSource == null && targetPixelCount != null) {
                 val videoSources = arrayListOf<IVideoSource>()
                 for (source in original.video.videoSources) {
-                    if (source is JSHLSManifestSource) {
+                    if (source is IHLSManifestSource) {
                         try {
-                            val playlistResponse = if (source.hasRequestModifier) {
-                                val request = source.getRequestModifier()!!.modifyRequest(source.url, mapOf())
-                                client.get(request.url!!, request.headers.toMutableMap())
-                            } else {
-                                client.get(source.url)
-                            }
+                            val playlistResponse = client.get(source.url)
                             if (playlistResponse.isOk) {
                                 val playlistContent = playlistResponse.body?.string()
                                 if (playlistContent != null) {
@@ -331,10 +328,6 @@ class VideoDownload {
                     if(original.video.videoSources.size == 0)
                         requireVideoSource = false;
                 }
-                else if (vsource is HLSVariantVideoUrlSource && vsource.container == "application/vnd.apple.mpegurl") {
-                    videoSource = VideoUrlSource.fromUrlSource(vsource)
-                    videoSourceLive = vsource.jsSource!!
-                }
                 else if(vsource is IVideoUrlSource)
                     videoSource = VideoUrlSource.fromUrlSource(vsource)
                 else if(vsource is JSSource && requiresLiveVideoSource)
@@ -348,14 +341,9 @@ class VideoDownload {
                 val video = original.video
                 if (video is VideoUnMuxedSourceDescriptor) {
                     for (source in video.audioSources) {
-                        if (source is JSHLSManifestAudioSource) {
+                        if (source is IHLSManifestAudioSource) {
                             try {
-                                val playlistResponse = if (source.hasRequestModifier) {
-                                    val request = source.getRequestModifier()!!.modifyRequest(source.url, mapOf())
-                                    client.get(request.url!!, request.headers.toMutableMap())
-                                } else {
-                                    client.get(source.url)
-                                }
+                                val playlistResponse = client.get(source.url)
                                 if (playlistResponse.isOk) {
                                     val playlistContent = playlistResponse.body?.string()
                                     if (playlistContent != null) {
@@ -370,26 +358,6 @@ class VideoDownload {
                         }
                     }
                 }
-                for (source in video.videoSources) {
-                    if (source is JSHLSManifestSource) {
-                        try {
-                            val playlistResponse = if (source.hasRequestModifier) {
-                                val request = source.getRequestModifier()!!.modifyRequest(source.url, mapOf())
-                                client.get(request.url!!, request.headers.toMutableMap())
-                            } else {
-                                client.get(source.url)
-                            }
-                            if (playlistResponse.isOk) {
-                                val playlistContent = playlistResponse.body?.string()
-                                if (playlistContent != null) {
-                                    audioSources.addAll(HLS.parseAndGetAudioSources(source, playlistContent, source.url))
-                                }
-                            }
-                        } catch (e: Throwable) {
-                            Log.i(TAG, "Failed to get HLS audio sources", e)
-                        }
-                    }
-                }
 
                 var asource: IAudioSource? = null;
                 if(targetAudioName != null) {
@@ -407,8 +375,8 @@ class VideoDownload {
                         else throw DownloadException("Could not find a valid video or audio source for download")
 
                 if(asource is JSSource) {
-                    this.hasVideoRequestExecutor = this.hasVideoRequestExecutor || asource.hasRequestExecutor;
-                    this.requiresLiveVideoSource = this.hasVideoRequestExecutor || (asource is JSDashManifestRawSource && asource.hasGenerate);
+                    this.hasAudioRequestExecutor = this.hasAudioRequestExecutor || asource.hasRequestExecutor;
+                    this.requiresLiveAudioSource = this.hasAudioRequestExecutor || (asource is JSDashManifestRawSource && asource.hasGenerate);
                 }
 
                 if(asource == null) {
@@ -416,10 +384,6 @@ class VideoDownload {
                     if(!original.video.isUnMuxed || original.video.videoSources.size == 0)
                         requireVideoSource = false;
                 }
-                else if (asource is HLSVariantAudioUrlSource && asource.container == "application/vnd.apple.mpegurl") {
-                    audioSource = AudioUrlSource.fromUrlSource(asource)
-                    audioSourceLive = asource.jsSource!!
-                }
                 else if(asource is IAudioUrlSource)
                     audioSource = AudioUrlSource.fromUrlSource(asource)
                 else if(asource is JSSource && requiresLiveAudioSource)
@@ -454,11 +418,13 @@ class VideoDownload {
         else audioSource;
 
         if(actualVideoSource != null) {
-            videoFileName = "${videoDetails!!.id.value!!} [${actualVideoSource!!.width}x${actualVideoSource!!.height}].${videoContainerToExtension(actualVideoSource!!.container)}".sanitizeFileName();
+            videoFileNameBase = "${videoDetails!!.id.value!!} [${actualVideoSource!!.width}x${actualVideoSource!!.height}]".sanitizeFileName();
+            videoFileNameExt = videoContainerToExtension(actualVideoSource!!.container);
             videoFilePath = File(downloadDir, videoFileName!!).absolutePath;
         }
         if(actualAudioSource != null) {
-            audioFileName = "${videoDetails!!.id.value!!} [${actualAudioSource!!.language}-${actualAudioSource!!.bitrate}].${audioContainerToExtension(actualAudioSource!!.container)}".sanitizeFileName();
+            audioFileNameBase = "${videoDetails!!.id.value!!} [${actualAudioSource!!.language}-${actualAudioSource!!.bitrate}]".sanitizeFileName();
+            audioFileNameExt = audioContainerToExtension(actualAudioSource!!.container);
             audioFilePath = File(downloadDir, audioFileName!!).absolutePath;
         }
         if(subtitleSource != null) {
@@ -502,9 +468,9 @@ class VideoDownload {
                     }
                 }
 
-                if(videoSource is IVideoUrlSource)
+                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)
+                        "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) {
@@ -542,9 +508,9 @@ class VideoDownload {
                     }
                 }
 
-                if(audioSource is IAudioUrlSource)
+                if(actualAudioSource is IAudioUrlSource)
                     audioFileSize = when (audioSource!!.container) {
-                        "application/vnd.apple.mpegurl" -> downloadHlsSource(context, "Audio", client, if (audioSourceLive is JSSource) audioSourceLive 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) {
@@ -598,15 +564,7 @@ class VideoDownload {
         }
     }
 
-    private fun decryptSegment(encryptedSegment: ByteArray, key: ByteArray, iv: ByteArray): ByteArray {
-        val cipher = Cipher.getInstance("AES/CBC/PKCS5Padding")
-        val secretKey = SecretKeySpec(key, "AES")
-        val ivSpec = IvParameterSpec(iv)
-        cipher.init(Cipher.DECRYPT_MODE, secretKey, ivSpec)
-        return cipher.doFinal(encryptedSegment)
-    }
-
-    private suspend fun downloadHlsSource(context: Context, name: String, client: ManagedHttpClient, source: JSSource?, hlsUrl: String, targetFile: File, onProgress: (Long, Long, Long) -> Unit): Long {
+    private suspend fun downloadHlsSource(context: Context, name: String, client: ManagedHttpClient, hlsUrl: String, targetFile: File, onProgress: (Long, Long, Long) -> Unit): Long {
         if(targetFile.exists())
             targetFile.delete();
 
@@ -614,33 +572,13 @@ class VideoDownload {
 
         val segmentFiles = arrayListOf<File>()
         try {
-            val response = if (source is JSSource && source.hasRequestModifier) {
-                val request = source.getRequestModifier()!!.modifyRequest(hlsUrl, mapOf())
-                client.get(request.url!!, request.headers.toMutableMap())
-            } else {
-                client.get(hlsUrl)
-            }
+            val response = client.get(hlsUrl)
             check(response.isOk) { "Failed to get variant playlist: ${response.code}" }
 
             val vpContent = response.body?.string()
                 ?: throw Exception("Variant playlist content is empty")
 
             val variantPlaylist = HLS.parseVariantPlaylist(vpContent, hlsUrl)
-
-            val decryptionInfo: DecryptionInfo? = if (variantPlaylist.decryptionInfo != null) {
-                val keyResponse = if (source is JSSource && source.hasRequestModifier) {
-                    val request = source.getRequestModifier()!!.modifyRequest(variantPlaylist.decryptionInfo.keyUrl, mapOf())
-                    client.get(request.url!!, request.headers.toMutableMap())
-                } else {
-                    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
-            }
-
             variantPlaylist.segments.forEachIndexed { index, segment ->
                 if (segment !is HLS.MediaSegment) {
                     return@forEachIndexed
@@ -652,7 +590,7 @@ class VideoDownload {
                 try {
                     segmentFiles.add(segmentFile)
 
-                    val segmentLength = downloadSource_Sequential(client, outputStream, segment.uri, if (index == 0) null else decryptionInfo) { segmentLength, totalRead, lastSpeed ->
+                    val segmentLength = downloadSource_Sequential(client, outputStream, segment.uri) { segmentLength, totalRead, lastSpeed ->
                         val averageSegmentLength = if (index == 0) segmentLength else downloadedTotalLength / index
                         val expectedTotalLength = averageSegmentLength * (variantPlaylist.segments.size - 1) + segmentLength
                         onProgress(expectedTotalLength, downloadedTotalLength + totalRead, lastSpeed)
@@ -692,8 +630,10 @@ class VideoDownload {
 
     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 fileList = File(context.cacheDir, "fileList-${UUID.randomUUID()}.txt")
+            fileList.writeText(segmentFiles.joinToString("\n") { "file '${it.absolutePath}'" })
+
+            val cmd = "-f concat -safe 0 -i \"${fileList.absolutePath}\" -c copy \"${targetFile.absolutePath}\""
 
             val statisticsCallback = StatisticsCallback { _ ->
                 //TODO: Show progress?
@@ -703,6 +643,7 @@ class VideoDownload {
             val session = FFmpegKit.executeAsync(cmd,
                 { session ->
                     if (ReturnCode.isSuccess(session.returnCode)) {
+                        fileList.delete()
                         continuation.resumeWith(Result.success(Unit))
                     } else {
                         val errorMessage = if (ReturnCode.isCancel(session.returnCode)) {
@@ -710,6 +651,7 @@ class VideoDownload {
                         } else {
                             "Command failed with state '${session.state}' and return code ${session.returnCode}, stack trace ${session.failStackTrace}"
                         }
+                        fileList.delete()
                         continuation.resumeWithException(RuntimeException(errorMessage))
                     }
                 },
@@ -829,7 +771,7 @@ class VideoDownload {
             else {
                 Logger.i(TAG, "Download $name Sequential");
                 try {
-                    sourceLength = downloadSource_Sequential(client, fileStream, videoUrl, null, onProgress);
+                    sourceLength = downloadSource_Sequential(client, fileStream, videoUrl, onProgress);
                 } catch (e: Throwable) {
                     Logger.w(TAG, "Failed to download sequentially (url = $videoUrl)")
                     throw e
@@ -856,31 +798,7 @@ class VideoDownload {
         }
         return sourceLength!!;
     }
-
-    data class DecryptionInfo(
-        val key: ByteArray,
-        val iv: ByteArray
-    ) {
-        override fun equals(other: Any?): Boolean {
-            if (this === other) return true
-            if (javaClass != other?.javaClass) return false
-
-            other as DecryptionInfo
-
-            if (!key.contentEquals(other.key)) return false
-            if (!iv.contentEquals(other.iv)) return false
-
-            return true
-        }
-
-        override fun hashCode(): Int {
-            var result = key.contentHashCode()
-            result = 31 * result + iv.contentHashCode()
-            return result
-        }
-    }
-
-    private fun downloadSource_Sequential(client: ManagedHttpClient, fileStream: FileOutputStream, url: String, decryptionInfo: DecryptionInfo?, onProgress: (Long, Long, Long) -> Unit): Long {
+    private fun downloadSource_Sequential(client: ManagedHttpClient, fileStream: FileOutputStream, url: String, onProgress: (Long, Long, Long) -> Unit): Long {
         val progressRate: Int = 4096 * 5;
         var lastProgressCount: Int = 0;
         val speedRate: Int = 4096 * 5;
@@ -900,8 +818,6 @@ class VideoDownload {
         val sourceLength = result.body.contentLength();
         val sourceStream = result.body.byteStream();
 
-        val segmentBuffer = ByteArrayOutputStream()
-
         var totalRead: Long = 0;
         try {
             var read: Int;
@@ -912,7 +828,7 @@ class VideoDownload {
                 if (read < 0)
                     break;
 
-                segmentBuffer.write(buffer, 0, read);
+                fileStream.write(buffer, 0, read);
 
                 totalRead += read;
 
@@ -938,14 +854,6 @@ class VideoDownload {
             result.body.close()
         }
 
-        if (decryptionInfo != null) {
-            val decryptedData =
-                decryptSegment(segmentBuffer.toByteArray(), decryptionInfo.key, decryptionInfo.iv)
-            fileStream.write(decryptedData)
-        } else {
-            fileStream.write(segmentBuffer.toByteArray())
-        }
-
         onProgress(sourceLength, totalRead, 0);
         return sourceLength;
     }
@@ -1164,8 +1072,8 @@ class VideoDownload {
     fun complete() {
         Logger.i(TAG, "VideoDownload Complete [${name}]");
         val existing = StateDownloads.instance.getCachedVideo(id);
-        val localVideoSource = videoFilePath?.let { LocalVideoSource.fromSource(videoSourceToUse!!, it, videoFileSize ?: 0) };
-        val localAudioSource = audioFilePath?.let { LocalAudioSource.fromSource(audioSourceToUse!!, it, audioFileSize ?: 0) };
+        val localVideoSource = videoFilePath?.let { LocalVideoSource.fromSource(videoSourceToUse!!, it, videoFileSize ?: 0, videoOverrideContainer) };
+        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)
@@ -1246,7 +1154,7 @@ class VideoDownload {
             else if (container.contains("video/x-matroska"))
                 return "mkv";
             else
-                return "video";
+                return "video";//throw IllegalStateException("Unknown container: " + container)
         }
 
         fun audioContainerToExtension(container: String): String {
@@ -1257,11 +1165,11 @@ class VideoDownload {
             else if (container.contains("audio/mp3"))
                 return "mp3";
             else if (container.contains("audio/webm"))
-                return "webma";
+                return "webm";
             else if (container == "application/vnd.apple.mpegurl")
-                return "mp4";
+                return "mp4a";
             else
-                return "audio";
+                return "audio";// throw IllegalStateException("Unknown container: " + container)
         }
 
         fun subtitleContainerToExtension(container: String?): String {

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

@@ -39,7 +39,7 @@ class VideoExport {
         this.subtitleSource = subtitleSource;
     }
 
-    suspend fun export(context: Context, onProgress: ((Double) -> Unit)? = null): DocumentFile = coroutineScope {
+    suspend fun export(context: Context, onProgress: ((Double) -> Unit)? = null, documentRoot: DocumentFile? = null): DocumentFile = coroutineScope {
         val v = videoSource;
         val a = audioSource;
         val s = subtitleSource;
@@ -50,7 +50,7 @@ class VideoExport {
         if (s != null) sourceCount++;
 
         val outputFile: DocumentFile?;
-        val downloadRoot = StateApp.instance.getExternalDownloadDirectory(context) ?: throw Exception("External download directory is not set");
+        val downloadRoot = documentRoot ?: StateApp.instance.getExternalDownloadDirectory(context) ?: throw Exception("External download directory is not set");
         if (sourceCount > 1) {
             val outputFileName = videoLocal.name.sanitizeFileName(true) + ".mp4"// + VideoDownload.videoContainerToExtension(v.container);
             val f = downloadRoot.createFile("video/mp4", outputFileName)

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

@@ -10,7 +10,7 @@ import com.futo.platformplayer.api.media.models.contents.IPlatformContent
 import com.futo.platformplayer.api.media.models.playback.IPlaybackTracker
 import com.futo.platformplayer.api.media.models.ratings.IRating
 import com.futo.platformplayer.api.media.models.streams.IVideoSourceDescriptor
-import com.futo.platformplayer.api.media.models.streams.LocalVideoMuxedSourceDescriptor
+import com.futo.platformplayer.api.media.models.streams.DownloadedVideoMuxedSourceDescriptor
 import com.futo.platformplayer.api.media.models.streams.LocalVideoUnMuxedSourceDescriptor
 import com.futo.platformplayer.api.media.models.streams.sources.IDashManifestSource
 import com.futo.platformplayer.api.media.models.streams.sources.IHLSManifestSource
@@ -57,7 +57,7 @@ class VideoLocal: IPlatformVideoDetails, IStoreItem {
     override val video: IVideoSourceDescriptor get() = if(audioSource.isNotEmpty())
         LocalVideoUnMuxedSourceDescriptor(this)
     else
-        LocalVideoMuxedSourceDescriptor(this);
+        DownloadedVideoMuxedSourceDescriptor(this);
     override val preview: IVideoSourceDescriptor? get() = videoSerialized.preview;
 
     override val live: IVideoSource? get() = videoSerialized.live;

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

@@ -13,7 +13,6 @@ import com.futo.platformplayer.R
 import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
 import com.futo.platformplayer.dp
 import com.futo.platformplayer.fixHtmlLinks
-import com.futo.platformplayer.fragment.mainactivity.main.PolycentricProfile
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.resolveChannelUrl
 import com.futo.platformplayer.selectBestImage
@@ -21,6 +20,7 @@ import com.futo.platformplayer.setPlatformPlayerLinkMovementMethod
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.toHumanNumber
 import com.futo.platformplayer.views.platform.PlatformLinkView
+import com.futo.polycentric.core.PolycentricProfile
 import com.futo.polycentric.core.toName
 import com.futo.polycentric.core.toURLInfoSystemLinkUrl
 
@@ -134,9 +134,7 @@ class ChannelAboutFragment : Fragment, IChannelTabFragment {
             }
         }
         if(!map.containsKey("Harbor"))
-            this.context?.let {
-                map.set("Harbor", polycentricProfile.getHarborUrl(it));
-            }
+            map.set("Harbor", polycentricProfile.getHarborUrl());
 
         if (map.isNotEmpty())
             setLinks(map, if (polycentricProfile.systemState.username.isNotBlank()) polycentricProfile.systemState.username else _lastChannel?.name ?: "")

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

@@ -29,7 +29,6 @@ import com.futo.platformplayer.engine.exceptions.PluginException
 import com.futo.platformplayer.engine.exceptions.ScriptCaptchaRequiredException
 import com.futo.platformplayer.exceptions.ChannelException
 import com.futo.platformplayer.fragment.mainactivity.main.FeedView
-import com.futo.platformplayer.fragment.mainactivity.main.PolycentricProfile
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateCache
 import com.futo.platformplayer.states.StatePlatform
@@ -39,6 +38,7 @@ import com.futo.platformplayer.views.FeedStyle
 import com.futo.platformplayer.views.adapters.ContentPreviewViewHolder
 import com.futo.platformplayer.views.adapters.InsertedViewAdapterWithLoader
 import com.futo.platformplayer.views.adapters.feedtypes.PreviewContentListAdapter
+import com.futo.polycentric.core.PolycentricProfile
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlin.math.max

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

@@ -16,12 +16,12 @@ import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.constructs.TaskHandler
 import com.futo.platformplayer.engine.exceptions.ScriptCaptchaRequiredException
 import com.futo.platformplayer.fragment.mainactivity.main.ChannelFragment
-import com.futo.platformplayer.fragment.mainactivity.main.PolycentricProfile
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.resolveChannelUrl
 import com.futo.platformplayer.states.StatePlatform
 import com.futo.platformplayer.views.adapters.InsertedViewAdapterWithLoader
 import com.futo.platformplayer.views.adapters.viewholders.CreatorViewHolder
+import com.futo.polycentric.core.PolycentricProfile
 
 class ChannelListFragment : Fragment, IChannelTabFragment {
     private var _channels: ArrayList<IPlatformChannel> = arrayListOf();

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

@@ -8,8 +8,8 @@ import android.widget.TextView
 import androidx.fragment.app.Fragment
 import com.futo.platformplayer.R
 import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
-import com.futo.platformplayer.fragment.mainactivity.main.PolycentricProfile
 import com.futo.platformplayer.views.SupportView
+import com.futo.polycentric.core.PolycentricProfile
 
 
 class ChannelMonetizationFragment : Fragment, IChannelTabFragment {

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

@@ -1,7 +1,7 @@
 package com.futo.platformplayer.fragment.channel.tab
 
 import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
-import com.futo.platformplayer.fragment.mainactivity.main.PolycentricProfile
+import com.futo.polycentric.core.PolycentricProfile
 
 interface IChannelTabFragment {
     fun setChannel(channel: IPlatformChannel)

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

@@ -42,7 +42,6 @@ import com.futo.platformplayer.images.GlideHelper.Companion.crossfade
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.SearchType
 import com.futo.platformplayer.models.Subscription
-import com.futo.platformplayer.polycentric.PolycentricCache
 import com.futo.platformplayer.selectBestImage
 import com.futo.platformplayer.selectHighestResolutionImage
 import com.futo.platformplayer.states.StatePlatform
@@ -55,29 +54,14 @@ 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.polycentric.core.OwnedClaim
-import com.futo.polycentric.core.PublicKey
-import com.futo.polycentric.core.Store
-import com.futo.polycentric.core.SystemState
-import com.futo.polycentric.core.systemToURLInfoSystemLinkUrl
+import com.futo.polycentric.core.ApiMethods
+import com.futo.polycentric.core.PolycentricProfile
 import com.futo.polycentric.core.toURLInfoSystemLinkUrl
 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
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class PolycentricProfile(
-    val system: PublicKey, val systemState: SystemState, val ownedClaims: List<OwnedClaim>
-) {
-    fun getHarborUrl(context: Context): String{
-        val systemState = SystemState.fromStorageTypeSystemState(Store.instance.getSystemState(system));
-        val url = system.systemToURLInfoSystemLinkUrl(systemState.servers.asIterable());
-        return "https://harbor.social/" + url.substring("polycentric://".length);
-    }
-}
 
 class ChannelFragment : MainFragment() {
     override val isMainView: Boolean = true
@@ -144,15 +128,14 @@ class ChannelFragment : MainFragment() {
 
         private val _onPageChangeCallback = object : ViewPager2.OnPageChangeCallback() {}
 
-        private val _taskLoadPolycentricProfile: TaskHandler<PlatformID, PolycentricCache.CachedPolycentricProfile?>
+        private val _taskLoadPolycentricProfile: TaskHandler<PlatformID, PolycentricProfile?>
         private val _taskGetChannel: TaskHandler<String, IPlatformChannel>
 
         init {
             inflater.inflate(R.layout.fragment_channel, this)
-            _taskLoadPolycentricProfile =
-                TaskHandler<PlatformID, PolycentricCache.CachedPolycentricProfile?>({ fragment.lifecycleScope },
+            _taskLoadPolycentricProfile = TaskHandler<PlatformID, PolycentricProfile?>({ fragment.lifecycleScope },
                     { id ->
-                        return@TaskHandler PolycentricCache.instance.getProfileAsync(id)
+                        return@TaskHandler ApiMethods.getPolycentricProfileByClaim(ApiMethods.SERVER, ApiMethods.FUTO_TRUST_ROOT, id.claimFieldType.toLong(), id.claimType.toLong(), id.value!!)
                     }).success { setPolycentricProfile(it, animate = true) }.exception<Throwable> {
                     Logger.w(TAG, "Failed to load polycentric profile.", it)
                 }
@@ -238,8 +221,8 @@ class ChannelFragment : MainFragment() {
             }
             adapter.onAddToWatchLaterClicked.subscribe { content ->
                 if (content is IPlatformVideo) {
-                    StatePlaylists.instance.addToWatchLater(SerializedPlatformVideo.fromVideo(content), true)
-                    UIDialogs.toast("Added to watch later\n[${content.name}]")
+                    if(StatePlaylists.instance.addToWatchLater(SerializedPlatformVideo.fromVideo(content), true))
+                        UIDialogs.toast("Added to watch later\n[${content.name}]")
                 }
             }
             adapter.onUrlClicked.subscribe { url ->
@@ -328,7 +311,7 @@ class ChannelFragment : MainFragment() {
                             _creatorThumbnail.setThumbnail(parameter.thumbnail, true)
                             Glide.with(_imageBanner).clear(_imageBanner)
 
-                            loadPolycentricProfile(parameter.id, parameter.url)
+                            loadPolycentricProfile(parameter.id)
                         }
 
                         _url = parameter.url
@@ -342,7 +325,7 @@ class ChannelFragment : MainFragment() {
                             _creatorThumbnail.setThumbnail(parameter.channel.thumbnail, true)
                             Glide.with(_imageBanner).clear(_imageBanner)
 
-                            loadPolycentricProfile(parameter.channel.id, parameter.channel.url)
+                            loadPolycentricProfile(parameter.channel.id)
                         }
 
                         _url = parameter.channel.url
@@ -359,16 +342,8 @@ class ChannelFragment : MainFragment() {
             _tabs.selectTab(_tabs.getTabAt(selectedTabIndex))
         }
 
-        private fun loadPolycentricProfile(id: PlatformID, url: String) {
-            val cachedPolycentricProfile = PolycentricCache.instance.getCachedProfile(url, true)
-            if (cachedPolycentricProfile != null) {
-                setPolycentricProfile(cachedPolycentricProfile, animate = true)
-                if (cachedPolycentricProfile.expired) {
-                    _taskLoadPolycentricProfile.run(id)
-                }
-            } else {
-                _taskLoadPolycentricProfile.run(id)
-            }
+        private fun loadPolycentricProfile(id: PlatformID) {
+            _taskLoadPolycentricProfile.run(id)
         }
 
         private fun setLoading(isLoading: Boolean) {
@@ -533,20 +508,13 @@ class ChannelFragment : MainFragment() {
 
         private fun setPolycentricProfileOr(url: String, or: () -> Unit) {
             setPolycentricProfile(null, animate = false)
-
-            val cachedProfile = channel?.let { PolycentricCache.instance.getCachedProfile(url) }
-            if (cachedProfile != null) {
-                setPolycentricProfile(cachedProfile, animate = false)
-            } else {
-                or()
-            }
+            or()
         }
 
         private fun setPolycentricProfile(
-            cachedPolycentricProfile: PolycentricCache.CachedPolycentricProfile?, animate: Boolean
+            profile: PolycentricProfile?, animate: Boolean
         ) {
             val dp35 = 35.dp(resources)
-            val profile = cachedPolycentricProfile?.profile
             val avatar = profile?.systemState?.avatar?.selectBestImage(dp35 * dp35)?.let {
                 it.toURLInfoSystemLinkUrl(
                     profile.system.toProto(), it.process, profile.systemState.servers.toList()

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

@@ -23,7 +23,6 @@ import com.futo.platformplayer.api.media.models.comments.IPlatformComment
 import com.futo.platformplayer.api.media.models.comments.PolycentricPlatformComment
 import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
 import com.futo.platformplayer.constructs.TaskHandler
-import com.futo.platformplayer.fullyBackfillServersAnnounceExceptions
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StatePlatform
@@ -32,6 +31,7 @@ import com.futo.platformplayer.views.adapters.CommentWithReferenceViewHolder
 import com.futo.platformplayer.views.adapters.InsertedViewAdapterWithLoader
 import com.futo.platformplayer.views.overlays.RepliesOverlay
 import com.futo.polycentric.core.PublicKey
+import com.futo.polycentric.core.fullyBackfillServersAnnounceExceptions
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import java.net.UnknownHostException

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

@@ -82,8 +82,8 @@ abstract class ContentFeedView<TFragment> : FeedView<TFragment, IPlatformContent
         };
         adapter.onAddToWatchLaterClicked.subscribe(this) {
             if(it is IPlatformVideo) {
-                StatePlaylists.instance.addToWatchLater(SerializedPlatformVideo.fromVideo(it), true);
-                UIDialogs.toast("Added to watch later\n[${it.name}]");
+                if(StatePlaylists.instance.addToWatchLater(SerializedPlatformVideo.fromVideo(it), true))
+                    UIDialogs.toast("Added to watch later\n[${it.name}]");
             }
         };
         adapter.onLongPress.subscribe(this) {

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

@@ -9,6 +9,7 @@ import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.UISlideOverlays
+import com.futo.platformplayer.activities.MainActivity
 import com.futo.platformplayer.api.media.models.ResultCapabilities
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
 import com.futo.platformplayer.api.media.structures.IPager
@@ -160,8 +161,14 @@ class ContentSearchResultsFragment : MainFragment() {
                                 navigate<RemotePlaylistFragment>(it);
                             else if(StatePlatform.instance.hasEnabledChannelClient(it))
                                 navigate<ChannelFragment>(it);
-                            else
-                                navigate<VideoDetailFragment>(it);
+                            else {
+                                val url = it;
+                                activity?.let {
+                                    close()
+                                    if(it is MainActivity)
+                                        it.navigate(it.getFragment<VideoDetailFragment>(), url);
+                                }
+                            }
                         }
                         else
                             setQuery(it, true);

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

@@ -10,6 +10,7 @@ import android.widget.EditText
 import android.widget.FrameLayout
 import android.widget.ImageButton
 import android.widget.Spinner
+import android.widget.TextView
 import androidx.core.widget.addTextChangedListener
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -26,6 +27,7 @@ class CreatorsFragment : MainFragment() {
     private var _overlayContainer: FrameLayout? = null;
     private var _containerSearch: FrameLayout? = null;
     private var _editSearch: EditText? = null;
+    private var _textMeta: TextView? = null;
     private var _buttonClearSearch: ImageButton? = null
 
     override fun onCreateMainView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
@@ -34,6 +36,7 @@ class CreatorsFragment : MainFragment() {
         val editSearch: EditText = view.findViewById(R.id.edit_search);
         val buttonClearSearch: ImageButton = view.findViewById(R.id.button_clear_search)
         _editSearch = editSearch
+        _textMeta = view.findViewById(R.id.text_meta);
         _buttonClearSearch = buttonClearSearch
         buttonClearSearch.setOnClickListener {
             editSearch.text.clear()
@@ -41,7 +44,11 @@ class CreatorsFragment : MainFragment() {
             _buttonClearSearch?.visibility = View.INVISIBLE;
         }
 
-        val adapter = SubscriptionAdapter(inflater, getString(R.string.confirm_delete_subscription));
+        val adapter = SubscriptionAdapter(inflater, getString(R.string.confirm_delete_subscription)) { subs ->
+            _textMeta?.let {
+                it.text = "${subs.size} creator${if(subs.size > 1) "s" else ""}";
+            }
+        };
         adapter.onClick.subscribe { platformUser -> navigate<ChannelFragment>(platformUser) };
         adapter.onSettings.subscribe { sub -> _overlayContainer?.let { UISlideOverlays.showSubscriptionOptionsOverlay(sub, it) } }
 

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

@@ -22,6 +22,7 @@ import com.futo.platformplayer.states.StateDownloads
 import com.futo.platformplayer.states.StatePlayer
 import com.futo.platformplayer.states.StatePlaylists
 import com.futo.platformplayer.toHumanBytesSize
+import com.futo.platformplayer.toHumanDuration
 import com.futo.platformplayer.views.AnyInsertedAdapterView
 import com.futo.platformplayer.views.AnyInsertedAdapterView.Companion.asAnyWithTop
 import com.futo.platformplayer.views.adapters.viewholders.VideoDownloadViewHolder
@@ -215,7 +216,7 @@ class DownloadsFragment : MainFragment() {
                 _listDownloadedHeader.visibility = GONE;
             } else {
                 _listDownloadedHeader.visibility = VISIBLE;
-                _listDownloadedMeta.text = "(${downloaded.size} ${context.getString(R.string.videos).lowercase()})";
+                _listDownloadedMeta.text = "(${downloaded.size} ${context.getString(R.string.videos).lowercase()}${if(downloaded.size > 0) ", ${downloaded.sumOf { it.duration }.toHumanDuration(false)}" else ""})";
             }
 
             lastDownloads = downloaded;
@@ -228,7 +229,7 @@ class DownloadsFragment : MainFragment() {
         fun filterDownloads(vids: List<VideoLocal>): List<VideoLocal>{
             var vidsToReturn = vids;
             if(!_listDownloadSearch.text.isNullOrEmpty())
-                vidsToReturn = vids.filter { it.name.contains(_listDownloadSearch.text, true) };
+                vidsToReturn = vids.filter { it.name.contains(_listDownloadSearch.text, true) || it.author.name.contains(_listDownloadSearch.text, true) };
             if(!ordering.isNullOrEmpty()) {
                 vidsToReturn = when(ordering){
                     "downloadDateAsc" -> vidsToReturn.sortedBy { it.downloadDate ?: OffsetDateTime.MAX };

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

@@ -23,6 +23,7 @@ import com.futo.platformplayer.states.StateMeta
 import com.futo.platformplayer.states.StatePlatform
 import com.futo.platformplayer.views.FeedStyle
 import com.futo.platformplayer.views.NoResultsView
+import com.futo.platformplayer.views.ToggleBar
 import com.futo.platformplayer.views.adapters.ContentPreviewViewHolder
 import com.futo.platformplayer.views.adapters.InsertedViewAdapterWithLoader
 import com.futo.platformplayer.views.adapters.InsertedViewHolder
@@ -94,6 +95,8 @@ class HomeFragment : MainFragment() {
     class HomeView : ContentFeedView<HomeFragment> {
         override val feedStyle: FeedStyle get() = Settings.instance.home.getHomeFeedStyle();
 
+        private var _toggleBar: ToggleBar? = null;
+
         private val _taskGetPager: TaskHandler<Boolean, IPager<IPlatformContent>>;
         override val shouldShowTimeBar: Boolean get() = Settings.instance.home.progressBar
 
@@ -127,6 +130,8 @@ class HomeFragment : MainFragment() {
                 }, fragment);
             };
 
+            initializeToolbarContent();
+
             setPreviewsEnabled(Settings.instance.home.previewFeedItems);
             showAnnouncementView()
         }
@@ -201,13 +206,43 @@ class HomeFragment : MainFragment() {
             loadResults();
         }
 
-        override fun filterResults(results: List<IPlatformContent>): List<IPlatformContent> {
-            return results.filter { !StateMeta.instance.isVideoHidden(it.url) && !StateMeta.instance.isCreatorHidden(it.author.url) };
+        private val _filterLock = Object();
+        private var _toggleRecent = false;
+        fun initializeToolbarContent() {
+            //Not stable enough with current viewport paging, doesn't work with less results, and reloads content instead of just re-filtering existing
+            /*
+            _toggleBar = ToggleBar(context).apply {
+                layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
+            }
+            synchronized(_filterLock) {
+                _toggleBar?.setToggles(
+                    //TODO: loadResults needs to be replaced with an internal reload of the current content
+                    ToggleBar.Toggle("Recent", _toggleRecent) { _toggleRecent = it; loadResults(false) }
+                )
+            }
+
+            _toolbarContentView.addView(_toggleBar, 0);
+            */
         }
 
-        private fun loadResults() {
+        override fun filterResults(results: List<IPlatformContent>): List<IPlatformContent> {
+            return results.filter {
+                if(StateMeta.instance.isVideoHidden(it.url))
+                    return@filter false;
+                if(StateMeta.instance.isCreatorHidden(it.author.url))
+                    return@filter false;
+
+                if(_toggleRecent && (it.datetime?.getNowDiffHours() ?: 0) > 23) {
+                    return@filter false;
+                }
+
+                return@filter true;
+            };
+        }
+
+        private fun loadResults(withRefetch: Boolean = true) {
             setLoading(true);
-            _taskGetPager.run(true);
+            _taskGetPager.run(withRefetch);
         }
         private fun loadedResult(pager : IPager<IPlatformContent>) {
             if (pager is EmptyPager<IPlatformContent>) {

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

@@ -8,6 +8,7 @@ import android.view.ViewGroup
 import androidx.core.app.ShareCompat
 import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.*
+import com.futo.platformplayer.activities.IWithResultLauncher
 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
@@ -78,6 +79,14 @@ class PlaylistFragment : MainFragment() {
             val nameInput = SlideUpMenuTextInput(context, context.getString(R.string.name));
             val editPlaylistOverlay = SlideUpMenuOverlay(context, overlayContainer, context.getString(R.string.edit_playlist), context.getString(R.string.ok), false, nameInput);
 
+            _buttonExport.setOnClickListener {
+                _playlist?.let {
+                    val context = StateApp.instance.contextOrNull ?: return@let;
+                    if(context is IWithResultLauncher)
+                        StateDownloads.instance.exportPlaylist(context, it.id);
+                }
+            };
+
             _buttonDownload.visibility = View.VISIBLE;
             editPlaylistOverlay.onOK.subscribe {
                 val text = nameInput.text;
@@ -176,6 +185,7 @@ class PlaylistFragment : MainFragment() {
                     setVideos(parameter.videos, true)
                     setMetadata(parameter.videos.size, parameter.videos.sumOf { it.duration })
                     setButtonDownloadVisible(true)
+                    setButtonExportVisible(false)
                     setButtonEditVisible(true)
 
                     if (!StatePlaylists.instance.playlistStore.hasItem { it.id == parameter.id }) {

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

@@ -6,12 +6,17 @@ 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.LinearLayout
+import android.widget.Spinner
 import android.widget.TextView
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.widget.addTextChangedListener
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -21,11 +26,13 @@ import com.futo.platformplayer.api.media.models.video.IPlatformVideo
 import com.futo.platformplayer.models.Playlist
 import com.futo.platformplayer.states.StatePlayer
 import com.futo.platformplayer.states.StatePlaylists
+import com.futo.platformplayer.views.SearchView
 import com.futo.platformplayer.views.adapters.*
 import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuOverlay
 import com.google.android.material.appbar.AppBarLayout
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import java.time.OffsetDateTime
 
 
 class PlaylistsFragment : MainFragment() {
@@ -65,6 +72,7 @@ class PlaylistsFragment : MainFragment() {
         private val _fragment: PlaylistsFragment;
 
         var watchLater: ArrayList<IPlatformVideo> = arrayListOf();
+        var allPlaylists: ArrayList<Playlist> = arrayListOf();
         var playlists: ArrayList<Playlist> = arrayListOf();
         private var _appBar: AppBarLayout;
         private var _adapterWatchLater: VideoListHorizontalAdapter;
@@ -72,12 +80,20 @@ class PlaylistsFragment : MainFragment() {
         private var _layoutWatchlist: ConstraintLayout;
         private var _slideUpOverlay: SlideUpMenuOverlay? = null;
 
+        private var _listPlaylistsSearch: EditText;
+
+        private var _ordering: String? = null;
+
+
         constructor(fragment: PlaylistsFragment, inflater: LayoutInflater) : super(inflater.context) {
             _fragment = fragment;
             inflater.inflate(R.layout.fragment_playlists, this);
 
+            _listPlaylistsSearch = findViewById(R.id.playlists_search);
+
             watchLater = ArrayList();
             playlists = ArrayList();
+            allPlaylists = ArrayList();
 
             val recyclerWatchLater = findViewById<RecyclerView>(R.id.recycler_watch_later);
 
@@ -105,6 +121,7 @@ class PlaylistsFragment : MainFragment() {
             buttonCreatePlaylist.setOnClickListener {
                 _slideUpOverlay = UISlideOverlays.showCreatePlaylistOverlay(findViewById<FrameLayout>(R.id.overlay_create_playlist)) {
                     val playlist = Playlist(it, arrayListOf());
+                    allPlaylists.add(0, playlist);
                     playlists.add(0, playlist);
                     StatePlaylists.instance.createOrUpdatePlaylist(playlist);
 
@@ -120,6 +137,34 @@ class PlaylistsFragment : MainFragment() {
             _appBar = findViewById(R.id.app_bar);
             _layoutWatchlist = findViewById(R.id.layout_watchlist);
 
+
+            _listPlaylistsSearch.addTextChangedListener {
+                updatePlaylistsFiltering();
+            }
+            val spinnerSortBy: Spinner = findViewById(R.id.spinner_sortby);
+            spinnerSortBy.adapter = ArrayAdapter(context, R.layout.spinner_item_simple, resources.getStringArray(R.array.playlists_sortby_array)).also {
+                it.setDropDownViewResource(R.layout.spinner_dropdownitem_simple);
+            };
+            spinnerSortBy.setSelection(0);
+            spinnerSortBy.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+                override fun onItemSelected(parent: AdapterView<*>, view: View?, pos: Int, id: Long) {
+                    when(pos) {
+                        0 -> _ordering = "nameAsc"
+                        1 -> _ordering = "nameDesc"
+                        2 -> _ordering = "dateEditAsc"
+                        3 -> _ordering = "dateEditDesc"
+                        4 -> _ordering = "dateCreateAsc"
+                        5 -> _ordering = "dateCreateDesc"
+                        6 -> _ordering = "datePlayAsc"
+                        7 -> _ordering = "datePlayDesc"
+                        else -> _ordering = null
+                    }
+                    updatePlaylistsFiltering()
+                }
+                override fun onNothingSelected(parent: AdapterView<*>?) = Unit
+            };
+
+
             findViewById<TextView>(R.id.text_view_all).setOnClickListener { _fragment.navigate<WatchLaterFragment>(context.getString(R.string.watch_later)); };
             StatePlaylists.instance.onWatchLaterChanged.subscribe(this) {
                 fragment.lifecycleScope.launch(Dispatchers.Main) {
@@ -134,10 +179,12 @@ class PlaylistsFragment : MainFragment() {
 
         @SuppressLint("NotifyDataSetChanged")
         fun onShown() {
+            allPlaylists.clear();
             playlists.clear()
-            playlists.addAll(
+            allPlaylists.addAll(
                 StatePlaylists.instance.getPlaylists().sortedByDescending { maxOf(it.datePlayed, it.dateUpdate, it.dateCreation) }
             );
+            playlists.addAll(filterPlaylists(allPlaylists));
             _adapterPlaylist.notifyDataSetChanged();
 
             updateWatchLater();
@@ -157,6 +204,32 @@ class PlaylistsFragment : MainFragment() {
             return false;
         }
 
+        private fun updatePlaylistsFiltering() {
+            val toFilter = allPlaylists ?: return;
+            playlists.clear();
+            playlists.addAll(filterPlaylists(toFilter));
+            _adapterPlaylist.notifyDataSetChanged();
+        }
+        private fun filterPlaylists(pls: List<Playlist>): List<Playlist> {
+            var playlistsToReturn = pls;
+            if(!_listPlaylistsSearch.text.isNullOrEmpty())
+                playlistsToReturn = playlistsToReturn.filter { it.name.contains(_listPlaylistsSearch.text, true) };
+            if(!_ordering.isNullOrEmpty()){
+                playlistsToReturn = when(_ordering){
+                    "nameAsc" -> playlistsToReturn.sortedBy { it.name.lowercase() }
+                    "nameDesc" -> playlistsToReturn.sortedByDescending { it.name.lowercase() };
+                    "dateEditAsc" -> playlistsToReturn.sortedBy { it.dateUpdate ?: OffsetDateTime.MAX };
+                    "dateEditDesc" -> playlistsToReturn.sortedByDescending { it.dateUpdate ?: OffsetDateTime.MIN }
+                    "dateCreateAsc" -> playlistsToReturn.sortedBy { it.dateCreation ?: OffsetDateTime.MAX };
+                    "dateCreateDesc" -> playlistsToReturn.sortedByDescending { it.dateCreation ?: OffsetDateTime.MIN }
+                    "datePlayAsc" -> playlistsToReturn.sortedBy { it.datePlayed ?: OffsetDateTime.MAX };
+                    "datePlayDesc" -> playlistsToReturn.sortedByDescending { it.datePlayed ?: OffsetDateTime.MIN }
+                    else -> playlistsToReturn
+                }
+            }
+            return playlistsToReturn;
+        }
+
         private fun updateWatchLater() {
             val watchList = StatePlaylists.instance.getWatchLater();
             if (watchList.isNotEmpty()) {
@@ -164,7 +237,7 @@ class PlaylistsFragment : MainFragment() {
 
                 _appBar.let { appBar ->
                     val layoutParams: CoordinatorLayout.LayoutParams = appBar.layoutParams as CoordinatorLayout.LayoutParams;
-                    layoutParams.height = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 230.0f, resources.displayMetrics).toInt();
+                    layoutParams.height = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 315.0f, resources.displayMetrics).toInt();
                     appBar.layoutParams = layoutParams;
                 }
             } else {
@@ -172,7 +245,7 @@ class PlaylistsFragment : MainFragment() {
 
                 _appBar.let { appBar ->
                     val layoutParams: CoordinatorLayout.LayoutParams = appBar.layoutParams as CoordinatorLayout.LayoutParams;
-                    layoutParams.height = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 25.0f, resources.displayMetrics).toInt();
+                    layoutParams.height = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 110.0f, resources.displayMetrics).toInt();
                     appBar.layoutParams = layoutParams;
                 };
             }

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

@@ -33,10 +33,8 @@ import com.futo.platformplayer.api.media.models.ratings.RatingLikes
 import com.futo.platformplayer.constructs.TaskHandler
 import com.futo.platformplayer.dp
 import com.futo.platformplayer.fixHtmlWhitespace
-import com.futo.platformplayer.fullyBackfillServersAnnounceExceptions
 import com.futo.platformplayer.images.GlideHelper.Companion.crossfade
 import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.polycentric.PolycentricCache
 import com.futo.platformplayer.setPlatformPlayerLinkMovementMethod
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StatePlatform
@@ -47,7 +45,6 @@ import com.futo.platformplayer.views.adapters.ChannelTab
 import com.futo.platformplayer.views.adapters.feedtypes.PreviewPostView
 import com.futo.platformplayer.views.comments.AddCommentView
 import com.futo.platformplayer.views.others.CreatorThumbnail
-import com.futo.platformplayer.views.others.Toggle
 import com.futo.platformplayer.views.overlays.RepliesOverlay
 import com.futo.platformplayer.views.pills.PillRatingLikesDislikes
 import com.futo.platformplayer.views.platform.PlatformIndicator
@@ -57,6 +54,8 @@ import com.futo.polycentric.core.ApiMethods
 import com.futo.polycentric.core.ContentType
 import com.futo.polycentric.core.Models
 import com.futo.polycentric.core.Opinion
+import com.futo.polycentric.core.PolycentricProfile
+import com.futo.polycentric.core.fullyBackfillServersAnnounceExceptions
 import com.google.android.flexbox.FlexboxLayout
 import com.google.android.material.imageview.ShapeableImageView
 import com.google.android.material.shape.CornerFamily
@@ -112,7 +111,7 @@ class PostDetailFragment : MainFragment {
         private var _isLoading = false;
         private var _post: IPlatformPostDetails? = null;
         private var _postOverview: IPlatformPost? = null;
-        private var _polycentricProfile: PolycentricCache.CachedPolycentricProfile? = null;
+        private var _polycentricProfile: PolycentricProfile? = null;
         private var _version = 0;
         private var _isRepliesVisible: Boolean = false;
         private var _repliesAnimator: ViewPropertyAnimator? = null;
@@ -169,7 +168,7 @@ class PostDetailFragment : MainFragment {
                 UIDialogs.showGeneralRetryErrorDialog(context, context.getString(R.string.failed_to_load_post), it, ::fetchPost, null, _fragment);
             } else TaskHandler(IPlatformPostDetails::class.java) { _fragment.lifecycleScope };
 
-        private val _taskLoadPolycentricProfile = TaskHandler<PlatformID, PolycentricCache.CachedPolycentricProfile?>(StateApp.instance.scopeGetter, { PolycentricCache.instance.getProfileAsync(it) })
+        private val _taskLoadPolycentricProfile = TaskHandler<PlatformID, PolycentricProfile?>(StateApp.instance.scopeGetter, { ApiMethods.getPolycentricProfileByClaim(ApiMethods.SERVER, ApiMethods.FUTO_TRUST_ROOT, it.claimFieldType.toLong(), it.claimType.toLong(), it.value!!) })
             .success { it -> setPolycentricProfile(it, animate = true) }
             .exception<Throwable> {
                 Logger.w(TAG, "Failed to load claims.", it);
@@ -274,7 +273,7 @@ class PostDetailFragment : MainFragment {
             };
 
             _buttonStore.setOnClickListener {
-                _polycentricProfile?.profile?.systemState?.store?.let {
+                _polycentricProfile?.systemState?.store?.let {
                     try {
                         val uri = Uri.parse(it);
                         val intent = Intent(Intent.ACTION_VIEW);
@@ -334,7 +333,7 @@ class PostDetailFragment : MainFragment {
                 }
 
                 try {
-                    val queryReferencesResponse = ApiMethods.getQueryReferences(PolycentricCache.SERVER, ref, null,null,
+                    val queryReferencesResponse = ApiMethods.getQueryReferences(ApiMethods.SERVER, ref, null,null,
                         arrayListOf(
                             Protocol.QueryReferencesRequestCountLWWElementReferences.newBuilder().setFromType(
                                 ContentType.OPINION.value).setValue(
@@ -604,16 +603,8 @@ class PostDetailFragment : MainFragment {
 
         private fun fetchPolycentricProfile() {
             val author = _post?.author ?: _postOverview?.author ?: return;
-            val cachedPolycentricProfile = PolycentricCache.instance.getCachedProfile(author.url, true);
-            if (cachedPolycentricProfile != null) {
-                setPolycentricProfile(cachedPolycentricProfile, animate = false);
-                if (cachedPolycentricProfile.expired) {
-                    _taskLoadPolycentricProfile.run(author.id);
-                }
-            } else {
                 setPolycentricProfile(null, animate = false);
                 _taskLoadPolycentricProfile.run(author.id);
-            }
         }
 
         private fun setChannelMeta(value: IPlatformPost?) {
@@ -639,17 +630,18 @@ class PostDetailFragment : MainFragment {
             _repliesOverlay.cleanup();
         }
 
-        private fun setPolycentricProfile(cachedPolycentricProfile: PolycentricCache.CachedPolycentricProfile?, animate: Boolean) {
-            _polycentricProfile = cachedPolycentricProfile;
+        private fun setPolycentricProfile(polycentricProfile: PolycentricProfile?, animate: Boolean) {
+            _polycentricProfile = polycentricProfile;
 
-            if (cachedPolycentricProfile?.profile == null) {
+            val pp = _polycentricProfile;
+            if (pp == null) {
                 _layoutMonetization.visibility = View.GONE;
                 _creatorThumbnail.setHarborAvailable(false, animate, null);
                 return;
             }
 
             _layoutMonetization.visibility = View.VISIBLE;
-            _creatorThumbnail.setHarborAvailable(true, animate, cachedPolycentricProfile.profile.system.toProto());
+            _creatorThumbnail.setHarborAvailable(true, animate, pp.system.toProto());
         }
 
         private fun fetchPost() {

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

@@ -556,7 +556,7 @@ class SourceDetailFragment : MainFragment() {
                     Logger.i(TAG, "Downloaded source config ($sourceUrl):\n${configJson}");
 
                     val config = SourcePluginConfig.fromJson(configJson);
-                    if (config.version <= c.version && config.name != "Youtube") {
+                    if (config.version <= c.version) {
                         Logger.i(TAG, "Plugin is up to date.");
                         withContext(Dispatchers.Main) { UIDialogs.toast(context.getString(R.string.plugin_is_fully_up_to_date)); };
                         return@launch;

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

@@ -256,6 +256,8 @@ class SubscriptionGroupFragment : MainFragment() {
                             val sub = StateSubscriptions.instance.getSubscription(sub) ?: StateSubscriptions.instance.getSubscriptionOther(sub);
                             if(sub != null && sub.channel.thumbnail != null) {
                                 g.image = ImageVariable.fromUrl(sub.channel.thumbnail!!);
+                                if(g.image != null)
+                                    g.image!!.subscriptionUrl = sub.channel.url;
                                 g.image?.setImageView(_imageGroup);
                                 g.image?.setImageView(_imageGroupBackground);
                                 break;

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

@@ -9,6 +9,7 @@ import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.futo.platformplayer.*
+import com.futo.platformplayer.activities.MainActivity
 import com.futo.platformplayer.constructs.TaskHandler
 import com.futo.platformplayer.fragment.mainactivity.topbar.SearchTopBarFragment
 import com.futo.platformplayer.logging.Logger
@@ -122,8 +123,14 @@ class SuggestionsFragment : MainFragment {
                                 navigate<RemotePlaylistFragment>(it);
                             else if(StatePlatform.instance.hasEnabledChannelClient(it))
                                 navigate<ChannelFragment>(it);
-                            else
-                                navigate<VideoDetailFragment>(it);
+                            else {
+                                val url = it;
+                                activity?.let {
+                                    close()
+                                    if(it is MainActivity)
+                                        it.navigate(it.getFragment<VideoDetailFragment>(), url);
+                                }
+                            }
                         }
                         else
                             navigate<ContentSearchResultsFragment>(SuggestionsFragmentData(it, SearchType.VIDEO, _channelUrl));

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

@@ -94,12 +94,10 @@ import com.futo.platformplayer.engine.exceptions.ScriptUnavailableException
 import com.futo.platformplayer.exceptions.UnsupportedCastException
 import com.futo.platformplayer.fixHtmlLinks
 import com.futo.platformplayer.fixHtmlWhitespace
-import com.futo.platformplayer.fullyBackfillServersAnnounceExceptions
 import com.futo.platformplayer.getNowDiffSeconds
 import com.futo.platformplayer.helpers.VideoHelper
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.Subscription
-import com.futo.platformplayer.polycentric.PolycentricCache
 import com.futo.platformplayer.receivers.MediaControlReceiver
 import com.futo.platformplayer.selectBestImage
 import com.futo.platformplayer.states.AnnouncementType
@@ -134,6 +132,7 @@ import com.futo.platformplayer.views.behavior.TouchInterceptFrameLayout
 import com.futo.platformplayer.views.casting.CastView
 import com.futo.platformplayer.views.comments.AddCommentView
 import com.futo.platformplayer.views.others.CreatorThumbnail
+import com.futo.platformplayer.views.overlays.ChaptersOverlay
 import com.futo.platformplayer.views.overlays.DescriptionOverlay
 import com.futo.platformplayer.views.overlays.LiveChatOverlay
 import com.futo.platformplayer.views.overlays.QueueEditorOverlay
@@ -149,6 +148,7 @@ import com.futo.platformplayer.views.pills.PillRatingLikesDislikes
 import com.futo.platformplayer.views.pills.RoundButton
 import com.futo.platformplayer.views.pills.RoundButtonGroup
 import com.futo.platformplayer.views.platform.PlatformIndicator
+import com.futo.platformplayer.views.segments.ChaptersList
 import com.futo.platformplayer.views.segments.CommentsList
 import com.futo.platformplayer.views.subscriptions.SubscribeButton
 import com.futo.platformplayer.views.video.FutoVideoPlayer
@@ -158,6 +158,8 @@ import com.futo.polycentric.core.ApiMethods
 import com.futo.polycentric.core.ContentType
 import com.futo.polycentric.core.Models
 import com.futo.polycentric.core.Opinion
+import com.futo.polycentric.core.PolycentricProfile
+import com.futo.polycentric.core.fullyBackfillServersAnnounceExceptions
 import com.futo.polycentric.core.toURLInfoSystemLinkUrl
 import com.google.protobuf.ByteString
 import kotlinx.coroutines.Dispatchers
@@ -195,6 +197,8 @@ class VideoDetailView : ConstraintLayout {
     private var _liveChat: LiveChatManager? = null;
     private var _videoResumePositionMilliseconds : Long = 0L;
 
+    private var _chapters: List<IChapter>? = null;
+
     private val _player: FutoVideoPlayer;
     private val _cast: CastView;
     private val _playerProgress: PlayerControlView;
@@ -263,6 +267,7 @@ class VideoDetailView : ConstraintLayout {
     private val _container_content_liveChat: LiveChatOverlay;
     private val _container_content_browser: WebviewOverlay;
     private val _container_content_support: SupportOverlay;
+    private val _container_content_chapters: ChaptersOverlay;
 
     private var _container_content_current: View;
 
@@ -294,7 +299,7 @@ class VideoDetailView : ConstraintLayout {
         private set;
     private var _historicalPosition: Long = 0;
     private var _commentsCount = 0;
-    private var _polycentricProfile: PolycentricCache.CachedPolycentricProfile? = null;
+    private var _polycentricProfile: PolycentricProfile? = null;
     private var _slideUpOverlay: SlideUpMenuOverlay? = null;
     private var _autoplayVideo: IPlatformVideo? = null
 
@@ -374,6 +379,7 @@ class VideoDetailView : ConstraintLayout {
         _container_content_liveChat = findViewById(R.id.videodetail_container_livechat);
         _container_content_support = findViewById(R.id.videodetail_container_support);
         _container_content_browser = findViewById(R.id.videodetail_container_webview)
+        _container_content_chapters = findViewById(R.id.videodetail_container_chapters);
 
         _addCommentView = findViewById(R.id.add_comment_view);
         _commentsList = findViewById(R.id.comments_list);
@@ -398,6 +404,10 @@ class VideoDetailView : ConstraintLayout {
         _monetization = findViewById(R.id.monetization);
         _player.attachPlayer();
 
+        _player.onChapterClicked.subscribe {
+            showChaptersUI();
+        };
+
 
         _buttonSubscribe.onSubscribed.subscribe {
             _slideUpOverlay = UISlideOverlays.showSubscriptionOptionsOverlay(it, _overlayContainer);
@@ -409,12 +419,12 @@ class VideoDetailView : ConstraintLayout {
         };
 
         _monetization.onSupportTap.subscribe {
-            _container_content_support.setPolycentricProfile(_polycentricProfile?.profile);
+            _container_content_support.setPolycentricProfile(_polycentricProfile);
             switchContentView(_container_content_support);
         };
 
         _monetization.onStoreTap.subscribe {
-            _polycentricProfile?.profile?.systemState?.store?.let {
+            _polycentricProfile?.systemState?.store?.let {
                 try {
                     val uri = Uri.parse(it);
                     val intent = Intent(Intent.ACTION_VIEW);
@@ -579,6 +589,14 @@ class VideoDetailView : ConstraintLayout {
         _minimize_title.setOnClickListener { onMaximize.emit(false) };
         _minimize_meta.setOnClickListener { onMaximize.emit(false) };
 
+        _player.onStateChange.subscribe {
+            if (_player.activelyPlaying) {
+                Logger.i(TAG, "Play changed, resetting error counter _didTriggerDatasourceErrorCount = 0 (_player.activelyPlaying: ${_player.activelyPlaying})")
+                _didTriggerDatasourceErrorCount = 0;
+                _didTriggerDatasourceError = false;
+            }
+        }
+
         _player.onPlayChanged.subscribe {
             if (StateCasting.instance.activeDevice == null) {
                 handlePlayChanged(it);
@@ -678,6 +696,11 @@ class VideoDetailView : ConstraintLayout {
         _container_content_replies.onClose.subscribe { switchContentView(_container_content_main); };
         _container_content_support.onClose.subscribe { switchContentView(_container_content_main); };
         _container_content_browser.onClose.subscribe { switchContentView(_container_content_main); };
+        _container_content_chapters.onClose.subscribe { switchContentView(_container_content_main); };
+
+        _container_content_chapters.onClick.subscribe {
+            handleSeek(it.timeStart.toLong() * 1000);
+        }
 
         _description_viewMore.setOnClickListener {
             switchContentView(_container_content_description);
@@ -844,6 +867,22 @@ class VideoDetailView : ConstraintLayout {
         _cast.stopAllGestures();
     }
 
+    fun showChaptersUI(){
+        video?.let {
+            try {
+                _chapters?.let {
+                    if(it.size == 0)
+                        return@let;
+                    _container_content_chapters.setChapters(_chapters);
+                    switchContentView(_container_content_chapters);
+                }
+            }
+            catch(ex: Throwable) {
+
+            }
+        }
+    }
+
     fun updateMoreButtons() {
         val isLimitedVersion = video?.url != null && StatePlatform.instance.getContentClientOrNull(video!!.url)?.let {
             if (it is JSClient)
@@ -857,6 +896,13 @@ class VideoDetailView : ConstraintLayout {
                 };
             }
         },
+            _chapters?.let {
+              if(it != null && it.size > 0)
+                  RoundButton(context, R.drawable.ic_list, "Chapters", TAG_CHAPTERS) {
+                      showChaptersUI();
+                  }
+              else null
+            },
             if(video?.isLive ?: false)
                 RoundButton(context, R.drawable.ic_chat, context.getString(R.string.live_chat), TAG_LIVECHAT) {
                     video?.let {
@@ -882,7 +928,7 @@ class VideoDetailView : ConstraintLayout {
                 _slideUpOverlay?.hide();
             }
             else null,
-            if(!isLimitedVersion)
+            if(!isLimitedVersion && !(video?.isLive ?: false))
                 RoundButton(context, R.drawable.ic_download, context.getString(R.string.download), TAG_DOWNLOAD) {
                     video?.let {
                         _slideUpOverlay = UISlideOverlays.showDownloadVideoOverlay(it, _overlayContainer, context.contentResolver);
@@ -922,7 +968,7 @@ class VideoDetailView : ConstraintLayout {
                     } else if(devices.size == 1){
                         val device = devices.first();
                         Logger.i(TAG, "Send to device? (public key: ${device.remotePublicKey}): " + videoToSend.url)
-                        UIDialogs.showConfirmationDialog(context, "Would you like to open\n[${videoToSend.name}]\non ${device.remotePublicKey}" , {
+                        UIDialogs.showConfirmationDialog(context, "Would you like to open\n[${videoToSend.name}]\non '${device.displayName}'" , {
                             Logger.i(TAG, "Send to device confirmed (public key: ${device.remotePublicKey}): " + videoToSend.url)
 
                             fragment.lifecycleScope.launch(Dispatchers.IO) {
@@ -963,6 +1009,7 @@ class VideoDetailView : ConstraintLayout {
                         throw IllegalStateException("Expected media content, found ${video.contentType}");
 
                     withContext(Dispatchers.Main) {
+                        _videoResumePositionMilliseconds = _player.position
                         setVideoDetails(video);
                     }
                 }
@@ -1227,16 +1274,8 @@ class VideoDetailView : ConstraintLayout {
         _creatorThumbnail.setThumbnail(video.author.thumbnail, false);
         _channelName.text = video.author.name;
 
-        val cachedPolycentricProfile = PolycentricCache.instance.getCachedProfile(video.author.url, true);
-        if (cachedPolycentricProfile != null) {
-            setPolycentricProfile(cachedPolycentricProfile, animate = false);
-            if (cachedPolycentricProfile.expired) {
-                _taskLoadPolycentricProfile.run(video.author.id);
-            }
-        } else {
-            setPolycentricProfile(null, animate = false);
-            _taskLoadPolycentricProfile.run(video.author.id);
-        }
+        setPolycentricProfile(null, animate = false);
+        _taskLoadPolycentricProfile.run(video.author.id);
 
         _player.clear();
 
@@ -1265,8 +1304,6 @@ class VideoDetailView : ConstraintLayout {
     @OptIn(ExperimentalCoroutinesApi::class)
     fun setVideoDetails(videoDetail: IPlatformVideoDetails, newVideo: Boolean = false) {
         Logger.i(TAG, "setVideoDetails (${videoDetail.name})")
-        _didTriggerDatasourceErrroCount = 0;
-        _didTriggerDatasourceError = false;
         _autoplayVideo = null
         Logger.i(TAG, "Autoplay video cleared (setVideoDetails)")
 
@@ -1277,6 +1314,10 @@ class VideoDetailView : ConstraintLayout {
             _lastVideoSource = null;
             _lastAudioSource = null;
             _lastSubtitleSource = null;
+
+            Logger.i(TAG, "_didTriggerDatasourceErrorCount reset to 0 because new video")
+            _didTriggerDatasourceErrorCount = 0;
+            _didTriggerDatasourceError = false;
         }
 
         if (videoDetail.datetime != null && videoDetail.datetime!! > OffsetDateTime.now())
@@ -1337,10 +1378,12 @@ class VideoDetailView : ConstraintLayout {
                     val chapters = null ?: StatePlatform.instance.getContentChapters(video.url);
                     _player.setChapters(chapters);
                     _cast.setChapters(chapters);
+                    _chapters = _player.getChapters();
                 } catch (ex: Throwable) {
                     Logger.e(TAG, "Failed to get chapters", ex);
                     _player.setChapters(null);
                     _cast.setChapters(null);
+                    _chapters = null;
 
                     /*withContext(Dispatchers.Main) {
                         UIDialogs.toast(context, "Failed to get chapters\n" + ex.message);
@@ -1379,6 +1422,10 @@ class VideoDetailView : ConstraintLayout {
                         );
                     }
                 }
+
+                fragment.lifecycleScope.launch(Dispatchers.Main) {
+                    updateMoreButtons();
+                }
             };
         }
 
@@ -1394,11 +1441,8 @@ class VideoDetailView : ConstraintLayout {
                 setTabIndex(2, true)
             } else {
                 when (Settings.instance.comments.defaultCommentSection) {
-                    0 -> if (Settings.instance.other.polycentricEnabled) setTabIndex(
-                        0,
-                        true
-                    ) else setTabIndex(1, true);
-                    1 -> setTabIndex(1, true);
+                    0 -> if (Settings.instance.other.polycentricEnabled) setTabIndex(0, true) else setTabIndex(1, true)
+                    1 -> setTabIndex(1, true)
                     2 -> setTabIndex(StateMeta.instance.getLastCommentSection(), true)
                 }
             }
@@ -1436,16 +1480,8 @@ class VideoDetailView : ConstraintLayout {
         _buttonSubscribe.setSubscribeChannel(video.author.url);
         setDescription(video.description.fixHtmlLinks());
         _creatorThumbnail.setThumbnail(video.author.thumbnail, false);
-
-
-        val cachedPolycentricProfile =
-            PolycentricCache.instance.getCachedProfile(video.author.url, true);
-        if (cachedPolycentricProfile != null) {
-            setPolycentricProfile(cachedPolycentricProfile, animate = false);
-        } else {
-            setPolycentricProfile(null, animate = false);
-            _taskLoadPolycentricProfile.run(video.author.id);
-        }
+        setPolycentricProfile(null, animate = false);
+        _taskLoadPolycentricProfile.run(video.author.id);
 
         _platform.setPlatformFromClientID(video.id.pluginId);
         val subTitleSegments: ArrayList<String> = ArrayList();
@@ -1474,7 +1510,7 @@ class VideoDetailView : ConstraintLayout {
         fragment.lifecycleScope.launch(Dispatchers.IO) {
             try {
                 val queryReferencesResponse = ApiMethods.getQueryReferences(
-                    PolycentricCache.SERVER, ref, null, null,
+                    ApiMethods.SERVER, ref, null, null,
                     arrayListOf(
                         Protocol.QueryReferencesRequestCountLWWElementReferences.newBuilder()
                             .setFromType(ContentType.OPINION.value).setValue(
@@ -1490,10 +1526,8 @@ class VideoDetailView : ConstraintLayout {
 
                 val likes = queryReferencesResponse.countsList[0];
                 val dislikes = queryReferencesResponse.countsList[1];
-                val hasLiked =
-                    StatePolycentric.instance.hasLiked(ref.toByteArray())/* || extraBytesRef?.let { StatePolycentric.instance.hasLiked(it) } ?: false*/;
-                val hasDisliked =
-                    StatePolycentric.instance.hasDisliked(ref.toByteArray())/* || extraBytesRef?.let { StatePolycentric.instance.hasDisliked(it) } ?: false*/;
+                val hasLiked = StatePolycentric.instance.hasLiked(ref.toByteArray())/* || extraBytesRef?.let { StatePolycentric.instance.hasLiked(it) } ?: false*/;
+                val hasDisliked = StatePolycentric.instance.hasDisliked(ref.toByteArray())/* || extraBytesRef?.let { StatePolycentric.instance.hasDisliked(it) } ?: false*/;
 
                 withContext(Dispatchers.Main) {
                     _rating.visibility = View.VISIBLE;
@@ -1831,7 +1865,7 @@ class VideoDetailView : ConstraintLayout {
         }
     }
 
-    private var _didTriggerDatasourceErrroCount = 0;
+    private var _didTriggerDatasourceErrorCount = 0;
     private var _didTriggerDatasourceError = false;
     private fun onDataSourceError(exception: Throwable) {
         Logger.e(TAG, "onDataSourceError", exception);
@@ -1841,32 +1875,53 @@ class VideoDetailView : ConstraintLayout {
                 return;
             val config = currentVideo.sourceConfig;
 
-            if(_didTriggerDatasourceErrroCount <= 3) {
+            if(_didTriggerDatasourceErrorCount <= 3) {
                 _didTriggerDatasourceError = true;
-                _didTriggerDatasourceErrroCount++;
+                _didTriggerDatasourceErrorCount++;
+
+                UIDialogs.toast("Detected video error, attempting automatic reload (${_didTriggerDatasourceErrorCount})");
+                Logger.i(TAG, "Block detected, attempting bypass (_didTriggerDatasourceErrorCount = ${_didTriggerDatasourceErrorCount})");
 
-                UIDialogs.toast("Block detected, attempting bypass");
                 //return;
                 fragment.lifecycleScope.launch(Dispatchers.IO) {
-                    val newDetails = StatePlatform.instance.getContentDetails(currentVideo.url, true).await();
-                    val previousVideoSource = _lastVideoSource;
-                    val previousAudioSource = _lastAudioSource;
+                    try {
+                        val newDetails = StatePlatform.instance.getContentDetails(currentVideo.url, true).await();
+                        val previousVideoSource = _lastVideoSource;
+                        val previousAudioSource = _lastAudioSource;
 
-                    if(newDetails is IPlatformVideoDetails) {
-                        val newVideoSource = if(previousVideoSource != null)
-                            VideoHelper.selectBestVideoSource(newDetails.video, previousVideoSource.height * previousVideoSource.width, FutoVideoPlayerBase.PREFERED_VIDEO_CONTAINERS);
-                        else null;
-                        val newAudioSource = if(previousAudioSource != null)
-                            VideoHelper.selectBestAudioSource(newDetails.video, FutoVideoPlayerBase.PREFERED_AUDIO_CONTAINERS, previousAudioSource.language, previousAudioSource.bitrate.toLong());
-                        else null;
-                        withContext(Dispatchers.Main) {
-                            video = newDetails;
-                            _player.setSource(newVideoSource, newAudioSource, true, true);
+                        if (newDetails is IPlatformVideoDetails) {
+                            val newVideoSource = if (previousVideoSource != null)
+                                VideoHelper.selectBestVideoSource(
+                                    newDetails.video,
+                                    previousVideoSource.height * previousVideoSource.width,
+                                    FutoVideoPlayerBase.PREFERED_VIDEO_CONTAINERS
+                                );
+                            else null;
+                            val newAudioSource = if (previousAudioSource != null)
+                                VideoHelper.selectBestAudioSource(
+                                    newDetails.video,
+                                    FutoVideoPlayerBase.PREFERED_AUDIO_CONTAINERS,
+                                    previousAudioSource.language,
+                                    previousAudioSource.bitrate.toLong()
+                                );
+                            else null;
+                            withContext(Dispatchers.Main) {
+                                video = newDetails;
+                                _player.setSource(newVideoSource, newAudioSource, true, true, true);
+                            }
+                        }
+                    } catch (e: Throwable) {
+                        Logger.e(TAG, "Failed to get video details, attempting retrying without reloading.", e)
+                        fragment.lifecycleScope.launch(Dispatchers.Main) {
+                            video?.let {
+                                _videoResumePositionMilliseconds = _player.position
+                                setVideoDetails(it, false)
+                            }
                         }
                     }
                 }
             }
-            else if(_didTriggerDatasourceErrroCount > 3) {
+            else if(_didTriggerDatasourceErrorCount > 3) {
                 UIDialogs.showDialog(context, R.drawable.ic_error_pred,
                     context.getString(R.string.media_error),
                     context.getString(R.string.the_media_source_encountered_an_unauthorized_error_this_might_be_solved_by_a_plugin_reload_would_you_like_to_reload_experimental),
@@ -2590,13 +2645,21 @@ class VideoDetailView : ConstraintLayout {
                     }
 
                     onChannelClicked.subscribe {
-                        fragment.navigate<ChannelFragment>(it)
+                        if(it.url.isNotBlank())
+                            fragment.navigate<ChannelFragment>(it)
+                        else
+                            UIDialogs.appToast("No author url present");
                     }
 
                     onAddToWatchLaterClicked.subscribe(this) {
                         if(it is IPlatformVideo) {
-                            StatePlaylists.instance.addToWatchLater(SerializedPlatformVideo.fromVideo(it), true);
-                            UIDialogs.toast("Added to watch later\n[${it.name}]");
+                            if(StatePlaylists.instance.addToWatchLater(SerializedPlatformVideo.fromVideo(it), true))
+                                UIDialogs.toast("Added to watch later\n[${it.name}]");
+                        }
+                    }
+                    onAddToQueueClicked.subscribe(this) {
+                        if(it is IPlatformVideo) {
+                            StatePlayer.instance.addToQueue(it);
                         }
                     }
                 })
@@ -2768,13 +2831,12 @@ class VideoDetailView : ConstraintLayout {
         }
     }
 
-    private fun setPolycentricProfile(cachedPolycentricProfile: PolycentricCache.CachedPolycentricProfile?, animate: Boolean) {
-        _polycentricProfile = cachedPolycentricProfile;
+    private fun setPolycentricProfile(profile: PolycentricProfile?, animate: Boolean) {
+        _polycentricProfile = profile
 
         val dp_35 = 35.dp(context.resources)
-        val profile = cachedPolycentricProfile?.profile;
         val avatar = profile?.systemState?.avatar?.selectBestImage(dp_35 * dp_35)
-            ?.let { it.toURLInfoSystemLinkUrl(profile.system.toProto(), it.process, profile.systemState.servers.toList()) };
+            ?.let { it.toURLInfoSystemLinkUrl(profile.system.toProto(), it.process, profile.systemState.servers.toList()) }
 
         if (avatar != null) {
             _creatorThumbnail.setThumbnail(avatar, animate);
@@ -2783,12 +2845,12 @@ class VideoDetailView : ConstraintLayout {
             _creatorThumbnail.setHarborAvailable(profile != null, animate, profile?.system?.toProto());
         }
 
-        val username = cachedPolycentricProfile?.profile?.systemState?.username
+        val username = profile?.systemState?.username
         if (username != null) {
             _channelName.text = username
         }
 
-        _monetization.setPolycentricProfile(cachedPolycentricProfile);
+        _monetization.setPolycentricProfile(profile);
     }
 
     fun setProgressBarOverlayed(isOverlayed: Boolean?) {
@@ -2976,7 +3038,7 @@ class VideoDetailView : ConstraintLayout {
             Logger.w(TAG, "Failed to load recommendations.", it);
         };
 
-    private val _taskLoadPolycentricProfile = TaskHandler<PlatformID, PolycentricCache.CachedPolycentricProfile?>(StateApp.instance.scopeGetter, { PolycentricCache.instance.getProfileAsync(it) })
+    private val _taskLoadPolycentricProfile = TaskHandler<PlatformID, PolycentricProfile?>(StateApp.instance.scopeGetter, { ApiMethods.getPolycentricProfileByClaim(ApiMethods.SERVER, ApiMethods.FUTO_TRUST_ROOT, it.claimFieldType.toLong(), it.claimType.toLong(), it.value!!) })
         .success { it -> setPolycentricProfile(it, animate = true) }
         .exception<Throwable> {
             Logger.w(TAG, "Failed to load claims.", it);
@@ -3062,6 +3124,7 @@ class VideoDetailView : ConstraintLayout {
         const val TAG_SHARE = "share";
         const val TAG_OVERLAY = "overlay";
         const val TAG_LIVECHAT = "livechat";
+        const val TAG_CHAPTERS = "chapters";
         const val TAG_OPEN = "open";
         const val TAG_SEND_TO_DEVICE = "send_to_device";
         const val TAG_MORE = "MORE";

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

@@ -9,6 +9,7 @@ import android.widget.ImageButton
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
+import androidx.core.view.isVisible
 import androidx.core.view.setPadding
 import com.bumptech.glide.Glide
 import com.futo.platformplayer.R
@@ -22,6 +23,7 @@ import com.futo.platformplayer.states.StateDownloads
 import com.futo.platformplayer.states.StatePlaylists
 import com.futo.platformplayer.toHumanDuration
 import com.futo.platformplayer.toHumanTime
+import com.futo.platformplayer.views.SearchView
 import com.futo.platformplayer.views.lists.VideoListEditorView
 
 abstract class VideoListEditorView : LinearLayout {
@@ -34,11 +36,18 @@ abstract class VideoListEditorView : LinearLayout {
     protected var overlayContainer: FrameLayout
         private set;
     protected var _buttonDownload: ImageButton;
+    protected var _buttonExport: ImageButton;
     private var _buttonShare: ImageButton;
     private var _buttonEdit: ImageButton;
+    private var _buttonSearch: ImageButton;
+
+    private var _search: SearchView;
 
     private var _onShare: (()->Unit)? = null;
 
+    private var _loadedVideos: List<IPlatformVideo>? = null;
+    private var _loadedVideosCanEdit: Boolean = false;
+
     constructor(inflater: LayoutInflater) : super(inflater.context) {
         inflater.inflate(R.layout.fragment_video_list_editor, this);
 
@@ -54,6 +63,28 @@ abstract class VideoListEditorView : LinearLayout {
         _buttonEdit = findViewById(R.id.button_edit);
         _buttonDownload = findViewById(R.id.button_download);
         _buttonDownload.visibility = View.GONE;
+        _buttonExport = findViewById(R.id.button_export);
+        _buttonExport.visibility = View.GONE;
+        _buttonSearch = findViewById(R.id.button_search);
+
+        _search = findViewById(R.id.search_bar);
+        _search.visibility = View.GONE;
+        _search.onSearchChanged.subscribe {
+            updateVideoFilters();
+        }
+
+        _buttonSearch.setOnClickListener {
+            if(_search.isVisible) {
+                _search.visibility = View.GONE;
+                _search.textSearch.text = "";
+                updateVideoFilters();
+                _buttonSearch.setImageResource(R.drawable.ic_search);
+            }
+            else {
+                _search.visibility = View.VISIBLE;
+                _buttonSearch.setImageResource(R.drawable.ic_search_off);
+            }
+        }
 
         _buttonShare = findViewById(R.id.button_share);
         val onShare = _onShare;
@@ -68,6 +99,7 @@ abstract class VideoListEditorView : LinearLayout {
         buttonShuffle.setOnClickListener { onShuffleClick(); };
 
         _buttonEdit.setOnClickListener { onEditClick(); };
+        setButtonExportVisible(false);
         setButtonDownloadVisible(canEdit());
 
         videoListEditorView.onVideoOrderChanged.subscribe(::onVideoOrderChanged);
@@ -108,6 +140,7 @@ abstract class VideoListEditorView : LinearLayout {
             _buttonDownload.setBackgroundResource(R.drawable.background_button_round);
 
         if(isDownloading) {
+            setButtonExportVisible(false);
             _buttonDownload.setImageResource(R.drawable.ic_loader_animated);
             _buttonDownload.drawable.assume<Animatable, Unit> { it.start() };
             _buttonDownload.setOnClickListener {
@@ -117,6 +150,7 @@ abstract class VideoListEditorView : LinearLayout {
             }
         }
         else if(isDownloaded) {
+            setButtonExportVisible(true)
             _buttonDownload.setImageResource(R.drawable.ic_download_off);
             _buttonDownload.setOnClickListener {
                 UIDialogs.showConfirmationDialog(context, context.getString(R.string.are_you_sure_you_want_to_delete_the_downloaded_videos), {
@@ -125,6 +159,7 @@ abstract class VideoListEditorView : LinearLayout {
             }
         }
         else {
+            setButtonExportVisible(false);
             _buttonDownload.setImageResource(R.drawable.ic_download);
             _buttonDownload.setOnClickListener {
                 onDownload();
@@ -164,13 +199,29 @@ abstract class VideoListEditorView : LinearLayout {
                 .load(R.drawable.placeholder_video_thumbnail)
                 .into(_imagePlaylistThumbnail)
         }
-
+        _loadedVideos = videos;
+        _loadedVideosCanEdit = canEdit;
         _videoListEditorView.setVideos(videos, canEdit);
     }
+    fun filterVideos(videos: List<IPlatformVideo>): List<IPlatformVideo> {
+        var toReturn = videos;
+        val searchStr = _search.textSearch.text
+        if(!searchStr.isNullOrBlank())
+            toReturn = toReturn.filter { it.name.contains(searchStr, true) || it.author.name.contains(searchStr, true) };
+        return toReturn;
+    }
+
+    fun updateVideoFilters() {
+        val videos = _loadedVideos ?: return;
+        _videoListEditorView.setVideos(filterVideos(videos), _loadedVideosCanEdit);
+    }
 
     protected fun setButtonDownloadVisible(isVisible: Boolean) {
         _buttonDownload.visibility = if (isVisible) View.VISIBLE else View.GONE;
     }
+    protected fun setButtonExportVisible(isVisible: Boolean) {
+        _buttonExport.visibility = if (isVisible) View.VISIBLE else View.GONE;
+    }
 
     protected fun setButtonEditVisible(isVisible: Boolean) {
         _buttonEdit.visibility = if (isVisible) View.VISIBLE else View.GONE;

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

@@ -14,9 +14,9 @@ import com.futo.platformplayer.R
 import com.futo.platformplayer.api.media.IPlatformClient
 import com.futo.platformplayer.api.media.models.PlatformAuthorLink
 import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
-import com.futo.platformplayer.fragment.mainactivity.main.PolycentricProfile
 import com.futo.platformplayer.models.Playlist
 import com.futo.platformplayer.views.casting.CastButton
+import com.futo.polycentric.core.PolycentricProfile
 
 class NavigationTopBarFragment : TopFragment() {
     private var _buttonBack: ImageButton? = null;

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

@@ -9,6 +9,7 @@ import androidx.media3.datasource.ResolvingDataSource
 import androidx.media3.exoplayer.dash.DashMediaSource
 import androidx.media3.exoplayer.dash.manifest.DashManifestParser
 import androidx.media3.exoplayer.source.MediaSource
+import com.futo.platformplayer.Settings
 import com.futo.platformplayer.api.media.models.streams.IVideoSourceDescriptor
 import com.futo.platformplayer.api.media.models.streams.VideoUnMuxedSourceDescriptor
 import com.futo.platformplayer.api.media.models.streams.sources.IAudioSource
@@ -85,12 +86,17 @@ class VideoHelper {
 
             return selectBestAudioSource((desc as VideoUnMuxedSourceDescriptor).audioSources.toList(), prefContainers, prefLanguage, targetBitrate);
         }
-        fun selectBestAudioSource(altSources : Iterable<IAudioSource>, prefContainers : Array<String>, preferredLanguage: String? = null, targetBitrate: Long? = null) : IAudioSource? {
+        fun selectBestAudioSource(sources : Iterable<IAudioSource>, prefContainers : Array<String>, preferredLanguage: String? = null, targetBitrate: Long? = null) : IAudioSource? {
+            val hasPriority = sources.any { it.priority };
+            var altSources = if(hasPriority) sources.filter { it.priority } else sources;
+            val hasOriginal = altSources.any { it.original };
+            if(hasOriginal && Settings.instance.playback.preferOriginalAudio)
+                altSources = altSources.filter { it.original };
             val languageToFilter = if(preferredLanguage != null && altSources.any { it.language == preferredLanguage }) {
                 preferredLanguage
             } else {
                 if(altSources.any { it.language == Language.ENGLISH })
-                    Language.ENGLISH
+                    Language.ENGLISH;
                 else
                     Language.UNKNOWN;
             }
@@ -208,5 +214,38 @@ class VideoHelper {
             }
             else return 0;
         }
+
+        fun mediaExtensionToMimetype(extension: String): String? {
+            return videoExtensionToMimetype(extension) ?: audioExtensionToMimetype(extension);
+        }
+        fun videoExtensionToMimetype(extension: String): String? {
+            val extensionTrimmed = extension.trim('.').lowercase();
+            return when (extensionTrimmed) {
+                "mp4" -> return "video/mp4";
+                "webm" -> return "video/webm";
+                "m3u8" -> return "video/x-mpegURL";
+                "3gp" -> return "video/3gpp";
+                "mov" -> return "video/quicktime";
+                "mkv" -> return "video/x-matroska";
+                "mp4a" -> return "audio/vnd.apple.mpegurl";
+                "mpga" -> return "audio/mpga";
+                "mp3" -> return "audio/mp3";
+                "webm" -> return "audio/webm";
+                "3gp" -> return "audio/3gpp";
+                else -> null;
+            }
+        }
+        fun audioExtensionToMimetype(extension: String): String? {
+            val extensionTrimmed = extension.trim('.').lowercase();
+            return when (extensionTrimmed) {
+                "mkv" -> return "audio/x-matroska";
+                "mp4a" -> return "audio/vnd.apple.mpegurl";
+                "mpga" -> return "audio/mpga";
+                "mp3" -> return "audio/mp3";
+                "webm" -> return "audio/webm";
+                "3gp" -> return "audio/3gpp";
+                else -> null;
+            }
+        }
     }
 }

app/src/main/java/com/futo/platformplayer/images/PolycentricModelLoader.java

@@ -1,5 +1,7 @@
 package com.futo.platformplayer.images;
 
+import static com.futo.platformplayer.Extensions_PolycentricKt.getDataLinkFromUrl;
+
 import android.util.Log;
 
 import androidx.annotation.NonNull;
@@ -12,10 +14,14 @@ import com.bumptech.glide.load.model.ModelLoader;
 import com.bumptech.glide.load.model.ModelLoaderFactory;
 import com.bumptech.glide.load.model.MultiModelLoaderFactory;
 import com.bumptech.glide.signature.ObjectKey;
-import com.futo.platformplayer.polycentric.PolycentricCache;
+import com.futo.polycentric.core.ApiMethods;
 
 import kotlin.Unit;
+import kotlinx.coroutines.CoroutineScopeKt;
 import kotlinx.coroutines.Deferred;
+import kotlinx.coroutines.Dispatchers;
+import userpackage.Protocol;
+
 import java.lang.Exception;
 import java.nio.ByteBuffer;
 import java.util.concurrent.CancellationException;
@@ -60,7 +66,14 @@ public class PolycentricModelLoader implements ModelLoader<String, ByteBuffer> {
         @Override
         public void loadData(@NonNull Priority priority, @NonNull DataFetcher.DataCallback<? super ByteBuffer> callback) {
             Log.i("PolycentricModelLoader", this._model);
-            _deferred = PolycentricCache.getInstance().getDataAsync(_model);
+
+            Protocol.URLInfoDataLink dataLink = getDataLinkFromUrl(_model);
+            if (dataLink == null) {
+                callback.onLoadFailed(new Exception("Data link cannot be null"));
+                return;
+            }
+
+            _deferred = ApiMethods.Companion.getDataFromServerAndReassemble(CoroutineScopeKt.CoroutineScope(Dispatchers.getIO()), dataLink);
             _deferred.invokeOnCompletion(throwable -> {
                 if (throwable != null) {
                     Log.e("PolycentricModelLoader", "getDataAsync failed throwable: " + throwable.toString());

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

@@ -3,6 +3,7 @@ package com.futo.platformplayer.models
 import com.futo.platformplayer.api.media.PlatformID
 import com.futo.platformplayer.api.media.models.PlatformAuthorLink
 import com.futo.platformplayer.api.media.models.Thumbnails
+import com.futo.platformplayer.api.media.models.contents.ContentType
 import com.futo.platformplayer.api.media.models.video.SerializedPlatformVideo
 import com.futo.platformplayer.serializers.OffsetDateTimeSerializer
 import java.time.LocalDateTime
@@ -46,6 +47,7 @@ class HistoryVideo {
             val name = str.substring(indexNext + 3);
 
             val video = resolve?.invoke(url) ?: SerializedPlatformVideo(
+                ContentType.MEDIA,
                 id = PlatformID.asUrlID(url),
                 name = name,
                 thumbnails = Thumbnails(),

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

@@ -7,6 +7,8 @@ import android.widget.ImageView
 import com.bumptech.glide.Glide
 import com.futo.platformplayer.PresetImages
 import com.futo.platformplayer.R
+import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.states.StateSubscriptions
 import kotlinx.serialization.Contextual
 import kotlinx.serialization.Transient
 import java.io.File
@@ -18,7 +20,8 @@ data class ImageVariable(
     @Transient
     @Contextual
     private val bitmap: Bitmap? = null,
-    val presetName: String? = null) {
+    val presetName: String? = null,
+    var subscriptionUrl: String? = null) {
 
     @SuppressLint("DiscouragedApi")
     fun setImageView(imageView: ImageView, fallbackResId: Int = -1) {
@@ -33,6 +36,12 @@ data class ImageVariable(
         } else if(!url.isNullOrEmpty()) {
             Glide.with(imageView)
                 .load(url)
+                .error(if(!subscriptionUrl.isNullOrBlank()) StateSubscriptions.instance.getSubscription(subscriptionUrl!!)?.channel?.thumbnail else null)
+                .placeholder(R.drawable.placeholder_channel_thumbnail)
+                .into(imageView);
+        } else if(!subscriptionUrl.isNullOrEmpty()) {
+            Glide.with(imageView)
+                .load(StateSubscriptions.instance.getSubscription(subscriptionUrl!!)?.channel?.thumbnail)
                 .placeholder(R.drawable.placeholder_channel_thumbnail)
                 .into(imageView);
         } else if(!presetName.isNullOrEmpty()) {
@@ -63,7 +72,13 @@ data class ImageVariable(
             return ImageVariable(null, null, null, str);
         }
         fun fromFile(file: File): ImageVariable {
-            return ImageVariable.fromBitmap(BitmapFactory.decodeFile(file.absolutePath));
+            try {
+                return ImageVariable.fromBitmap(BitmapFactory.decodeFile(file.absolutePath));
+            }
+            catch(ex: Throwable) {
+                Logger.e("ImageVariable", "Unsupported image format? " + ex.message, ex);
+                return fromResource(R.drawable.ic_error_pred);
+            }
         }
     }
 }

app/src/main/java/com/futo/platformplayer/parsers/HLS.kt

@@ -5,7 +5,6 @@ import com.futo.platformplayer.api.media.models.streams.sources.HLSVariantSubtit
 import com.futo.platformplayer.api.media.models.streams.sources.HLSVariantVideoUrlSource
 import com.futo.platformplayer.api.media.models.streams.sources.IHLSManifestAudioSource
 import com.futo.platformplayer.api.media.models.streams.sources.IHLSManifestSource
-import com.futo.platformplayer.api.media.platforms.js.models.sources.JSSource
 import com.futo.platformplayer.toYesNo
 import com.futo.platformplayer.yesNoToBoolean
 import java.net.URI
@@ -62,28 +61,7 @@ class HLS {
             val playlistType = lines.find { it.startsWith("#EXT-X-PLAYLIST-TYPE:") }?.substringAfter(":")
             val streamInfo = lines.find { it.startsWith("#EXT-X-STREAM-INF:") }?.let { parseStreamInfo(it) }
 
-
-            val keyInfo =
-                lines.find { it.startsWith("#EXT-X-KEY:") }?.substringAfter(":")?.split(",")
-
-            val key = keyInfo?.find { it.startsWith("URI=") }?.substringAfter("=")?.trim('"')
-            val iv =
-                keyInfo?.find { it.startsWith("IV=") }?.substringAfter("=")?.substringAfter("x")
-
-            val decryptionInfo: DecryptionInfo? = key?.let { k ->
-                iv?.let { i ->
-                    DecryptionInfo(k, i)
-                }
-            }
-
-            val initSegment =
-                lines.find { it.startsWith("#EXT-X-MAP:") }?.substringAfter(":")?.split(",")?.get(0)
-                    ?.substringAfter("=")?.trim('"')
             val segments = mutableListOf<Segment>()
-            if (initSegment != null) {
-                segments.add(MediaSegment(0.0, resolveUrl(sourceUrl, initSegment)))
-            }
-
             var currentSegment: MediaSegment? = null
             lines.forEach { line ->
                 when {
@@ -108,14 +86,14 @@ class HLS {
                 }
             }
 
-            return VariantPlaylist(version, targetDuration, mediaSequence, discontinuitySequence, programDateTime, playlistType, streamInfo, segments, decryptionInfo)
+            return VariantPlaylist(version, targetDuration, mediaSequence, discontinuitySequence, programDateTime, playlistType, streamInfo, segments)
         }
 
-        fun parseAndGetVideoSources(source: JSSource, content: String, url: String): List<HLSVariantVideoUrlSource> {
+        fun parseAndGetVideoSources(source: Any, content: String, url: String): List<HLSVariantVideoUrlSource> {
             val masterPlaylist: MasterPlaylist
             try {
                 masterPlaylist = parseMasterPlaylist(content, url)
-                return masterPlaylist.getVideoSources(source)
+                return masterPlaylist.getVideoSources()
             } catch (e: Throwable) {
                 if (content.lines().any { it.startsWith("#EXTINF:") }) {
                     return if (source is IHLSManifestSource) {
@@ -131,17 +109,17 @@ class HLS {
             }
         }
 
-        fun parseAndGetAudioSources(source: JSSource, content: String, url: String): List<HLSVariantAudioUrlSource> {
+        fun parseAndGetAudioSources(source: Any, content: String, url: String): List<HLSVariantAudioUrlSource> {
             val masterPlaylist: MasterPlaylist
             try {
                 masterPlaylist = parseMasterPlaylist(content, url)
-                return masterPlaylist.getAudioSources(source)
+                return masterPlaylist.getAudioSources()
             } catch (e: Throwable) {
                 if (content.lines().any { it.startsWith("#EXTINF:") }) {
                     return if (source is IHLSManifestSource) {
                         listOf()
                     } else if (source is IHLSManifestAudioSource) {
-                        listOf(HLSVariantAudioUrlSource("variant", 0, "application/vnd.apple.mpegurl", "", "", null, false, url))
+                        listOf(HLSVariantAudioUrlSource("variant", 0, "application/vnd.apple.mpegurl", "", "", null, false, false, url))
                     } else {
                         throw NotImplementedError()
                     }
@@ -339,7 +317,7 @@ class HLS {
             return builder.toString()
         }
 
-        fun getVideoSources(source: JSSource? = null): List<HLSVariantVideoUrlSource> {
+        fun getVideoSources(): List<HLSVariantVideoUrlSource> {
             return variantPlaylistsRefs.map {
                 var width: Int? = null
                 var height: Int? = null
@@ -350,11 +328,11 @@ class HLS {
                 }
 
                 val suffix = listOf(it.streamInfo.video, it.streamInfo.codecs).mapNotNull { x -> x?.ifEmpty { null } }.joinToString(", ")
-                HLSVariantVideoUrlSource(suffix, width ?: 0, height ?: 0, "application/vnd.apple.mpegurl", it.streamInfo.codecs ?: "", it.streamInfo.bandwidth, 0, false, it.url, source)
+                HLSVariantVideoUrlSource(suffix, width ?: 0, height ?: 0, "application/vnd.apple.mpegurl", it.streamInfo.codecs ?: "", it.streamInfo.bandwidth, 0, false, it.url)
             }
         }
 
-        fun getAudioSources(source: JSSource? = null): List<HLSVariantAudioUrlSource> {
+        fun getAudioSources(): List<HLSVariantAudioUrlSource> {
             return mediaRenditions.mapNotNull {
                 if (it.uri == null) {
                     return@mapNotNull null
@@ -362,7 +340,7 @@ class HLS {
 
                 val suffix = listOf(it.language, it.groupID).mapNotNull { x -> x?.ifEmpty { null } }.joinToString(", ")
                 return@mapNotNull when (it.type) {
-                    "AUDIO" -> HLSVariantAudioUrlSource(it.name?.ifEmpty { "Audio (${suffix})" } ?: "Audio (${suffix})", 0, "application/vnd.apple.mpegurl", "", it.language ?: "", null, false, it.uri, source)
+                    "AUDIO" -> HLSVariantAudioUrlSource(it.name?.ifEmpty { "Audio (${suffix})" } ?: "Audio (${suffix})", 0, "application/vnd.apple.mpegurl", "", it.language ?: "", null, false, false, it.uri)
                     else -> null
                 }
             }
@@ -390,11 +368,6 @@ class HLS {
         }
     }
 
-    data class DecryptionInfo(
-        val keyUrl: String,
-        val iv: String
-    )
-
     data class VariantPlaylist(
         val version: Int?,
         val targetDuration: Int?,
@@ -403,8 +376,7 @@ class HLS {
         val programDateTime: ZonedDateTime?,
         val playlistType: String?,
         val streamInfo: StreamInfo?,
-        val segments: List<Segment>,
-        val decryptionInfo: DecryptionInfo? = null
+        val segments: List<Segment>
     ) {
         fun buildM3U8(): String = buildString {
             append("#EXTM3U\n")

app/src/main/java/com/futo/platformplayer/polycentric/PolycentricCache.kt

@@ -1,353 +0,0 @@
-package com.futo.platformplayer.polycentric
-
-import com.futo.platformplayer.api.media.PlatformID
-import com.futo.platformplayer.constructs.BatchedTaskHandler
-import com.futo.platformplayer.fragment.mainactivity.main.PolycentricProfile
-import com.futo.platformplayer.getNowDiffSeconds
-import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.resolveChannelUrls
-import com.futo.platformplayer.serializers.OffsetDateTimeSerializer
-import com.futo.platformplayer.states.StatePolycentric
-import com.futo.platformplayer.stores.CachedPolycentricProfileStorage
-import com.futo.platformplayer.stores.FragmentedStorage
-import com.futo.polycentric.core.ApiMethods
-import com.futo.polycentric.core.ContentType
-import com.futo.polycentric.core.OwnedClaim
-import com.futo.polycentric.core.PublicKey
-import com.futo.polycentric.core.SignedEvent
-import com.futo.polycentric.core.StorageTypeSystemState
-import com.futo.polycentric.core.SystemState
-import com.futo.polycentric.core.base64ToByteArray
-import com.futo.polycentric.core.base64UrlToByteArray
-import com.futo.polycentric.core.getClaimIfValid
-import com.futo.polycentric.core.getValidClaims
-import com.google.protobuf.ByteString
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Deferred
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.cancel
-import kotlinx.serialization.Serializable
-import userpackage.Protocol
-import java.nio.ByteBuffer
-import java.time.OffsetDateTime
-import kotlin.system.measureTimeMillis
-
-class PolycentricCache {
-    data class CachedOwnedClaims(val ownedClaims: List<OwnedClaim>?, val creationTime: OffsetDateTime = OffsetDateTime.now()) {
-        val expired get() = creationTime.getNowDiffSeconds() > CACHE_EXPIRATION_SECONDS
-    }
-    @Serializable
-    data class CachedPolycentricProfile(val profile: PolycentricProfile?, @Serializable(with = OffsetDateTimeSerializer::class) val creationTime: OffsetDateTime = OffsetDateTime.now()) {
-        val expired get() = creationTime.getNowDiffSeconds() > CACHE_EXPIRATION_SECONDS
-    }
-
-    private val _cache = hashMapOf<PlatformID, CachedOwnedClaims>()
-    private val _profileCache = hashMapOf<PublicKey, CachedPolycentricProfile>()
-    private val _profileUrlCache: CachedPolycentricProfileStorage;
-    private val _scope = CoroutineScope(Dispatchers.IO);
-    init {
-        Logger.i(TAG, "Initializing Polycentric cache");
-        val time = measureTimeMillis {
-            _profileUrlCache = FragmentedStorage.get<CachedPolycentricProfileStorage>("profileUrlCache")
-        }
-        Logger.i(TAG, "Initialized Polycentric cache (${_profileUrlCache.map.size}, ${time}ms)");
-    }
-
-    private val _taskGetProfile = BatchedTaskHandler<PublicKey, CachedPolycentricProfile>(_scope,
-        { system ->
-            val signedEventsList = ApiMethods.getQueryLatest(
-                SERVER,
-                system.toProto(),
-                listOf(
-                    ContentType.BANNER.value,
-                    ContentType.AVATAR.value,
-                    ContentType.USERNAME.value,
-                    ContentType.DESCRIPTION.value,
-                    ContentType.STORE.value,
-                    ContentType.SERVER.value,
-                    ContentType.STORE_DATA.value,
-                    ContentType.PROMOTION_BANNER.value,
-                    ContentType.PROMOTION.value,
-                    ContentType.MEMBERSHIP_URLS.value,
-                    ContentType.DONATION_DESTINATIONS.value
-                )
-            ).eventsList.map { e -> SignedEvent.fromProto(e) };
-
-            val signedProfileEvents = signedEventsList.groupBy { e -> e.event.contentType }
-                .map { (_, events) -> events.maxBy { it.event.unixMilliseconds ?: 0 } };
-
-            val storageSystemState = StorageTypeSystemState.create()
-            for (signedEvent in signedProfileEvents) {
-                storageSystemState.update(signedEvent.event)
-            }
-
-            val signedClaimEvents = ApiMethods.getQueryIndex(
-                SERVER,
-                system.toProto(),
-                ContentType.CLAIM.value,
-                limit = 200
-            ).eventsList.map { e -> SignedEvent.fromProto(e) };
-
-            val ownedClaims: ArrayList<OwnedClaim> = arrayListOf()
-            for (signedEvent in signedClaimEvents) {
-                if (signedEvent.event.contentType != ContentType.CLAIM.value) {
-                    continue;
-                }
-
-                val response = ApiMethods.getQueryReferences(
-                    SERVER,
-                    Protocol.Reference.newBuilder()
-                        .setReference(signedEvent.toPointer().toProto().toByteString())
-                        .setReferenceType(2)
-                        .build(),
-                    null,
-                    Protocol.QueryReferencesRequestEvents.newBuilder()
-                        .setFromType(ContentType.VOUCH.value)
-                        .build()
-                );
-
-                val ownedClaim = response.itemsList.map { SignedEvent.fromProto(it.event) }.getClaimIfValid(signedEvent);
-                if (ownedClaim != null) {
-                    ownedClaims.add(ownedClaim);
-                }
-            }
-
-            Logger.i(TAG, "Retrieved profile (ownedClaims = $ownedClaims)");
-            val systemState = SystemState.fromStorageTypeSystemState(storageSystemState);
-            return@BatchedTaskHandler CachedPolycentricProfile(PolycentricProfile(system, systemState, ownedClaims));
-        },
-        { system -> return@BatchedTaskHandler getCachedProfile(system); },
-        { system, result ->
-            synchronized(_cache) {
-                _profileCache[system] = result;
-
-                if (result.profile != null) {
-                    for (claim in result.profile.ownedClaims) {
-                        val urls = claim.claim.resolveChannelUrls();
-                        for (url in urls)
-                            _profileUrlCache.map[url] = result;
-                    }
-                }
-
-                _profileUrlCache.save();
-            }
-        });
-
-    private val _batchTaskGetClaims = BatchedTaskHandler<PlatformID, CachedOwnedClaims>(_scope,
-        { id ->
-            val resolved = if (id.claimFieldType == -1) ApiMethods.getResolveClaim(SERVER, system, id.claimType.toLong(), id.value!!)
-                else ApiMethods.getResolveClaim(SERVER, system, id.claimType.toLong(), id.claimFieldType.toLong(), id.value!!);
-            Logger.v(TAG, "getResolveClaim(url = $SERVER, system = $system, id = $id, claimType = ${id.claimType}, matchAnyField = ${id.value})");
-            val protoEvents = resolved.matchesList.flatMap { arrayListOf(it.claim).apply { addAll(it.proofChainList) } }
-            val resolvedEvents = protoEvents.map { i -> SignedEvent.fromProto(i) };
-            return@BatchedTaskHandler CachedOwnedClaims(resolvedEvents.getValidClaims());
-        },
-        { id -> return@BatchedTaskHandler getCachedValidClaims(id); },
-        { id, result ->
-            synchronized(_cache) {
-                _cache[id] = result;
-            }
-        });
-
-    private val _batchTaskGetData = BatchedTaskHandler<String, ByteBuffer>(_scope,
-        {
-            val dataLink = getDataLinkFromUrl(it) ?: throw Exception("Only URLInfoDataLink is supported");
-            return@BatchedTaskHandler ApiMethods.getDataFromServerAndReassemble(dataLink);
-        },
-        { return@BatchedTaskHandler null },
-        { _, _ -> });
-
-    fun getCachedValidClaims(id: PlatformID, ignoreExpired: Boolean = false): CachedOwnedClaims? {
-        if (!StatePolycentric.instance.enabled || id.claimType <= 0) {
-            return CachedOwnedClaims(null);
-        }
-
-        synchronized(_cache) {
-            val cached = _cache[id]
-            if (cached == null) {
-                return null
-            }
-
-            if (!ignoreExpired && cached.expired) {
-                return  null;
-            }
-
-            return cached;
-        }
-    }
-
-    //TODO: Review all return null in this file, perhaps it should be CachedX(null) instead
-    fun getValidClaimsAsync(id: PlatformID): Deferred<CachedOwnedClaims> {
-        if (!StatePolycentric.instance.enabled || id.value == null || id.claimType <= 0) {
-            return _scope.async { CachedOwnedClaims(null) };
-        }
-
-        Logger.v(TAG, "getValidClaims (id: $id)")
-        val def = _batchTaskGetClaims.execute(id);
-        def.invokeOnCompletion {
-            if (it == null) {
-                return@invokeOnCompletion
-            }
-
-            handleException(it, handleNetworkException = { /* Do nothing (do not cache) */ }, handleOtherException = {
-                //Cache failed result
-                synchronized(_cache) {
-                    _cache[id] = CachedOwnedClaims(null);
-                }
-            })
-        };
-        return def;
-    }
-
-    fun getDataAsync(url: String): Deferred<ByteBuffer> {
-        StatePolycentric.instance.ensureEnabled()
-        return _batchTaskGetData.execute(url);
-    }
-
-    fun getCachedProfile(url: String, ignoreExpired: Boolean = false): CachedPolycentricProfile? {
-        if (!StatePolycentric.instance.enabled) {
-            return CachedPolycentricProfile(null)
-        }
-
-        synchronized (_profileCache) {
-            val cached = _profileUrlCache.get(url) ?: return null;
-            if (!ignoreExpired && cached.expired) {
-                return  null;
-            }
-
-            return cached;
-        }
-    }
-
-    fun getCachedProfile(system: PublicKey, ignoreExpired: Boolean = false): CachedPolycentricProfile? {
-        if (!StatePolycentric.instance.enabled) {
-            return CachedPolycentricProfile(null)
-        }
-
-        synchronized(_profileCache) {
-            val cached = _profileCache[system] ?: return null;
-            if (!ignoreExpired && cached.expired) {
-                return null;
-            }
-
-            return cached;
-        }
-    }
-
-    suspend fun getProfileAsync(id: PlatformID, urlNullCache: String? = null): CachedPolycentricProfile? {
-        if (!StatePolycentric.instance.enabled || id.claimType <= 0) {
-            return CachedPolycentricProfile(null);
-        }
-
-        val cachedClaims = getCachedValidClaims(id);
-        if (cachedClaims != null) {
-            if (!cachedClaims.ownedClaims.isNullOrEmpty()) {
-                Logger.v(TAG, "getProfileAsync (id: $id) != null (with cached valid claims)")
-                return getProfileAsync(cachedClaims.ownedClaims.first().system).await();
-            } else {
-                return null;
-            }
-        } else {
-            Logger.v(TAG, "getProfileAsync (id: $id) no cached valid claims, will be retrieved")
-
-            val claims = getValidClaimsAsync(id).await()
-            if (!claims.ownedClaims.isNullOrEmpty()) {
-                Logger.v(TAG, "getProfileAsync (id: $id) != null (with retrieved valid claims)")
-                return getProfileAsync(claims.ownedClaims.first().system).await()
-            } else {
-                synchronized (_cache) {
-                    if (urlNullCache != null) {
-                        _profileUrlCache.setAndSave(urlNullCache, CachedPolycentricProfile(null))
-                    }
-                }
-                return null;
-            }
-        }
-    }
-
-    fun getProfileAsync(system: PublicKey): Deferred<CachedPolycentricProfile?> {
-        if (!StatePolycentric.instance.enabled) {
-            return _scope.async { CachedPolycentricProfile(null) };
-        }
-
-        Logger.i(TAG, "getProfileAsync (system: ${system})")
-        val def = _taskGetProfile.execute(system);
-        def.invokeOnCompletion {
-            if (it == null) {
-                return@invokeOnCompletion
-            }
-
-            handleException(it, handleNetworkException = { /* Do nothing (do not cache) */ }, handleOtherException = {
-                //Cache failed result
-                synchronized(_cache) {
-                    val cachedProfile = CachedPolycentricProfile(null);
-                    _profileCache[system] = cachedProfile;
-                }
-            })
-        };
-        return def;
-    }
-
-    private fun handleException(e: Throwable, handleNetworkException: () -> Unit, handleOtherException: () -> Unit) {
-        val isNetworkException = when(e) {
-            is java.net.UnknownHostException,
-            is java.net.SocketTimeoutException,
-            is java.net.ConnectException -> true
-            else -> when(e.cause) {
-                is java.net.UnknownHostException,
-                is java.net.SocketTimeoutException,
-                is java.net.ConnectException -> true
-                else -> false
-            }
-        }
-        if (isNetworkException) {
-            handleNetworkException()
-        } else {
-            handleOtherException()
-        }
-    }
-
-    companion object {
-        private val system = Protocol.PublicKey.newBuilder()
-            .setKeyType(1)
-            .setKey(ByteString.copyFrom("gX0eCWctTm6WHVGot4sMAh7NDAIwWsIM5tRsOz9dX04=".base64ToByteArray())) //Production key
-            //.setKey(ByteString.copyFrom("LeQkzn1j625YZcZHayfCmTX+6ptrzsA+CdAyq+BcEdQ".base64ToByteArray())) //Test key koen-futo
-            .build();
-
-        private const val TAG = "PolycentricCache"
-        const val SERVER = "https://srv1-prod.polycentric.io"
-        private var _instance: PolycentricCache? = null;
-        private val CACHE_EXPIRATION_SECONDS = 60 * 5;
-
-        @JvmStatic
-        val instance: PolycentricCache
-            get(){
-            if(_instance == null)
-                _instance = PolycentricCache();
-            return _instance!!;
-        };
-
-        fun finish() {
-            _instance?.let {
-                _instance = null;
-                it._scope.cancel("PolycentricCache finished");
-            }
-        }
-
-        fun getDataLinkFromUrl(it: String): Protocol.URLInfoDataLink? {
-            val urlData = if (it.startsWith("polycentric://")) {
-                it.substring("polycentric://".length)
-            } else it;
-
-            val urlBytes = urlData.base64UrlToByteArray();
-            val urlInfo = Protocol.URLInfo.parseFrom(urlBytes);
-            if (urlInfo.urlType != 4L) {
-                return null
-            }
-
-            val dataLink = Protocol.URLInfoDataLink.parseFrom(urlInfo.body);
-            return dataLink
-        }
-    }
-}

app/src/main/java/com/futo/platformplayer/serializers/OffsetDateTimeSerializer.kt

@@ -39,4 +39,16 @@ class OffsetDateTimeSerializer : KSerializer<OffsetDateTime> {
             return OffsetDateTime.MIN;
         return OffsetDateTime.of(LocalDateTime.ofEpochSecond(epochSecond, 0, ZoneOffset.UTC), ZoneOffset.UTC);
     }
+}
+class OffsetDateTimeStringSerializer : KSerializer<OffsetDateTime> {
+    override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("OffsetDateTime", PrimitiveKind.STRING)
+
+    override fun serialize(encoder: Encoder, value: OffsetDateTime) {
+        encoder.encodeString(value.toString());
+    }
+    override fun deserialize(decoder: Decoder): OffsetDateTime {
+        val str = decoder.decodeString();
+
+        return OffsetDateTime.parse(str);
+    }
 }

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

@@ -6,7 +6,6 @@ import com.futo.platformplayer.api.media.structures.DedupContentPager
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.api.media.structures.MultiChronoContentPager
 import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.polycentric.PolycentricCache
 import com.futo.platformplayer.resolveChannelUrl
 import com.futo.platformplayer.serializers.PlatformContentSerializer
 import com.futo.platformplayer.stores.db.ManagedDBStore
@@ -50,14 +49,7 @@ class StateCache {
         val subs = StateSubscriptions.instance.getSubscriptions();
         Logger.i(TAG, "Subscriptions CachePager polycentric urls");
         val allUrls = subs
-            .map {
-            val otherUrls = PolycentricCache.instance.getCachedProfile(it.channel.url)?.profile?.ownedClaims?.mapNotNull { c -> c.claim.resolveChannelUrl() } ?: listOf();
-            if(!otherUrls.contains(it.channel.url))
-                return@map listOf(listOf(it.channel.url), otherUrls).flatten();
-            else
-                return@map otherUrls;
-        }
-            .flatten()
+            .map { it.channel.url }
             .distinct()
             .filter { StatePlatform.instance.hasEnabledChannelClient(it) };
 

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

@@ -3,9 +3,11 @@ package com.futo.platformplayer.states
 import android.content.ContentResolver
 import android.content.Context
 import android.os.StatFs
+import androidx.documentfile.provider.DocumentFile
 import com.futo.platformplayer.R
 import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
+import com.futo.platformplayer.activities.IWithResultLauncher
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.media.PlatformID
 import com.futo.platformplayer.api.media.models.streams.sources.IAudioSource
@@ -46,6 +48,17 @@ class StateDownloads {
     private val _downloadsStat = StatFs(_downloadsDirectory.absolutePath);
 
     private val _downloaded = FragmentedStorage.storeJson<VideoLocal>("downloaded")
+        .withOnModified({
+            synchronized(_downloadedSet) {
+                if(!_downloadedSet.contains(it.id))
+                    _downloadedSet.add(it.id);
+            }
+        }, {
+            synchronized(_downloadedSet) {
+                if(_downloadedSet.contains(it.id))
+                    _downloadedSet.remove(it.id);
+            }
+        })
         .load()
         .apply { afterLoadingDownloaded(this) };
     private val _downloading = FragmentedStorage.storeJson<VideoDownload>("downloading")
@@ -85,9 +98,6 @@ class StateDownloads {
         Logger.i("StateDownloads", "Deleting local video ${id.value}");
         val downloaded = getCachedVideo(id);
         if(downloaded != null) {
-            synchronized(_downloadedSet) {
-                _downloadedSet.remove(id);
-            }
             _downloaded.delete(downloaded);
         }
         onDownloadedChanged.emit();
@@ -261,9 +271,6 @@ class StateDownloads {
                 if(existing.groupID == null) {
                     existing.groupID = VideoDownload.GROUP_WATCHLATER;
                     existing.groupType = VideoDownload.GROUP_WATCHLATER;
-                    synchronized(_downloadedSet) {
-                        _downloadedSet.add(existing.id);
-                    }
                     _downloaded.save(existing);
                 }
             }
@@ -306,9 +313,6 @@ class StateDownloads {
                 if(existing.groupID == null) {
                     existing.groupID = playlist.id;
                     existing.groupType = VideoDownload.GROUP_PLAYLIST;
-                    synchronized(_downloadedSet) {
-                        _downloadedSet.add(existing.id);
-                    }
                     _downloaded.save(existing);
                 }
             }
@@ -336,8 +340,8 @@ class StateDownloads {
     fun download(video: IPlatformVideo, targetPixelcount: Long?, targetBitrate: Long?) {
         download(VideoDownload(video, targetPixelcount, targetBitrate));
     }
-    fun download(video: IPlatformVideoDetails, videoSource: IVideoSource?, audioSource: IAudioSource?, subtitleSource: SubtitleRawSource?, hasRequestModifier: Boolean = false) {
-        download(VideoDownload(video, videoSource, audioSource, subtitleSource, hasRequestModifier));
+    fun download(video: IPlatformVideoDetails, videoSource: IVideoSource?, audioSource: IAudioSource?, subtitleSource: SubtitleRawSource?) {
+        download(VideoDownload(video, videoSource, audioSource, subtitleSource));
     }
 
     private fun download(videoState: VideoDownload, notify: Boolean = true) {
@@ -466,6 +470,65 @@ class StateDownloads {
         return _downloadsDirectory;
     }
 
+    fun exportPlaylist(context: Context, playlistId: String) {
+        if(context is IWithResultLauncher)
+            StateApp.instance.requestDirectoryAccess(context, "Export Playlist", "To export playlist to directory", null) {
+                if (it == null)
+                    return@requestDirectoryAccess;
+
+                val root = DocumentFile.fromTreeUri(context, it!!);
+
+                val playlist = StatePlaylists.instance.getPlaylist(playlistId);
+                var localVideos = StateDownloads.instance.getDownloadedVideosPlaylist(playlistId);
+                if(playlist != null) {
+                    val missing = playlist.videos
+                                .filter { vid -> !localVideos.any { it.id.value == null || it.id.value == vid.id.value  } }
+                                .map { getCachedVideo(it.id) }
+                                .filterNotNull();
+                    if(missing.size > 0)
+                        localVideos = localVideos + missing;
+                };
+
+                var lastNotifyTime = -1L;
+
+                UIDialogs.showDialogProgress(context) {
+                    StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
+                        it.setText("Exporting videos..");
+                        var i = 0;
+                        var success = 0;
+                        for (video in localVideos) {
+                            withContext(Dispatchers.Main) {
+                                it.setText("Exporting videos...(${i}/${localVideos.size})");
+                                //it.setProgress(i.toDouble() / localVideos.size);
+                            }
+
+                            try {
+                                val export = VideoExport(video, video.videoSource.firstOrNull(), video.audioSource.firstOrNull(), video.subtitlesSources.firstOrNull());
+                                Logger.i(TAG, "Exporting [${export.videoLocal.name}] started");
+
+                                val file = export.export(context, { progress ->
+                                    val now = System.currentTimeMillis();
+                                    if (lastNotifyTime == -1L || now - lastNotifyTime > 100) {
+                                        it.setProgress(progress);
+                                        lastNotifyTime = now;
+                                    }
+                                }, root);
+                                success++;
+                            } catch(ex: Throwable) {
+                                Logger.e(TAG, "Failed export [${video.name}]: ${ex.message}", ex);
+                            }
+                            i++;
+                        }
+                        withContext(Dispatchers.Main) {
+                            it.setProgress(1f);
+                            it.dismiss();
+                            UIDialogs.appToast("Finished exporting playlist (${success} videos${if(i < success) ", ${i} errors" else ""})");
+                        }
+                    };
+                }
+            }
+    }
+
     fun export(context: Context, videoLocal: VideoLocal, videoSource: LocalVideoSource?, audioSource: LocalAudioSource?, subtitleSource: LocalSubtitleSource?) {
         var lastNotifyTime = -1L;
 
@@ -477,13 +540,13 @@ class StateDownloads {
                 try {
                     Logger.i(TAG, "Exporting [${export.videoLocal.name}] started");
 
-                    val file = export.export(context) { progress ->
+                    val file = export.export(context, { progress ->
                         val now = System.currentTimeMillis();
                         if (lastNotifyTime == -1L || now - lastNotifyTime > 100) {
                             it.setProgress(progress);
                             lastNotifyTime = now;
                         }
-                    }
+                    }, null);
 
                     withContext(Dispatchers.Main) {
                         it.setProgress(100.0f)

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

@@ -14,7 +14,7 @@ class StateMeta {
         return when(lastCommentSection.value){
             "Polycentric" -> 0;
             "Platform" -> 1;
-            else -> 1
+            else -> 0
         }
     }
     fun setLastCommentSection(value: Int) {

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

@@ -13,6 +13,7 @@ import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.api.media.models.playlists.IPlatformPlaylistDetails
 import com.futo.platformplayer.api.media.models.video.IPlatformVideo
 import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
+import com.futo.platformplayer.api.media.models.video.SerializedPlatformVideo
 import com.futo.platformplayer.constructs.Event0
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.logging.Logger
@@ -130,6 +131,12 @@ class StatePlayer {
         closeMediaSession();
     }
 
+    fun saveQueueAsPlaylist(name: String){
+        val videos = _queue.toList();
+        val playlist = Playlist(name, videos.map { SerializedPlatformVideo.fromVideo(it) });
+        StatePlaylists.instance.createOrUpdatePlaylist(playlist);
+    }
+
     //Notifications
     fun hasMediaSession() : Boolean {
         return MediaPlaybackService.getService() != null;

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

@@ -177,11 +177,14 @@ class StatePlaylists {
             StateDownloads.instance.checkForOutdatedPlaylistVideos(VideoDownload.GROUP_WATCHLATER);
         }
     }
-    fun addToWatchLater(video: SerializedPlatformVideo, isUserInteraction: Boolean = false, orderPosition: Int = -1) {
+    fun addToWatchLater(video: SerializedPlatformVideo, isUserInteraction: Boolean = false, orderPosition: Int = -1): Boolean {
+        var wasNew = false;
         synchronized(_watchlistStore) {
+            if(!_watchlistStore.hasItem { it.url == video.url })
+                wasNew = true;
             _watchlistStore.saveAsync(video);
             if(orderPosition == -1)
-                _watchlistOrderStore.set(*(listOf(video.url) + _watchlistOrderStore.values) .toTypedArray());
+                _watchlistOrderStore.set(*(listOf(video.url) + _watchlistOrderStore.values).toTypedArray());
             else {
                 val existing = _watchlistOrderStore.getAllValues().toMutableList();
                 existing.add(orderPosition, video.url);
@@ -198,6 +201,7 @@ class StatePlaylists {
         }
 
         StateDownloads.instance.checkForOutdatedPlaylists();
+        return wasNew;
     }
 
     fun getLastPlayedPlaylist() : Playlist? {
@@ -226,17 +230,20 @@ class StatePlaylists {
         }
     }
 
+    public fun getWatchLaterSyncPacket(orderOnly: Boolean = false): SyncWatchLaterPackage{
+        return SyncWatchLaterPackage(
+            if (orderOnly) listOf() else getWatchLater(),
+            if (orderOnly) mapOf() else _watchLaterAdds.all(),
+            if (orderOnly) mapOf() else _watchLaterRemovals.all(),
+            getWatchLaterLastReorderTime().toEpochSecond(),
+            _watchlistOrderStore.values.toList()
+        )
+    }
     private fun broadcastWatchLater(orderOnly: Boolean = false) {
         StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
             try {
                 StateSync.instance.broadcastJsonData(
-                    GJSyncOpcodes.syncWatchLater, SyncWatchLaterPackage(
-                        if (orderOnly) listOf() else getWatchLater(),
-                        if (orderOnly) mapOf() else _watchLaterAdds.all(),
-                        if (orderOnly) mapOf() else _watchLaterRemovals.all(),
-                        getWatchLaterLastReorderTime().toEpochSecond(),
-                        _watchlistOrderStore.values.toList()
-                    )
+                    GJSyncOpcodes.syncWatchLater, getWatchLaterSyncPacket(orderOnly)
                 );
             } catch (e: Throwable) {
                 Logger.w(TAG, "Failed to broadcast watch later", e)

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

@@ -2,6 +2,7 @@ package com.futo.platformplayer.states
 
 import android.content.Context
 import com.futo.platformplayer.R
+import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.activities.LoginActivity
 import com.futo.platformplayer.api.http.ManagedHttpClient
@@ -101,6 +102,8 @@ class StatePlugins {
             if (availableClient !is JSClient) {
                 continue
             }
+            if(!Settings.instance.plugins.checkDisabledPluginsForUpdates && !StatePlatform.instance.isClientEnabled(availableClient.id))
+                continue;
 
             val newConfig = checkForUpdates(availableClient.config);
             if (newConfig != null) {

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

@@ -21,9 +21,7 @@ import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.api.media.structures.MultiChronoContentPager
 import com.futo.platformplayer.awaitFirstDeferred
 import com.futo.platformplayer.dp
-import com.futo.platformplayer.fragment.mainactivity.main.PolycentricProfile
 import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.polycentric.PolycentricCache
 import com.futo.platformplayer.polycentric.PolycentricStorage
 import com.futo.platformplayer.resolveChannelUrl
 import com.futo.platformplayer.selectBestImage
@@ -33,6 +31,7 @@ import com.futo.polycentric.core.ApiMethods
 import com.futo.polycentric.core.ClaimType
 import com.futo.polycentric.core.ContentType
 import com.futo.polycentric.core.Opinion
+import com.futo.polycentric.core.PolycentricProfile
 import com.futo.polycentric.core.ProcessHandle
 import com.futo.polycentric.core.PublicKey
 import com.futo.polycentric.core.SignedEvent
@@ -234,34 +233,7 @@ class StatePolycentric {
         if (!enabled) {
             return Pair(false, listOf(url));
         }
-        var polycentricProfile: PolycentricProfile? = null;
-        try {
-            val polycentricCached = PolycentricCache.instance.getCachedProfile(url, cacheOnly)
-            polycentricProfile = polycentricCached?.profile;
-            if (polycentricCached == null && channelId != null) {
-                Logger.i("StateSubscriptions", "Get polycentric profile not cached");
-                if(!cacheOnly) {
-                    polycentricProfile = runBlocking { PolycentricCache.instance.getProfileAsync(channelId, if(doCacheNull) url else null) }?.profile;
-                    didUpdate = true;
-                }
-            } else {
-                Logger.i("StateSubscriptions", "Get polycentric profile cached");
-            }
-        }
-        catch(ex: Throwable) {
-            Logger.w(StateSubscriptions.TAG, "Polycentric getCachedProfile failed for subscriptions", ex);
-            //TODO: Some way to communicate polycentric failing without blocking here
-        }
-        if(polycentricProfile != null) {
-            val urls = polycentricProfile.ownedClaims.groupBy { it.claim.claimType }
-                .mapNotNull { it.value.firstOrNull()?.claim?.resolveChannelUrl() }.toMutableList();
-            if(urls.any { it.equals(url, true) })
-                return Pair(didUpdate, urls);
-            else
-                return Pair(didUpdate, listOf(url) + urls);
-        }
-        else
-            return Pair(didUpdate, listOf(url));
+        return Pair(didUpdate, listOf(url));
     }
 
     fun getChannelContent(scope: CoroutineScope, profile: PolycentricProfile, isSubscriptionOptimized: Boolean = false, channelConcurrency: Int = -1): IPager<IPlatformContent>? {
@@ -325,7 +297,7 @@ class StatePolycentric {
                     id = PlatformID("polycentric", author, null, ClaimType.POLYCENTRIC.value.toInt()),
                     name = systemState.username,
                     url = author,
-                    thumbnail = systemState.avatar?.selectBestImage(dp_25 * dp_25)?.let { img -> img.toURLInfoSystemLinkUrl(system.toProto(), img.process, listOf(PolycentricCache.SERVER)) },
+                    thumbnail = systemState.avatar?.selectBestImage(dp_25 * dp_25)?.let { img -> img.toURLInfoSystemLinkUrl(system.toProto(), img.process, listOf(ApiMethods.SERVER)) },
                     subscribers = null
                 ),
                 msg = if (post.content.count() > PolycentricPlatformComment.MAX_COMMENT_SIZE) post.content.substring(0, PolycentricPlatformComment.MAX_COMMENT_SIZE) else post.content,
@@ -349,7 +321,7 @@ class StatePolycentric {
     suspend fun getLikesDislikesReplies(reference: Protocol.Reference): LikesDislikesReplies {
         ensureEnabled()
 
-        val response = ApiMethods.getQueryReferences(PolycentricCache.SERVER, reference, null,
+        val response = ApiMethods.getQueryReferences(ApiMethods.SERVER, reference, null,
             null,
             listOf(
                 Protocol.QueryReferencesRequestCountLWWElementReferences.newBuilder()
@@ -382,7 +354,7 @@ class StatePolycentric {
         }
 
         val pointer = Protocol.Pointer.parseFrom(reference.reference)
-        val events = ApiMethods.getEvents(PolycentricCache.SERVER, pointer.system, Protocol.RangesForSystem.newBuilder()
+        val events = ApiMethods.getEvents(ApiMethods.SERVER, pointer.system, Protocol.RangesForSystem.newBuilder()
             .addRangesForProcesses(Protocol.RangesForProcess.newBuilder()
                 .setProcess(pointer.process)
                 .addRanges(Protocol.Range.newBuilder()
@@ -400,11 +372,11 @@ class StatePolycentric {
         }
 
         val post = Protocol.Post.parseFrom(ev.content);
-        val systemLinkUrl = ev.system.systemToURLInfoSystemLinkUrl(listOf(PolycentricCache.SERVER));
+        val systemLinkUrl = ev.system.systemToURLInfoSystemLinkUrl(listOf(ApiMethods.SERVER));
         val dp_25 = 25.dp(StateApp.instance.context.resources)
 
         val profileEvents = ApiMethods.getQueryLatest(
-            PolycentricCache.SERVER,
+            ApiMethods.SERVER,
             ev.system.toProto(),
             listOf(
                 ContentType.AVATAR.value,
@@ -433,7 +405,7 @@ class StatePolycentric {
                 id = PlatformID("polycentric", systemLinkUrl, null, ClaimType.POLYCENTRIC.value.toInt()),
                 name = nameEvent?.event?.lwwElement?.value?.decodeToString() ?: "Unknown",
                 url = systemLinkUrl,
-                thumbnail =  imageBundle?.selectBestImage(dp_25 * dp_25)?.let { img -> img.toURLInfoSystemLinkUrl(ev.system.toProto(), img.process, listOf(PolycentricCache.SERVER)) },
+                thumbnail =  imageBundle?.selectBestImage(dp_25 * dp_25)?.let { img -> img.toURLInfoSystemLinkUrl(ev.system.toProto(), img.process, listOf(ApiMethods.SERVER)) },
                 subscribers = null
             ),
             msg = if (post.content.count() > PolycentricPlatformComment.MAX_COMMENT_SIZE) post.content.substring(0, PolycentricPlatformComment.MAX_COMMENT_SIZE) else post.content,
@@ -445,12 +417,12 @@ class StatePolycentric {
         )
     }
 
-    suspend fun getCommentPager(contextUrl: String, reference: Protocol.Reference, extraByteReferences: List<ByteArray>? = null): IPager<IPlatformComment> {
+    suspend fun getCommentPager(contextUrl: String, reference: Reference, extraByteReferences: List<ByteArray>? = null): IPager<IPlatformComment> {
         if (!enabled) {
             return EmptyPager()
         }
 
-        val response = ApiMethods.getQueryReferences(PolycentricCache.SERVER, reference, null,
+        val response = ApiMethods.getQueryReferences(ApiMethods.SERVER, reference, null,
             Protocol.QueryReferencesRequestEvents.newBuilder()
                 .setFromType(ContentType.POST.value)
                 .addAllCountLwwElementReferences(arrayListOf(
@@ -486,7 +458,7 @@ class StatePolycentric {
             }
 
             override suspend fun nextPageAsync() {
-                val nextPageResponse = ApiMethods.getQueryReferences(PolycentricCache.SERVER, reference, _cursor,
+                val nextPageResponse = ApiMethods.getQueryReferences(ApiMethods.SERVER, reference, _cursor,
                     Protocol.QueryReferencesRequestEvents.newBuilder()
                         .setFromType(ContentType.POST.value)
                         .addAllCountLwwElementReferences(arrayListOf(
@@ -534,7 +506,7 @@ class StatePolycentric {
                 return@mapNotNull LazyComment(scope.async(_commentPoolDispatcher){
                     Logger.i(TAG, "Fetching comment data for [" + ev.system.key.toBase64() + "]");
                     val profileEvents = ApiMethods.getQueryLatest(
-                        PolycentricCache.SERVER,
+                        ApiMethods.SERVER,
                         ev.system.toProto(),
                         listOf(
                             ContentType.AVATAR.value,
@@ -558,7 +530,7 @@ class StatePolycentric {
 
                     val unixMilliseconds = ev.unixMilliseconds
                     //TODO: Don't use single hardcoded sderver here
-                    val systemLinkUrl = ev.system.systemToURLInfoSystemLinkUrl(listOf(PolycentricCache.SERVER));
+                    val systemLinkUrl = ev.system.systemToURLInfoSystemLinkUrl(listOf(ApiMethods.SERVER));
                     val dp_25 = 25.dp(StateApp.instance.context.resources)
                     return@async PolycentricPlatformComment(
                         contextUrl = contextUrl,
@@ -566,7 +538,7 @@ class StatePolycentric {
                             id = PlatformID("polycentric", systemLinkUrl, null, ClaimType.POLYCENTRIC.value.toInt()),
                             name = nameEvent?.event?.lwwElement?.value?.decodeToString() ?: "Unknown",
                             url = systemLinkUrl,
-                            thumbnail =  imageBundle?.selectBestImage(dp_25 * dp_25)?.let { img -> img.toURLInfoSystemLinkUrl(ev.system.toProto(), img.process, listOf(PolycentricCache.SERVER)) },
+                            thumbnail =  imageBundle?.selectBestImage(dp_25 * dp_25)?.let { img -> img.toURLInfoSystemLinkUrl(ev.system.toProto(), img.process, listOf(ApiMethods.SERVER)) },
                             subscribers = null
                         ),
                         msg = if (post.content.count() > PolycentricPlatformComment.MAX_COMMENT_SIZE) post.content.substring(0, PolycentricPlatformComment.MAX_COMMENT_SIZE) else post.content,

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

@@ -1,54 +1,17 @@
 package com.futo.platformplayer.states
 
-import com.futo.platformplayer.Settings
-import com.futo.platformplayer.UIDialogs
-import com.futo.platformplayer.api.media.models.ResultCapabilities
-import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
-import com.futo.platformplayer.api.media.models.channels.SerializedChannel
-import com.futo.platformplayer.api.media.models.contents.IPlatformContent
-import com.futo.platformplayer.api.media.platforms.js.JSClient
-import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
-import com.futo.platformplayer.api.media.structures.*
-import com.futo.platformplayer.api.media.structures.ReusablePager.Companion.asReusable
 import com.futo.platformplayer.constructs.Event0
-import com.futo.platformplayer.constructs.Event1
-import com.futo.platformplayer.constructs.Event2
-import com.futo.platformplayer.engine.exceptions.PluginException
-import com.futo.platformplayer.engine.exceptions.ScriptCaptchaRequiredException
-import com.futo.platformplayer.engine.exceptions.ScriptCriticalException
-import com.futo.platformplayer.exceptions.ChannelException
-import com.futo.platformplayer.findNonRuntimeException
-import com.futo.platformplayer.fragment.mainactivity.main.PolycentricProfile
-import com.futo.platformplayer.getNowDiffDays
 import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.models.Subscription
 import com.futo.platformplayer.models.SubscriptionGroup
-import com.futo.platformplayer.polycentric.PolycentricCache
-import com.futo.platformplayer.resolveChannelUrl
-import com.futo.platformplayer.states.StateHistory.Companion
 import com.futo.platformplayer.stores.FragmentedStorage
 import com.futo.platformplayer.stores.StringDateMapStorage
-import com.futo.platformplayer.stores.SubscriptionStorage
-import com.futo.platformplayer.stores.v2.ReconstructStore
-import com.futo.platformplayer.stores.v2.ManagedStore
-import com.futo.platformplayer.subscription.SubscriptionFetchAlgorithm
-import com.futo.platformplayer.subscription.SubscriptionFetchAlgorithms
 import com.futo.platformplayer.sync.internal.GJSyncOpcodes
 import com.futo.platformplayer.sync.models.SyncSubscriptionGroupsPackage
-import com.futo.platformplayer.sync.models.SyncSubscriptionsPackage
-import kotlinx.coroutines.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import java.time.OffsetDateTime
-import java.util.concurrent.ExecutionException
-import java.util.concurrent.ForkJoinPool
-import java.util.concurrent.ForkJoinTask
-import kotlin.collections.ArrayList
-import kotlin.coroutines.resumeWithException
-import kotlin.coroutines.suspendCoroutine
-import kotlin.streams.asSequence
-import kotlin.streams.toList
-import kotlin.system.measureTimeMillis
 
 /***
  * Used to maintain subscription groups

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

@@ -1,5 +1,6 @@
 package com.futo.platformplayer.states
 
+import SubsExchangeClient
 import com.futo.platformplayer.Settings
 import com.futo.platformplayer.api.media.PlatformID
 import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
@@ -15,10 +16,10 @@ import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.ImportCache
 import com.futo.platformplayer.models.Subscription
 import com.futo.platformplayer.models.SubscriptionGroup
-import com.futo.platformplayer.polycentric.PolycentricCache
 import com.futo.platformplayer.resolveChannelUrl
 import com.futo.platformplayer.stores.FragmentedStorage
 import com.futo.platformplayer.stores.StringDateMapStorage
+import com.futo.platformplayer.stores.StringStorage
 import com.futo.platformplayer.stores.StringStringMapStorage
 import com.futo.platformplayer.stores.SubscriptionStorage
 import com.futo.platformplayer.stores.v2.ReconstructStore
@@ -68,10 +69,24 @@ class StateSubscriptions {
 
     val onSubscriptionsChanged = Event2<List<Subscription>, Boolean>();
 
+    private val _subsExchangeServer = "https://exchange.grayjay.app/";
+    private val _subscriptionKey = FragmentedStorage.get<StringStorage>("sub_exchange_key");
+
     init {
         global.onUpdateProgress.subscribe { progress, total ->
             onFeedProgress.emit(null, progress, total);
         }
+        if(_subscriptionKey.value.isNullOrBlank())
+            generateNewSubsExchangeKey();
+    }
+
+    fun generateNewSubsExchangeKey(){
+        _subscriptionKey.setAndSave(SubsExchangeClient.createPrivateKey());
+    }
+    fun getSubsExchangeClient(): SubsExchangeClient {
+        if(_subscriptionKey.value.isNullOrBlank())
+            throw IllegalStateException("No valid subscription exchange key set");
+        return SubsExchangeClient(_subsExchangeServer, _subscriptionKey.value);
     }
 
     fun getOldestUpdateTime(): OffsetDateTime {
@@ -335,12 +350,6 @@ class StateSubscriptions {
                 return true;
             }
 
-            //TODO: This causes issues, because what if the profile is not cached yet when the susbcribe button is loaded for example?
-            val cachedProfile = PolycentricCache.instance.getCachedProfile(urls.first(), true)?.profile;
-            if (cachedProfile != null) {
-                return cachedProfile.ownedClaims.any { c -> _subscriptions.hasItem { s -> c.claim.resolveChannelUrl() == s.channel.url } };
-            }
-
             return false;
         }
     }
@@ -366,7 +375,17 @@ class StateSubscriptions {
     }
 
     fun getSubscriptionsFeedWithExceptions(allowFailure: Boolean = false, withCacheFallback: Boolean = false, cacheScope: CoroutineScope, onProgress: ((Int, Int)->Unit)? = null, onNewCacheHit: ((Subscription, IPlatformContent)->Unit)? = null, subGroup: SubscriptionGroup? = null): Pair<IPager<IPlatformContent>, List<Throwable>> {
-        val algo = SubscriptionFetchAlgorithm.getAlgorithm(_algorithmSubscriptions, cacheScope, allowFailure, withCacheFallback, _subscriptionsPool);
+        var exchangeClient: SubsExchangeClient? = null;
+        if(Settings.instance.subscriptions.useSubscriptionExchange) {
+            try {
+                exchangeClient = getSubsExchangeClient();
+            }
+            catch(ex: Throwable){
+                Logger.e(TAG, "Failed to get subs exchange client: ${ex.message}", ex);
+            }
+        }
+
+        val algo = SubscriptionFetchAlgorithm.getAlgorithm(_algorithmSubscriptions, cacheScope, allowFailure, withCacheFallback, _subscriptionsPool, exchangeClient);
         if(onNewCacheHit != null)
             algo.onNewCacheHit.subscribe(onNewCacheHit)
 

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

@@ -44,6 +44,7 @@ import kotlin.system.measureTimeMillis
 
 class StateSync {
     private val _authorizedDevices = FragmentedStorage.get<StringArrayStorage>("authorized_devices")
+    private val _nameStorage = FragmentedStorage.get<StringStringMapStorage>("sync_remembered_name_storage")
     private val _syncKeyPair = FragmentedStorage.get<StringStorage>("sync_key_pair")
     private val _lastAddressStorage = FragmentedStorage.get<StringStringMapStorage>("sync_last_address_storage")
     private val _syncSessionData = FragmentedStorage.get<StringTMapStorage<SyncSessionData>>("syncSessionData")
@@ -305,12 +306,22 @@ class StateSync {
                 synchronized(_sessions) {
                     session = _sessions[s.remotePublicKey]
                     if (session == null) {
+                        val remoteDeviceName = synchronized(_nameStorage) {
+                            _nameStorage.get(remotePublicKey)
+                        }
+
                         session = SyncSession(remotePublicKey, onAuthorized = { it, isNewlyAuthorized, isNewSession ->
                             if (!isNewSession) {
                                 return@SyncSession
                             }
 
-                            Logger.i(TAG, "${s.remotePublicKey} authorized")
+                            it.remoteDeviceName?.let { remoteDeviceName ->
+                                synchronized(_nameStorage) {
+                                    _nameStorage.setAndSave(remotePublicKey, remoteDeviceName)
+                                }
+                            }
+
+                            Logger.i(TAG, "${s.remotePublicKey} authorized (name: ${it.displayName})")
                             synchronized(_lastAddressStorage) {
                                 _lastAddressStorage.setAndSave(remotePublicKey, s.remoteAddress)
                             }
@@ -341,7 +352,7 @@ class StateSync {
 
                             deviceRemoved.emit(it.remotePublicKey)
 
-                        })
+                        }, remoteDeviceName)
                         _sessions[remotePublicKey] = session!!
                     }
                     session!!.addSocketSession(s)
@@ -469,6 +480,12 @@ class StateSync {
         }
     }
 
+    fun getCachedName(publicKey: String): String? {
+        return synchronized(_nameStorage) {
+            _nameStorage.get(publicKey)
+        }
+    }
+
     suspend fun delete(publicKey: String) {
         withContext(Dispatchers.IO) {
             try {

app/src/main/java/com/futo/platformplayer/stores/CachedPolycentricProfileStorage.kt

@@ -1,31 +0,0 @@
-package com.futo.platformplayer.stores
-
-import com.futo.platformplayer.polycentric.PolycentricCache
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
-
-@kotlinx.serialization.Serializable
-class CachedPolycentricProfileStorage : FragmentedStorageFileJson() {
-    var map: HashMap<String, PolycentricCache.CachedPolycentricProfile> = hashMapOf();
-
-    override fun encode(): String {
-        val encoded = Json.encodeToString(this);
-        return encoded;
-    }
-
-    fun get(key: String) : PolycentricCache.CachedPolycentricProfile? {
-        return map[key];
-    }
-
-    fun setAndSave(key: String, value: PolycentricCache.CachedPolycentricProfile) : PolycentricCache.CachedPolycentricProfile {
-        map[key] = value;
-        save();
-        return value;
-    }
-
-    fun setAndSaveBlocking(key: String, value: PolycentricCache.CachedPolycentricProfile) : PolycentricCache.CachedPolycentricProfile {
-        map[key] = value;
-        saveBlocking();
-        return value;
-    }
-}

app/src/main/java/com/futo/platformplayer/stores/v2/ManagedStore.kt

@@ -33,6 +33,9 @@ class ManagedStore<T>{
 
     val className: String? get() = _class.classifier?.assume<KClass<*>>()?.simpleName;
 
+    private var _onModificationCreate: ((T) -> Unit)? = null;
+    private var _onModificationDelete: ((T) -> Unit)? = null;
+
     val name: String;
 
     constructor(name: String, dir: File, clazz: KType, serializer: StoreSerializer<T>, niceName: String? = null) {
@@ -62,6 +65,12 @@ class ManagedStore<T>{
         return this;
     }
 
+    fun withOnModified(created: (T)->Unit, deleted: (T)->Unit): ManagedStore<T> {
+        _onModificationCreate = created;
+        _onModificationDelete = deleted;
+        return this;
+    }
+
     fun load(): ManagedStore<T> {
         synchronized(_files) {
             _files.clear();
@@ -265,6 +274,7 @@ class ManagedStore<T>{
                 file = saveNew(obj);
                 if(_reconstructStore != null && (_reconstructStore!!.backupOnCreate || withReconstruction))
                     saveReconstruction(file, obj);
+                _onModificationCreate?.invoke(obj)
             }
         }
     }
@@ -300,6 +310,7 @@ class ManagedStore<T>{
                 _files.remove(item);
                 Logger.v(TAG, "Deleting file ${logName(file.id)}");
                 file.delete();
+                _onModificationDelete?.invoke(item)
             }
         }
     }

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

@@ -1,5 +1,6 @@
 package com.futo.platformplayer.subscription
 
+import SubsExchangeClient
 import com.futo.platformplayer.Settings
 import com.futo.platformplayer.api.media.models.ResultCapabilities
 import com.futo.platformplayer.api.media.platforms.js.JSClient
@@ -15,8 +16,9 @@ class SmartSubscriptionAlgorithm(
     scope: CoroutineScope,
     allowFailure: Boolean = false,
     withCacheFallback: Boolean = true,
-    threadPool: ForkJoinPool? = null
-): SubscriptionsTaskFetchAlgorithm(scope, allowFailure, withCacheFallback, threadPool) {
+    threadPool: ForkJoinPool? = null,
+    subsExchangeClient: SubsExchangeClient? = null
+): SubscriptionsTaskFetchAlgorithm(scope, allowFailure, withCacheFallback, threadPool, subsExchangeClient) {
     override fun getSubscriptionTasks(subs: Map<Subscription, List<String>>): List<SubscriptionTask> {
         val allTasks: List<SubscriptionTask> = subs.flatMap { entry ->
             val sub = entry.key;

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

@@ -1,5 +1,6 @@
 package com.futo.platformplayer.subscription
 
+import SubsExchangeClient
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
 import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.structures.IPager
@@ -33,11 +34,11 @@ abstract class SubscriptionFetchAlgorithm(
     companion object {
         public val TAG = "SubscriptionAlgorithm";
 
-        fun getAlgorithm(algo: SubscriptionFetchAlgorithms, scope: CoroutineScope, allowFailure: Boolean = false, withCacheFallback: Boolean = false, pool: ForkJoinPool? = null): SubscriptionFetchAlgorithm {
+        fun getAlgorithm(algo: SubscriptionFetchAlgorithms, scope: CoroutineScope, allowFailure: Boolean = false, withCacheFallback: Boolean = false, pool: ForkJoinPool? = null, withExchangeClient: SubsExchangeClient? = null): SubscriptionFetchAlgorithm {
             return when(algo) {
                 SubscriptionFetchAlgorithms.CACHE -> CachedSubscriptionAlgorithm(scope, allowFailure, withCacheFallback, pool, 50);
                 SubscriptionFetchAlgorithms.SIMPLE -> SimpleSubscriptionAlgorithm(scope, allowFailure, withCacheFallback, pool);
-                SubscriptionFetchAlgorithms.SMART -> SmartSubscriptionAlgorithm(scope, allowFailure, withCacheFallback, pool);
+                SubscriptionFetchAlgorithms.SMART -> SmartSubscriptionAlgorithm(scope, allowFailure, withCacheFallback, pool, withExchangeClient);
             }
         }
     }

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

@@ -1,19 +1,23 @@
 package com.futo.platformplayer.subscription
 
+import SubsExchangeClient
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.activities.MainActivity
 import com.futo.platformplayer.api.media.models.ResultCapabilities
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
+import com.futo.platformplayer.api.media.models.video.IPlatformVideo
+import com.futo.platformplayer.api.media.models.video.SerializedPlatformContent
+import com.futo.platformplayer.api.media.models.video.SerializedPlatformVideo
 import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.api.media.structures.DedupContentPager
 import com.futo.platformplayer.api.media.structures.EmptyPager
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.api.media.structures.MultiChronoContentPager
+import com.futo.platformplayer.api.media.structures.PlatformContentPager
 import com.futo.platformplayer.engine.exceptions.PluginException
 import com.futo.platformplayer.engine.exceptions.ScriptCaptchaRequiredException
 import com.futo.platformplayer.engine.exceptions.ScriptCriticalException
-import com.futo.platformplayer.engine.exceptions.ScriptException
 import com.futo.platformplayer.exceptions.ChannelException
 import com.futo.platformplayer.findNonRuntimeException
 import com.futo.platformplayer.fragment.mainactivity.main.SubscriptionsFeedFragment
@@ -24,6 +28,9 @@ import com.futo.platformplayer.states.StateCache
 import com.futo.platformplayer.states.StatePlatform
 import com.futo.platformplayer.states.StatePlugins
 import com.futo.platformplayer.states.StateSubscriptions
+import com.futo.platformplayer.subsexchange.ChannelRequest
+import com.futo.platformplayer.subsexchange.ChannelResolve
+import com.futo.platformplayer.subsexchange.ExchangeContract
 import kotlinx.coroutines.CoroutineScope
 import java.time.OffsetDateTime
 import java.util.concurrent.ExecutionException
@@ -35,7 +42,8 @@ abstract class SubscriptionsTaskFetchAlgorithm(
     scope: CoroutineScope,
     allowFailure: Boolean = false,
     withCacheFallback: Boolean = true,
-    _threadPool: ForkJoinPool? = null
+    _threadPool: ForkJoinPool? = null,
+    private val subsExchangeClient: SubsExchangeClient? = null
 ) : SubscriptionFetchAlgorithm(scope, allowFailure, withCacheFallback, _threadPool) {
 
 
@@ -45,7 +53,7 @@ abstract class SubscriptionsTaskFetchAlgorithm(
     }
 
     override fun getSubscriptions(subs: Map<Subscription, List<String>>): Result {
-        val tasks = getSubscriptionTasks(subs);
+        var tasks = getSubscriptionTasks(subs).toMutableList()
 
         val tasksGrouped = tasks.groupBy { it.client }
 
@@ -70,6 +78,32 @@ abstract class SubscriptionsTaskFetchAlgorithm(
 
         val exs: ArrayList<Throwable> = arrayListOf();
 
+        var contract: ExchangeContract? = null;
+        var providedTasks: MutableList<SubscriptionTask>? = null;
+
+        try {
+            val contractableTasks =
+                tasks.filter { !it.fromPeek && !it.fromCache && (it.type == ResultCapabilities.TYPE_VIDEOS || it.type == ResultCapabilities.TYPE_MIXED) };
+            contract =
+                if (contractableTasks.size > 10) subsExchangeClient?.requestContract(*contractableTasks.map {
+                    ChannelRequest(it.url)
+                }.toTypedArray()) else null;
+            if (contract?.provided?.isNotEmpty() == true)
+                Logger.i(TAG, "Received subscription exchange contract (Requires ${contract?.required?.size}, Provides ${contract?.provided?.size}), ID: ${contract?.id}");
+            if (contract != null && contract.required.isNotEmpty()) {
+                providedTasks = mutableListOf()
+                for (task in tasks.toList()) {
+                    if (!task.fromCache && !task.fromPeek && contract.provided.contains(task.url)) {
+                        providedTasks.add(task);
+                        tasks.remove(task);
+                    }
+                }
+            }
+        }
+        catch(ex: Throwable){
+            Logger.e("SubscriptionsTaskFetchAlgorithm", "Failed to retrieve SubsExchange contract due to: " + ex.message, ex);
+        }
+
         val failedPlugins = mutableListOf<String>();
         val cachedChannels = mutableListOf<String>()
         val forkTasks = executeSubscriptionTasks(tasks, failedPlugins, cachedChannels);
@@ -104,6 +138,42 @@ abstract class SubscriptionsTaskFetchAlgorithm(
                 };
             }
         }
+
+        //Resolve Subscription Exchange
+        if(contract != null) {
+            try {
+                val resolves = taskResults.filter { it.pager != null && (it.task.type == ResultCapabilities.TYPE_MIXED || it.task.type == ResultCapabilities.TYPE_VIDEOS) && contract.required.contains(it.task.url) }.map {
+                    ChannelResolve(
+                        it.task.url,
+                        it.pager!!.getResults().filter { it is IPlatformVideo }.map { SerializedPlatformVideo.fromVideo(it as IPlatformVideo) }
+                    )
+                }.toTypedArray()
+                val resolve = subsExchangeClient?.resolveContract(
+                    contract,
+                    *resolves
+                );
+                if (resolve != null) {
+                    UIDialogs.appToast("SubsExchange (Res: ${resolves.size}, Prov: ${resolve.size})")
+                    for(result in resolve){
+                        val task = providedTasks?.find { it.url == result.channelUrl };
+                        if(task != null) {
+                            taskResults.add(SubscriptionTaskResult(task, PlatformContentPager(result.content, result.content.size), null));
+                            providedTasks?.remove(task);
+                        }
+                    }
+                }
+                if (providedTasks != null) {
+                    for(task in providedTasks) {
+                        taskResults.add(SubscriptionTaskResult(task, null, IllegalStateException("No data received from exchange")));
+                    }
+                }
+            }
+            catch(ex: Throwable) {
+                //TODO: fetch remainder after all?
+                Logger.e(TAG, "Failed to resolve Subscription Exchange contract due to: " + ex.message, ex);
+            }
+        }
+
         Logger.i("StateSubscriptions", "Subscriptions results in ${timeTotal}ms")
 
         //Cache pagers grouped by channel
@@ -173,6 +243,8 @@ abstract class SubscriptionsTaskFetchAlgorithm(
                         Logger.e(StateSubscriptions.TAG, "Subscription peek [${task.sub.channel.name}] failed", ex);
                     }
                 }
+
+                //Intercepts task.fromCache & task.fromPeek
                 synchronized(cachedChannels) {
                     if(task.fromCache || task.fromPeek) {
                         finished++;

app/src/main/java/com/futo/platformplayer/subsexchange/ChannelRequest.kt

@@ -0,0 +1,10 @@
+package com.futo.platformplayer.subsexchange
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+class ChannelRequest(
+    @SerialName("ChannelUrl")
+    var channelUrl: String
+);

app/src/main/java/com/futo/platformplayer/subsexchange/ChannelResolve.kt

@@ -0,0 +1,19 @@
+package com.futo.platformplayer.subsexchange
+
+import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
+import com.futo.platformplayer.api.media.models.contents.IPlatformContent
+import com.futo.platformplayer.api.media.models.video.SerializedPlatformContent
+import com.futo.platformplayer.api.media.models.video.SerializedPlatformVideo
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import java.time.OffsetDateTime
+
+@Serializable
+class ChannelResolve(
+    @SerialName("ChannelUrl")
+    var channelUrl: String,
+    @SerialName("Content")
+    var content: List<SerializedPlatformContent>,
+    @SerialName("Channel")
+    var channel: IPlatformChannel? = null
+)

app/src/main/java/com/futo/platformplayer/subsexchange/ChannelResult.kt

@@ -0,0 +1,23 @@
+package com.futo.platformplayer.subsexchange
+
+import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
+import com.futo.platformplayer.api.media.models.contents.IPlatformContent
+import com.futo.platformplayer.api.media.models.video.SerializedPlatformContent
+import com.futo.platformplayer.serializers.OffsetDateTimeNullableSerializer
+import com.futo.platformplayer.serializers.OffsetDateTimeSerializer
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import java.time.OffsetDateTime
+
+@Serializable
+class ChannelResult(
+    @kotlinx.serialization.Serializable(with = OffsetDateTimeSerializer::class)
+    @SerialName("DateTime")
+    var dateTime: OffsetDateTime,
+    @SerialName("ChannelUrl")
+    var channelUrl: String,
+    @SerialName("Content")
+    var content: List<SerializedPlatformContent>,
+    @SerialName("Channel")
+    var channel: IPlatformChannel? = null
+)

app/src/main/java/com/futo/platformplayer/subsexchange/ExchangeContract.kt

@@ -0,0 +1,27 @@
+package com.futo.platformplayer.subsexchange
+
+import com.futo.platformplayer.serializers.OffsetDateTimeNullableSerializer
+import com.futo.platformplayer.serializers.OffsetDateTimeSerializer
+import com.futo.platformplayer.serializers.OffsetDateTimeStringSerializer
+import com.google.gson.annotations.SerializedName
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.Serializer
+import java.time.OffsetDateTime
+
+@Serializable
+class ExchangeContract(
+    @SerialName("ID")
+    var id: String,
+    @SerialName("Requests")
+    var requests: List<ChannelRequest>,
+    @SerialName("Provided")
+    var provided: List<String> = listOf(),
+    @SerialName("Required")
+    var required: List<String> = listOf(),
+    @SerialName("Expire")
+    @kotlinx.serialization.Serializable(with = OffsetDateTimeStringSerializer::class)
+    var expired: OffsetDateTime = OffsetDateTime.MIN,
+    @SerialName("ContractVersion")
+    var contractVersion: Int = 1
+)

app/src/main/java/com/futo/platformplayer/subsexchange/ExchangeContractResolve.kt

@@ -0,0 +1,14 @@
+package com.futo.platformplayer.subsexchange
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ExchangeContractResolve(
+    @SerialName("PublicKey")
+    val publicKey: String,
+    @SerialName("Signature")
+    val signature: String,
+    @SerialName("Data")
+    val data: String
+)

app/src/main/java/com/futo/platformplayer/subsexchange/SubsExchangeClient.kt

@@ -0,0 +1,149 @@
+import com.futo.platformplayer.api.media.Serializer
+import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.subsexchange.ChannelRequest
+import com.futo.platformplayer.subsexchange.ChannelResolve
+import com.futo.platformplayer.subsexchange.ChannelResult
+import com.futo.platformplayer.subsexchange.ExchangeContract
+import com.futo.platformplayer.subsexchange.ExchangeContractResolve
+import kotlinx.serialization.*
+import kotlinx.serialization.json.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import java.net.HttpURLConnection
+import java.net.URL
+import java.security.KeyFactory
+import java.security.PrivateKey
+import java.security.PublicKey
+import java.security.Signature
+import java.security.interfaces.RSAPrivateKey
+import java.security.interfaces.RSAPublicKey
+import java.util.Base64
+import java.io.InputStreamReader
+import java.io.OutputStream
+import java.io.OutputStreamWriter
+import java.math.BigInteger
+import java.nio.charset.StandardCharsets
+import java.security.KeyPairGenerator
+import java.security.spec.PKCS8EncodedKeySpec
+import java.security.spec.RSAPublicKeySpec
+
+
+class SubsExchangeClient(private val server: String, private val privateKey: String) {
+
+    private val json = Json {
+        ignoreUnknownKeys = true
+    }
+
+    private val publicKey: String = extractPublicKey(privateKey)
+
+    // Endpoints
+
+    // Endpoint: Contract
+    fun requestContract(vararg channels: ChannelRequest): ExchangeContract {
+        val data = post("/api/Channel/Contract", Json.encodeToString(channels), "application/json")
+        return Json.decodeFromString(data)
+    }
+    suspend fun requestContractAsync(vararg channels: ChannelRequest): ExchangeContract {
+        val data = postAsync("/api/Channel/Contract", Json.encodeToString(channels), "application/json")
+        return Json.decodeFromString(data)
+    }
+
+    // Endpoint: Resolve
+    fun resolveContract(contract: ExchangeContract, vararg resolves: ChannelResolve): Array<ChannelResult> {
+        val contractResolve = convertResolves(*resolves)
+        val result = post("/api/Channel/Resolve?contractId=${contract.id}", Serializer.json.encodeToString(contractResolve), "application/json")
+        return Serializer.json.decodeFromString(result)
+    }
+    suspend fun resolveContractAsync(contract: ExchangeContract, vararg resolves: ChannelResolve): Array<ChannelResult> {
+        val contractResolve = convertResolves(*resolves)
+        val result = postAsync("/api/Channel/Resolve?contractId=${contract.id}", Serializer.json.encodeToString(contractResolve), "application/json")
+        return Serializer.json.decodeFromString(result)
+    }
+
+
+    private fun convertResolves(vararg resolves: ChannelResolve): ExchangeContractResolve {
+        val data = Serializer.json.encodeToString(resolves)
+        val signature = createSignature(data, privateKey)
+
+        return ExchangeContractResolve(
+            publicKey = publicKey,
+            signature = signature,
+            data = data
+        )
+    }
+
+    // IO methods
+    private fun post(query: String, body: String, contentType: String): String {
+        val url = URL("${server.trim('/')}$query")
+        with(url.openConnection() as HttpURLConnection) {
+            requestMethod = "POST"
+            setRequestProperty("Content-Type", contentType)
+            doOutput = true
+            OutputStreamWriter(outputStream, StandardCharsets.UTF_8).use { it.write(body); it.flush() }
+
+            val status = responseCode;
+            Logger.i("SubsExchangeClient", "POST [${url}]: ${status}");
+
+            if(status == 200)
+                InputStreamReader(inputStream, StandardCharsets.UTF_8).use {
+                    return it.readText()
+                }
+            else {
+                var errorStr = "";
+                try {
+                    errorStr = InputStreamReader(errorStream, StandardCharsets.UTF_8).use {
+                        return@use it.readText()
+                    }
+                }
+                catch(ex: Throwable){}
+
+                throw Exception("Exchange server resulted in code ${status}:\n" + errorStr);
+
+            }
+        }
+    }
+    private suspend fun postAsync(query: String, body: String, contentType: String): String {
+        return withContext(Dispatchers.IO) {
+            post(query, body, contentType)
+        }
+    }
+
+    // Crypto methods
+    companion object {
+        fun createPrivateKey(): String {
+            val rsa = KeyFactory.getInstance("RSA")
+            val keyPairGenerator = KeyPairGenerator.getInstance("RSA");
+            keyPairGenerator.initialize(2048);
+            val keyPair = keyPairGenerator.generateKeyPair();
+            return Base64.getEncoder().encodeToString(keyPair.private.encoded);
+        }
+
+        fun extractPublicKey(privateKey: String): String {
+            val keySpec = PKCS8EncodedKeySpec(Base64.getDecoder().decode(privateKey))
+            val keyFactory = KeyFactory.getInstance("RSA")
+            val privateKeyObj = keyFactory.generatePrivate(keySpec) as RSAPrivateKey
+            val publicKeyObj: PublicKey? = keyFactory.generatePublic(RSAPublicKeySpec(privateKeyObj.modulus, BigInteger.valueOf(65537)));
+            var publicKeyBase64 = Base64.getEncoder().encodeToString(publicKeyObj?.encoded);
+            var pem = "-----BEGIN PUBLIC KEY-----"
+            while(publicKeyBase64.length > 0) {
+                val length = Math.min(publicKeyBase64.length, 64);
+                pem += "\n" + publicKeyBase64.substring(0, length);
+                publicKeyBase64 = publicKeyBase64.substring(length);
+            }
+            return  pem + "\n-----END PUBLIC KEY-----";
+        }
+
+        fun createSignature(data: String, privateKey: String): String {
+            val keySpec = PKCS8EncodedKeySpec(Base64.getDecoder().decode(privateKey))
+            val keyFactory = KeyFactory.getInstance("RSA")
+            val rsaPrivateKey = keyFactory.generatePrivate(keySpec) as RSAPrivateKey
+
+            val signature = Signature.getInstance("SHA256withRSA")
+            signature.initSign(rsaPrivateKey)
+            signature.update(data.toByteArray(Charsets.UTF_8))
+
+            val signatureBytes = signature.sign()
+            return Base64.getEncoder().encodeToString(signatureBytes)
+        }
+    }
+}

app/src/main/java/com/futo/platformplayer/sync/internal/SyncSession.kt

@@ -6,12 +6,10 @@ import com.futo.platformplayer.api.media.Serializer
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.HistoryVideo
 import com.futo.platformplayer.models.Subscription
-import com.futo.platformplayer.models.SubscriptionGroup
 import com.futo.platformplayer.smartMerge
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StateBackup
 import com.futo.platformplayer.states.StateHistory
-import com.futo.platformplayer.states.StatePlayer
 import com.futo.platformplayer.states.StatePlaylists
 import com.futo.platformplayer.states.StateSubscriptionGroups
 import com.futo.platformplayer.states.StateSubscriptions
@@ -30,6 +28,7 @@ import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import java.io.ByteArrayInputStream
 import java.nio.ByteBuffer
+import java.nio.ByteOrder
 import java.time.Instant
 import java.time.OffsetDateTime
 import java.time.ZoneOffset
@@ -53,6 +52,9 @@ class SyncSession : IAuthorizable {
     private val _id = UUID.randomUUID()
     private var _remoteId: UUID? = null
     private var _lastAuthorizedRemoteId: UUID? = null
+    var remoteDeviceName: String? = null
+        private set
+    val displayName: String get() = remoteDeviceName ?: remotePublicKey
 
     var connected: Boolean = false
         private set(v) {
@@ -62,7 +64,7 @@ class SyncSession : IAuthorizable {
         }
     }
 
-    constructor(remotePublicKey: String, onAuthorized: (session: SyncSession, isNewlyAuthorized: Boolean, isNewSession: Boolean) -> Unit, onUnauthorized: (session: SyncSession) -> Unit, onConnectedChanged: (session: SyncSession, connected: Boolean) -> Unit, onClose: (session: SyncSession) -> Unit) {
+    constructor(remotePublicKey: String, onAuthorized: (session: SyncSession, isNewlyAuthorized: Boolean, isNewSession: Boolean) -> Unit, onUnauthorized: (session: SyncSession) -> Unit, onConnectedChanged: (session: SyncSession, connected: Boolean) -> Unit, onClose: (session: SyncSession) -> Unit, remoteDeviceName: String?) {
         this.remotePublicKey = remotePublicKey
         _onAuthorized = onAuthorized
         _onUnauthorized = onUnauthorized
@@ -85,7 +87,20 @@ class SyncSession : IAuthorizable {
 
     fun authorize(socketSession: SyncSocketSession) {
         Logger.i(TAG, "Sent AUTHORIZED with session id $_id")
-        socketSession.send(Opcode.NOTIFY_AUTHORIZED.value, 0u, ByteBuffer.wrap(_id.toString().toByteArray()))
+
+        if (socketSession.remoteVersion >= 3) {
+            val idStringBytes = _id.toString().toByteArray()
+            val nameBytes = "${android.os.Build.MANUFACTURER}-${android.os.Build.MODEL}".toByteArray()
+            val buffer = ByteArray(1 + idStringBytes.size + 1 + nameBytes.size)
+            socketSession.send(Opcode.NOTIFY_AUTHORIZED.value, 0u, ByteBuffer.wrap(buffer).order(ByteOrder.LITTLE_ENDIAN).apply {
+                put(idStringBytes.size.toByte())
+                put(idStringBytes)
+                put(nameBytes.size.toByte())
+                put(nameBytes)
+            }.apply { flip() })
+        } else {
+            socketSession.send(Opcode.NOTIFY_AUTHORIZED.value, 0u, ByteBuffer.wrap(_id.toString().toByteArray()))
+        }
         _authorized = true
         checkAuthorized()
     }
@@ -138,15 +153,37 @@ class SyncSession : IAuthorizable {
 
             when (opcode) {
                 Opcode.NOTIFY_AUTHORIZED.value -> {
-                    val str = data.toUtf8String()
-                    _remoteId = if (data.remaining() >= 0) UUID.fromString(str) else UUID.fromString("00000000-0000-0000-0000-000000000000")
+                    if (socketSession.remoteVersion >= 3) {
+                        val idByteCount = data.get().toInt()
+                        if (idByteCount > 64)
+                            throw Exception("Id should always be smaller than 64 bytes")
+
+                        val idBytes = ByteArray(idByteCount)
+                        data.get(idBytes)
+
+                        val nameByteCount = data.get().toInt()
+                        if (nameByteCount > 64)
+                            throw Exception("Name should always be smaller than 64 bytes")
+
+                        val nameBytes = ByteArray(nameByteCount)
+                        data.get(nameBytes)
+
+                        _remoteId = UUID.fromString(idBytes.toString(Charsets.UTF_8))
+                        remoteDeviceName = nameBytes.toString(Charsets.UTF_8)
+                    } else {
+                        val str = data.toUtf8String()
+                        _remoteId = if (data.remaining() >= 0) UUID.fromString(str) else UUID.fromString("00000000-0000-0000-0000-000000000000")
+                        remoteDeviceName = null
+                    }
+
                     _remoteAuthorized = true
-                    Logger.i(TAG, "Received AUTHORIZED with session id $_remoteId")
+                    Logger.i(TAG, "Received AUTHORIZED with session id $_remoteId (device name: '${remoteDeviceName ?: "not set"}')")
                     checkAuthorized()
                     return
                 }
                 Opcode.NOTIFY_UNAUTHORIZED.value -> {
                     _remoteId = null
+                    remoteDeviceName = null
                     _lastAuthorizedRemoteId = null
                     _remoteAuthorized = false
                     _onUnauthorized(this)
@@ -195,6 +232,8 @@ class SyncSession : IAuthorizable {
                     sendData(GJSyncOpcodes.syncSubscriptionGroups, StateSubscriptionGroups.instance.getSyncSubscriptionGroupsPackageString());
                     sendData(GJSyncOpcodes.syncPlaylists, StatePlaylists.instance.getSyncPlaylistsPackageString())
 
+                    sendData(GJSyncOpcodes.syncWatchLater, Json.encodeToString(StatePlaylists.instance.getWatchLaterSyncPacket(false)));
+
                     val recentHistory = StateHistory.instance.getRecentHistory(syncSessionData.lastHistory);
                     if(recentHistory.size > 0)
                         sendJsonData(GJSyncOpcodes.syncHistory, recentHistory);

app/src/main/java/com/futo/platformplayer/sync/internal/SyncSocketSession.kt

@@ -46,6 +46,8 @@ class SyncSocketSession {
     val localPublicKey: String get() = _localPublicKey
     private val _onData: (session: SyncSocketSession, opcode: UByte, subOpcode: UByte, data: ByteBuffer) -> Unit
     var authorizable: IAuthorizable? = null
+    var remoteVersion: Int = -1
+        private set
 
     val remoteAddress: String
 
@@ -162,11 +164,12 @@ class SyncSocketSession {
     }
 
     private fun performVersionCheck() {
-        val CURRENT_VERSION = 2
+        val CURRENT_VERSION = 3
+        val MINIMUM_VERSION = 2
         _outputStream.writeInt(CURRENT_VERSION)
-        val version = _inputStream.readInt()
-        Logger.i(TAG, "performVersionCheck (version = $version)")
-        if (version != CURRENT_VERSION)
+        remoteVersion = _inputStream.readInt()
+        Logger.i(TAG, "performVersionCheck (version = $remoteVersion)")
+        if (remoteVersion < MINIMUM_VERSION)
             throw Exception("Invalid version")
     }
 

app/src/main/java/com/futo/platformplayer/views/MonetizationView.kt

@@ -16,11 +16,11 @@ import com.futo.platformplayer.constructs.Event0
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.constructs.TaskHandler
 import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.polycentric.PolycentricCache
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.views.AnyAdapterView.Companion.asAny
 import com.futo.platformplayer.views.adapters.viewholders.StoreItemViewHolder
 import com.futo.platformplayer.views.platform.PlatformIndicator
+import com.futo.polycentric.core.PolycentricProfile
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 
@@ -125,8 +125,7 @@ class MonetizationView : LinearLayout {
         }
     }
 
-    fun setPolycentricProfile(cachedPolycentricProfile: PolycentricCache.CachedPolycentricProfile?) {
-        val profile = cachedPolycentricProfile?.profile;
+    fun setPolycentricProfile(profile: PolycentricProfile?) {
         if (profile != null) {
             if (profile.systemState.store.isNotEmpty()) {
                 _buttonStore.visibility = View.VISIBLE;

app/src/main/java/com/futo/platformplayer/views/SupportView.kt

@@ -14,10 +14,10 @@ import androidx.core.view.isVisible
 import androidx.core.view.size
 import com.bumptech.glide.Glide
 import com.futo.platformplayer.R
-import com.futo.platformplayer.fragment.mainactivity.main.PolycentricProfile
 import com.futo.platformplayer.images.GlideHelper.Companion.crossfade
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.views.buttons.BigButton
+import com.futo.polycentric.core.PolycentricProfile
 import com.futo.polycentric.core.toURLInfoSystemLinkUrl
 import com.google.android.material.imageview.ShapeableImageView
 

app/src/main/java/com/futo/platformplayer/views/ToggleBar.kt

@@ -0,0 +1,74 @@
+package com.futo.platformplayer.views
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import android.widget.LinearLayout
+import androidx.lifecycle.findViewTreeLifecycleOwner
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.RecyclerView
+import com.futo.platformplayer.R
+import com.futo.platformplayer.Settings
+import com.futo.platformplayer.UIDialogs
+import com.futo.platformplayer.api.media.models.channels.SerializedChannel
+import com.futo.platformplayer.constructs.Event1
+import com.futo.platformplayer.models.Subscription
+import com.futo.platformplayer.models.SubscriptionGroup
+import com.futo.platformplayer.states.StateSubscriptionGroups
+import com.futo.platformplayer.states.StateSubscriptions
+import com.futo.platformplayer.views.AnyAdapterView.Companion.asAny
+import com.futo.platformplayer.views.others.ToggleTagView
+import com.futo.platformplayer.views.adapters.viewholders.SubscriptionBarViewHolder
+import com.futo.platformplayer.views.adapters.viewholders.SubscriptionGroupBarViewHolder
+import com.futo.platformplayer.views.subscriptions.SubscriptionExploreButton
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+
+class ToggleBar : LinearLayout {
+    private val _tagsContainer: LinearLayout;
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow();
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        StateSubscriptionGroups.instance.onGroupsChanged.remove(this);
+    }
+
+    constructor(context: Context, attrs: AttributeSet? = null) : super(context, attrs) {
+        inflate(context, R.layout.view_toggle_bar, this);
+
+        _tagsContainer = findViewById(R.id.container_tags);
+    }
+
+    fun setToggles(vararg buttons: Toggle) {
+        _tagsContainer.removeAllViews();
+        for(button in buttons) {
+            _tagsContainer.addView(ToggleTagView(context).apply {
+                this.setInfo(button.name, button.isActive);
+                this.onClick.subscribe { button.action(it); };
+            });
+        }
+    }
+
+    class Toggle {
+        val name: String;
+        val icon: Int;
+        val action: (Boolean)->Unit;
+        val isActive: Boolean;
+
+        constructor(name: String, icon: Int, isActive: Boolean = false, action: (Boolean)->Unit) {
+            this.name = name;
+            this.icon = icon;
+            this.action = action;
+            this.isActive = isActive;
+        }
+        constructor(name: String, isActive: Boolean = false, action: (Boolean)->Unit) {
+            this.name = name;
+            this.icon = 0;
+            this.action = action;
+            this.isActive = isActive;
+        }
+    }
+}

app/src/main/java/com/futo/platformplayer/views/adapters/ChannelViewPagerAdapter.kt

@@ -17,7 +17,7 @@ import com.futo.platformplayer.fragment.channel.tab.ChannelListFragment
 import com.futo.platformplayer.fragment.channel.tab.ChannelMonetizationFragment
 import com.futo.platformplayer.fragment.channel.tab.ChannelPlaylistsFragment
 import com.futo.platformplayer.fragment.channel.tab.IChannelTabFragment
-import com.futo.platformplayer.fragment.mainactivity.main.PolycentricProfile
+import com.futo.polycentric.core.PolycentricProfile
 import com.google.android.material.tabs.TabLayout
 
 

app/src/main/java/com/futo/platformplayer/views/adapters/ChapterViewHolder.kt

@@ -0,0 +1,91 @@
+package com.futo.platformplayer.views.adapters
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.view.isVisible
+import androidx.recyclerview.widget.RecyclerView.ViewHolder
+import com.futo.platformplayer.R
+import com.futo.platformplayer.Settings
+import com.futo.platformplayer.api.media.models.chapters.ChapterType
+import com.futo.platformplayer.api.media.models.chapters.IChapter
+import com.futo.platformplayer.api.media.models.comments.IPlatformComment
+import com.futo.platformplayer.api.media.models.comments.LazyComment
+import com.futo.platformplayer.api.media.models.comments.PolycentricPlatformComment
+import com.futo.platformplayer.api.media.models.ratings.RatingLikeDislikes
+import com.futo.platformplayer.api.media.models.ratings.RatingLikes
+import com.futo.platformplayer.constructs.Event1
+import com.futo.platformplayer.fixHtmlLinks
+import com.futo.platformplayer.setPlatformPlayerLinkMovementMethod
+import com.futo.platformplayer.states.StateApp
+import com.futo.platformplayer.states.StatePolycentric
+import com.futo.platformplayer.toHumanDuration
+import com.futo.platformplayer.toHumanNowDiffString
+import com.futo.platformplayer.toHumanNumber
+import com.futo.platformplayer.toHumanTime
+import com.futo.platformplayer.views.LoaderView
+import com.futo.platformplayer.views.others.CreatorThumbnail
+import com.futo.platformplayer.views.pills.PillButton
+import com.futo.platformplayer.views.pills.PillRatingLikesDislikes
+import com.futo.polycentric.core.ApiMethods
+import com.futo.polycentric.core.Opinion
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+
+class ChapterViewHolder : ViewHolder {
+
+    private val _layoutChapter: ConstraintLayout;
+
+    private val _containerChapter: ConstraintLayout;
+
+    private val _textTitle: TextView;
+    private val _textTimestamp: TextView;
+    private val _textMeta: TextView;
+
+    var onClick = Event1<IChapter>();
+    var chapter: IChapter? = null
+        private set;
+
+    constructor(viewGroup: ViewGroup) : super(LayoutInflater.from(viewGroup.context).inflate(R.layout.list_chapter, viewGroup, false)) {
+        _layoutChapter = itemView.findViewById(R.id.layout_chapter);
+        _containerChapter = itemView.findViewById(R.id.chapter_container);
+
+        _containerChapter.setOnClickListener {
+            chapter?.let {
+                onClick.emit(it);
+            }
+        }
+
+        _textTitle = itemView.findViewById(R.id.text_title);
+        _textTimestamp = itemView.findViewById(R.id.text_timestamp);
+        _textMeta = itemView.findViewById(R.id.text_meta);
+    }
+
+    fun bind(chapter: IChapter) {
+        _textTitle.text = chapter.name;
+        _textTimestamp.text = chapter.timeStart.toLong().toHumanTime(false);
+
+        if(chapter.type == ChapterType.NORMAL) {
+            _textMeta.isVisible = false;
+        }
+        else {
+            _textMeta.isVisible = true;
+            when(chapter.type) {
+                ChapterType.SKIP -> _textMeta.text = "(Skip)";
+                ChapterType.SKIPPABLE -> _textMeta.text = "(Manual Skip)"
+                ChapterType.SKIPONCE -> _textMeta.text = "(Skip Once)"
+                else -> _textMeta.isVisible = false;
+            };
+        }
+        this.chapter = chapter;
+    }
+
+    companion object {
+        private const val TAG = "CommentViewHolder";
+    }
+}

app/src/main/java/com/futo/platformplayer/views/adapters/CommentViewHolder.kt

@@ -18,8 +18,6 @@ import com.futo.platformplayer.api.media.models.ratings.RatingLikeDislikes
 import com.futo.platformplayer.api.media.models.ratings.RatingLikes
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.fixHtmlLinks
-import com.futo.platformplayer.fullyBackfillServersAnnounceExceptions
-import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.setPlatformPlayerLinkMovementMethod
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StatePolycentric
@@ -29,6 +27,7 @@ import com.futo.platformplayer.views.LoaderView
 import com.futo.platformplayer.views.others.CreatorThumbnail
 import com.futo.platformplayer.views.pills.PillButton
 import com.futo.platformplayer.views.pills.PillRatingLikesDislikes
+import com.futo.polycentric.core.ApiMethods
 import com.futo.polycentric.core.Opinion
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -81,24 +80,18 @@ class CommentViewHolder : ViewHolder {
                 throw Exception("Not implemented for non polycentric comments")
             }
 
-            if (args.hasLiked) {
-                args.processHandle.opinion(c.reference, Opinion.like);
+            val newOpinion: Opinion = if (args.hasLiked) {
+                Opinion.like
             } else if (args.hasDisliked) {
-                args.processHandle.opinion(c.reference, Opinion.dislike);
+                Opinion.dislike
             } else {
-                args.processHandle.opinion(c.reference, Opinion.neutral);
+                Opinion.neutral
             }
 
             _layoutComment.alpha = if (args.dislikes > 2 && args.dislikes.toFloat() / (args.likes + args.dislikes).toFloat() >= 0.7f) 0.5f else 1.0f;
 
             StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
-                try {
-                    Logger.i(TAG, "Started backfill");
-                    args.processHandle.fullyBackfillServersAnnounceExceptions();
-                    Logger.i(TAG, "Finished backfill");
-                } catch (e: Throwable) {
-                    Logger.e(TAG, "Failed to backfill servers.", e)
-                }
+                ApiMethods.setOpinion(args.processHandle, c.reference, newOpinion)
             }
 
             StatePolycentric.instance.updateLikeMap(c.reference, args.hasLiked, args.hasDisliked)

app/src/main/java/com/futo/platformplayer/views/adapters/CommentWithReferenceViewHolder.kt

@@ -16,7 +16,6 @@ import com.futo.platformplayer.api.media.models.ratings.RatingLikeDislikes
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.constructs.TaskHandler
 import com.futo.platformplayer.fixHtmlLinks
-import com.futo.platformplayer.fullyBackfillServersAnnounceExceptions
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.setPlatformPlayerLinkMovementMethod
 import com.futo.platformplayer.states.StateApp
@@ -26,6 +25,7 @@ import com.futo.platformplayer.views.others.CreatorThumbnail
 import com.futo.platformplayer.views.pills.PillButton
 import com.futo.platformplayer.views.pills.PillRatingLikesDislikes
 import com.futo.polycentric.core.Opinion
+import com.futo.polycentric.core.fullyBackfillServersAnnounceExceptions
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import java.util.IdentityHashMap

app/src/main/java/com/futo/platformplayer/views/adapters/PlaylistView.kt

@@ -16,7 +16,6 @@ import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.constructs.TaskHandler
 import com.futo.platformplayer.images.GlideHelper.Companion.crossfade
 import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.polycentric.PolycentricCache
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.views.FeedStyle
 import com.futo.platformplayer.views.others.CreatorThumbnail
@@ -29,21 +28,12 @@ open class PlaylistView : LinearLayout {
     protected val _imageThumbnail: ImageView
     protected val _imageChannel: ImageView?
     protected val _creatorThumbnail: CreatorThumbnail?
-    protected val _imageNeopassChannel: ImageView?;
     protected val _platformIndicator: PlatformIndicator;
     protected val _textPlaylistName: TextView
     protected val _textVideoCount: TextView
     protected val _textVideoCountLabel: TextView;
     protected val _textPlaylistItems: TextView
     protected val _textChannelName: TextView
-    protected var _neopassAnimator: ObjectAnimator? = null;
-
-    private val _taskLoadValidClaims = TaskHandler<PlatformID, PolycentricCache.CachedOwnedClaims>(StateApp.instance.scopeGetter,
-        { PolycentricCache.instance.getValidClaimsAsync(it).await() })
-        .success { it -> updateClaimsLayout(it, animate = true) }
-        .exception<Throwable> {
-            Logger.w(TAG, "Failed to load claims.", it);
-        };
 
     val onPlaylistClicked = Event1<IPlatformPlaylist>();
     val onChannelClicked = Event1<PlatformAuthorLink>();
@@ -66,7 +56,6 @@ open class PlaylistView : LinearLayout {
         _textVideoCountLabel = findViewById(R.id.text_video_count_label);
         _textChannelName = findViewById(R.id.text_channel_name);
         _textPlaylistItems = findViewById(R.id.text_playlist_items);
-        _imageNeopassChannel = findViewById(R.id.image_neopass_channel);
 
         setOnClickListener { onOpenClicked()  };
         _imageChannel?.setOnClickListener { currentPlaylist?.let { onChannelClicked.emit(it.author) }  };
@@ -88,20 +77,6 @@ open class PlaylistView : LinearLayout {
 
 
     open fun bind(content: IPlatformContent) {
-        _taskLoadValidClaims.cancel();
-
-        if (content.author.id.claimType > 0) {
-            val cachedClaims = PolycentricCache.instance.getCachedValidClaims(content.author.id);
-            if (cachedClaims != null) {
-                updateClaimsLayout(cachedClaims, animate = false);
-            } else {
-                updateClaimsLayout(null, animate = false);
-                _taskLoadValidClaims.run(content.author.id);
-            }
-        } else {
-            updateClaimsLayout(null, animate = false);
-        }
-
         isClickable = true;
 
         _imageChannel?.let {
@@ -155,25 +130,6 @@ open class PlaylistView : LinearLayout {
         }
     }
 
-    private fun updateClaimsLayout(claims: PolycentricCache.CachedOwnedClaims?, animate: Boolean) {
-        _neopassAnimator?.cancel();
-        _neopassAnimator = null;
-
-        val firstClaim = claims?.ownedClaims?.firstOrNull();
-        val harborAvailable = firstClaim != null
-        if (harborAvailable) {
-            _imageNeopassChannel?.visibility = View.VISIBLE
-            if (animate) {
-                _neopassAnimator = ObjectAnimator.ofFloat(_imageNeopassChannel, "alpha", 0.0f, 1.0f).setDuration(500)
-                _neopassAnimator?.start()
-            }
-        } else {
-            _imageNeopassChannel?.visibility = View.GONE
-        }
-
-        _creatorThumbnail?.setHarborAvailable(harborAvailable, animate, firstClaim?.system?.toProto())
-    }
-
     companion object {
         private val TAG = "VideoPreviewViewHolder"
     }

app/src/main/java/com/futo/platformplayer/views/adapters/SubscriptionAdapter.kt

@@ -16,6 +16,7 @@ class SubscriptionAdapter : RecyclerView.Adapter<SubscriptionViewHolder> {
     private lateinit var _sortedDataset: List<Subscription>;
     private val _inflater: LayoutInflater;
     private val _confirmationMessage: String;
+    private val _onDatasetChanged: ((List<Subscription>)->Unit)?;
 
     var onClick = Event1<Subscription>();
     var onSettings = Event1<Subscription>();
@@ -30,9 +31,10 @@ class SubscriptionAdapter : RecyclerView.Adapter<SubscriptionViewHolder> {
             updateDataset();
         }
 
-    constructor(inflater: LayoutInflater, confirmationMessage: String) : super() {
+    constructor(inflater: LayoutInflater, confirmationMessage: String, onDatasetChanged: ((List<Subscription>)->Unit)? = null) : super() {
         _inflater = inflater;
         _confirmationMessage = confirmationMessage;
+        _onDatasetChanged = onDatasetChanged;
 
         StateSubscriptions.instance.onSubscriptionsChanged.subscribe { _, _ -> if(Looper.myLooper() != Looper.getMainLooper())
                 StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) { updateDataset() }
@@ -78,6 +80,8 @@ class SubscriptionAdapter : RecyclerView.Adapter<SubscriptionViewHolder> {
             .filter { (queryLower.isNullOrBlank() || it.channel.name.lowercase().contains(queryLower)) }
             .toList();
 
+        _onDatasetChanged?.invoke(_sortedDataset);
+
         notifyDataSetChanged();
     }
 

app/src/main/java/com/futo/platformplayer/views/adapters/SubscriptionViewHolder.kt

@@ -15,7 +15,6 @@ import com.futo.platformplayer.constructs.TaskHandler
 import com.futo.platformplayer.dp
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.Subscription
-import com.futo.platformplayer.polycentric.PolycentricCache
 import com.futo.platformplayer.selectBestImage
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.toHumanTimeIndicator
@@ -32,14 +31,6 @@ class SubscriptionViewHolder : ViewHolder {
     private val _platformIndicator : PlatformIndicator;
     private val _textMeta: TextView;
 
-    private val _taskLoadProfile = TaskHandler<PlatformID, PolycentricCache.CachedPolycentricProfile?>(
-        StateApp.instance.scopeGetter,
-        { PolycentricCache.instance.getProfileAsync(it) })
-        .success { it -> onProfileLoaded(null, it, true) }
-        .exception<Throwable> {
-            Logger.w(TAG, "Failed to load profile.", it);
-        };
-
     var subscription: Subscription? = null
         private set;
 
@@ -74,45 +65,12 @@ class SubscriptionViewHolder : ViewHolder {
     }
 
     fun bind(sub: Subscription) {
-        _taskLoadProfile.cancel();
-
         this.subscription = sub;
 
         _creatorThumbnail.setThumbnail(sub.channel.thumbnail, false);
         _textName.text = sub.channel.name;
         bindViewMetrics(sub);
         _platformIndicator.setPlatformFromClientID(sub.channel.id.pluginId);
-        
-        val cachedProfile = PolycentricCache.instance.getCachedProfile(sub.channel.url, true);
-        if (cachedProfile != null) {
-            onProfileLoaded(sub, cachedProfile, false);
-            if (cachedProfile.expired) {
-                _taskLoadProfile.run(sub.channel.id);
-            }
-        } else {
-            _taskLoadProfile.run(sub.channel.id);
-        }
-    }
-
-    private fun onProfileLoaded(sub: Subscription?, cachedPolycentricProfile: PolycentricCache.CachedPolycentricProfile?, animate: Boolean) {
-        val dp_46 = 46.dp(itemView.context.resources);
-        val profile = cachedPolycentricProfile?.profile;
-        val avatar = profile?.systemState?.avatar?.selectBestImage(dp_46 * dp_46)
-            ?.let { it.toURLInfoSystemLinkUrl(profile.system.toProto(), it.process, profile.systemState.servers.toList()) };
-
-        if (avatar != null) {
-            _creatorThumbnail.setThumbnail(avatar, animate);
-        } else {
-            _creatorThumbnail.setThumbnail(this.subscription?.channel?.thumbnail, animate);
-            _creatorThumbnail.setHarborAvailable(profile != null, animate, profile?.system?.toProto());
-        }
-
-        if (profile != null) {
-            _textName.text = profile.systemState.username;
-        }
-
-        if(sub != null)
-            bindViewMetrics(sub)
     }
 
     fun bindViewMetrics(sub: Subscription?) {

app/src/main/java/com/futo/platformplayer/views/adapters/feedtypes/PreviewPostView.kt

@@ -30,7 +30,6 @@ import com.futo.platformplayer.dp
 import com.futo.platformplayer.fixHtmlWhitespace
 import com.futo.platformplayer.images.GlideHelper.Companion.crossfade
 import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.polycentric.PolycentricCache
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.toHumanNowDiffString
 import com.futo.platformplayer.views.FeedStyle
@@ -44,7 +43,6 @@ class PreviewPostView : LinearLayout {
 
     private val _imageAuthorThumbnail: ImageView;
     private val _textAuthorName: TextView;
-    private val _imageNeopassChannel: ImageView;
     private val _textMetadata: TextView;
     private val _textTitle: TextView;
     private val _textDescription: TextView;
@@ -64,15 +62,6 @@ class PreviewPostView : LinearLayout {
     private val _layoutComments: LinearLayout?;
     private val _textComments: TextView?;
 
-    private var _neopassAnimator: ObjectAnimator? = null;
-
-    private val _taskLoadValidClaims = TaskHandler<PlatformID, PolycentricCache.CachedOwnedClaims>(StateApp.instance.scopeGetter,
-        { PolycentricCache.instance.getValidClaimsAsync(it).await() })
-        .success { it -> updateClaimsLayout(it, animate = true) }
-        .exception<Throwable> {
-            Logger.w(TAG, "Failed to load claims.", it);
-        };
-
     val content: IPlatformContent? get() = _content;
 
     val onContentClicked = Event1<IPlatformContent>();
@@ -83,7 +72,6 @@ class PreviewPostView : LinearLayout {
 
         _imageAuthorThumbnail = findViewById(R.id.image_author_thumbnail);
         _textAuthorName = findViewById(R.id.text_author_name);
-        _imageNeopassChannel = findViewById(R.id.image_neopass_channel);
         _textMetadata = findViewById(R.id.text_metadata);
         _textTitle = findViewById(R.id.text_title);
         _textDescription = findViewById(R.id.text_description);
@@ -130,21 +118,8 @@ class PreviewPostView : LinearLayout {
     }
 
     fun bind(content: IPlatformContent) {
-        _taskLoadValidClaims.cancel();
         _content = content;
 
-        if (content.author.id.claimType > 0) {
-            val cachedClaims = PolycentricCache.instance.getCachedValidClaims(content.author.id);
-            if (cachedClaims != null) {
-                updateClaimsLayout(cachedClaims, animate = false);
-            } else {
-                updateClaimsLayout(null, animate = false);
-                _taskLoadValidClaims.run(content.author.id);
-            }
-        } else {
-            updateClaimsLayout(null, animate = false);
-        }
-
         _textAuthorName.text = content.author.name;
         _textMetadata.text = content.datetime?.toHumanNowDiffString()?.let { "$it ago" } ?: "";
 
@@ -292,25 +267,6 @@ class PreviewPostView : LinearLayout {
         };
     }
 
-    private fun updateClaimsLayout(claims: PolycentricCache.CachedOwnedClaims?, animate: Boolean) {
-        _neopassAnimator?.cancel();
-        _neopassAnimator = null;
-
-        val harborAvailable = claims != null && !claims.ownedClaims.isNullOrEmpty();
-        if (harborAvailable) {
-            _imageNeopassChannel.visibility = View.VISIBLE
-            if (animate) {
-                _neopassAnimator = ObjectAnimator.ofFloat(_imageNeopassChannel, "alpha", 0.0f, 1.0f).setDuration(500)
-                _neopassAnimator?.start()
-            }
-        } else {
-            _imageNeopassChannel.visibility = View.GONE
-        }
-
-        //TODO: Necessary if we decide to use creator thumbnail with neopass indicator instead
-        //_creatorThumbnail?.setHarborAvailable(harborAvailable, animate)
-    }
-
     companion object {
         val TAG = "PreviewPostView";
     }

app/src/main/java/com/futo/platformplayer/views/adapters/feedtypes/PreviewVideoView.kt

@@ -24,7 +24,6 @@ import com.futo.platformplayer.getNowDiffSeconds
 import com.futo.platformplayer.images.GlideHelper.Companion.crossfade
 import com.futo.platformplayer.images.GlideHelper.Companion.loadThumbnails
 import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.polycentric.PolycentricCache
 import com.futo.platformplayer.selectBestImage
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StateDownloads
@@ -47,7 +46,6 @@ open class PreviewVideoView : LinearLayout {
     protected val _imageVideo: ImageView
     protected val _imageChannel: ImageView?
     protected val _creatorThumbnail: CreatorThumbnail?
-    protected val _imageNeopassChannel: ImageView?;
     protected val _platformIndicator: PlatformIndicator;
     protected val _textVideoName: TextView
     protected val _textChannelName: TextView
@@ -57,7 +55,6 @@ open class PreviewVideoView : LinearLayout {
     protected var _playerVideoThumbnail: FutoThumbnailPlayer? = null;
     protected val _containerLive: LinearLayout;
     protected val _playerContainer: FrameLayout;
-    protected var _neopassAnimator: ObjectAnimator? = null;
     protected val _layoutDownloaded: FrameLayout;
 
     protected val _button_add_to_queue : View;
@@ -65,15 +62,6 @@ open class PreviewVideoView : LinearLayout {
     protected val _button_add_to : View;
 
     protected val _exoPlayer: PlayerManager?;
-
-    private val _taskLoadProfile = TaskHandler<PlatformID, PolycentricCache.CachedPolycentricProfile?>(
-        StateApp.instance.scopeGetter,
-        { PolycentricCache.instance.getProfileAsync(it) })
-        .success { it -> onProfileLoaded(it, true) }
-        .exception<Throwable> {
-            Logger.w(TAG, "Failed to load profile.", it);
-        };
-
     private val _timeBar: ProgressBar?;
 
     val onVideoClicked = Event2<IPlatformVideo, Long>();
@@ -108,7 +96,6 @@ open class PreviewVideoView : LinearLayout {
         _button_add_to_queue = findViewById(R.id.button_add_to_queue);
         _button_add_to_watch_later = findViewById(R.id.button_add_to_watch_later);
         _button_add_to = findViewById(R.id.button_add_to);
-        _imageNeopassChannel = findViewById(R.id.image_neopass_channel);
         _layoutDownloaded = findViewById(R.id.layout_downloaded);
         _timeBar = findViewById(R.id.time_bar)
 
@@ -132,7 +119,7 @@ open class PreviewVideoView : LinearLayout {
 
     fun hideAddTo() {
         _button_add_to.visibility = View.GONE
-        _button_add_to_queue.visibility = View.GONE
+        //_button_add_to_queue.visibility = View.GONE
     }
 
     protected open fun inflate(feedStyle: FeedStyle) {
@@ -160,15 +147,12 @@ open class PreviewVideoView : LinearLayout {
 
 
     open fun bind(content: IPlatformContent) {
-        _taskLoadProfile.cancel();
-
         isClickable = true;
 
         val isPlanned = (content.datetime?.getNowDiffSeconds() ?: 0) < 0;
 
         stopPreview();
 
-        _imageNeopassChannel?.visibility = View.GONE;
         _creatorThumbnail?.setThumbnail(content.author.thumbnail, false);
 
         val thumbnail = content.author.thumbnail
@@ -186,16 +170,6 @@ open class PreviewVideoView : LinearLayout {
 
         _textChannelName.text = content.author.name
 
-        val cachedProfile = PolycentricCache.instance.getCachedProfile(content.author.url, true);
-        if (cachedProfile != null) {
-            onProfileLoaded(cachedProfile, false);
-            if (cachedProfile.expired) {
-                _taskLoadProfile.run(content.author.id);
-            }
-        } else {
-            _taskLoadProfile.run(content.author.id);
-        }
-
         _imageChannel?.clipToOutline = true;
 
         _textVideoName.text = content.name;
@@ -335,52 +309,6 @@ open class PreviewVideoView : LinearLayout {
         _playerVideoThumbnail?.setMuteChangedListener(callback);
     }
 
-    private fun onProfileLoaded(cachedPolycentricProfile: PolycentricCache.CachedPolycentricProfile?, animate: Boolean) {
-        _neopassAnimator?.cancel();
-        _neopassAnimator = null;
-
-        val profile = cachedPolycentricProfile?.profile;
-        if (_creatorThumbnail != null) {
-            val dp_32 = 32.dp(context.resources);
-            val avatar = profile?.systemState?.avatar?.selectBestImage(dp_32 * dp_32)
-                ?.let { it.toURLInfoSystemLinkUrl(profile.system.toProto(), it.process, profile.systemState.servers.toList()) };
-
-            if (avatar != null) {
-                _creatorThumbnail.setThumbnail(avatar, animate);
-            } else {
-                _creatorThumbnail.setThumbnail(content?.author?.thumbnail, animate);
-                _creatorThumbnail.setHarborAvailable(profile != null, animate, profile?.system?.toProto());
-            }
-        } else if (_imageChannel != null) {
-            val dp_28 = 28.dp(context.resources);
-            val avatar = profile?.systemState?.avatar?.selectBestImage(dp_28 * dp_28)
-                ?.let { it.toURLInfoSystemLinkUrl(profile.system.toProto(), it.process, profile.systemState.servers.toList()) };
-
-            if (avatar != null) {
-                _imageChannel.let {
-                    Glide.with(_imageChannel)
-                        .load(avatar)
-                        .placeholder(R.drawable.placeholder_channel_thumbnail)
-                        .into(_imageChannel);
-                }
-
-                _imageNeopassChannel?.visibility = View.VISIBLE
-                if (animate) {
-                    _neopassAnimator = ObjectAnimator.ofFloat(_imageNeopassChannel, "alpha", 0.0f, 1.0f).setDuration(500)
-                    _neopassAnimator?.start()
-                } else {
-                    _imageNeopassChannel?.alpha = 1.0f;
-                }
-            } else {
-                _imageNeopassChannel?.visibility = View.GONE
-            }
-        }
-
-        if (profile != null) {
-            _textChannelName.text = profile.systemState.username
-        }
-    }
-
     companion object {
         private val TAG = "VideoPreviewViewHolder"
     }

app/src/main/java/com/futo/platformplayer/views/adapters/viewholders/CreatorBarViewHolder.kt

@@ -11,7 +11,6 @@ import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.constructs.TaskHandler
 import com.futo.platformplayer.dp
 import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.polycentric.PolycentricCache
 import com.futo.platformplayer.selectBestImage
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.views.adapters.AnyAdapter
@@ -27,14 +26,6 @@ class CreatorBarViewHolder(private val _viewGroup: ViewGroup) : AnyAdapter.AnyVi
 
     val onClick = Event1<IPlatformChannel>();
 
-    private val _taskLoadProfile = TaskHandler<PlatformID, PolycentricCache.CachedPolycentricProfile?>(
-        StateApp.instance.scopeGetter,
-        { PolycentricCache.instance.getProfileAsync(it) })
-        .success { onProfileLoaded(it, true) }
-        .exception<Throwable> {
-            Logger.w(TAG, "Failed to load profile.", it);
-        };
-    
     init {
         _creatorThumbnail = _view.findViewById(R.id.creator_thumbnail);
         _name = _view.findViewById(R.id.text_channel_name);
@@ -45,40 +36,10 @@ class CreatorBarViewHolder(private val _viewGroup: ViewGroup) : AnyAdapter.AnyVi
     }
 
     override fun bind(value: IPlatformChannel) {
-        _taskLoadProfile.cancel();
-
         _channel = value;
 
         _creatorThumbnail.setThumbnail(value.thumbnail, false);
         _name.text = value.name;
-
-        val cachedProfile = PolycentricCache.instance.getCachedProfile(value.url, true);
-        if (cachedProfile != null) {
-            onProfileLoaded(cachedProfile, false);
-            if (cachedProfile.expired) {
-                _taskLoadProfile.run(value.id);
-            }
-        } else {
-            _taskLoadProfile.run(value.id);
-        }
-    }
-
-    private fun onProfileLoaded(cachedPolycentricProfile: PolycentricCache.CachedPolycentricProfile?, animate: Boolean) {
-        val dp_55 = 55.dp(itemView.context.resources)
-        val profile = cachedPolycentricProfile?.profile;
-        val avatar = profile?.systemState?.avatar?.selectBestImage(dp_55 * dp_55)
-            ?.let { it.toURLInfoSystemLinkUrl(profile.system.toProto(), it.process, profile.systemState.servers.toList()) };
-
-        if (avatar != null) {
-            _creatorThumbnail.setThumbnail(avatar, animate);
-        } else {
-            _creatorThumbnail.setThumbnail(_channel?.thumbnail, animate);
-            _creatorThumbnail.setHarborAvailable(profile != null, animate, profile?.system?.toProto());
-        }
-
-        if (profile != null) {
-            _name.text = profile.systemState.username;
-        }
     }
 
     companion object {
@@ -94,14 +55,6 @@ class SelectableCreatorBarViewHolder(private val _viewGroup: ViewGroup) : AnyAda
 
     val onClick = Event1<Selectable>();
 
-    private val _taskLoadProfile = TaskHandler<PlatformID, PolycentricCache.CachedPolycentricProfile?>(
-        StateApp.instance.scopeGetter,
-        { PolycentricCache.instance.getProfileAsync(it) })
-        .success { onProfileLoaded(it, true) }
-        .exception<Throwable> {
-            Logger.w(TAG, "Failed to load profile.", it);
-        };
-
     init {
         _creatorThumbnail = _view.findViewById(R.id.creator_thumbnail);
         _name = _view.findViewById(R.id.text_channel_name);
@@ -112,8 +65,6 @@ class SelectableCreatorBarViewHolder(private val _viewGroup: ViewGroup) : AnyAda
     }
 
     override fun bind(value: Selectable) {
-        _taskLoadProfile.cancel();
-
         _channel = value;
 
         if(value.active)
@@ -123,34 +74,6 @@ class SelectableCreatorBarViewHolder(private val _viewGroup: ViewGroup) : AnyAda
 
         _creatorThumbnail.setThumbnail(value.channel.thumbnail, false);
         _name.text = value.channel.name;
-
-        val cachedProfile = PolycentricCache.instance.getCachedProfile(value.channel.url, true);
-        if (cachedProfile != null) {
-            onProfileLoaded(cachedProfile, false);
-            if (cachedProfile.expired) {
-                _taskLoadProfile.run(value.channel.id);
-            }
-        } else {
-            _taskLoadProfile.run(value.channel.id);
-        }
-    }
-
-    private fun onProfileLoaded(cachedPolycentricProfile: PolycentricCache.CachedPolycentricProfile?, animate: Boolean) {
-        val dp_55 = 55.dp(itemView.context.resources)
-        val profile = cachedPolycentricProfile?.profile;
-        val avatar = profile?.systemState?.avatar?.selectBestImage(dp_55 * dp_55)
-            ?.let { it.toURLInfoSystemLinkUrl(profile.system.toProto(), it.process, profile.systemState.servers.toList()) };
-
-        if (avatar != null) {
-            _creatorThumbnail.setThumbnail(avatar, animate);
-        } else {
-            _creatorThumbnail.setThumbnail(_channel?.channel?.thumbnail, animate);
-            _creatorThumbnail.setHarborAvailable(profile != null, animate, profile?.system?.toProto());
-        }
-
-        if (profile != null) {
-            _name.text = profile.systemState.username;
-        }
     }
 
     companion object {