Merge branch 'master' of gitlab.futo.org:videostreaming/grayjay

Changelog: added

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,19 +1,19 @@
 name: Bug Report
 description: Let us know about an unexpected error, a crash, or an incorrect behavior.
-labels: ["bug", "new"]
+labels: ["Bug"]
 body:
   - type: markdown
     attributes:
       value: |
         # Thank you for taking the time to fill out this bug report.
-        
+
         The [grayjay-android](https://github.com/futo-org/grayjay-android) issue tracker is reserved for issues relating to the Grayjay Android Application
 
         For general usage questions, please see: [The Official FUTO Grayjay Zulip Channel](https://chat.futo.org/#narrow/stream/46-Grayjay)
 
         ## Filing a bug report
 
-        To fix your issues faster, we need clear reproduction cases - ideally allowing us to make it happen locally. 
+        To fix your issues faster, we need clear reproduction cases - ideally allowing us to make it happen locally.
         * Please include all needed context. For example, Device, OS, Application, your Grayjay Configurations and Plugin versioning info.
         * if you've found out a particular series of UI interactions can introduce buggy behavior, please label those steps 1-n with markdown
 
@@ -41,18 +41,21 @@ body:
       label: What plugins are you seeing the problem on?
       multiple: true
       options:
-        - All
-        - Youtube
-        - BiliBili (CN)
-        - Twitch
-        - Odysee
-        - Rumble
-        - Kick
-        - PeerTube
-        - Patreon
-        - Nebula
-        - SoundCloud
-        - Other
+        - "All"
+        - "Youtube"
+        - "Odysee"
+        - "Rumble"
+        - "Kick"
+        - "Twitch"
+        - "PeerTube"
+        - "Patreon"
+        - "Nebula"
+        - "BiliBili (CN)"
+        - "Bitchute"
+        - "SoundCloud"
+        - "Dailymotion"
+        - "Apple Podcasts"
+        - "Other"
     validations:
       required: true
 
@@ -72,6 +75,17 @@ body:
       - label: While logged out
       - label: N/A
 
+  - type: dropdown
+    id: vpn
+    attributes:
+      label: Are you using a VPN?
+      multiple: false
+      options:
+        - "No"
+        - "Yes"
+    validations:
+      required: true
+
   - type: textarea
     id: logs
     attributes:

.github/ISSUE_TEMPLATE/documentation_issue.yml

@@ -1,13 +1,13 @@
 name: Documentation Issue
 description: Report an issue or suggest a change in the documentation.
-labels: ["documentation", "new"]
+labels: ["Documentation"]
 body:
   - type: markdown
     attributes:
       value: |
         # Thank you for opening a documentation change request.
 
-        The [grayjay-android](https://github.com/futo-org/grayjay-android) issue tracker is reserved for issues relating to the Grayjay Android Application. Use the `Documentation` issue type to report problems with the documentation in our code repositories, inside the application, or on [https://grayjay.app](https://grayjay.app) 
+        The [grayjay-android](https://github.com/futo-org/grayjay-android) issue tracker is reserved for issues relating to the Grayjay Android Application. Use the `Documentation` issue type to report problems with the documentation in our code repositories, inside the application, or on [https://grayjay.app](https://grayjay.app)
         Technical writers monitor this issue type, so report Grayjay bugs or feature requests with the `Bug report` or `Feature Request` issue types instead to get engineering attention.
 
         For general usage questions, please see: [The Official FUTO Grayjay Zulip Channel](https://chat.futo.org/#narrow/stream/46-Grayjay)

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,6 +1,6 @@
 name: Feature Request
 description: Suggest a new feature or other enhancement.
-labels: ["enhancement", "new"]
+labels: ["Enhancement"]
 body:
   - type: markdown
     attributes:
@@ -9,8 +9,6 @@ body:
 
         The [grayjay-android](https://github.com/futo-org/grayjay-android) issue tracker is reserved for issues relating to the Grayjay Android Application
 
-        [External Contributions are closed at this time](https://github.com/tom-futo/grayjay-android/blob/master/CONTRIBUTION.md#contributing-to-core)
-
         For discussion related to enhancements, please see: [The FUTO Grayjay Zulip Channel](https://chat.futo.org/#narrow/stream/46-Grayjay)
 
   - type: textarea
@@ -55,4 +53,4 @@ body:
     attributes:
       value: |
         **Note:** If the submit button is disabled and you have filled out all required fields, please check that you did not forget a **Title** for the issue.
-        
+

.github/workflows/labeler.yml

@@ -1,34 +0,0 @@
-name: Issue labeler
-on:
-  issues:
-    types: [ opened ]
-
-permissions:
-  contents: read
-
-jobs:
-  label-component:
-    runs-on: ubuntu-latest
-
-    permissions:
-      # required for all workflows
-      issues: write
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Parse issue form
-        uses: stefanbuck/github-issue-parser@v3
-        id: issue-parser
-        with:
-          template-path: .github/ISSUE_TEMPLATE/bug_report.yml
-
-      - name: Set labels based on plugin field
-        uses: redhat-plumbers-in-action/advanced-issue-labeler@v2
-        with:
-          issue-form: ${{ steps.issue-parser.outputs.jsonString }}
-          section: plugin
-          block-list: |
-            None
-            Other
-          token: ${{ secrets.GITHUB_TOKEN }}

.gitmodules

@@ -82,3 +82,9 @@
 [submodule "app/src/stable/assets/sources/dailymotion"]
 	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-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

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

@@ -11,7 +11,8 @@ let Type = {
         Streams: "STREAMS",
         Mixed: "MIXED",
         Live: "LIVE",
-        Subscriptions: "SUBSCRIPTIONS"
+        Subscriptions: "SUBSCRIPTIONS",
+        Shorts: "SHORTS"
     },
     Order: {
         Chronological: "CHRONOLOGICAL"
@@ -244,6 +245,7 @@ class PlatformVideo extends PlatformContent {
         this.viewCount = obj.viewCount ?? -1; //Long
 
         this.isLive = obj.isLive ?? false; //Boolean
+        this.isShort = !!obj.isShort ?? false;
     }
 }
 class PlatformVideoDetails extends PlatformVideo {
@@ -260,6 +262,11 @@ 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_Formatting.kt

@@ -226,6 +226,25 @@ fun Long.toHumanTime(isMs: Boolean): String {
     else
         return  "${prefix}${minsStr}:${secsStr}"
 }
+fun Long.toHumanDuration(isMs: Boolean): String {
+    var scaler = 1;
+    if(isMs)
+        scaler = 1000;
+    val v = Math.abs(this);
+    val hours = Math.max(v/(secondsInHour*scaler), 0);
+    val mins = Math.max((v % (secondsInHour*scaler)) / (secondsInMinute * scaler), 0);
+    val minsStr = mins.toString();
+    val seconds = Math.max(((v % (secondsInHour*scaler)) % (secondsInMinute * scaler))/scaler, 0);
+    val secsStr = seconds.toString().padStart(2, '0');
+    val prefix = if (this < 0) { "-" } else { "" };
+
+    return listOf(
+        if(hours > 0) "${hours}h" else null,
+        if(mins > 0) "${mins}m" else null ,
+        if(seconds > 0) "${seconds}s" else null
+    ).filterNotNull().joinToString(" ");
+}
+
 
 //TODO: Determine if below stuff should have its own proper class, seems a bit too complex for a utility method
 fun String.fixHtmlWhitespace(): Spanned {

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

@@ -6,6 +6,7 @@ import java.io.ByteArrayOutputStream
 import java.io.IOException
 import java.io.InputStream
 import java.net.Inet4Address
+import java.net.Inet6Address
 import java.net.InetAddress
 import java.net.InetSocketAddress
 import java.net.Socket

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

@@ -33,10 +33,10 @@ fun Boolean?.toYesNo(): String {
 fun InetAddress?.toUrlAddress(): String {
     return when (this) {
         is Inet6Address -> {
-            "[${toString()}]"
+            "[${hostAddress}]"
         }
         is Inet4Address -> {
-            toString()
+            hostAddress
         }
         else -> {
             throw Exception("Invalid address type")

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

@@ -254,6 +254,9 @@ class Settings : FragmentedStorageFileJson() {
         @FormField(R.string.progress_bar, FieldForm.TOGGLE, R.string.progress_bar_description, 6)
         var progressBar: Boolean = true;
 
+        @FormField(R.string.hide_hidden_from_search, FieldForm.TOGGLE, R.string.hide_hidden_from_search_description, 7)
+        var hidefromSearch: Boolean = false;
+
 
         fun getSearchFeedStyle(): FeedStyle {
             if(searchFeedStyle == 0)
@@ -412,15 +415,13 @@ class Settings : FragmentedStorageFileJson() {
         var preferredPreviewQuality: Int = 5;
         fun getPreferredPreviewQualityPixelCount(): Int = preferedQualityToPixels(preferredPreviewQuality);
 
-
         @FormField(R.string.simplify_sources, FieldForm.TOGGLE, R.string.simplify_sources_description, 4)
         var simplifySources: Boolean = true;
 
-        @FormField(R.string.auto_rotate, FieldForm.DROPDOWN, -1, 5)
-        @DropdownFieldOptionsId(R.array.system_enabled_disabled_array)
-        var autoRotate: Int = 2;
+        @FormField(R.string.always_allow_reverse_landscape_auto_rotate, FieldForm.TOGGLE, R.string.always_allow_reverse_landscape_auto_rotate_description, 5)
+        var alwaysAllowReverseLandscapeAutoRotate: Boolean = true
 
-        @FormField(R.string.background_behavior, FieldForm.DROPDOWN, -1, 7)
+        @FormField(R.string.background_behavior, FieldForm.DROPDOWN, -1, 6)
         @DropdownFieldOptionsId(R.array.player_background_behavior)
         var backgroundPlay: Int = 2;
 
@@ -643,6 +644,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;
 
@@ -863,11 +867,13 @@ class Settings : FragmentedStorageFileJson() {
     class Other {
         @FormField(R.string.playlist_delete_confirmation, FieldForm.TOGGLE, R.string.playlist_delete_confirmation_description, 2)
         var playlistDeleteConfirmation: Boolean = true;
+        @FormField(R.string.playlist_allow_dups, FieldForm.TOGGLE, R.string.playlist_allow_dups_description, 3)
+        var playlistAllowDups: Boolean = true;
 
-        @FormField(R.string.enable_polycentric, FieldForm.TOGGLE, R.string.can_be_disabled_when_you_are_experiencing_issues, 3)
+        @FormField(R.string.enable_polycentric, FieldForm.TOGGLE, R.string.can_be_disabled_when_you_are_experiencing_issues, 4)
         var polycentricEnabled: Boolean = true;
 
-        @FormField(R.string.polycentric_local_cache, FieldForm.TOGGLE, R.string.polycentric_local_cache_description, 4)
+        @FormField(R.string.polycentric_local_cache, FieldForm.TOGGLE, R.string.polycentric_local_cache_description, 5)
         var polycentricLocalCache: Boolean = true;
     }
 

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

@@ -1,6 +1,7 @@
 package com.futo.platformplayer
 
 import android.content.Context
+import android.content.Intent
 import android.webkit.CookieManager
 import androidx.work.Data
 import androidx.work.OneTimeWorkRequestBuilder

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

@@ -368,8 +368,8 @@ class UIDialogs {
             }
         }
 
-        fun showChangelogDialog(context: Context, lastVersion: Int) {
-            val dialog = ChangelogDialog(context);
+        fun showChangelogDialog(context: Context, lastVersion: Int, changelogs: Map<Int, String>? = null) {
+            val dialog = ChangelogDialog(context, changelogs);
             registerDialogOpened(dialog);
             dialog.setOnDismissListener { registerDialogClosed(dialog) };
             dialog.show();

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

@@ -79,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>();
 
@@ -335,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
                         ))
@@ -417,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),
@@ -430,7 +462,7 @@ class UISlideOverlays {
                             menu?.setOk(container.context.getString(R.string.download));
                     },
                     invokeParent = false
-                )) +
+                )) else listOf()) +
                 videoSources
                 .filter { it.isDownloadable() }
                 .map {
@@ -895,7 +927,8 @@ class UISlideOverlays {
                             "${lastUpdated.videos.size} " + container.context.getString(R.string.videos),
                             tag = "",
                             call = {
-                                StatePlaylists.instance.addToPlaylist(lastUpdated.id, video);
+                                if(StatePlaylists.instance.addToPlaylist(lastUpdated.id, video))
+                                    UIDialogs.appToast("Added to playlist [${lastUpdated?.name}]", false);
                                 StateDownloads.instance.checkForOutdatedPlaylists();
                             }))
                 );
@@ -906,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,
@@ -991,7 +1024,8 @@ class UISlideOverlays {
                     "${playlist.videos.size} " + container.context.getString(R.string.videos),
                     tag = "",
                     call = {
-                        StatePlaylists.instance.addToPlaylist(playlist.id, video);
+                        if(StatePlaylists.instance.addToPlaylist(playlist.id, video))
+                            UIDialogs.appToast("Added to playlist [${playlist.name}]", false);
                         StateDownloads.instance.checkForOutdatedPlaylists();
                     }));
             }
@@ -1018,7 +1052,8 @@ class UISlideOverlays {
                             "${lastUpdated.videos.size} " + container.context.getString(R.string.videos),
                             tag = "",
                             call = {
-                                StatePlaylists.instance.addToPlaylist(lastUpdated.id, video);
+                                if(StatePlaylists.instance.addToPlaylist(lastUpdated.id, video))
+                                    UIDialogs.appToast("Added to playlist [${lastUpdated?.name}]", false);
                                 StateDownloads.instance.checkForOutdatedPlaylists();
                             }))
                 );
@@ -1040,7 +1075,10 @@ class UISlideOverlays {
                         StatePlayer.TYPE_WATCHLATER,
                         "${watchLater.size} " + container.context.getString(R.string.videos),
                         tag = "watch later",
-                        call = { StatePlaylists.instance.addToWatchLater(SerializedPlatformVideo.fromVideo(video), true); }),
+                        call = {
+                            if(StatePlaylists.instance.addToWatchLater(SerializedPlatformVideo.fromVideo(video), true))
+                                UIDialogs.appToast("Added to watch later", false);
+                        }),
                     )
             );
 
@@ -1067,7 +1105,8 @@ class UISlideOverlays {
                     "${playlist.videos.size} " + container.context.getString(R.string.videos),
                     tag = "",
                     call = {
-                        StatePlaylists.instance.addToPlaylist(playlist.id, video);
+                        if(StatePlaylists.instance.addToPlaylist(playlist.id, video))
+                            UIDialogs.appToast("Added to playlist [${playlist.name}]", false);
                         StateDownloads.instance.checkForOutdatedPlaylists();
                     }));
             }

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

@@ -1281,7 +1281,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             if (toast.long)
                 delay(5000);
             else
-                delay(3000);
+                delay(2500);
         }
         Logger.i(TAG, "Ending appToast loop");
         lifecycleScope.launch(Dispatchers.Main) {

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/activities/SyncPairActivity.kt

@@ -122,7 +122,11 @@ class SyncPairActivity : AppCompatActivity() {
                 } catch (e: Throwable) {
                     withContext(Dispatchers.Main) {
                         _layoutPairingError.visibility = View.VISIBLE
-                        _textError.text = e.message
+                        if(e.message == "Failed to connect") {
+                            _textError.text = "Failed to connect.\n\nThis may be due to not being on the same network, due to firewall, or vpn.\nSync currently operates only over local direct connections."
+                        }
+                        else
+                            _textError.text = e.message
                         _layoutPairing.visibility = View.GONE
                         Logger.e(TAG, "Failed to pair", e)
                     }

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

@@ -5,6 +5,8 @@ import com.futo.platformplayer.SettingsDev
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.ensureNotMainThread
 import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.states.StateApp
+import com.futo.platformplayer.stores.FragmentedStorage
 import okhttp3.Call
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.OkHttpClient
@@ -63,7 +65,7 @@ open class ManagedHttpClient {
 
     constructor(builder: OkHttpClient.Builder = OkHttpClient.Builder()) {
         _builderTemplate = builder;
-        if(SettingsDev.instance.developerMode && SettingsDev.instance.networking.allowAllCertificates)
+        if(FragmentedStorage.isInitialized && StateApp.instance.isMainActive && SettingsDev.instance.developerMode && SettingsDev.instance.networking.allowAllCertificates)
             trustAllCertificates(builder);
         client = builder.addNetworkInterceptor { chain ->
             val request = beforeRequest(chain.request());

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/ResultCapabilities.kt

@@ -30,6 +30,7 @@ class ResultCapabilities(
         const val TYPE_POSTS = "POSTS";
         const val TYPE_MIXED = "MIXED";
         const val TYPE_SUBSCRIPTIONS = "SUBSCRIPTIONS";
+        const val TYPE_SHORTS = "SHORTS";
 
         const val ORDER_CHONOLOGICAL = "CHRONOLOGICAL";
 

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

@@ -33,13 +33,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/IPlatformVideo.kt

@@ -13,4 +13,6 @@ interface IPlatformVideo : IPlatformContent {
     val viewCount: Long;
 
     val isLive : Boolean;
+
+    val isShort: Boolean;
 }

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

@@ -25,6 +25,7 @@ open class SerializedPlatformVideo(
 
     override val duration: Long,
     override val viewCount: Long,
+    override val isShort: Boolean = false
 ) : IPlatformVideo, SerializedPlatformContent {
     override val contentType: ContentType = ContentType.MEDIA;
 

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

@@ -38,7 +38,8 @@ open class SerializedPlatformVideoDetails(
     override val video: ISerializedVideoSourceDescriptor,
     override val preview: ISerializedVideoSourceDescriptor?,
 
-    override val subtitles: List<SubtitleRawSource> = listOf()
+    override val subtitles: List<SubtitleRawSource> = listOf(),
+    override val isShort: Boolean = false
 ) : IPlatformVideo, IPlatformVideoDetails {
     final override val contentType: ContentType get() = ContentType.MEDIA;
 

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

@@ -33,6 +33,7 @@ class SourcePluginConfig(
     override val allowEval: Boolean = false,
     override val allowUrls: List<String> = listOf(),
     override val packages: List<String> = listOf(),
+    override val packagesOptional: List<String> = listOf(),
 
     val settings: List<Setting> = listOf(),
 
@@ -52,6 +53,7 @@ class SourcePluginConfig(
     var allowAllHttpHeaderAccess: Boolean = false,
     var maxDownloadParallelism: Int = 0,
     var reduceFunctionsInLimitedVersion: Boolean = false,
+    var changelog: HashMap<String, List<String>>? = null
 ) : IV8PluginConfig {
 
     val absoluteIconUrl: String? get() = resolveAbsoluteUrl(iconUrl, sourceUrl);
@@ -101,6 +103,10 @@ class SourcePluginConfig(
             if(!packages.contains(pack))
                 return false;
         }
+        for(pack in newConfig.packagesOptional) {
+            if(!packagesOptional.contains(pack))
+                return false;
+        }
         //Developer Submit Url should be same or empty
         if(!newConfig.developerSubmitUrl.isNullOrEmpty() && developerSubmitUrl != newConfig.developerSubmitUrl)
             return false;
@@ -129,7 +135,7 @@ class SourcePluginConfig(
 
         val currentlyInstalledPlugin = StatePlugins.instance.getPlugin(id);
         if (currentlyInstalledPlugin != null) {
-            if (currentlyInstalledPlugin.config.scriptPublicKey != scriptPublicKey) {
+            if (currentlyInstalledPlugin.config.scriptPublicKey != scriptPublicKey && !currentlyInstalledPlugin.config.scriptPublicKey.isNullOrEmpty()) {
                 list.add(Pair(
                     "Different Author",
                     "This plugin was signed by a different author. Please ensure that this is correct and that the plugin was not provided by a malicious actor."));
@@ -178,6 +184,19 @@ class SourcePluginConfig(
         return _allowUrlsLower.any { it == host || (it.length > 0 && it[0] == '.' && host.matchesDomain(it)) };
     }
 
+    fun getChangelogString(version: String): String?{
+        if(changelog == null || !changelog!!.containsKey(version))
+            return null;
+        val changelog = changelog!![version]!!;
+        if(changelog.size > 1) {
+            return "Changelog (${version})\n" + changelog.map { " - " + it.trim() }.joinToString("\n");
+        }
+        else if(changelog.size == 1) {
+            return "Changelog (${version})\n" + changelog[0].trim();
+        }
+        return null;
+    }
+
     companion object {
         fun fromJson(json: String, sourceUrl: String? = null): SourcePluginConfig {
             val obj = Serializer.json.decodeFromString<SourcePluginConfig>(json);

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

@@ -6,6 +6,7 @@ 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.IPlatformVideo
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
+import com.futo.platformplayer.getOrDefault
 import com.futo.platformplayer.getOrThrow
 
 open class JSVideo : JSContent, IPlatformVideo, IPluginSourced {
@@ -17,6 +18,7 @@ open class JSVideo : JSContent, IPlatformVideo, IPluginSourced {
     final override val viewCount: Long;
 
     final override val isLive: Boolean;
+    final override val isShort: Boolean;
 
     constructor(config: SourcePluginConfig, obj: V8ValueObject): super(config, obj) {
         val contextName = "PlatformVideo";
@@ -26,5 +28,6 @@ open class JSVideo : JSContent, IPlatformVideo, IPluginSourced {
         duration = _content.getOrThrow<Int>(config, "duration", contextName).toLong();
         viewCount = _content.getOrThrow(config, "viewCount", contextName);
         isLive = _content.getOrThrow(config, "isLive", contextName);
+        isShort = _content.getOrDefault(config, "isShort", contextName, false) ?: false;
     }
 }

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,8 +16,8 @@ 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;
@@ -29,11 +31,14 @@ 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;
@@ -50,15 +55,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/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/ChangelogDialog.kt

@@ -1,37 +1,24 @@
 package com.futo.platformplayer.dialogs
 
 import android.app.AlertDialog
-import android.app.PendingIntent.*
 import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageInstaller
 import android.graphics.drawable.Animatable
 import android.os.Bundle
 import android.text.method.ScrollingMovementMethod
 import android.view.LayoutInflater
 import android.view.View
-import android.view.WindowManager
 import android.widget.Button
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
-import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.*
-import com.futo.platformplayer.receivers.InstallReceiver
 import com.futo.platformplayer.api.http.ManagedHttpClient
-import com.futo.platformplayer.api.media.models.PlatformAuthorLink
-import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.constructs.TaskHandler
-import com.futo.platformplayer.fragment.mainactivity.main.ChannelFragment
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateApp
-import com.futo.platformplayer.states.StatePlatform
 import com.futo.platformplayer.states.StateUpdate
-import kotlinx.coroutines.*
-import java.io.File
-import java.io.InputStream
 
-class ChangelogDialog(context: Context?) : AlertDialog(context) {
+class ChangelogDialog(context: Context?, val changelogs: Map<Int, String>? = null) : AlertDialog(context) {
     companion object {
         private val TAG = "ChangelogDialog";
     }
@@ -48,7 +35,11 @@ class ChangelogDialog(context: Context?) : AlertDialog(context) {
     private var _maxVersion: Int = 0;
     private var _managedHttpClient = ManagedHttpClient();
 
-    private val _taskDownloadChangelog = TaskHandler<Int, String?>(StateApp.instance.scopeGetter, { version -> StateUpdate.instance.downloadChangelog(_managedHttpClient, version) })
+    private val _taskDownloadChangelog = TaskHandler<Int, String?>(StateApp.instance.scopeGetter, { version -> if(changelogs == null)
+            StateUpdate.instance.downloadChangelog(_managedHttpClient, version)
+        else
+            changelogs[version]
+    })
         .success { setChangelog(it); }
         .exception<Throwable> {
             Logger.w(TAG, "Failed to load changelog.", it);
@@ -97,7 +88,7 @@ class ChangelogDialog(context: Context?) : AlertDialog(context) {
         setVersion(version);
 
         val currentVersion = BuildConfig.VERSION_CODE;
-        _buttonUpdate.visibility = if (currentVersion == _maxVersion) View.GONE else View.VISIBLE;
+        _buttonUpdate.visibility = if (currentVersion == _maxVersion || changelogs != null) View.GONE else View.VISIBLE;
     }
 
     private fun setVersion(version: Int) {

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

@@ -54,6 +54,7 @@ class PluginUpdateDialog : AlertDialog {
     private lateinit var _buttonInstall: LinearLayout;
 
     private lateinit var _textPlugin: TextView;
+    private lateinit var _textChangelog: TextView;
     private lateinit var _textProgres: TextView;
     private lateinit var _textError: TextView;
     private lateinit var _textResult: TextView;
@@ -94,6 +95,7 @@ class PluginUpdateDialog : AlertDialog {
         _buttonInstall = findViewById(R.id.button_install);
 
         _textPlugin = findViewById(R.id.text_plugin);
+        _textChangelog = findViewById(R.id.text_changelog);
         _textProgres = findViewById(R.id.text_progress);
         _textError = findViewById(R.id.text_error);
         _textResult = findViewById(R.id.text_result);
@@ -110,6 +112,27 @@ class PluginUpdateDialog : AlertDialog {
         _updateSpinner = findViewById(R.id.update_spinner);
         _iconPlugin = findViewById(R.id.icon_plugin);
 
+        try {
+            var changelogVersion = _newConfig.version.toString();
+                if (_newConfig.changelog != null && _newConfig.changelog?.containsKey(changelogVersion) == true) {
+                _textChangelog.movementMethod = ScrollingMovementMethod();
+                val changelog = _newConfig.changelog!![changelogVersion]!!;
+                if(changelog.size > 1) {
+                    _textChangelog.text = "Changelog (${_newConfig.version})\n" + changelog.map { " - " + it.trim() }.joinToString("\n");
+                }
+                else if(changelog.size == 1) {
+                    _textChangelog.text = "Changelog (${_newConfig.version})\n" + changelog[0].trim();
+                }
+                else
+                    _textChangelog.visibility = View.GONE;
+            } else
+                _textChangelog.visibility = View.GONE;
+        }
+        catch(ex: Throwable) {
+            _textChangelog.visibility = View.GONE;
+            Logger.e(TAG, "Invalid changelog? ", ex);
+        }
+
         _buttonCancel1.setOnClickListener {
             dismiss();
         };

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

@@ -141,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;
@@ -235,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");
@@ -310,6 +318,10 @@ class VideoDownload {
                 if(vsource == null)
                     vsource = VideoHelper.selectBestVideoSource(videoSources, targetPixelCount!!.toInt(), arrayOf())
                 //    ?: throw IllegalStateException("Could not find a valid video source for video");
+                if(vsource is JSSource) {
+                    this.hasVideoRequestExecutor = this.hasVideoRequestExecutor || vsource.hasRequestExecutor;
+                    this.requiresLiveVideoSource = this.hasVideoRequestExecutor || (vsource is JSDashManifestRawSource && vsource.hasGenerate);
+                }
 
                 if(vsource == null) {
                     videoSource = null;
@@ -361,6 +373,12 @@ class VideoDownload {
                     asource = VideoHelper.selectBestAudioSource(audioSources, arrayOf(), null, targetBitrate)
                         ?: if(videoSource != null ) null
                         else throw DownloadException("Could not find a valid video or audio source for download")
+
+                if(asource is JSSource) {
+                    this.hasAudioRequestExecutor = this.hasAudioRequestExecutor || asource.hasRequestExecutor;
+                    this.requiresLiveAudioSource = this.hasAudioRequestExecutor || (asource is JSDashManifestRawSource && asource.hasGenerate);
+                }
+
                 if(asource == null) {
                     audioSource = null;
                     if(!original.video.isUnMuxed || original.video.videoSources.size == 0)
@@ -400,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) {
@@ -1052,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)
@@ -1082,7 +1102,7 @@ class VideoDownload {
             StateDownloads.instance.updateCachedVideo(existing);
         }
         else {
-            val newVideo = VideoLocal(videoDetails!!);
+            val newVideo = VideoLocal(videoDetails!!, OffsetDateTime.now());
             if(localVideoSource != null)
                 newVideo.videoSource.add(localVideoSource);
             if(localAudioSource != null)
@@ -1134,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 {
@@ -1145,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

@@ -23,6 +23,7 @@ import com.futo.platformplayer.api.media.models.subtitles.ISubtitleSource
 import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
 import com.futo.platformplayer.api.media.models.video.SerializedPlatformVideoDetails
 import com.futo.platformplayer.api.media.structures.IPager
+import com.futo.platformplayer.serializers.OffsetDateTimeNullableSerializer
 import com.futo.platformplayer.stores.v2.IStoreItem
 import java.io.File
 import java.time.OffsetDateTime
@@ -70,14 +71,21 @@ class VideoLocal: IPlatformVideoDetails, IStoreItem {
 
     override val isLive: Boolean get() = videoSerialized.isLive;
 
+    override val isShort: Boolean get() = videoSerialized.isShort;
+
     //TODO: Offline subtitles
     override val subtitles: List<ISubtitleSource> = listOf();
 
-    constructor(video: SerializedPlatformVideoDetails) {
+    @kotlinx.serialization.Serializable(with = OffsetDateTimeNullableSerializer::class)
+    var downloadDate: OffsetDateTime? = null;
+
+    constructor(video: SerializedPlatformVideoDetails, downloadDate: OffsetDateTime? = null) {
         this.videoSerialized = video;
+        this.downloadDate = downloadDate;
     }
     constructor(video: IPlatformVideoDetails, subtitleSources: List<SubtitleRawSource>) {
         this.videoSerialized = SerializedPlatformVideoDetails.fromVideo(video, subtitleSources);
+        downloadDate = OffsetDateTime.now();
     }
 
     override fun getComments(client: IPlatformClient): IPager<IPlatformComment>? = null;

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

@@ -32,6 +32,7 @@ import com.futo.platformplayer.engine.internal.V8Converter
 import com.futo.platformplayer.engine.packages.PackageBridge
 import com.futo.platformplayer.engine.packages.PackageDOMParser
 import com.futo.platformplayer.engine.packages.PackageHttp
+import com.futo.platformplayer.engine.packages.PackageJSDOM
 import com.futo.platformplayer.engine.packages.PackageUtilities
 import com.futo.platformplayer.engine.packages.V8Package
 import com.futo.platformplayer.getOrThrow
@@ -94,7 +95,11 @@ class V8Plugin {
         withDependency(PackageBridge(this, config));
 
         for(pack in config.packages)
-            withDependency(getPackage(pack));
+            withDependency(getPackage(pack)!!);
+        for(pack in config.packagesOptional)
+            getPackage(pack, true)?.let {
+                withDependency(it);
+            }
     }
 
     fun changeAllowDevSubmit(isAllowed: Boolean) {
@@ -254,13 +259,14 @@ class V8Plugin {
         }
     }
 
-    private fun getPackage(packageName: String): V8Package {
+    private fun getPackage(packageName: String, allowNull: Boolean = false): V8Package? {
         //TODO: Auto get all package types?
         return when(packageName) {
             "DOMParser" -> PackageDOMParser(this)
             "Http" -> PackageHttp(this, config)
             "Utilities" -> PackageUtilities(this, config)
-            else -> throw ScriptCompilationException(config, "Unknown package [${packageName}] required for plugin ${config.name}");
+            "JSDOM" -> PackageJSDOM(this, config)
+            else -> if(allowNull) null else throw ScriptCompilationException(config, "Unknown package [${packageName}] required for plugin ${config.name}");
         };
     }
 

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

@@ -5,6 +5,7 @@ interface IV8PluginConfig {
     val allowEval: Boolean;
     val allowUrls: List<String>;
     val packages: List<String>;
+    val packagesOptional: List<String>;
 }
 
 @kotlinx.serialization.Serializable
@@ -13,17 +14,20 @@ class V8PluginConfig : IV8PluginConfig {
     override val allowEval: Boolean;
     override val allowUrls: List<String>;
     override val packages: List<String>;
+    override val packagesOptional: List<String>;
 
     constructor() {
         name = "Unknown";
         allowEval = false;
         allowUrls = listOf();
         packages = listOf();
+        packagesOptional = listOf();
     }
-    constructor(name: String, allowEval: Boolean, allowUrls: List<String>, packages: List<String> = listOf()) {
+    constructor(name: String, allowEval: Boolean, allowUrls: List<String>, packages: List<String> = listOf(), packagesOptional: List<String> = listOf()) {
         this.name = name;
         this.allowEval = allowEval;
         this.allowUrls = allowUrls;
         this.packages = packages;
+        this.packagesOptional = packagesOptional;
     }
 }

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

@@ -1,8 +1,12 @@
 package com.futo.platformplayer.engine.packages
 
+import android.media.MediaCodec
+import android.media.MediaCodecList
 import com.caoccao.javet.annotations.V8Function
 import com.caoccao.javet.annotations.V8Property
+import com.caoccao.javet.utils.JavetResourceUtils
 import com.caoccao.javet.values.V8Value
+import com.caoccao.javet.values.reference.V8ValueFunction
 import com.futo.platformplayer.BuildConfig
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateDeveloper
@@ -16,6 +20,7 @@ import com.futo.platformplayer.engine.IV8PluginConfig
 import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.states.StateApp
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.encodeToString
@@ -37,6 +42,18 @@ class PackageBridge : V8Package {
         _config = config;
         _client = plugin.httpClient;
         _clientAuth = plugin.httpClientAuth;
+
+        withScript("""
+             function setTimeout(func, delay) {
+                 let args = Array.prototype.slice.call(arguments, 2);
+                 return bridge.setTimeout(func.bind(globalThis, ...args), delay || 0);
+             }
+        """.trimIndent());
+        withScript("""
+               function clearTimeout(id) {
+                    bridge.clearTimeout(id);
+                }
+        """.trimIndent());
     }
 
 
@@ -62,6 +79,48 @@ class PackageBridge : V8Package {
         value.close();
     }
 
+    var timeoutCounter = 0;
+    var timeoutMap = HashSet<Int>();
+    @V8Function
+    fun setTimeout(func: V8ValueFunction, timeout: Long): Int {
+        val id = timeoutCounter++;
+
+        val funcClone = func.toClone<V8ValueFunction>()
+
+        StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
+            delay(timeout);
+            synchronized(timeoutMap) {
+                if(!timeoutMap.contains(id)) {
+                    JavetResourceUtils.safeClose(funcClone);
+                    return@launch;
+                }
+                timeoutMap.remove(id);
+            }
+            try {
+                _plugin.whenNotBusy {
+                    funcClone.callVoid(null, arrayOf<Any>());
+                }
+            }
+            catch(ex: Throwable) {
+                Logger.e(TAG, "Failed timeout callback", ex);
+            }
+            finally {
+                JavetResourceUtils.safeClose(funcClone);
+            }
+        };
+        synchronized(timeoutMap) {
+            timeoutMap.add(id);
+        }
+        return id;
+    }
+    @V8Function
+    fun clearTimeout(id: Int) {
+        synchronized(timeoutMap) {
+            if(timeoutMap.contains(id))
+                timeoutMap.remove(id);
+        }
+    }
+
     @V8Function
     fun toast(str: String) {
         Logger.i(TAG, "Plugin toast [${_config.name}]: ${str}");
@@ -130,7 +189,44 @@ class PackageBridge : V8Package {
         return false;
     }
 
+    @V8Function
+    fun getHardwareCodecs(): List<String>{
+        return getSupportedHardwareMediaCodecs();
+    }
+
+
     companion object {
         private const val TAG = "PackageBridge";
+
+        private var _mediaCodecList: MutableList<String> = mutableListOf();
+        private var _mediaCodecListHardware: MutableList<String> = mutableListOf();
+
+        fun getSupportedMediaCodecs(): List<String>{
+            synchronized(_mediaCodecList) {
+                if(_mediaCodecList.size <= 0)
+                    updateMediaCodecList();
+                return _mediaCodecList;
+            }
+        }
+        fun getSupportedHardwareMediaCodecs(): List<String>{
+            synchronized(_mediaCodecList) {
+                if(_mediaCodecList.size <= 0)
+                    updateMediaCodecList();
+                return _mediaCodecListHardware;
+            }
+        }
+        private fun updateMediaCodecList() {
+            _mediaCodecList.clear();
+            _mediaCodecListHardware.clear();
+            for(codec in MediaCodecList(MediaCodecList.ALL_CODECS).codecInfos) {
+                if(!codec.isEncoder) {
+                    _mediaCodecList.add(codec.canonicalName);
+                    if (codec.isHardwareAccelerated)
+                        _mediaCodecListHardware.add(codec.canonicalName);
+                }
+            }
+        }
+
+
     }
 }

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

@@ -21,9 +21,13 @@ import com.futo.platformplayer.engine.internal.IV8Convertable
 import com.futo.platformplayer.engine.internal.V8BindObject
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateApp
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import java.net.SocketTimeoutException
+import java.util.concurrent.ForkJoinPool
+import java.util.concurrent.ForkJoinTask
+import kotlin.concurrent.thread
 import kotlin.streams.asSequence
 
 class PackageHttp: V8Package {
@@ -42,6 +46,9 @@ class PackageHttp: V8Package {
     override val name: String get() = "Http";
     override val variableName: String get() = "http";
 
+    private var _batchPoolLock: Any = Any();
+    private var _batchPool: ForkJoinPool? = null;
+
 
     constructor(plugin: V8Plugin, config: IV8PluginConfig): super(plugin) {
         _config = config;
@@ -51,6 +58,37 @@ class PackageHttp: V8Package {
         _packageClientAuth = PackageHttpClient(this, _clientAuth);
     }
 
+
+    /*
+    Automatically adjusting threadpool dedicated per PackageHttp for batch requests.
+     */
+    private fun <T, R> autoParallelPool(data: List<T>, parallelism: Int, handle: (T)->R): List<Pair<R?, Throwable?>> {
+        synchronized(_batchPoolLock) {
+            val threadsToUse = if (parallelism <= 0) data.size else Math.min(parallelism, data.size);
+            if(_batchPool == null)
+                _batchPool = ForkJoinPool(threadsToUse);
+            var pool = _batchPool ?: return listOf();
+            if(pool.poolSize < threadsToUse) { //Resize pool
+                pool.shutdown();
+                _batchPool = ForkJoinPool(threadsToUse);
+                pool = _batchPool ?: return listOf();
+            }
+
+            val resultTasks = mutableListOf<ForkJoinTask<Pair<R?, Throwable?>>>();
+            for(item in data){
+                resultTasks.add(pool.submit<Pair<R?, Throwable?>> {
+                      try {
+                          return@submit Pair<R?, Throwable?>(handle(item), null);
+                      }
+                      catch(ex: Throwable) {
+                          return@submit Pair<R?, Throwable?>(null, ex);
+                      }
+                });
+            }
+            return resultTasks.map { it.join() };
+        }
+    }
+
     @V8Function
     fun newClient(withAuth: Boolean): PackageHttpClient {
         val httpClient = if(withAuth) _clientAuth.clone() else _client.clone();
@@ -176,8 +214,6 @@ class PackageHttp: V8Package {
             obj.set("url", url);
             obj.set("code", code);
             if(body != null) {
-                val buffer = runtime.createV8ValueArrayBuffer(body.size);
-                buffer.fromBytes(body);
                 obj.set("body", body);
             }
             obj.set("headers", headers);
@@ -236,16 +272,19 @@ class PackageHttp: V8Package {
         //Finalizer
         @V8Function
         fun execute(): List<IBridgeHttpResponse?> {
-            return _reqs.parallelStream().map {
+            return _package.autoParallelPool(_reqs, -1) {
                 if(it.second.method == "DUMMY")
-                    return@map null;
+                    return@autoParallelPool null;
                 if(it.second.body != null)
-                    return@map it.first.requestWithBody(it.second.method, it.second.url, it.second.body!!, it.second.headers, it.second.respType);
+                    return@autoParallelPool it.first.requestWithBody(it.second.method, it.second.url, it.second.body!!, it.second.headers, it.second.respType);
                 else
-                    return@map it.first.request(it.second.method, it.second.url, it.second.headers, it.second.respType);
-            }
-                .asSequence()
-                .toList();
+                    return@autoParallelPool it.first.request(it.second.method, it.second.url, it.second.headers, it.second.respType);
+            }.map {
+                if(it.second != null)
+                    throw it.second!!;
+                else
+                    return@map it.first;
+            }.toList();
         }
     }
 
@@ -439,11 +478,8 @@ class PackageHttp: V8Package {
             else {
                 headers?.forEach { (header, values) ->
                     val lowerCaseHeader = header.lowercase()
-                    if(lowerCaseHeader == "set-cookie") {
-                        result[lowerCaseHeader] = values.filter{
-                            !it.lowercase().contains("httponly")
-                        };
-                    }
+                    if(lowerCaseHeader == "set-cookie" && !values.any { it.lowercase().contains("httponly") })
+                        result[lowerCaseHeader] = values;
                     else
                         result[lowerCaseHeader] = values;
                 }

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

@@ -0,0 +1,20 @@
+package com.futo.platformplayer.engine.packages
+
+import com.futo.platformplayer.engine.IV8PluginConfig
+import com.futo.platformplayer.engine.V8Plugin
+import com.futo.platformplayer.states.StateApp
+
+
+class PackageJSDOM : V8Package {
+    @Transient
+    private val _config: IV8PluginConfig;
+
+    override val name: String get() = "JSDOM";
+    override val variableName: String get() = "packageJSDOM";
+
+    constructor(plugin: V8Plugin, config: IV8PluginConfig): super(plugin) {
+        _config = config;
+        plugin.withDependency(StateApp.instance.contextOrNull ?: return, "scripts/JSDOM.js");
+    }
+
+}

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

@@ -43,7 +43,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlin.math.max
 
-class ChannelContentsFragment : Fragment(), IChannelTabFragment {
+class ChannelContentsFragment(private val subType: String? = null) : Fragment(), IChannelTabFragment {
     private var _recyclerResults: RecyclerView? = null;
     private var _glmVideo: GridLayoutManager? = null;
     private var _loading = false;
@@ -73,9 +73,12 @@ class ChannelContentsFragment : Fragment(), IChannelTabFragment {
         if (lastPolycentricProfile != null)
             pager= StatePolycentric.instance.getChannelContent(lifecycleScope, lastPolycentricProfile);
 
-        if(pager == null)
-            pager = StatePlatform.instance.getChannelContent(channel.url);
-
+        if(pager == null) {
+            if(subType != null)
+                pager = StatePlatform.instance.getChannelContent(channel.url, subType);
+            else
+                pager = StatePlatform.instance.getChannelContent(channel.url);
+        }
         return pager;
     }
 
@@ -367,6 +370,6 @@ class ChannelContentsFragment : Fragment(), IChannelTabFragment {
 
     companion object {
         val TAG = "VideoListFragment";
-        fun newInstance() = ChannelContentsFragment().apply { }
+        fun newInstance(subType: String? = null) = ChannelContentsFragment(subType).apply { }
     }
 }

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

@@ -90,7 +90,7 @@ class BuyFragment : MainFragment() {
                 try {
                     val currencies = StatePayment.instance.getAvailableCurrencies("grayjay");
                     val prices = StatePayment.instance.getAvailableCurrencyPrices("grayjay");
-                    val country = StatePayment.instance.getPaymentCountryFromIP()?.let { c -> PaymentConfigurations.COUNTRIES.find { it.id.equals(c, ignoreCase = true) } };
+                    val country = StatePayment.instance.getPaymentCountryFromIP(true)?.let { c -> PaymentConfigurations.COUNTRIES.find { it.id.equals(c, ignoreCase = true) } };
                     val currency = country?.let { c -> PaymentConfigurations.CURRENCIES.find { it.id == c.defaultCurrencyId && (currencies.contains(it.id)) } };
 
                     if(currency != null && prices.containsKey(currency.id)) {

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

@@ -25,6 +25,7 @@ import com.futo.platformplayer.UISlideOverlays
 import com.futo.platformplayer.api.media.PlatformID
 import com.futo.platformplayer.api.media.exceptions.NoPlatformClientException
 import com.futo.platformplayer.api.media.models.PlatformAuthorLink
+import com.futo.platformplayer.api.media.models.ResultCapabilities
 import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
 import com.futo.platformplayer.api.media.models.channels.SerializedChannel
 import com.futo.platformplayer.api.media.models.contents.ContentType
@@ -237,8 +238,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 ->
@@ -457,6 +458,12 @@ class ChannelFragment : MainFragment() {
 
                         _fragment.topBar?.assume<NavigationTopBarFragment>()?.setMenuItems(buttons)
                     }
+                    if(plugin != null && plugin.capabilities.hasGetChannelCapabilities) {
+                        if(plugin.getChannelCapabilities()?.types?.contains(ResultCapabilities.TYPE_SHORTS) ?: false &&
+                            !(_viewPager.adapter as ChannelViewPagerAdapter).containsItem(ChannelTab.SHORTS.ordinal.toLong())) {
+                            (_viewPager.adapter as ChannelViewPagerAdapter).insert(1, ChannelTab.SHORTS);
+                        }
+                    }
                 }
             }
 
@@ -469,8 +476,13 @@ class ChannelFragment : MainFragment() {
                     R.string.subscribers
                 ).lowercase() else ""
 
-            val supportsPlaylists =
-                StatePlatform.instance.getChannelClient(channel.url).capabilities.hasGetChannelPlaylists
+            var supportsPlaylists = false;
+            try {
+                supportsPlaylists = StatePlatform.instance.getChannelClient(channel.url).capabilities.hasGetChannelPlaylists
+            } catch (ex: Throwable) {
+                //Ignore error
+                Logger.e(TAG, "Failed to check if supports playlists", ex);
+            }
             val playlistPosition = 1
             if (supportsPlaylists && !(_viewPager.adapter as ChannelViewPagerAdapter).containsItem(
                     ChannelTab.PLAYLISTS.ordinal.toLong()

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

@@ -17,6 +17,7 @@ import com.futo.platformplayer.engine.exceptions.ScriptCaptchaRequiredException
 import com.futo.platformplayer.fragment.mainactivity.topbar.SearchTopBarFragment
 import com.futo.platformplayer.isHttpUrl
 import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.states.StateMeta
 import com.futo.platformplayer.states.StatePlatform
 import com.futo.platformplayer.views.FeedStyle
 import kotlinx.coroutines.Dispatchers
@@ -222,6 +223,12 @@ class ContentSearchResultsFragment : MainFragment() {
             setSortByOptions(null);
         }
 
+        override fun filterResults(results: List<IPlatformContent>): List<IPlatformContent> {
+            if(Settings.instance.search.hidefromSearch)
+                return super.filterResults(results.filter { !StateMeta.instance.isVideoHidden(it.url) && !StateMeta.instance.isCreatorHidden(it.author.url) });
+            return super.filterResults(results)
+        }
+
         override fun reload() {
             loadResults();
         }

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

@@ -4,8 +4,13 @@ import android.os.Bundle
 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.LinearLayout
+import android.widget.Spinner
 import android.widget.TextView
+import androidx.core.widget.addTextChangedListener
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.RecyclerView
 import com.futo.platformplayer.R
@@ -17,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
@@ -25,6 +31,7 @@ import com.futo.platformplayer.views.items.PlaylistDownloadItem
 import com.futo.platformplayer.views.others.ProgressBar
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import java.time.OffsetDateTime
 
 class DownloadsFragment : MainFragment() {
     private val TAG = "DownloadsFragment";
@@ -92,8 +99,12 @@ class DownloadsFragment : MainFragment() {
 
         private val _listDownloadedHeader: LinearLayout;
         private val _listDownloadedMeta: TextView;
+        private val _listDownloadSearch: EditText;
         private val _listDownloaded: AnyInsertedAdapterView<VideoLocal, VideoDownloadViewHolder>;
 
+        private var lastDownloads: List<VideoLocal>? = null;
+        private var ordering: String? = "nameAsc";
+
         constructor(frag: DownloadsFragment, inflater: LayoutInflater): super(frag.requireContext()) {
             inflater.inflate(R.layout.fragment_downloads, this);
             _frag = frag;
@@ -104,6 +115,7 @@ class DownloadsFragment : MainFragment() {
 
             _listActiveDownloadsContainer = findViewById(R.id.downloads_active_downloads_container);
             _listActiveDownloadsMeta = findViewById(R.id.downloads_active_downloads_meta);
+            _listDownloadSearch = findViewById(R.id.downloads_search);
             _listActiveDownloads = findViewById(R.id.downloads_active_downloads_list);
 
             _listPlaylistsContainer = findViewById(R.id.downloads_playlist_container);
@@ -113,6 +125,30 @@ class DownloadsFragment : MainFragment() {
             _listDownloadedHeader = findViewById(R.id.downloads_videos_header);
             _listDownloadedMeta = findViewById(R.id.downloads_videos_meta);
 
+            _listDownloadSearch.addTextChangedListener {
+                updateContentFilters();
+            }
+            val spinnerSortBy: Spinner = findViewById(R.id.spinner_sortby);
+            spinnerSortBy.adapter = ArrayAdapter(context, R.layout.spinner_item_simple, resources.getStringArray(R.array.downloads_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 = "downloadDateAsc"
+                        3 -> ordering = "downloadDateDesc"
+                        4 -> ordering = "releasedAsc"
+                        5 -> ordering = "releasedDesc"
+                        else -> ordering = null
+                    }
+                    updateContentFilters()
+                }
+                override fun onNothingSelected(parent: AdapterView<*>?) = Unit
+            };
+
             _listDownloaded = findViewById<RecyclerView>(R.id.list_downloaded)
                 .asAnyWithTop(findViewById(R.id.downloads_top)) {
                     it.onClick.subscribe {
@@ -125,7 +161,6 @@ class DownloadsFragment : MainFragment() {
             reloadUI();
         }
 
-
         fun reloadUI() {
             val usage = StateDownloads.instance.getTotalUsage(true);
             _usageUsed.text = "${usage.usage.toHumanBytesSize()} " + context.getString(R.string.used);
@@ -181,10 +216,32 @@ 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 ""})";
             }
 
-            _listDownloaded.setData(downloaded);
+            lastDownloads = downloaded;
+            _listDownloaded.setData(filterDownloads(downloaded));
+        }
+        fun updateContentFilters(){
+            val toFilter = lastDownloads ?: return;
+            _listDownloaded.setData(filterDownloads(toFilter));
+        }
+        fun filterDownloads(vids: List<VideoLocal>): List<VideoLocal>{
+            var vidsToReturn = vids;
+            if(!_listDownloadSearch.text.isNullOrEmpty())
+                vidsToReturn = vids.filter { it.name.contains(_listDownloadSearch.text, true) };
+            if(!ordering.isNullOrEmpty()) {
+                vidsToReturn = when(ordering){
+                    "downloadDateAsc" -> vidsToReturn.sortedBy { it.downloadDate ?: OffsetDateTime.MAX };
+                    "downloadDateDesc" -> vidsToReturn.sortedByDescending { it.downloadDate ?: OffsetDateTime.MIN };
+                    "nameAsc" -> vidsToReturn.sortedBy { it.name.lowercase() }
+                    "nameDesc" -> vidsToReturn.sortedByDescending { it.name.lowercase() }
+                    "releasedAsc" -> vidsToReturn.sortedBy { it.datetime ?: OffsetDateTime.MAX }
+                    "releasedDesc" -> vidsToReturn.sortedByDescending { it.datetime ?: OffsetDateTime.MIN }
+                    else -> vidsToReturn
+                }
+            }
+            return vidsToReturn;
         }
     }
 }

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;
@@ -146,7 +155,7 @@ class PlaylistFragment : MainFragment() {
                     setName(it.name);
                     //TODO: Implement support for pagination
                     setVideos(it.videos, false);
-                    setVideoCount(it.videos.size);
+                    setMetadata(it.videos.size, it.videos.sumOf { it.duration });
                     setLoading(false);
                 }
                 .exception<Throwable> {
@@ -174,8 +183,9 @@ class PlaylistFragment : MainFragment() {
                 if (parameter != null) {
                     setName(parameter.name)
                     setVideos(parameter.videos, true)
-                    setVideoCount(parameter.videos.size)
+                    setMetadata(parameter.videos.size, parameter.videos.sumOf { it.duration })
                     setButtonDownloadVisible(true)
+                    setButtonExportVisible(false)
                     setButtonEditVisible(true)
 
                     if (!StatePlaylists.instance.playlistStore.hasItem { it.id == parameter.id }) {
@@ -187,7 +197,7 @@ class PlaylistFragment : MainFragment() {
                 } else {
                     setName(null)
                     setVideos(null, false)
-                    setVideoCount(-1)
+                    setMetadata(-1, -1);
                     setButtonDownloadVisible(false)
                     setButtonEditVisible(false)
                 }
@@ -195,7 +205,7 @@ class PlaylistFragment : MainFragment() {
                 _playlist = null
                 _url = parameter.url
 
-                setVideoCount(parameter.videoCount)
+                setMetadata(parameter.videoCount, -1);
                 setName(parameter.name)
                 setVideos(null, false)
                 setButtonDownloadVisible(false)
@@ -208,7 +218,7 @@ class PlaylistFragment : MainFragment() {
 
                 setName(null)
                 setVideos(null, false)
-                setVideoCount(-1)
+                setMetadata(-1, -1);
                 setButtonDownloadVisible(false)
                 setButtonEditVisible(false)
 

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

@@ -237,7 +237,19 @@ class SourceDetailFragment : MainFragment() {
                 BigButtonGroup(c, context.getString(R.string.update),
                     BigButton(c, context.getString(R.string.check_for_updates), context.getString(R.string.checks_for_new_versions_of_the_source), R.drawable.ic_update) {
                         checkForUpdatesSource();
-                    }
+                    },
+                    if(config.changelog?.any() == true)
+                        BigButton(c, context.getString(R.string.changelog), context.getString(R.string.changelog_plugin_description), R.drawable.ic_list) {
+                            UIDialogs.showChangelogDialog(context, config.version, config.changelog!!.filterKeys { it.toIntOrNull() != null }
+                                .mapKeys { it.key.toInt() }
+                                .mapValues { config.getChangelogString(it.key.toString()) ?: "" });
+                        }.apply {
+                            this.layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT).apply {
+                                setMargins(0, TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 5f, resources.displayMetrics).toInt(), 0, 0);
+                            };
+                        }
+                    else
+                        null
                 )
             );
 

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

@@ -204,8 +204,10 @@ class SubscriptionsFeedFragment : MainFragment() {
             val feed = StateSubscriptions.instance.getFeed(group?.id);
 
             val currentExs = feed?.exceptions ?: listOf();
-            if(currentExs != _lastExceptions && currentExs.any())
-                handleExceptions(currentExs);
+            if(currentExs != _lastExceptions && currentExs.any()) {
+                handleExceptions(currentExs)
+                feed?.exceptions = listOf()
+            }
 
             return@TaskHandler resp;
         })

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

@@ -151,6 +151,7 @@ class TutorialFragment : MainFragment() {
         override val rating: IRating = RatingLikes(-1)
         override val viewCount: Long = -1
         override val video: IVideoSourceDescriptor = TutorialVideoSourceDescriptor(videoUrl, duration, width, height)
+        override val isShort: Boolean = false;
         override fun getComments(client: IPlatformClient): IPager<IPlatformComment> {
             return EmptyPager()
         }

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

@@ -1,17 +1,24 @@
 package com.futo.platformplayer.fragment.mainactivity.main
 
 import android.annotation.SuppressLint
+import android.content.Context
 import android.content.pm.ActivityInfo
 import android.content.res.Configuration
+import android.database.ContentObserver
 import android.os.Build
 import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
 import android.view.LayoutInflater
+import android.view.OrientationEventListener
+import android.view.Surface
 import android.view.View
 import android.view.ViewGroup
 import android.view.WindowInsets
 import android.view.WindowInsetsController
 import android.view.WindowManager
 import androidx.constraintlayout.motion.widget.MotionLayout
+import androidx.core.view.ViewCompat.getDisplay
 import androidx.core.view.WindowCompat
 import androidx.media3.common.util.UnstableApi
 import com.futo.platformplayer.R
@@ -28,13 +35,18 @@ import com.futo.platformplayer.models.PlatformVideoWithTime
 import com.futo.platformplayer.models.UrlVideoWithTime
 import com.futo.platformplayer.states.StatePlayer
 import com.futo.platformplayer.views.containers.SingleViewTouchableMotionLayout
-import kotlin.math.min
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 
+
+//region Fragment
 @UnstableApi
-class VideoDetailFragment : MainFragment {
-    override val isMainView : Boolean = false;
+class VideoDetailFragment() : MainFragment() {
+    override val isMainView: Boolean = false;
     override val hasBottomBar: Boolean = true;
-    override val isOverlay : Boolean = true;
+    override val isOverlay: Boolean = true;
     override val isHistory: Boolean = false;
 
     private var _isActive: Boolean = false;
@@ -76,8 +88,9 @@ class VideoDetailFragment : MainFragment {
     private var _loadUrlOnCreate: UrlVideoWithTime? = null;
     private var _leavingPiP = false;
 
-//region Fragment
-    constructor() : super()
+    private var _landscapeOrientationListener: LandscapeOrientationListener? = null
+    private var _portraitOrientationListener: PortraitOrientationListener? = null
+    private var _autoRotateObserver: AutoRotateObserver? = null
 
     fun nextVideo() {
         _viewDetail?.nextVideo(true, true, true);
@@ -88,23 +101,27 @@ class VideoDetailFragment : MainFragment {
     }
 
     private fun isSmallWindow(): Boolean {
-        return min(
-            resources.configuration.screenWidthDp,
-            resources.configuration.screenHeightDp
-        ) < resources.getInteger(R.integer.column_width_dp) * 2
+        return resources.configuration.smallestScreenWidthDp < resources.getInteger(R.integer.column_width_dp) * 2
+    }
+
+    private fun isAutoRotateEnabled(): Boolean {
+        return android.provider.Settings.System.getInt(
+            context?.contentResolver,
+            android.provider.Settings.System.ACCELEROMETER_ROTATION, 0
+        ) == 1
     }
 
     override fun onConfigurationChanged(newConfig: Configuration) {
         super.onConfigurationChanged(newConfig)
 
         val isLandscapeVideo: Boolean = _viewDetail?.isLandscapeVideo() ?: false
-
         val isSmallWindow = isSmallWindow()
 
         if (
             isSmallWindow
             && newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE
             && !isFullscreen
+            && !isInPictureInPicture
             && state == State.MAXIMIZED
         ) {
             _viewDetail?.setFullscreen(true)
@@ -141,49 +158,93 @@ class VideoDetailFragment : MainFragment {
         ) {
             _viewDetail?.setFullscreen(true)
         }
+
+        updateOrientation()
     }
 
-    @SuppressLint("SourceLockedOrientationActivity")
     fun updateOrientation() {
         val a = activity ?: return
         val isFullScreenPortraitAllowed = Settings.instance.playback.fullscreenPortrait
         val isReversePortraitAllowed = Settings.instance.playback.reversePortrait
         val rotationLock = StatePlayer.instance.rotationLock
+        val alwaysAllowReverseLandscapeAutoRotate = Settings.instance.playback.alwaysAllowReverseLandscapeAutoRotate
 
-        val isLandscapeVideo: Boolean = _viewDetail?.isLandscapeVideo() ?: false
+        val isLandscapeVideo: Boolean = _viewDetail?.isLandscapeVideo() ?: true
 
         val isSmallWindow = isSmallWindow()
+        val autoRotateEnabled = isAutoRotateEnabled()
 
         // For small windows if the device isn't landscape right now and full screen portrait isn't allowed then we should force landscape
         if (isSmallWindow && isFullscreen && !isFullScreenPortraitAllowed && resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT && !rotationLock && isLandscapeVideo) {
-            a.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE
+            if (alwaysAllowReverseLandscapeAutoRotate){
+                a.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
+            } else {
+                a.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE
+            }
+            if (autoRotateEnabled
+            ) {
+                // start listening for the device to rotate to landscape
+                // at which point we'll be able to set requestedOrientation to back to UNSPECIFIED
+                _landscapeOrientationListener?.enableListener()
+            }
+        }
+        // For small windows if always all reverse landscape then we'll lock the orientation to landscape when system auto-rotate is off to make sure that locking
+        // and unlockiung in the player settings keep orientation in landscape
+        else if (isSmallWindow && isFullscreen && !isFullScreenPortraitAllowed && alwaysAllowReverseLandscapeAutoRotate && !rotationLock && isLandscapeVideo && !autoRotateEnabled) {
+            a.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
         }
         // For small windows if the device isn't in a portrait orientation and we're in the maximized state then we should force portrait
+        // only do this if auto-rotate is on portrait is forced when leaving full screen for autorotate off
         else if (isSmallWindow && !isMinimizingFromFullScreen && !isFullscreen && state == State.MAXIMIZED && resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE) {
+            @SuppressLint("SourceLockedOrientationActivity")
             a.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT
+            if (autoRotateEnabled
+            ) {
+                // start listening for the device to rotate to portrait
+                // at which point we'll be able to set requestedOrientation to back to UNSPECIFIED
+                _portraitOrientationListener?.enableListener()
+            }
         } else if (rotationLock) {
-            a.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LOCKED
+            _portraitOrientationListener?.disableListener()
+            _landscapeOrientationListener?.disableListener()
+            val display = getDisplay(_viewDetail!!)
+            val rotation = display!!.rotation
+            val orientation = resources.configuration.orientation
+
+            a.requestedOrientation = when (orientation) {
+                Configuration.ORIENTATION_PORTRAIT -> {
+                    if (rotation == Surface.ROTATION_0 || rotation == Surface.ROTATION_180) {
+                        if (rotation == Surface.ROTATION_0) {
+                            ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+                        } else {
+                            ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT
+                        }
+                    } else {
+                        ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+                    }
+                }
+
+                Configuration.ORIENTATION_LANDSCAPE -> {
+                    if (rotation == Surface.ROTATION_90 || rotation == Surface.ROTATION_270) {
+                        if (rotation == Surface.ROTATION_90) {
+                            ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+                        } else {
+                            ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE
+                        }
+                    } else {
+                        ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+                    }
+                }
+
+                else -> ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
+            }
         } else {
-            when (Settings.instance.playback.autoRotate) {
-                0 -> {
-                    a.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LOCKED
-                }
-
-                1 -> {
-                    a.requestedOrientation = if (isReversePortraitAllowed) {
-                        ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR
-                    } else {
-                        ActivityInfo.SCREEN_ORIENTATION_SENSOR
-                    }
-                }
-
-                2 -> {
-                    a.requestedOrientation = if (isReversePortraitAllowed) {
-                        ActivityInfo.SCREEN_ORIENTATION_FULL_USER
-                    } else {
-                        ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
-                    }
-                }
+            _portraitOrientationListener?.disableListener()
+            _landscapeOrientationListener?.disableListener()
+            a.requestedOrientation = if (isReversePortraitAllowed) {
+                ActivityInfo.SCREEN_ORIENTATION_FULL_USER
+            } else {
+                ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
             }
         }
     }
@@ -354,6 +415,30 @@ class VideoDetailFragment : MainFragment {
         StatePlayer.instance.onRotationLockChanged.subscribe(this) {
             updateOrientation()
         }
+
+        val delayBeforeRemoveRotationLock = 800L
+
+        _landscapeOrientationListener = LandscapeOrientationListener(requireContext())
+        {
+            CoroutineScope(Dispatchers.Main).launch {
+                // delay to make sure that the system auto rotate updates
+                delay(delayBeforeRemoveRotationLock)
+                updateOrientation()
+            }
+        }
+        _portraitOrientationListener = PortraitOrientationListener(requireContext())
+        {
+            CoroutineScope(Dispatchers.Main).launch {
+                // delay to make sure that the system auto rotate updates
+                delay(delayBeforeRemoveRotationLock)
+                updateOrientation()
+            }
+        }
+        _autoRotateObserver = AutoRotateObserver(requireContext(), Handler(Looper.getMainLooper())) {
+            updateOrientation()
+        }
+        _autoRotateObserver?.startObserving()
+
         return _view!!;
     }
 
@@ -455,6 +540,10 @@ class VideoDetailFragment : MainFragment {
         SettingsActivity.settingsActivityClosed.remove(this)
         StatePlayer.instance.onRotationLockChanged.remove(this)
 
+        _landscapeOrientationListener?.disableListener()
+        _portraitOrientationListener?.disableListener()
+        _autoRotateObserver?.stopObserving()
+
         _viewDetail?.let {
             _viewDetail = null;
             it.onDestroy();
@@ -526,6 +615,11 @@ class VideoDetailFragment : MainFragment {
             showSystemUI()
         }
 
+        // temporarily force the device to portrait if auto-rotate is disabled to prevent landscape when exiting full screen on a small device
+//        @SuppressLint("SourceLockedOrientationActivity")
+//        if (!isFullscreen && isSmallWindow() && !isAutoRotateEnabled() && !isMinimizingFromFullScreen) {
+//            activity?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT
+//        }
         updateOrientation();
         _view?.allowMotion = !fullscreen;
     }
@@ -547,4 +641,88 @@ class VideoDetailFragment : MainFragment {
 //region View
     //TODO: Determine if encapsulated would be readable enough
 //endregion
-}
+}
+
+class LandscapeOrientationListener(
+    context: Context,
+    private val onLandscapeDetected: () -> Unit
+) : OrientationEventListener(context) {
+
+    private var isListening = false
+
+    override fun onOrientationChanged(orientation: Int) {
+        if (!isListening) return
+
+        if (orientation in 60..120 || orientation in 240..300) {
+            onLandscapeDetected()
+            disableListener()
+        }
+    }
+
+    fun enableListener() {
+        if (!isListening) {
+            isListening = true
+            enable()
+        }
+    }
+
+    fun disableListener() {
+        if (isListening) {
+            isListening = false
+            disable()
+        }
+    }
+}
+
+class PortraitOrientationListener(
+    context: Context,
+    private val onPortraitDetected: () -> Unit
+) : OrientationEventListener(context) {
+
+    private var isListening = false
+
+    override fun onOrientationChanged(orientation: Int) {
+        if (!isListening) return
+
+        if (orientation in 0..30 || orientation in 330..360 || orientation in 150..210) {
+            onPortraitDetected()
+            disableListener()
+        }
+    }
+
+    fun enableListener() {
+        if (!isListening) {
+            isListening = true
+            enable()
+        }
+    }
+
+    fun disableListener() {
+        if (isListening) {
+            isListening = false
+            disable()
+        }
+    }
+}
+
+class AutoRotateObserver(context: Context, handler: Handler, private val onAutoRotateChanged: () -> Unit) : ContentObserver(handler) {
+    private val contentResolver = context.contentResolver
+
+    override fun onChange(selfChange: Boolean) {
+        super.onChange(selfChange)
+
+        onAutoRotateChanged()
+    }
+
+    fun startObserving() {
+        contentResolver.registerContentObserver(
+            android.provider.Settings.System.getUriFor(android.provider.Settings.System.ACCELEROMETER_ROTATION),
+            false,
+            this
+        )
+    }
+
+    fun stopObserving() {
+        contentResolver.unregisterContentObserver(this)
+    }
+}

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

@@ -171,7 +171,6 @@ import kotlinx.coroutines.withContext
 import userpackage.Protocol
 import java.time.OffsetDateTime
 import kotlin.math.abs
-import kotlin.math.max
 import kotlin.math.roundToLong
 
 @UnstableApi
@@ -580,6 +579,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);
@@ -649,18 +656,9 @@ class VideoDetailView : ConstraintLayout {
         };
 
         var hadDevice = false;
-        StateSync.instance.deviceUpdatedOrAdded.subscribe(this) { id, session ->
-            val hasDevice = StateSync.instance.hasAtLeastOneOnlineDevice();
-            if(hasDevice != hadDevice) {
-                hadDevice = hasDevice;
-                fragment.lifecycleScope.launch(Dispatchers.Main) {
-                    updateMoreButtons();
-                }
-            }
-        };
-        StateSync.instance.deviceRemoved.subscribe(this) { id ->
-            val hasDevice = StateSync.instance.hasAtLeastOneOnlineDevice();
-            if(hasDevice != hadDevice) {
+        val devicesChanged = { id: String ->
+            val hasDevice = StateSync.instance.hasAuthorizedDevice();
+            if (hasDevice != hadDevice) {
                 hadDevice = hasDevice;
                 fragment.lifecycleScope.launch(Dispatchers.Main) {
                     updateMoreButtons();
@@ -668,6 +666,9 @@ class VideoDetailView : ConstraintLayout {
             }
         }
 
+        StateSync.instance.deviceUpdatedOrAdded.subscribe(this) { id, _ -> devicesChanged(id) };
+        StateSync.instance.deviceRemoved.subscribe(this) { id -> devicesChanged(id) };
+
         MediaControlReceiver.onLowerVolumeReceived.subscribe(this) { handleLowerVolume() };
         MediaControlReceiver.onPlayReceived.subscribe(this) { handlePlay() };
         MediaControlReceiver.onPauseReceived.subscribe(this) { handlePause() };
@@ -876,22 +877,20 @@ class VideoDetailView : ConstraintLayout {
                     }
                     _slideUpOverlay?.hide();
                 } else null,
-            if(!isLimitedVersion)
-                RoundButton(context, R.drawable.ic_screen_share, context.getString(R.string.background), TAG_BACKGROUND) {
-                    if(!allowBackground) {
-                        _player.switchToAudioMode();
-                        allowBackground = true;
-                        it.text.text = resources.getString(R.string.background_revert);
-                    }
-                    else {
-                        _player.switchToVideoMode();
-                        allowBackground = false;
-                        it.text.text = resources.getString(R.string.background);
-                    }
-                    _slideUpOverlay?.hide();
+            if (!isLimitedVersion) RoundButton(context, R.drawable.ic_screen_share, if (allowBackground) context.getString(R.string.background_revert) else context.getString(R.string.background), TAG_BACKGROUND) {
+                if (!allowBackground) {
+                    _player.switchToAudioMode();
+                    allowBackground = true;
+                    it.text.text = resources.getString(R.string.background_revert);
+                } else {
+                    _player.switchToVideoMode();
+                    allowBackground = false;
+                    it.text.text = resources.getString(R.string.background);
                 }
+                _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,18 +921,25 @@ class VideoDetailView : ConstraintLayout {
                 };
                 _slideUpOverlay?.hide();
             },
-            if(StateSync.instance.hasAtLeastOneOnlineDevice()) {
+            if (StateSync.instance.hasAuthorizedDevice()) {
                 RoundButton(context, R.drawable.ic_device, context.getString(R.string.send_to_device), TAG_SEND_TO_DEVICE) {
-                    val devices = StateSync.instance.getSessions();
+                    val devices = StateSync.instance.getAuthorizedSessions();
                     val videoToSend = video ?: return@RoundButton;
                     if(devices.size > 1) {
                         //not implemented
-                    }
-                    else if(devices.size == 1){
+                    } else if(devices.size == 1){
                         val device = devices.first();
-                        UIDialogs.showConfirmationDialog(context, "Would you like to open\n[${videoToSend.name}]\non ${device.remotePublicKey}" , {
+                        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.displayName}'" , {
+                            Logger.i(TAG, "Send to device confirmed (public key: ${device.remotePublicKey}): " + videoToSend.url)
+
                             fragment.lifecycleScope.launch(Dispatchers.IO) {
-                                device.sendJsonData(GJSyncOpcodes.sendToDevices, SendToDevicePackage(videoToSend.url, (lastPositionMilliseconds/1000).toInt()));
+                                try {
+                                    device.sendJsonData(GJSyncOpcodes.sendToDevices, SendToDevicePackage(videoToSend.url, (lastPositionMilliseconds / 1000).toInt()))
+                                    Logger.i(TAG, "Send to device packet sent (public key: ${device.remotePublicKey}): " + videoToSend.url)
+                                } catch (e: Throwable) {
+                                    Logger.e(TAG, "Send to device packet failed to send", e)
+                                }
                             }
                         })
                     }
@@ -965,6 +971,7 @@ class VideoDetailView : ConstraintLayout {
                         throw IllegalStateException("Expected media content, found ${video.contentType}");
 
                     withContext(Dispatchers.Main) {
+                        _videoResumePositionMilliseconds = _player.position
                         setVideoDetails(video);
                     }
                 }
@@ -1267,8 +1274,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)")
 
@@ -1279,6 +1284,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())
@@ -1833,7 +1842,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);
@@ -1843,32 +1852,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);
+                            }
+                        }
+                    } 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),
@@ -1900,13 +1930,45 @@ class VideoDetailView : ConstraintLayout {
         return super.onInterceptTouchEvent(ev);
     }
 
-
     //Actions
     private fun showVideoSettings() {
         Logger.i(TAG, "showVideoSettings")
         _overlay_quality_selector?.selectOption("video", _lastVideoSource);
         _overlay_quality_selector?.selectOption("audio", _lastAudioSource);
         _overlay_quality_selector?.selectOption("subtitles", _lastSubtitleSource);
+
+        if (_lastVideoSource is IDashManifestSource || _lastVideoSource is IHLSManifestSource) {
+
+            val videoTracks =
+                _player.exoPlayer?.player?.currentTracks?.groups?.firstOrNull { it.mediaTrackGroup.type == C.TRACK_TYPE_VIDEO }
+
+            var selectedQuality: Format? = null
+
+            if (videoTracks != null) {
+                for (i in 0 until videoTracks.mediaTrackGroup.length) {
+                    if (videoTracks.mediaTrackGroup.getFormat(i).height == _player.targetTrackVideoHeight) {
+                        selectedQuality = videoTracks.mediaTrackGroup.getFormat(i)
+                    }
+                }
+            }
+
+            var videoMenuGroup: SlideUpMenuGroup? = null
+            for (view in _overlay_quality_selector!!.groupItems) {
+                if (view is SlideUpMenuGroup && view.groupTag == "video") {
+                    videoMenuGroup = view
+                }
+            }
+
+            if (selectedQuality != null) {
+                videoMenuGroup?.getItem("auto")?.setSubText("")
+                _overlay_quality_selector?.selectOption("video", selectedQuality)
+            } else {
+                videoMenuGroup?.getItem("auto")
+                    ?.setSubText("${_player.exoPlayer?.player?.videoFormat?.width}x${_player.exoPlayer?.player?.videoFormat?.height}")
+                _overlay_quality_selector?.selectOption("video", "auto")
+            }
+        }
+
         val currentPlaybackRate = (if (_isCasting) StateCasting.instance.activeDevice?.speed else _player.getPlaybackRate()) ?: 1.0
         _overlay_quality_selector?.groupItems?.firstOrNull { it is SlideUpMenuButtonList && it.id == "playback_rate" }?.let {
             (it as SlideUpMenuButtonList).setSelected(currentPlaybackRate.toString())
@@ -2080,17 +2142,15 @@ class VideoDetailView : ConstraintLayout {
                                 call = { handleSelectSubtitleTrack(it) })
                         }.toList().toTypedArray())
             else null,
-            if(liveStreamVideoFormats?.isEmpty() == false)
-                SlideUpMenuGroup(this.context, context.getString(R.string.stream_video), "video",
-                    *liveStreamVideoFormats
-                        .map {
-                            SlideUpMenuItem(this.context,
-                                R.drawable.ic_movie,
-                                it.label ?: it.containerMimeType ?: it.bitrate.toString(),
-                                "${it.width}x${it.height}",
-                                tag = it,
-                                call = { _player.selectVideoTrack(it.height) });
-                        }.toList().toTypedArray())
+            if (liveStreamVideoFormats?.isEmpty() == false) SlideUpMenuGroup(
+                this.context, context.getString(R.string.stream_video), "video", (listOf(
+                    SlideUpMenuItem(this.context, R.drawable.ic_movie, "Auto", tag = "auto", call = { _player.selectVideoTrack(-1) })
+                ) + (liveStreamVideoFormats.map {
+                    SlideUpMenuItem(this.context, R.drawable.ic_movie, it.label
+                        ?: it.containerMimeType
+                        ?: it.bitrate.toString(), "${it.width}x${it.height}", tag = it, call = { _player.selectVideoTrack(it.height) });
+                }))
+            )
             else null,
             if(liveStreamAudioFormats?.isEmpty() == false)
                 SlideUpMenuGroup(this.context, context.getString(R.string.stream_audio), "audio",
@@ -2384,8 +2444,13 @@ class VideoDetailView : ConstraintLayout {
     }
 
     fun isLandscapeVideo(): Boolean? {
-        val videoSourceWidth = _player.exoPlayer?.player?.videoSize?.width
-        val videoSourceHeight = _player.exoPlayer?.player?.videoSize?.height
+        var videoSourceWidth = _player.exoPlayer?.player?.videoSize?.width
+        var videoSourceHeight = _player.exoPlayer?.player?.videoSize?.height
+
+        if (video?.video?.videoSources?.isNotEmpty() == true && (videoSourceWidth == null || videoSourceHeight == null || videoSourceWidth == 0 || videoSourceHeight == 0)) {
+            videoSourceWidth = video?.video?.videoSources!![0].width
+            videoSourceHeight = video?.video?.videoSources!![0].height
+        }
 
         return if (videoSourceWidth == null || videoSourceHeight == null || videoSourceWidth == 0 || videoSourceHeight == 0){
             null
@@ -2562,8 +2627,13 @@ class VideoDetailView : ConstraintLayout {
 
                     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);
                         }
                     }
                 })

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

@@ -20,6 +20,8 @@ import com.futo.platformplayer.downloads.VideoDownload
 import com.futo.platformplayer.images.GlideHelper.Companion.crossfade
 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.lists.VideoListEditorView
 
 abstract class VideoListEditorView : LinearLayout {
@@ -32,6 +34,7 @@ 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;
 
@@ -52,6 +55,8 @@ 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;
 
         _buttonShare = findViewById(R.id.button_share);
         val onShare = _onShare;
@@ -66,6 +71,7 @@ abstract class VideoListEditorView : LinearLayout {
         buttonShuffle.setOnClickListener { onShuffleClick(); };
 
         _buttonEdit.setOnClickListener { onEditClick(); };
+        setButtonExportVisible(false);
         setButtonDownloadVisible(canEdit());
 
         videoListEditorView.onVideoOrderChanged.subscribe(::onVideoOrderChanged);
@@ -106,6 +112,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 {
@@ -115,6 +122,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), {
@@ -123,6 +131,7 @@ abstract class VideoListEditorView : LinearLayout {
             }
         }
         else {
+            setButtonExportVisible(false);
             _buttonDownload.setImageResource(R.drawable.ic_download);
             _buttonDownload.setOnClickListener {
                 onDownload();
@@ -136,8 +145,14 @@ abstract class VideoListEditorView : LinearLayout {
         _textName.text = name ?: "";
     }
 
-    protected fun setVideoCount(videoCount: Int = -1) {
-        _textMetadata.text = if (videoCount == -1) "" else "${videoCount} " + context.getString(R.string.videos);
+    protected fun setMetadata(videoCount: Int = -1, duration: Long = -1) {
+        val parts = mutableListOf<String>()
+        if(videoCount >= 0)
+            parts.add("${videoCount} " + context.getString(R.string.videos));
+        if(duration > 0)
+            parts.add("${duration.toHumanDuration(false)} ");
+
+        _textMetadata.text = parts.joinToString(" • ");
     }
 
     protected fun setVideos(videos: List<IPlatformVideo>?, canEdit: Boolean) {
@@ -163,6 +178,9 @@ abstract class VideoListEditorView : LinearLayout {
     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/helpers/VideoHelper.kt

@@ -13,16 +13,15 @@ import com.futo.platformplayer.api.media.models.streams.IVideoSourceDescriptor
 import com.futo.platformplayer.api.media.models.streams.VideoUnMuxedSourceDescriptor
 import com.futo.platformplayer.api.media.models.streams.sources.IAudioSource
 import com.futo.platformplayer.api.media.models.streams.sources.IAudioUrlSource
-import com.futo.platformplayer.api.media.models.streams.sources.IAudioUrlWidevineSource
 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.IWidevineSource
 import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
 import com.futo.platformplayer.api.media.platforms.js.models.sources.JSAudioUrlRangeSource
 import com.futo.platformplayer.api.media.platforms.js.models.sources.JSDashManifestRawAudioSource
 import com.futo.platformplayer.api.media.platforms.js.models.sources.JSDashManifestRawSource
-import com.futo.platformplayer.api.media.platforms.js.models.sources.JSSource
 import com.futo.platformplayer.api.media.platforms.js.models.sources.JSVideoUrlRangeSource
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.others.Language
@@ -47,8 +46,8 @@ class VideoHelper {
             return false
         }
 
-        fun isDownloadable(source: IVideoSource) = source is IVideoUrlSource || source is IHLSManifestSource || source is JSDashManifestRawSource;
-        fun isDownloadable(source: IAudioSource) = (source is IAudioUrlSource || source is IHLSManifestAudioSource || source is JSDashManifestRawAudioSource) && source !is IAudioUrlWidevineSource
+        fun isDownloadable(source: IVideoSource) = (source is IVideoUrlSource || source is IHLSManifestSource || source is JSDashManifestRawSource) && source !is IWidevineSource
+        fun isDownloadable(source: IAudioSource) = (source is IAudioUrlSource || source is IHLSManifestAudioSource || source is JSDashManifestRawAudioSource) && source !is IWidevineSource
 
         fun selectBestVideoSource(desc: IVideoSourceDescriptor, desiredPixelCount : Int, prefContainers : Array<String>) : IVideoSource? = selectBestVideoSource(desc.videoSources.toList(), desiredPixelCount, prefContainers);
         fun selectBestVideoSource(sources: Iterable<IVideoSource>, desiredPixelCount : Int, prefContainers : Array<String>) : IVideoSource? {

app/src/main/java/com/futo/platformplayer/mdns/ServiceRecordAggregator.kt

@@ -55,21 +55,25 @@ class ServiceRecordAggregator {
             if (_cts != null) throw Exception("Already started.")
 
             _cts = CoroutineScope(Dispatchers.Default).launch {
-                while (isActive) {
-                    val now = Date()
-                    synchronized(_currentServices) {
-                        _cachedAddressRecords.forEach { it.value.removeAll { record -> now.after(record.expirationTime) } }
-                        _cachedTxtRecords.entries.removeIf { now.after(it.value.expirationTime) }
-                        _cachedSrvRecords.entries.removeIf { now.after(it.value.expirationTime) }
-                        _cachedPtrRecords.forEach { it.value.removeAll { record -> now.after(record.expirationTime) } }
+                try {
+                    while (isActive) {
+                        val now = Date()
+                        synchronized(_currentServices) {
+                            _cachedAddressRecords.forEach { it.value.removeAll { record -> now.after(record.expirationTime) } }
+                            _cachedTxtRecords.entries.removeIf { now.after(it.value.expirationTime) }
+                            _cachedSrvRecords.entries.removeIf { now.after(it.value.expirationTime) }
+                            _cachedPtrRecords.forEach { it.value.removeAll { record -> now.after(record.expirationTime) } }
 
-                        val newServices = getCurrentServices()
-                        _currentServices.clear()
-                        _currentServices.addAll(newServices)
+                            val newServices = getCurrentServices()
+                            _currentServices.clear()
+                            _currentServices.addAll(newServices)
+                        }
+
+                        onServicesUpdated?.invoke(_currentServices.toList())
+                        delay(5000)
                     }
-
-                    onServicesUpdated?.invoke(_currentServices.toList())
-                    delay(5000)
+                } catch (e: Throwable) {
+                    Logger.e(TAG, "Unexpected failure in MDNS loop", e)
                 }
             }
         }
@@ -83,6 +87,7 @@ class ServiceRecordAggregator {
     }
 
     fun add(packet: DnsPacket) {
+        val currentServices: List<DnsService>
         val dnsResourceRecords = packet.answers + packet.additionals + packet.authorities
         val txtRecords = dnsResourceRecords.filter { it.type == ResourceRecordType.TXT.value.toInt() }.map { it to it.getDataReader().readTXTRecord() }
         val aRecords = dnsResourceRecords.filter { it.type == ResourceRecordType.A.value.toInt() }.map { it to it.getDataReader().readARecord() }
@@ -99,35 +104,33 @@ class ServiceRecordAggregator {
         aaaaRecords.forEach { builder.appendLine("AAAA ${it.first.name} ${it.first.type} ${it.first.clazz} TTL ${it.first.timeToLive}: ${it.second.address}") }
         Logger.i(TAG, "$builder")*/
 
-        val currentServices: MutableList<DnsService>
-        ptrRecords.forEach { record ->
-            val cachedPtrRecord = _cachedPtrRecords.getOrPut(record.first.name) { mutableListOf() }
-            val newPtrRecord = CachedDnsPtrRecord(Date(System.currentTimeMillis() + record.first.timeToLive.toLong() * 1000L), record.second.domainName)
-            cachedPtrRecord.replaceOrAdd(newPtrRecord) { it.target == record.second.domainName }
-        }
-
-        aRecords.forEach { aRecord ->
-            val cachedARecord = _cachedAddressRecords.getOrPut(aRecord.first.name) { mutableListOf() }
-            val newARecord = CachedDnsAddressRecord(Date(System.currentTimeMillis() + aRecord.first.timeToLive.toLong() * 1000L), aRecord.second.address)
-            cachedARecord.replaceOrAdd(newARecord) { it.address == newARecord.address }
-        }
-
-        aaaaRecords.forEach { aaaaRecord ->
-            val cachedAaaaRecord = _cachedAddressRecords.getOrPut(aaaaRecord.first.name) { mutableListOf() }
-            val newAaaaRecord = CachedDnsAddressRecord(Date(System.currentTimeMillis() + aaaaRecord.first.timeToLive.toLong() * 1000L), aaaaRecord.second.address)
-            cachedAaaaRecord.replaceOrAdd(newAaaaRecord) { it.address == newAaaaRecord.address }
-        }
-
-        txtRecords.forEach { txtRecord ->
-            _cachedTxtRecords[txtRecord.first.name] = CachedDnsTxtRecord(Date(System.currentTimeMillis() + txtRecord.first.timeToLive.toLong() * 1000L), txtRecord.second.texts)
-        }
-
-        srvRecords.forEach { srvRecord ->
-            _cachedSrvRecords[srvRecord.first.name] = CachedDnsSrvRecord(Date(System.currentTimeMillis() + srvRecord.first.timeToLive.toLong() * 1000L), srvRecord.second)
-        }
-
-        //TODO: Maybe this can be debounced?
         synchronized(this._currentServices) {
+            ptrRecords.forEach { record ->
+                val cachedPtrRecord = _cachedPtrRecords.getOrPut(record.first.name) { mutableListOf() }
+                val newPtrRecord = CachedDnsPtrRecord(Date(System.currentTimeMillis() + record.first.timeToLive.toLong() * 1000L), record.second.domainName)
+                cachedPtrRecord.replaceOrAdd(newPtrRecord) { it.target == record.second.domainName }
+            }
+
+            aRecords.forEach { aRecord ->
+                val cachedARecord = _cachedAddressRecords.getOrPut(aRecord.first.name) { mutableListOf() }
+                val newARecord = CachedDnsAddressRecord(Date(System.currentTimeMillis() + aRecord.first.timeToLive.toLong() * 1000L), aRecord.second.address)
+                cachedARecord.replaceOrAdd(newARecord) { it.address == newARecord.address }
+            }
+
+            aaaaRecords.forEach { aaaaRecord ->
+                val cachedAaaaRecord = _cachedAddressRecords.getOrPut(aaaaRecord.first.name) { mutableListOf() }
+                val newAaaaRecord = CachedDnsAddressRecord(Date(System.currentTimeMillis() + aaaaRecord.first.timeToLive.toLong() * 1000L), aaaaRecord.second.address)
+                cachedAaaaRecord.replaceOrAdd(newAaaaRecord) { it.address == newAaaaRecord.address }
+            }
+
+            txtRecords.forEach { txtRecord ->
+                _cachedTxtRecords[txtRecord.first.name] = CachedDnsTxtRecord(Date(System.currentTimeMillis() + txtRecord.first.timeToLive.toLong() * 1000L), txtRecord.second.texts)
+            }
+
+            srvRecords.forEach { srvRecord ->
+                _cachedSrvRecords[srvRecord.first.name] = CachedDnsSrvRecord(Date(System.currentTimeMillis() + srvRecord.first.timeToLive.toLong() * 1000L), srvRecord.second)
+            }
+
             currentServices = getCurrentServices()
             this._currentServices.clear()
             this._currentServices.addAll(currentServices)

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

@@ -59,7 +59,7 @@ class PlatformLinkMovementMethod(private val _context: Context) : LinkMovementMe
                 if (linkPressed && pressedLinks != null) {
                     val dx = event.x - downX
                     val dy = event.y - downY
-                    if (Math.abs(dx) <= touchSlop && Math.abs(dy) <= touchSlop) {
+                    if (Math.abs(dx) <= touchSlop && Math.abs(dy) <= touchSlop && isTouchInside(widget, event)) {
                         runBlocking {
                             for (link in pressedLinks!!) {
                                 Logger.i(TAG) { "Link clicked '${link.url}'." }
@@ -101,7 +101,7 @@ class PlatformLinkMovementMethod(private val _context: Context) : LinkMovementMe
             }
         }
 
-        return super.onTouchEvent(widget, buffer, event)
+        return false
     }
 
     private fun findLinksAtTouchPosition(widget: TextView, buffer: Spannable, event: MotionEvent): Array<URLSpan> {
@@ -114,6 +114,10 @@ class PlatformLinkMovementMethod(private val _context: Context) : LinkMovementMe
         return buffer.getSpans(off, off, URLSpan::class.java)
     }
 
+    private fun isTouchInside(widget: TextView, event: MotionEvent): Boolean {
+        return event.x >= 0 && event.x <= widget.width && event.y >= 0 && event.y <= widget.height
+    }
+
     companion object {
         const val TAG = "PlatformLinkMovementMethod"
     }

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

@@ -160,10 +160,6 @@ class StateApp {
     private var _cacheDirectory: File? = null;
     private var _persistentDirectory: File? = null;
 
-
-    //AutoRotate
-    var systemAutoRotate: Boolean = false;
-
     //Network
     private var _lastMeteredState: Boolean = false;
     private var _connectivityManager: ConnectivityManager? = null;
@@ -201,17 +197,6 @@ class StateApp {
         return File(_persistentDirectory, name);
     }
 
-    fun getCurrentSystemAutoRotate(): Boolean {
-        _context?.let {
-            systemAutoRotate = android.provider.Settings.System.getInt(
-                it.contentResolver,
-                android.provider.Settings.System.ACCELEROMETER_ROTATION, 0
-            ) == 1;
-        };
-        return systemAutoRotate;
-    }
-
-
     fun isCurrentMetered(): Boolean {
         ensureConnectivityManager();
         return _connectivityManager?.isActiveNetworkMetered ?: throw IllegalStateException("Connectivity manager not available");
@@ -312,9 +297,6 @@ class StateApp {
     fun setGlobalContext(context: Context, coroutineScope: CoroutineScope? = null) {
         _context = context;
         _scope = coroutineScope
-
-        //System checks
-        systemAutoRotate = getCurrentSystemAutoRotate();
     }
 
     fun initializeFiles(force: Boolean = false) {

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

@@ -1,6 +1,7 @@
 package com.futo.platformplayer.states
 
 import android.content.Context
+import com.futo.platformplayer.logging.Logger
 import kotlin.streams.asSequence
 
 /***
@@ -45,10 +46,16 @@ class StateAssets {
             var text: String?;
             synchronized(_cache) {
                 if (!_cache.containsKey(path)) {
-                    text = context.assets
-                        ?.open(path)
-                        ?.bufferedReader()
-                        ?.use { it.readText(); };
+                    try {
+                        text = context.assets
+                            ?.open(path)
+                            ?.bufferedReader()
+                            ?.use { it.readText(); };
+                    }
+                    catch(ex: Throwable) {
+                        Logger.e("StateAssets", "Could not open asset: " + path, ex);
+                        return null;
+                    }
 
                     _cache.put(path, text);
                 } else {

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);
                 }
             }
@@ -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/StateHistory.kt

@@ -8,6 +8,7 @@ import com.futo.platformplayer.constructs.Event2
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.HistoryVideo
 import com.futo.platformplayer.models.ImportCache
+import com.futo.platformplayer.states.StatePlaylists.Companion
 import com.futo.platformplayer.stores.FragmentedStorage
 import com.futo.platformplayer.stores.db.ManagedDBStore
 import com.futo.platformplayer.stores.db.types.DBHistory
@@ -89,12 +90,14 @@ class StateHistory {
                 if(isUserAction && _lastHistoryBroadcast != historyBroadcastSig) {
                     _lastHistoryBroadcast = historyBroadcastSig;
                     StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
-                        if(StateSync.instance.hasAtLeastOneOnlineDevice()) {
+                        try {
                             Logger.i(TAG, "SyncHistory playback broadcasted (${liveObj.name}: ${position})");
                             StateSync.instance.broadcastJsonData(
                                 GJSyncOpcodes.syncHistory,
                                 listOf(historyVideo)
                             );
+                        } catch (e: Throwable) {
+                            Logger.e(StatePlaylists.TAG, "Failed to broadcast sync history", e)
                         }
                     };
                 }

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

@@ -5,6 +5,7 @@ import android.net.Uri
 import androidx.core.content.FileProvider
 import androidx.fragment.app.Fragment
 import com.futo.platformplayer.R
+import com.futo.platformplayer.Settings
 import com.futo.platformplayer.api.media.exceptions.NoPlatformClientException
 import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
@@ -176,8 +177,11 @@ 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());
@@ -197,6 +201,7 @@ class StatePlaylists {
         }
 
         StateDownloads.instance.checkForOutdatedPlaylists();
+        return wasNew;
     }
 
     fun getLastPlayedPlaylist() : Playlist? {
@@ -227,31 +232,50 @@ class StatePlaylists {
 
     private fun broadcastWatchLater(orderOnly: Boolean = false) {
         StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
-            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()));
+            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()
+                    )
+                );
+            } catch (e: Throwable) {
+                Logger.w(TAG, "Failed to broadcast watch later", e)
+            }
         };
     }
     private fun broadcastWatchLaterAddition(video: SerializedPlatformVideo, time: OffsetDateTime) {
         StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
-            StateSync.instance.broadcastJsonData(GJSyncOpcodes.syncWatchLater, SyncWatchLaterPackage(
-                listOf(video),
-                mapOf(Pair(video.url, time.toEpochSecond())),
-                mapOf(),
+            try {
+                StateSync.instance.broadcastJsonData(
+                    GJSyncOpcodes.syncWatchLater, SyncWatchLaterPackage(
+                        listOf(video),
+                        mapOf(Pair(video.url, time.toEpochSecond())),
+                        mapOf(),
 
-            ))
+                        )
+                )
+            } catch (e: Throwable) {
+                Logger.w(TAG, "Failed to broadcast watch later addition", e)
+            }
         };
     }
     private fun broadcastWatchLaterRemoval(url: String, time: OffsetDateTime) {
         StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
-            StateSync.instance.broadcastJsonData(GJSyncOpcodes.syncWatchLater, SyncWatchLaterPackage(
-                listOf(),
-                mapOf(),
-                mapOf(Pair(url, time.toEpochSecond()))
-            ))
+            try {
+                StateSync.instance.broadcastJsonData(
+                    GJSyncOpcodes.syncWatchLater, SyncWatchLaterPackage(
+                        listOf(),
+                        mapOf(),
+                        mapOf(Pair(url, time.toEpochSecond()))
+                    )
+                )
+            } catch (e: Throwable) {
+                Logger.w(TAG, "Failed to broadcast watch later removal", e)
+            }
         };
     }
 
@@ -287,25 +311,32 @@ class StatePlaylists {
                 broadcastSyncPlaylist(playlist);
         }
     }
-    fun addToPlaylist(id: String, video: IPlatformVideo) {
+    fun addToPlaylist(id: String, video: IPlatformVideo): Boolean {
         synchronized(playlistStore) {
-            val playlist = getPlaylist(id) ?: return;
+            val playlist = getPlaylist(id) ?: return false;
+            if(!Settings.instance.other.playlistAllowDups && playlist.videos.any { it.url == video.url })
+                return false;
+
+
             playlist.videos.add(SerializedPlatformVideo.fromVideo(video));
             playlist.dateUpdate = OffsetDateTime.now();
             playlistStore.saveAsync(playlist, true);
 
             broadcastSyncPlaylist(playlist);
+            return true;
         }
     }
 
     private fun broadcastSyncPlaylist(playlist: Playlist){
         StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
-            if(StateSync.instance.hasAtLeastOneOnlineDevice()) {
+            try {
                 Logger.i(StateSubscriptionGroups.TAG, "SyncPlaylist (${playlist.name})");
                 StateSync.instance.broadcastJsonData(
                     GJSyncOpcodes.syncPlaylists,
                     SyncPlaylistsPackage(listOf(playlist), mapOf())
                 );
+            } catch (e: Throwable) {
+                Logger.e(TAG, "Failed to broadcast sync playlist", e)
             }
         };
     }
@@ -319,12 +350,14 @@ class StatePlaylists {
             _playlistRemoved.setAndSave(playlist.id, OffsetDateTime.now());
 
             StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
-                if(StateSync.instance.hasAtLeastOneOnlineDevice()) {
+                try {
                     Logger.i(StateSubscriptionGroups.TAG, "SyncPlaylist (${playlist.name})");
                     StateSync.instance.broadcastJsonData(
                         GJSyncOpcodes.syncPlaylists,
                         SyncPlaylistsPackage(listOf(), mapOf(Pair(playlist.id, OffsetDateTime.now().toEpochSecond())))
                     );
+                } catch (e: Throwable) {
+                    Logger.e(TAG, "Failed to broadcast sync playlists", 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/StateSubscriptionGroups.kt

@@ -79,12 +79,14 @@ class StateSubscriptionGroups {
             onGroupsChanged.emit();
         if(!preventSync) {
             StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
-                if(StateSync.instance.hasAtLeastOneOnlineDevice()) {
+                try {
                     Logger.i(TAG, "SyncSubscriptionGroup (${subGroup.name})");
                     StateSync.instance.broadcastJsonData(
                         GJSyncOpcodes.syncSubscriptionGroups,
                         SyncSubscriptionGroupsPackage(listOf(subGroup), mapOf())
                     );
+                } catch (e: Throwable) {
+                    Logger.e(TAG, "Failed to broadcast update subscription group", e)
                 }
             };
         }
@@ -98,12 +100,14 @@ class StateSubscriptionGroups {
             if(isUserInteraction) {
                 _groupsRemoved.setAndSave(id, OffsetDateTime.now());
                 StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
-                    if(StateSync.instance.hasAtLeastOneOnlineDevice()) {
+                    try {
                         Logger.i(TAG, "SyncSubscriptionGroup delete (${group.name})");
                         StateSync.instance.broadcastJsonData(
                             GJSyncOpcodes.syncSubscriptionGroups,
                             SyncSubscriptionGroupsPackage(listOf(), mapOf(Pair(id, OffsetDateTime.now().toEpochSecond())))
                         );
+                    } catch (e: Throwable) {
+                        Logger.e(TAG, "Failed to delete subscription group", e)
                     }
                 };
             }

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")
@@ -65,6 +66,12 @@ class StateSync {
     val deviceRemoved: Event1<String> = Event1()
     val deviceUpdatedOrAdded: Event2<String, SyncSession> = Event2()
 
+    fun hasAuthorizedDevice(): Boolean {
+        synchronized(_sessions) {
+            return _sessions.any{ it.value.connected && it.value.isAuthorized };
+        }
+    }
+
     fun start() {
         if (_started) {
             Logger.i(TAG, "Already started.")
@@ -216,6 +223,11 @@ class StateSync {
             return _sessions.values.toList()
         };
     }
+    fun getAuthorizedSessions(): List<SyncSession> {
+        return synchronized(_sessions) {
+            return _sessions.values.filter { it.isAuthorized }.toList()
+        };
+    }
 
     fun getSyncSessionData(key: String): SyncSessionData {
         return _syncSessionData.get(key) ?: SyncSessionData(key);
@@ -294,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)
                             }
@@ -330,7 +352,7 @@ class StateSync {
 
                             deviceRemoved.emit(it.remotePublicKey)
 
-                        })
+                        }, remoteDeviceName)
                         _sessions[remotePublicKey] = session!!
                     }
                     session!!.addSocketSession(s)
@@ -349,8 +371,12 @@ class StateSync {
                             scope.launch(Dispatchers.Main) {
                                 UIDialogs.showConfirmationDialog(activity, "Allow connection from ${remotePublicKey}?", action = {
                                     scope.launch(Dispatchers.IO) {
-                                        session!!.authorize(s)
-                                        Logger.i(TAG, "Connection authorized for ${remotePublicKey} by confirmation")
+                                        try {
+                                            session!!.authorize(s)
+                                            Logger.i(TAG, "Connection authorized for $remotePublicKey by confirmation")
+                                        } catch (e: Throwable) {
+                                            Logger.e(TAG, "Failed to send authorize", e)
+                                        }
                                     }
                                 }, cancelAction = {
                                     scope.launch(Dispatchers.IO) {
@@ -404,11 +430,9 @@ class StateSync {
         broadcast(opcode, subOpcode, data.toByteArray(Charsets.UTF_8));
     }
     fun broadcast(opcode: UByte, subOpcode: UByte, data: ByteArray) {
-        for(session in getSessions()) {
+        for(session in getAuthorizedSessions()) {
             try {
-                if (session.isAuthorized && session.connected) {
-                    session.send(opcode, subOpcode, data);
-                }
+                session.send(opcode, subOpcode, data);
             }
             catch(ex: Exception) {
                 Logger.w(TAG, "Failed to broadcast (opcode = ${opcode}, subOpcode = ${subOpcode}) to ${session.remotePublicKey}: ${ex.message}}", ex);
@@ -450,23 +474,18 @@ class StateSync {
         return session
     }
 
-    fun hasAtLeastOneDevice(): Boolean {
-        synchronized(_authorizedDevices) {
-            return _authorizedDevices.values.isNotEmpty()
-        }
-    }
-    fun hasAtLeastOneOnlineDevice(): Boolean {
-        synchronized(_sessions) {
-            return _sessions.any{ it.value.connected && it.value.isAuthorized };
-        }
-    }
-
     fun getAll(): List<String> {
         synchronized(_authorizedDevices) {
             return _authorizedDevices.values.toList()
         }
     }
 
+    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/states/StateUpdate.kt

@@ -189,9 +189,9 @@ class StateUpdate {
             }
         } catch (e: Throwable) {
             Logger.w(TAG, "Failed to check for updates.", e);
-
+            android.util.Log.e(TAG, "Failed to check for updates.", e);
             withContext(Dispatchers.Main) {
-                UIDialogs.toast(context, "Failed to check for updates");
+                UIDialogs.toast(context, "Failed to check for updates\n" + e.message);
             }
         }
     }

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/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)
@@ -398,7 +435,6 @@ class SyncSession : IAuthorizable {
         }
     }
 
-
     inline fun <reified T> sendJsonData(subOpcode: UByte, data: T) {
         send(Opcode.DATA.value, subOpcode, Json.encodeToString<T>(data));
     }
@@ -409,12 +445,29 @@ class SyncSession : IAuthorizable {
         send(opcode, subOpcode, data.toByteArray(Charsets.UTF_8));
     }
     fun send(opcode: UByte, subOpcode: UByte, data: ByteArray) {
-        val sock = _socketSessions.firstOrNull();
-        if(sock != null){
-            sock.send(opcode, subOpcode, ByteBuffer.wrap(data));
+        val socketSessions = synchronized(_socketSessions) {
+            _socketSessions.toList()
+        }
+
+        if (socketSessions.isEmpty()) {
+            Logger.v(TAG, "Packet was not sent (opcode = ${opcode}, subOpcode = ${subOpcode}) due to no connected sockets")
+            return
+        }
+
+        var sent = false
+        for (socketSession in socketSessions) {
+            try {
+                socketSession.send(opcode, subOpcode, ByteBuffer.wrap(data))
+                sent = true
+                break
+            } catch (e: Throwable) {
+                Logger.w(TAG, "Packet failed to send (opcode = ${opcode}, subOpcode = ${subOpcode})", e)
+            }
+        }
+
+        if (!sent) {
+            throw Exception("Packet was not sent (opcode = ${opcode}, subOpcode = ${subOpcode}) due to send errors and no remaining candidates")
         }
-        else
-            throw IllegalStateException("Session has no active sockets");
     }
 
     private companion object {

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")
     }
 
@@ -300,6 +303,8 @@ class SyncSocketSession {
     }
 
     private fun handlePacket(opcode: UByte, subOpcode: UByte, data: ByteBuffer) {
+        Logger.i(TAG, "Handle packet (opcode = ${opcode}, subOpcode = ${subOpcode})")
+
         when (opcode) {
             Opcode.PING.value -> {
                 send(Opcode.PONG.value)

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

@@ -55,7 +55,7 @@ class ToastView : LinearLayout {
             translationY = 20.dp(context.resources).toFloat();
             animate()
                 .alpha(1f)
-                .setDuration(700)
+                .setDuration(300)
                 .translationY(0f)
                 .start();
         }

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

@@ -5,6 +5,7 @@ import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.Lifecycle
 import androidx.viewpager2.adapter.FragmentStateAdapter
 import com.futo.platformplayer.api.media.models.PlatformAuthorLink
+import com.futo.platformplayer.api.media.models.ResultCapabilities
 import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
 import com.futo.platformplayer.api.media.models.contents.ContentType
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
@@ -21,7 +22,7 @@ import com.google.android.material.tabs.TabLayout
 
 
 enum class ChannelTab {
-    VIDEOS, CHANNELS, PLAYLISTS, SUPPORT, ABOUT
+    VIDEOS, SHORTS, CHANNELS, PLAYLISTS, SUPPORT, ABOUT
 }
 
 class ChannelViewPagerAdapter(fragmentManager: FragmentManager, lifecycle: Lifecycle) :
@@ -91,6 +92,19 @@ class ChannelViewPagerAdapter(fragmentManager: FragmentManager, lifecycle: Lifec
                 }
             }
 
+            ChannelTab.SHORTS -> {
+                fragment = ChannelContentsFragment.newInstance(ResultCapabilities.TYPE_SHORTS).apply {
+                    onContentClicked.subscribe(this@ChannelViewPagerAdapter.onContentClicked::emit)
+                    onContentUrlClicked.subscribe(this@ChannelViewPagerAdapter.onContentUrlClicked::emit)
+                    onUrlClicked.subscribe(this@ChannelViewPagerAdapter.onUrlClicked::emit)
+                    onChannelClicked.subscribe(this@ChannelViewPagerAdapter.onChannelClicked::emit)
+                    onAddToClicked.subscribe(this@ChannelViewPagerAdapter.onAddToClicked::emit)
+                    onAddToQueueClicked.subscribe(this@ChannelViewPagerAdapter.onAddToQueueClicked::emit)
+                    onAddToWatchLaterClicked.subscribe(this@ChannelViewPagerAdapter.onAddToWatchLaterClicked::emit)
+                    onLongPress.subscribe(this@ChannelViewPagerAdapter.onLongPress::emit)
+                }
+            }
+
             ChannelTab.CHANNELS -> {
                 fragment = ChannelListFragment.newInstance()
                     .apply { onClickChannel.subscribe(onChannelClicked::emit) }

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/feedtypes/PreviewVideoView.kt

@@ -132,7 +132,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) {

app/src/main/java/com/futo/platformplayer/views/behavior/GestureControlView.kt

@@ -755,10 +755,6 @@ class GestureControlView : LinearLayout {
                 }
             }
 
-            if (!Settings.instance.gestureControls.useSystemBrightness) {
-                _brightnessFactor = 1.0f;
-            }
-
             if (Settings.instance.gestureControls.useSystemVolume) {
                 val audioManager = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
                 val currentVolume = audioManager.getStreamVolume(AudioManager.STREAM_MUSIC)

app/src/main/java/com/futo/platformplayer/views/behavior/NonScrollingTextView.kt

@@ -76,7 +76,7 @@ class NonScrollingTextView : androidx.appcompat.widget.AppCompatTextView {
                 if (linkPressed && _lastTouchedLinks != null) {
                     val dx = event.x - downX
                     val dy = event.y - downY
-                    if (Math.abs(dx) <= touchSlop && Math.abs(dy) <= touchSlop) {
+                    if (Math.abs(dx) <= touchSlop && Math.abs(dy) <= touchSlop && isTouchInside(event)) {
                         runBlocking {
                             for (link in _lastTouchedLinks!!) {
                                 Logger.i(PlatformLinkMovementMethod.TAG) { "Link clicked '${link.url}'." }
@@ -119,7 +119,11 @@ class NonScrollingTextView : androidx.appcompat.widget.AppCompatTextView {
             }
         }
 
-        return super.onTouchEvent(event)
+        return false
+    }
+
+    private fun isTouchInside(event: MotionEvent): Boolean {
+        return event.x >= 0 && event.x <= width && event.y >= 0 && event.y <= height
     }
 
     companion object {

app/src/main/java/com/futo/platformplayer/views/overlays/QueueEditorOverlay.kt

@@ -2,16 +2,26 @@ package com.futo.platformplayer.views.overlays
 
 import android.content.Context
 import android.util.AttributeSet
+import android.widget.FrameLayout
+import android.widget.ImageView
 import android.widget.LinearLayout
 import com.futo.platformplayer.states.StatePlayer
 import com.futo.platformplayer.R
+import com.futo.platformplayer.UISlideOverlays
 import com.futo.platformplayer.constructs.Event0
 import com.futo.platformplayer.views.lists.VideoListEditorView
+import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuItem
+import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuOverlay
+import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuTextInput
 
 class QueueEditorOverlay : LinearLayout {
 
     private val _topbar : OverlayTopbar;
     private val _editor : VideoListEditorView;
+    private val _btnSettings: ImageView;
+
+    private val _overlayContainer: FrameLayout;
+
 
     val onClose = Event0();
 
@@ -19,6 +29,9 @@ class QueueEditorOverlay : LinearLayout {
         inflate(context, R.layout.overlay_queue, this)
         _topbar = findViewById(R.id.topbar);
         _editor = findViewById(R.id.editor);
+        _btnSettings = findViewById(R.id.button_settings);
+        _overlayContainer = findViewById(R.id.overlay_container_queue);
+
 
         _topbar.onClose.subscribe(this, onClose::emit);
         _editor.onVideoOrderChanged.subscribe { StatePlayer.instance.setQueueWithExisting(it) }
@@ -28,6 +41,10 @@ class QueueEditorOverlay : LinearLayout {
         }
         _editor.onVideoClicked.subscribe { v -> StatePlayer.instance.setQueuePosition(v) }
 
+        _btnSettings.setOnClickListener {
+            handleSettings();
+        }
+
         _topbar.setInfo(context.getString(R.string.queue), "");
     }
 
@@ -40,4 +57,8 @@ class QueueEditorOverlay : LinearLayout {
     fun cleanup() {
         _topbar.onClose.remove(this);
     }
+
+    fun handleSettings() {
+        UISlideOverlays.showQueueOptionsOverlay(context, _overlayContainer);
+    }
 }

app/src/main/java/com/futo/platformplayer/views/overlays/slideup/SlideUpMenuGroup.kt

@@ -61,6 +61,15 @@ class SlideUpMenuGroup : LinearLayout {
         return didSelect;
     }
 
+    fun getItem(tag: Any?): SlideUpMenuItem? {
+        for(item in items) {
+            if(item.itemTag == tag){
+                return item
+            }
+        }
+        return null
+    }
+
     private fun addItems(items: List<SlideUpMenuItem>) {
         for (item in items) {
             item.setParentClickListener { parentClickListener?.invoke() }

app/src/main/java/com/futo/platformplayer/views/overlays/slideup/SlideUpMenuItem.kt

@@ -82,6 +82,10 @@ class SlideUpMenuItem : ConstraintLayout {
         return isSelected;
     }
 
+    fun setSubText(subText: String) {
+        _subtext.text = subText
+    }
+
     fun setParentClickListener(listener: (()->Unit)?) {
         _parentClickListener = listener;
     }

app/src/main/java/com/futo/platformplayer/views/video/FutoVideoPlayer.kt

@@ -592,11 +592,6 @@ class FutoVideoPlayer : FutoVideoPlayerBase {
 
     @OptIn(UnstableApi::class)
     fun setFullScreen(fullScreen: Boolean) {
-        // prevent fullscreen before the video has loaded to make sure we know whether it's a vertical or horizontal video
-        if(exoPlayer?.player?.videoSize?.height ?: 0 == 0 && fullScreen){
-            return
-        }
-
         updateRotateLock()
 
         if (isFullScreen == fullScreen) {
@@ -813,17 +808,12 @@ class FutoVideoPlayer : FutoVideoPlayerBase {
     }
 
     fun updateRotateLock() {
-        if(Settings.instance.playback.autoRotate == 0) {
-            _control_rotate_lock.visibility = View.GONE;
-            _control_rotate_lock_fullscreen.visibility = View.GONE;
-        }
-        else {
-            _control_rotate_lock.visibility = View.VISIBLE;
-            _control_rotate_lock_fullscreen.visibility = View.VISIBLE;
-        }
+        _control_rotate_lock.visibility = View.VISIBLE;
+        _control_rotate_lock_fullscreen.visibility = View.VISIBLE;
+
         if(StatePlayer.instance.rotationLock) {
-            _control_rotate_lock_fullscreen.setImageResource(R.drawable.ic_screen_rotation);
-            _control_rotate_lock.setImageResource(R.drawable.ic_screen_rotation);
+            _control_rotate_lock_fullscreen.setImageResource(R.drawable.ic_screen_lock_rotation_active);
+            _control_rotate_lock.setImageResource(R.drawable.ic_screen_lock_rotation_active);
         }
         else {
             _control_rotate_lock_fullscreen.setImageResource(R.drawable.ic_screen_lock_rotation);

app/src/main/java/com/futo/platformplayer/views/video/FutoVideoPlayerBase.kt

@@ -96,6 +96,7 @@ abstract class FutoVideoPlayerBase : RelativeLayout {
     val exoPlayerStateName: String;
 
     var playing: Boolean = false;
+    val activelyPlaying: Boolean get() = (exoPlayer?.player?.playbackState == Player.STATE_READY) && (exoPlayer?.player?.playWhenReady ?: false)
     val position: Long get() = exoPlayer?.player?.currentPosition ?: 0;
     val duration: Long get() = exoPlayer?.player?.duration ?: 0;
 
@@ -110,8 +111,10 @@ abstract class FutoVideoPlayerBase : RelativeLayout {
     private var _didCallSourceChange = false;
     private var _lastState: Int = -1;
 
-    private var _targetTrackVideoHeight = -1;
-    private var _targetTrackAudioBitrate = -1;
+
+    var targetTrackVideoHeight = -1
+        private set
+    private var _targetTrackAudioBitrate = -1
 
     private var _toResume = false;
 
@@ -278,7 +281,7 @@ abstract class FutoVideoPlayerBase : RelativeLayout {
 
     //TODO: Temporary solution, Implement custom track selector without using constraints
     fun selectVideoTrack(height: Int) {
-        _targetTrackVideoHeight = height;
+        targetTrackVideoHeight = height;
         updateTrackSelector();
     }
     fun selectAudioTrack(bitrate: Int) {
@@ -288,16 +291,22 @@ abstract class FutoVideoPlayerBase : RelativeLayout {
     @OptIn(UnstableApi::class)
     private fun updateTrackSelector() {
         var builder = DefaultTrackSelector.Parameters.Builder(context);
-        if(_targetTrackVideoHeight > 0) {
+        if(targetTrackVideoHeight > 0) {
             builder = builder
-                .setMinVideoSize(0, _targetTrackVideoHeight - 10)
-                .setMaxVideoSize(9999, _targetTrackVideoHeight + 10);
+                .setMinVideoSize(0, targetTrackVideoHeight - 10)
+                .setMaxVideoSize(9999, targetTrackVideoHeight + 10);
         }
 
         if(_targetTrackAudioBitrate > 0) {
             builder = builder.setMaxAudioBitrate(_targetTrackAudioBitrate);
         }
 
+        builder = if (isAudioMode) {
+            builder.setTrackTypeDisabled(C.TRACK_TYPE_VIDEO, true)
+        } else {
+            builder.setTrackTypeDisabled(C.TRACK_TYPE_VIDEO, false)
+        }
+
         val trackSelector = exoPlayer?.player?.trackSelector;
         if(trackSelector != null) {
             trackSelector.parameters = builder.build();
@@ -737,6 +746,7 @@ abstract class FutoVideoPlayerBase : RelativeLayout {
         val sourceAudio = _lastAudioMediaSource;
         val sourceSubs = _lastSubtitleMediaSource;
 
+        updateTrackSelector()
 
         beforeSourceChanged();
 
@@ -820,7 +830,7 @@ abstract class FutoVideoPlayerBase : RelativeLayout {
         Logger.i(TAG, "onPlayerError error=$error error.errorCode=${error.errorCode} connectivityLoss");
 
         when (error.errorCode) {
-            PlaybackException.ERROR_CODE_IO_BAD_HTTP_STATUS -> {
+            PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_FAILED, PlaybackException.ERROR_CODE_IO_BAD_HTTP_STATUS -> {
                 Logger.w(TAG, "ERROR_CODE_IO_BAD_HTTP_STATUS ${error.cause?.javaClass?.simpleName}");
                 if(error.cause is HttpDataSource.InvalidResponseCodeException) {
                     val cause = error.cause as HttpDataSource.InvalidResponseCodeException

app/src/main/res/drawable/ic_screen_lock_rotation_active.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:fillColor="@color/colorPrimary"
+      android:pathData="M35.25,23.3 L36.4,22.2 38.6,24.45Q39.5,25.3 39.5,26.55Q39.5,27.8 38.6,28.65L32.5,34.75Q31.6,35.6 30.375,35.6Q29.15,35.6 28.3,34.75L13.8,20.25Q12.95,19.4 12.95,18.15Q12.95,16.9 13.8,16.1L19.95,9.95Q20.8,9.1 22.05,9.1Q23.3,9.1 24.1,9.95L26.45,12.25L25.3,13.35L22.9,10.95Q22.55,10.6 22.025,10.6Q21.5,10.6 21.15,10.95L14.85,17.25Q14.5,17.6 14.5,18.15Q14.5,18.7 14.85,19.05L29.5,33.75Q29.85,34.1 30.4,34.1Q30.95,34.1 31.25,33.75L37.6,27.4Q37.95,27.05 37.95,26.525Q37.95,26 37.6,25.65ZM26.15,44.45Q21.6,44.45 17.6,42.725Q13.6,41 10.625,38.025Q7.65,35.05 5.925,31.025Q4.2,27 4.2,22.5H5.75Q5.75,26.65 7.325,30.35Q8.9,34.05 11.65,36.825Q14.4,39.6 18.125,41.2Q21.85,42.8 26,42.85L18.55,35.35L19.65,34.25L29.5,44.1Q28.6,44.25 27.8,44.35Q27,44.45 26.15,44.45ZM32.4,18Q31.7,18 31.1,17.4Q30.5,16.8 30.5,16.1V10.85Q30.5,10.15 31.1,9.525Q31.7,8.9 32.4,8.9H32.55V6.85Q32.55,5.4 33.575,4.4Q34.6,3.4 36.05,3.4Q37.55,3.4 38.55,4.4Q39.55,5.4 39.55,6.85V8.9H39.75Q40.45,8.9 41,9.525Q41.55,10.15 41.55,10.85V16.1Q41.55,16.8 40.975,17.4Q40.4,18 39.65,18ZM34.05,8.9H38.05V6.85Q38.05,6 37.475,5.425Q36.9,4.85 36.05,4.85Q35.2,4.85 34.625,5.425Q34.05,6 34.05,6.85ZM26.25,22.35Q26.25,22.35 26.25,22.35Q26.25,22.35 26.25,22.35Q26.25,22.35 26.25,22.35Q26.25,22.35 26.25,22.35Q26.25,22.35 26.25,22.35Q26.25,22.35 26.25,22.35Q26.25,22.35 26.25,22.35Q26.25,22.35 26.25,22.35Q26.25,22.35 26.25,22.35Q26.25,22.35 26.25,22.35Z"/>
+</vector>

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

@@ -93,6 +93,26 @@
                 android:layout_marginStart="30dp"
                 android:layout_marginEnd="30dp" />
 
+            <TextView
+                android:id="@+id/text_changelog"
+                android:layout_width="match_parent"
+                android:layout_height="80dp"
+                android:textAlignment="textStart"
+                android:text="Changelog"
+                android:textSize="9.5sp"
+                android:textColor="@color/white"
+                android:fontFamily="monospace"
+                android:scrollbars="vertical"
+
+                android:background="@color/black"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:paddingTop="5dp"
+                android:paddingBottom="5dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp" />
+
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"

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

@@ -16,7 +16,7 @@
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="100dp"
+            android:layout_height="110dp"
             android:minHeight="0dp"
             app:layout_scrollFlags="scroll"
             app:contentInsetStart="0dp"
@@ -77,7 +77,16 @@
                         android:layout_height="wrap_content"
                         android:paddingStart="20dp"
                         android:paddingEnd="20dp" />
+
                 </LinearLayout>
+                <TextView
+                    android:id="@+id/text_meta"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textSize="9dp"
+                    android:textAlignment="center"
+                    android:textColor="#333333"
+                    android:text="0 creators" />
             </LinearLayout>
 
         </androidx.appcompat.widget.Toolbar>

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

@@ -99,7 +99,6 @@
             </LinearLayout>
         </LinearLayout>
 
-
         <!--Playlists-->
         <LinearLayout
             android:id="@+id/downloads_playlist_container"
@@ -163,6 +162,37 @@
                 android:textColor="#ACACAC"
                 tools:text="(12 videos)" />
         </LinearLayout>
+        <EditText
+            android:id="@+id/downloads_search"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:background="@drawable/background_button_round"
+            android:hint="Seach.." />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:gravity="center_vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="14dp"
+                android:textColor="@color/gray_ac"
+                android:fontFamily="@font/inter_light"
+                android:text="@string/sort_by"
+                android:paddingStart="20dp" />
+
+            <Spinner
+                android:id="@+id/spinner_sortby"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp" />
+        </LinearLayout>
     </LinearLayout>
 
     <androidx.recyclerview.widget.RecyclerView

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

@@ -54,6 +54,22 @@
 
 
 
+                        <ImageButton
+                            android:id="@+id/button_export"
+                            android:layout_width="40dp"
+                            android:layout_height="40dp"
+                            android:contentDescription="@string/cd_button_download"
+                            android:background="@drawable/background_button_round"
+                            android:gravity="center"
+                            android:layout_marginStart="10dp"
+                            android:orientation="horizontal"
+                            app:srcCompat="@drawable/ic_export"
+                            app:layout_constraintRight_toLeftOf="@id/button_share"
+                            app:layout_constraintTop_toTopOf="@id/button_share"
+                            app:tint="@color/white"
+                            android:padding="8dp"
+                            android:layout_marginRight="10dp"
+                            android:scaleType="fitCenter" />
                         <ImageButton
                             android:id="@+id/button_share"
                             android:layout_width="40dp"

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

@@ -21,5 +21,20 @@
         android:layout_height="0dp"
         app:layout_constraintTop_toBottomOf="@id/topbar"
         app:layout_constraintBottom_toBottomOf="parent" />
+    <ImageView
+        android:id="@+id/button_settings"
+        android:background="@drawable/background_pill"
+        android:padding="5dp"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_margin="10dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:srcCompat="@drawable/ic_settings" />
 
+    <FrameLayout
+        android:id="@+id/overlay_container_queue"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone" />
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:scrollbars="horizontal">
+        <LinearLayout
+            android:id="@+id/container_tags"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal" />
+    </ScrollView>
+</LinearLayout>

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

@@ -233,8 +233,6 @@
     <string name="announcement">إعلان</string>
     <string name="attempt_to_utilize_byte_ranges">محاولة استخدام مدى البايت</string>
     <string name="auto_update">تحديث تلقائي</string>
-    <string name="auto_rotate">تدوير تلقائي</string>
-    <string name="auto_rotate_dead_zone">منطقة ميتة للتدوير التلقائي</string>
     <string name="automatic_backup">نسخ احتياطي تلقائي</string>
     <string name="background_behavior">سلوك الخلفية</string>
     <string name="background_update">تحديث الخلفية</string>
@@ -539,7 +537,6 @@
     <string name="not_yet_available_retrying_in_time_s">لم يصبح متوفراً بعد، إعادة المحاولة في {time}s</string>
     <string name="failed_to_retry_for_live_stream">فشل في إعادة المحاولة للبث المباشر</string>
     <string name="this_app_is_in_development_please_submit_bug_reports_and_understand_that_many_features_are_incomplete">هذا التطبيق قيد التطوير. يرجى إرسال تقارير الأخطاء وفهم أن العديد من الميزات غير مكتملة.</string>
-    <string name="please_use_at_least_3_characters">يرجى استخدام 3 أحرف على الأقل</string>
     <string name="are_you_sure_you_want_to_delete_this_video">هل أنت متأكد من أنك ترغب في حذف هذا الفيديو؟</string>
     <string name="tap_to_open">انقر للفتح</string>
     <string name="watching">يشاهد</string>
@@ -661,11 +658,6 @@
         <item>عند التشغيل</item>
         <item>أبداً</item>
     </string-array>
-    <string-array name="system_enabled_disabled_array">
-        <item>معطل</item>
-        <item>مفعل</item>
-        <item>كما في النظام</item>
-    </string-array>
     <string-array name="enabled_disabled_array">
         <item>معطل</item>
         <item>مفعل</item>

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

@@ -243,8 +243,6 @@
     <string name="announcement">Ankündigung</string>
     <string name="attempt_to_utilize_byte_ranges">Versuch, Byte-Bereiche zu nutzen</string>
     <string name="auto_update">Automatische Aktualisierung</string>
-    <string name="auto_rotate">Automatische Drehung</string>
-    <string name="auto_rotate_dead_zone">Toter Winkel für automatische Drehung</string>
     <string name="automatic_backup">Automatisches Backup</string>
     <string name="background_behavior">Hintergrundverhalten</string>
     <string name="background_update">Hintergrundaktualisierung</string>
@@ -542,7 +540,6 @@
     <string name="not_yet_available_retrying_in_time_s">Noch nicht verfügbar, erneuter Versuch in {time}s</string>
     <string name="failed_to_retry_for_live_stream">Fehler beim erneuten Versuch für den Live-Stream</string>
     <string name="this_app_is_in_development_please_submit_bug_reports_and_understand_that_many_features_are_incomplete">Diese App befindet sich in der Entwicklung. Bitte senden Sie Fehlerberichte und verstehen Sie, dass viele Funktionen unvollständig sind.</string>
-    <string name="please_use_at_least_3_characters">Bitte verwenden Sie mindestens 3 Zeichen</string>
     <string name="are_you_sure_you_want_to_delete_this_video">Sind Sie sicher, dass Sie dieses Video löschen möchten?</string>
     <string name="tap_to_open">Tippen Sie zum Öffnen</string>
     <string name="watching">anschauen</string>
@@ -661,11 +658,6 @@
         <item>Beim Start</item>
         <item>Nie</item>
     </string-array>
-    <string-array name="system_enabled_disabled_array">
-        <item>Deaktiviert</item>
-        <item>Aktiviert</item>
-        <item>Gleich wie System</item>
-    </string-array>
     <string-array name="enabled_disabled_array">
         <item>Deaktiviert</item>
         <item>Aktiviert</item>

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

@@ -217,8 +217,6 @@
     <string name="announcement">Anuncio</string>
     <string name="attempt_to_utilize_byte_ranges">Intentar utilizar rangos de bytes</string>
     <string name="auto_update">Actualización automática</string>
-    <string name="auto_rotate">Auto-rotar</string>
-    <string name="auto_rotate_dead_zone">Zona muerta de auto-rotación</string>
     <string name="automatic_backup">Copia de seguridad automática</string>
     <string name="background_behavior">Comportamiento en segundo plano</string>
     <string name="background_update">Actualización en segundo plano</string>
@@ -523,7 +521,6 @@
     <string name="not_yet_available_retrying_in_time_s">Todavía no está disponible, reintento en {time}s</string>
     <string name="failed_to_retry_for_live_stream">Error al reintentar la transmisión en vivo</string>
     <string name="this_app_is_in_development_please_submit_bug_reports_and_understand_that_many_features_are_incomplete">Esta aplicación está en desarrollo. Por favor, envía informes de errores y comprende que muchas características están incompletas.</string>
-    <string name="please_use_at_least_3_characters">Por favor, usa al menos 3 caracteres</string>
     <string name="are_you_sure_you_want_to_delete_this_video">¿Estás seguro de que deseas eliminar este video?</string>
     <string name="tap_to_open">Toca para abrir</string>
     <string name="watching">viendo</string>
@@ -671,17 +668,6 @@
         <item>Al Iniciar</item>
         <item>Nunca</item>
     </string-array>
-    <string-array name="system_enabled_disabled_array">
-        <item>Desactivado</item>
-        <item>Activado</item>
-        <item>Mismo que el Sistema</item>
-    </string-array>
-    <string-array name="auto_rotate_dead_zone">
-        <item>0</item>
-        <item>5</item>
-        <item>10</item>
-        <item>20</item>
-    </string-array>
     <string-array name="enabled_disabled_array">
         <item>Desactivado</item>
         <item>Activado</item>

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

@@ -256,8 +256,6 @@
     <string name="announcement">Annonce</string>
     <string name="attempt_to_utilize_byte_ranges">Tentative d\'utilisation de plages d\'octets</string>
     <string name="auto_update">Mise à jour automatique</string>
-    <string name="auto_rotate">Rotation automatique</string>
-    <string name="auto_rotate_dead_zone">Zone morte de rotation automatique</string>
     <string name="automatic_backup">Sauvegarde automatique</string>
     <string name="background_behavior">Comportement en arrière-plan</string>
     <string name="background_update">Mise à jour en arrière-plan</string>
@@ -562,7 +560,6 @@
     <string name="not_yet_available_retrying_in_time_s">Pas encore disponible, réessai dans {time}s</string>
     <string name="failed_to_retry_for_live_stream">Échec de la tentative de réessai pour la diffusion en direct</string>
     <string name="this_app_is_in_development_please_submit_bug_reports_and_understand_that_many_features_are_incomplete">Cette application est en développement. Veuillez soumettre des rapports de bug et comprendre que de nombreuses fonctionnalités ne sont pas encore complètes.</string>
-    <string name="please_use_at_least_3_characters">Veuillez utiliser au moins 3 caractères</string>
     <string name="are_you_sure_you_want_to_delete_this_video">Êtes-vous sûr de vouloir supprimer cette vidéo ?</string>
     <string name="tap_to_open">Appuyez pour ouvrir</string>
     <string name="watching">en train de regarder</string>
@@ -661,11 +658,6 @@
         <item>Au démarrage</item>
         <item>Jamais</item>
     </string-array>
-    <string-array name="system_enabled_disabled_array">
-        <item>Désactivé</item>
-        <item>Activé</item>
-        <item>Même que le système</item>
-    </string-array>
     <string-array name="enabled_disabled_array">
         <item>Désactivé</item>
         <item>Activé</item>

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

@@ -220,8 +220,6 @@
     <string name="announcement">お知らせ</string>
     <string name="attempt_to_utilize_byte_ranges">バイト範囲を使用する試み</string>
     <string name="auto_update">自動更新</string>
-    <string name="auto_rotate">自動回転</string>
-    <string name="auto_rotate_dead_zone">自動回転デッドゾーン</string>
     <string name="automatic_backup">自動バックアップ</string>
     <string name="background_behavior">バックグラウンドの動作</string>
     <string name="background_update">バックグラウンド更新</string>
@@ -524,7 +522,6 @@
     <string name="not_yet_available_retrying_in_time_s">{time}秒後に再試行、まだ利用できません</string>
     <string name="failed_to_retry_for_live_stream">ライブストリームの再試行に失敗しました</string>
     <string name="this_app_is_in_development_please_submit_bug_reports_and_understand_that_many_features_are_incomplete">このアプリは開発中です。バグレポートを提出し、多くの機能が未完成であることを理解してください。</string>
-    <string name="please_use_at_least_3_characters">少なくとも3文字を使用してください</string>
     <string name="are_you_sure_you_want_to_delete_this_video">このビデオを削除してもよろしいですか？</string>
     <string name="tap_to_open">タップして開く</string>
     <string name="watching">視聴中</string>
@@ -661,11 +658,6 @@
         <item>起動時</item>
         <item>なし</item>
     </string-array>
-    <string-array name="system_enabled_disabled_array">
-        <item>無効</item>
-        <item>有効</item>
-        <item>システムと同じ</item>
-    </string-array>
     <string-array name="enabled_disabled_array">
         <item>無効</item>
         <item>有効</item>

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

@@ -255,8 +255,6 @@
     <string name="announcement">공고</string>
     <string name="attempt_to_utilize_byte_ranges">바이트 범위 사용 시도</string>
     <string name="auto_update">자동 업데이트</string>
-    <string name="auto_rotate">자동 회전</string>
-    <string name="auto_rotate_dead_zone">자동 회전 데드 존</string>
     <string name="automatic_backup">자동 백업</string>
     <string name="background_behavior">백그라운드 동작</string>
     <string name="background_update">백그라운드 업데이트</string>
@@ -561,7 +559,6 @@
     <string name="not_yet_available_retrying_in_time_s">아직 사용할 수 없습니다, {time}초 후에 다시 시도합니다</string>
     <string name="failed_to_retry_for_live_stream">라이브 스트림을 다시 시도하지 못했습니다</string>
     <string name="this_app_is_in_development_please_submit_bug_reports_and_understand_that_many_features_are_incomplete">이 앱은 개발 중입니다. 버그 보고를 제출해 주시고, 많은 기능이 미완성임을 이해해 주세요.</string>
-    <string name="please_use_at_least_3_characters">최소 3자 이상 사용해 주세요</string>
     <string name="are_you_sure_you_want_to_delete_this_video">이 비디오를 삭제하시겠습니까?</string>
     <string name="tap_to_open">열려면 탭하세요</string>
     <string name="watching">시청 중</string>
@@ -661,11 +658,6 @@
         <item>시작할 때</item>
         <item>안 함</item>
     </string-array>
-    <string-array name="system_enabled_disabled_array">
-        <item>비활성화</item>
-        <item>활성화</item>
-        <item>시스템과 동일</item>
-    </string-array>
     <string-array name="enabled_disabled_array">
         <item>비활성화</item>
         <item>활성화</item>

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

@@ -256,8 +256,6 @@
     <string name="announcement">Anúncio</string>
     <string name="attempt_to_utilize_byte_ranges">Tentar utilizar intervalos de bytes</string>
     <string name="auto_update">Atualização Automática</string>
-    <string name="auto_rotate">Rotação Automática</string>
-    <string name="auto_rotate_dead_zone">Zona Morta de Rotação Automática</string>
     <string name="automatic_backup">Backup Automático</string>
     <string name="background_behavior">Comportamento em Segundo Plano</string>
     <string name="background_update">Atualização em Segundo Plano</string>
@@ -557,7 +555,6 @@
     <string name="not_yet_available_retrying_in_time_s">Ainda não disponível, tentando novamente em {time}s</string>
     <string name="failed_to_retry_for_live_stream">Falha ao tentar novamente para transmissão ao vivo</string>
     <string name="this_app_is_in_development_please_submit_bug_reports_and_understand_that_many_features_are_incomplete">Este aplicativo está em desenvolvimento. Envie relatórios de erros e entenda que muitos recursos estão incompletos.</string>
-    <string name="please_use_at_least_3_characters">Use pelo menos 3 caracteres</string>
     <string name="are_you_sure_you_want_to_delete_this_video">Tem certeza de que deseja excluir este vídeo?</string>
     <string name="tap_to_open">Toque para abrir</string>
     <string name="watching">Assistindo</string>
@@ -661,11 +658,6 @@
         <item>Ao Iniciar</item>
         <item>Nunca</item>
     </string-array>
-    <string-array name="system_enabled_disabled_array">
-        <item>Desativado</item>
-        <item>Ativado</item>
-        <item>Como no Sistema</item>
-    </string-array>
     <string-array name="enabled_disabled_array">
         <item>Desativado</item>
         <item>Ativado</item>

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

@@ -252,8 +252,6 @@
     <string name="announcement">Объявление</string>
     <string name="attempt_to_utilize_byte_ranges">Попытка использовать диапазоны байт</string>
     <string name="auto_update">Автообновление</string>
-    <string name="auto_rotate">Автоповорот</string>
-    <string name="auto_rotate_dead_zone">Мертвая зона автоповорота</string>
     <string name="automatic_backup">Автоматическое резервное копирование</string>
     <string name="background_behavior">Поведение в фоновом режиме</string>
     <string name="background_update">Фоновое обновление</string>
@@ -558,7 +556,6 @@
     <string name="not_yet_available_retrying_in_time_s">Ещё недоступно, повторная попытка через {time}с</string>
     <string name="failed_to_retry_for_live_stream">Не удалось повторить попытку для прямого эфира</string>
     <string name="this_app_is_in_development_please_submit_bug_reports_and_understand_that_many_features_are_incomplete">Это приложение находится в стадии разработки. Пожалуйста, отправляйте сообщения об ошибках и поймите, что многие функции незавершены.</string>
-    <string name="please_use_at_least_3_characters">Пожалуйста, используйте хотя бы 3 символа</string>
     <string name="are_you_sure_you_want_to_delete_this_video">Вы уверены, что хотите удалить это видео?</string>
     <string name="tap_to_open">Нажмите, чтобы открыть</string>
     <string name="watching">Смотрят</string>
@@ -661,11 +658,6 @@
         <item>При запуске</item>
         <item>Никогда</item>
     </string-array>
-    <string-array name="system_enabled_disabled_array">
-        <item>Отключено</item>
-        <item>Включено</item>
-        <item>Как в системе</item>
-    </string-array>
     <string-array name="enabled_disabled_array">
         <item>Отключено</item>
         <item>Включено</item>