Permanently stop playlist video download on cancel, Use detailed video download overlay in overviews

Fix issues with attempting to download sources that are not supported (including mixed playlists)
Add missing use
2026-05-16 21:12:39 +02:00 · 2023-10-13 19:09:07 +02:00 · 2023-10-13 18:00:01 +02:00 · 2023-10-12 19:21:14 +02:00 · 2023-10-12 19:18:56 +02:00 · 2023-10-11 23:48:03 +02:00
52 changed files with 720 additions and 224 deletions
@@ -0,0 +1,15 @@
+package com.futo.platformplayer
+
+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.IVideoSource
+import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
+import com.futo.platformplayer.helpers.VideoHelper
+
+fun IPlatformVideoDetails.isDownloadable(): Boolean = VideoHelper.isDownloadable(this);
+fun IVideoSource.isDownloadable(): Boolean = VideoHelper.isDownloadable(this);
+fun IAudioSource.isDownloadable(): Boolean = VideoHelper.isDownloadable(this);
+
+
+fun IVideoSourceDescriptor.hasAnySource(): Boolean = this.videoSources.any() || (this is VideoUnMuxedSourceDescriptor && this.audioSources.any());
@@ -333,7 +333,7 @@ class Settings : FragmentedStorageFileJson() {
            "Submit logs to help us narrow down issues", 1
        )
        fun submitLogs() {
-            StateApp.instance.scopeGetter().launch(Dispatchers.IO) {
+            StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
                try {
                    if (!Logger.submitLogs()) {
                        withContext(Dispatchers.Main) {
@@ -406,6 +406,33 @@ class Settings : FragmentedStorageFileJson() {
    }


+    @FormField("External Storage", FieldForm.GROUP, "", 12)
+    var storage = Storage();
+    @Serializable
+    class Storage {
+        var storage_general: String? = null;
+        var storage_download: String? = null;
+
+        fun getStorageGeneralUri(): Uri? = storage_general?.let { Uri.parse(it) };
+        fun getStorageDownloadUri(): Uri? = storage_download?.let { Uri.parse(it) };
+        fun isStorageMainValid(context: Context): Boolean = StateApp.instance.isValidStorageUri(context, getStorageGeneralUri());
+        fun isStorageDownloadValid(context: Context): Boolean = StateApp.instance.isValidStorageUri(context, getStorageDownloadUri());
+
+        @FormField("Change external General directory", FieldForm.BUTTON, "Change the external directory for general files, used for persistent files like auto-backup", 3)
+        fun changeStorageGeneral() {
+            SettingsActivity.getActivity()?.let {
+                StateApp.instance.changeExternalGeneralDirectory(it);
+            }
+        }
+        @FormField("Change external Downloads directory", FieldForm.BUTTON, "Change the external storage for download files, used for exported download files", 4)
+        fun changeStorageDownload() {
+            SettingsActivity.getActivity()?.let {
+                StateApp.instance.changeExternalDownloadDirectory(it);
+            }
+        }
+    }
+
+
    @FormField("Auto Update", "group", "Configure the auto updater", 12)
    var autoUpdate = AutoUpdate();
    @Serializable
@@ -462,7 +489,7 @@ class Settings : FragmentedStorageFileJson() {
        fun viewChangelog() {
            UIDialogs.toast("Retrieving changelog");
            SettingsActivity.getActivity()?.let {
-                StateApp.instance.scopeGetter().launch(Dispatchers.IO) {
+                StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
                    try {
                        val version = StateUpdate.instance.downloadVersionCode(ManagedHttpClient()) ?: return@launch;
                        Logger.i(TAG, "Version retrieved $version");
@@ -511,7 +538,9 @@ class Settings : FragmentedStorageFileJson() {

        @FormField("Set Automatic Backup", FieldForm.BUTTON, "Configure daily backup in case of catastrophic failure. (Written to the external Grayjay directory)", 1)
        fun configureAutomaticBackup() {
-            UIDialogs.showAutomaticBackupDialog(SettingsActivity.getActivity()!!);
+            UIDialogs.showAutomaticBackupDialog(SettingsActivity.getActivity()!!, autoBackupPassword != null) {
+                SettingsActivity.getActivity()?.reloadSettings();
+            };
        }
        @FormField("Restore Automatic Backup", FieldForm.BUTTON, "Restore a previous automatic backup", 2)
        fun restoreAutomaticBackup() {
@@ -542,6 +571,7 @@ class Settings : FragmentedStorageFileJson() {
            StatePayment.instance.clearLicenses();
            SettingsActivity.getActivity()?.let {
                UIDialogs.toast(it, "Licenses cleared, might require app restart");
+                it.reloadSettings();
            }
        }
    }
@@ -15,7 +15,9 @@ import com.futo.platformplayer.casting.StateCasting
 import com.futo.platformplayer.dialogs.*
 import com.futo.platformplayer.engine.exceptions.PluginException
 import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.states.StateAnnouncement
 import com.futo.platformplayer.states.StateApp
+import com.futo.platformplayer.states.StateBackup
 import com.futo.platformplayer.stores.v2.ManagedStore
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -90,11 +92,25 @@ class UIDialogs {
        }


-        fun showAutomaticBackupDialog(context: Context) {
-            val dialog = AutomaticBackupDialog(context);
-            registerDialogOpened(dialog);
-            dialog.setOnDismissListener { registerDialogClosed(dialog) };
-            dialog.show();
+        fun showAutomaticBackupDialog(context: Context, skipRestoreCheck: Boolean = false, onClosed: (()->Unit)? = null) {
+            val dialogAction: ()->Unit = {
+                val dialog = AutomaticBackupDialog(context);
+                registerDialogOpened(dialog);
+                dialog.setOnDismissListener { registerDialogClosed(dialog); onClosed?.invoke() };
+                dialog.show();
+            };
+            if(StateBackup.hasAutomaticBackup() && !skipRestoreCheck)
+                UIDialogs.showDialog(context, R.drawable.ic_move_up, "An old backup is available", "Would you like to restore this backup?", null, 0,
+                    UIDialogs.Action("Cancel", {}), //To nothing
+                    UIDialogs.Action("Override", {
+                        dialogAction();
+                    }, UIDialogs.ActionStyle.DANGEROUS),
+                    UIDialogs.Action("Restore", {
+                        UIDialogs.showAutomaticRestoreDialog(context, StateApp.instance.scope);
+                    }, UIDialogs.ActionStyle.PRIMARY));
+            else {
+                dialogAction();
+            }
        }
        fun showAutomaticRestoreDialog(context: Context, scope: CoroutineScope) {
            val dialog = AutomaticRestoreDialog(context, scope);
@@ -134,10 +150,10 @@ class UIDialogs {
                    val buttonView = TextView(context);
                    val dp10 = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 10f, resources.displayMetrics).toInt();
                    val dp28 = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 28f, resources.displayMetrics).toInt();
-                    val dp14 = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 14.0f, resources.displayMetrics);
+                    val dp14 = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 14.0f, resources.displayMetrics).toInt();
                    buttonView.layoutParams = LinearLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT).apply {
                        if(actions.size > 1)
-                            this.marginEnd = dp28;
+                            this.marginEnd = if(actions.size > 2) dp14 else dp28;
                    };
                    buttonView.setTextColor(Color.WHITE);
                    buttonView.textSize = 14f;
@@ -151,8 +167,9 @@ class UIDialogs {
                        ActionStyle.DANGEROUS_TEXT -> buttonView.setTextColor(ContextCompat.getColor(context, R.color.pastel_red))
                        else -> buttonView.setTextColor(ContextCompat.getColor(context, R.color.colorPrimary))
                    }
+                    val paddingSpecialButtons = if(actions.size > 2) dp14 else dp28;
                    if(act.style != ActionStyle.NONE && act.style != ActionStyle.DANGEROUS_TEXT)
-                        buttonView.setPadding(dp28, dp10, dp28, dp10);
+                        buttonView.setPadding(paddingSpecialButtons, dp10, paddingSpecialButtons, dp10);
                    else
                        buttonView.setPadding(dp10, dp10, dp10, dp10);

@@ -4,7 +4,6 @@ import android.content.ContentResolver
 import android.view.View
 import android.view.ViewGroup
 import com.futo.platformplayer.api.http.ManagedHttpClient
-import com.futo.platformplayer.api.http.server.handlers.HttpConstantHandler
 import com.futo.platformplayer.api.media.models.streams.VideoUnMuxedSourceDescriptor
 import com.futo.platformplayer.api.media.models.streams.sources.IAudioUrlSource
 import com.futo.platformplayer.api.media.models.streams.sources.IVideoUrlSource
@@ -18,6 +17,7 @@ import com.futo.platformplayer.helpers.VideoHelper
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.Playlist
 import com.futo.platformplayer.states.*
+import com.futo.platformplayer.views.Loader
 import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuGroup
 import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuItem
 import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuOverlay
@@ -29,7 +29,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import java.io.File
+import java.lang.IllegalStateException

 class UISlideOverlays {
    companion object {
@@ -45,7 +45,7 @@ class UISlideOverlays {
            menu.show();
        }

-        fun showDownloadVideoOverlay(contentResolver: ContentResolver, video: IPlatformVideoDetails, container: ViewGroup): SlideUpMenuOverlay? {
+        fun showDownloadVideoOverlay(video: IPlatformVideoDetails, container: ViewGroup, contentResolver: ContentResolver? = null): SlideUpMenuOverlay? {
            val items = arrayListOf<View>();
            var menu: SlideUpMenuOverlay? = null;

@@ -68,6 +68,12 @@ class UISlideOverlays {
                return null;
            }

+            if(!VideoHelper.isDownloadable(video)) {
+                Logger.i(TAG, "Attempted to open downloads without valid sources for [${video.name}]: ${video.url}");
+                UIDialogs.toast( "No downloadable sources (yet)");
+                return null;
+            }
+
            items.add(SlideUpMenuGroup(container.context, "Video", videoSources,
                listOf(listOf(SlideUpMenuItem(container.context, R.drawable.ic_movie, "None", "Audio Only", "none", {
                    selectedVideo = null;
@@ -76,7 +82,7 @@ class UISlideOverlays {
                        menu?.setOk("Download");
                }, false)) +
                videoSources
-                .filter { it is IVideoUrlSource }
+                .filter { it.isDownloadable() }
                .map {
                    SlideUpMenuItem(container.context, R.drawable.ic_movie, it.name, "${it.width}x${it.height}", it, {
                        selectedVideo = it as IVideoUrlSource;
@@ -88,14 +94,14 @@ class UISlideOverlays {
            ));

            if(Settings.instance.downloads.getDefaultVideoQualityPixels() > 0 && videoSources.size > 0)
-                selectedVideo = VideoHelper.selectBestVideoSource(videoSources.filter { it is IVideoUrlSource }.asIterable(),
+                selectedVideo = VideoHelper.selectBestVideoSource(videoSources.filter { it.isDownloadable() }.asIterable(),
                    Settings.instance.downloads.getDefaultVideoQualityPixels(),
                    FutoVideoPlayerBase.PREFERED_VIDEO_CONTAINERS) as IVideoUrlSource;


            audioSources?.let { audioSources ->
                items.add(SlideUpMenuGroup(container.context, "Audio", audioSources, audioSources
-                    .filter { it is IAudioUrlSource }
+                    .filter { VideoHelper.isDownloadable(it) }
                    .map {
                        SlideUpMenuItem(container.context, R.drawable.ic_music, it.name, "${it.bitrate}", it, {
                            selectedAudio = it as IAudioUrlSource;
@@ -111,24 +117,27 @@ class UISlideOverlays {
                menu?.selectOption(asources, preferredAudioSource);


-                selectedAudio = VideoHelper.selectBestAudioSource(audioSources.filter { it is IAudioUrlSource }.asIterable(),
+                selectedAudio = VideoHelper.selectBestAudioSource(audioSources.filter { it.isDownloadable() }.asIterable(),
                    FutoVideoPlayerBase.PREFERED_AUDIO_CONTAINERS,
                    Settings.instance.playback.getPrimaryLanguage(container.context),
                    if(Settings.instance.downloads.isHighBitrateDefault()) 9999999 else 1) as IAudioUrlSource?;
            }

-            items.add(SlideUpMenuGroup(container.context, "Subtitles", subtitleSources, subtitleSources
-                .map {
-                    SlideUpMenuItem(container.context, R.drawable.ic_edit, it.name, "", it, {
-                        if (selectedSubtitle == it) {
-                            selectedSubtitle = null;
-                            menu?.selectOption(subtitleSources, null);
-                        } else {
-                            selectedSubtitle = it;
-                            menu?.selectOption(subtitleSources, it);
-                        }
-                    }, false);
-                }));
+            //ContentResolver is required for subtitles..
+            if(contentResolver != null) {
+                items.add(SlideUpMenuGroup(container.context, "Subtitles", subtitleSources, subtitleSources
+                    .map {
+                        SlideUpMenuItem(container.context, R.drawable.ic_edit, it.name, "", it, {
+                            if (selectedSubtitle == it) {
+                                selectedSubtitle = null;
+                                menu?.selectOption(subtitleSources, null);
+                            } else {
+                                selectedSubtitle = it;
+                                menu?.selectOption(subtitleSources, it);
+                            }
+                        }, false);
+                    }));
+            }

            menu = SlideUpMenuOverlay(container.context, container, "Download Video", null, true, items);

@@ -153,29 +162,12 @@ class UISlideOverlays {
                        StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
                            try {
                                val subtitleUri = subtitleToDownload.getSubtitlesURI();
-                                if (subtitleUri != null) {
-                                    var subtitles: String? = null;
-                                    if ("file" == subtitleUri.scheme) {
-                                        val inputStream = contentResolver.openInputStream(subtitleUri);
-                                        inputStream?.use { stream ->
-                                            val reader = stream.bufferedReader();
-                                            subtitles = reader.use { it.readText() };
-                                        }
-                                    } else if ("http" == subtitleUri.scheme || "https" == subtitleUri.scheme) {
-                                        val client = ManagedHttpClient();
-                                        val subtitleResponse = client.get(subtitleUri.toString());
-                                        if (!subtitleResponse.isOk) {
-                                            throw Exception("Cannot fetch subtitles from source '${subtitleUri}': ${subtitleResponse.code}");
-                                        }
-
-                                        subtitles = subtitleResponse.body?.toString()
-                                            ?: throw Exception("Subtitles are invalid '${subtitleUri}': ${subtitleResponse.code}");
-                                    } else {
-                                        throw Exception("Unsuported scheme");
-                                    }
+                                //TODO: Remove uri dependency, should be able to work with raw aswell?
+                                if (subtitleUri != null && contentResolver != null) {
+                                    val subtitlesRaw = StateDownloads.instance.downloadSubtitles(subtitleToDownload, contentResolver);

                                    withContext(Dispatchers.Main) {
-                                        StateDownloads.instance.download(video, selectedVideo, selectedAudio, if (subtitles != null) SubtitleRawSource(subtitleToDownload.name, subtitleToDownload.format, subtitles!!) else null);
+                                        StateDownloads.instance.download(video, selectedVideo, selectedAudio, subtitlesRaw);
                                    }
                                } else {
                                    withContext(Dispatchers.Main) {
@@ -191,10 +183,41 @@ class UISlideOverlays {
            };
            return menu.apply { show() };
        }
-        fun showDownloadVideoOverlay(video: IPlatformVideo, container: ViewGroup) {
-            showUnknownVideoDownload("Video", container) { px, bitrate ->
-                StateDownloads.instance.download(video, px, bitrate)
+        fun showDownloadVideoOverlay(video: IPlatformVideo, container: ViewGroup, useDetails: Boolean = false) {
+            val handleUnknownDownload: ()->Unit = {
+                showUnknownVideoDownload("Video", container) { px, bitrate ->
+                    StateDownloads.instance.download(video, px, bitrate)
+                };
            };
+            if(!useDetails)
+                handleUnknownDownload();
+            else {
+                val scope = StateApp.instance.scopeOrNull;
+
+                if(scope != null) {
+                    val loader = showLoaderOverlay("Fetching video details", container);
+                    scope.launch(Dispatchers.IO) {
+                        try {
+                            val videoDetails = StatePlatform.instance.getContentDetails(video.url, false).await();
+                            if(videoDetails !is IPlatformVideoDetails)
+                                throw IllegalStateException("Not a video details");
+
+                            withContext(Dispatchers.Main) {
+                                if(showDownloadVideoOverlay(videoDetails, container, StateApp.instance.contextOrNull?.contentResolver) == null)
+                                    loader.hide(true);
+                            }
+                        }
+                        catch(ex: Throwable) {
+                            withContext(Dispatchers.Main) {
+                                UIDialogs.toast("Failed to fetch details for download");
+                                handleUnknownDownload();
+                                loader.hide(true);
+                            }
+                        }
+                    }
+                }
+                else handleUnknownDownload();
+            }
        }
        fun showDownloadPlaylistOverlay(playlist: Playlist, container: ViewGroup) {
            showUnknownVideoDownload("Video", container) { px, bitrate ->
@@ -269,6 +292,18 @@ class UISlideOverlays {
            menu.show();
        }

+        fun showLoaderOverlay(text: String, container: ViewGroup): SlideUpMenuOverlay {
+            val dp70 = 70.dp(container.context.resources);
+            val dp15 = 15.dp(container.context.resources);
+            val overlay = SlideUpMenuOverlay(container.context, container, text, null, true, listOf(
+                Loader(container.context, true, dp70).apply {
+                    this.setPadding(0, dp15, 0, dp15);
+                }
+            ), true);
+            overlay.show();
+            return overlay;
+        }
+
        fun showVideoOptionsOverlay(video: IPlatformVideo, container: ViewGroup, onVideoHidden: (()->Unit)? = null): SlideUpMenuOverlay {
            val items = arrayListOf<View>();
            val lastUpdated = StatePlaylists.instance.getLastUpdatedPlaylist();
@@ -291,7 +326,7 @@ class UISlideOverlays {
                SlideUpMenuItem(container.context, R.drawable.ic_visibility_off, "Hide", "Hide from Home", "hide",
                    { StateMeta.instance.addHiddenVideo(video.url); onVideoHidden?.invoke() }),
                SlideUpMenuItem(container.context, R.drawable.ic_download, "Download", "Download the video", "download",
-                    { showDownloadVideoOverlay(video, container); }, false)
+                    { showDownloadVideoOverlay(video, container, true); }, false)
            ))
            items.add(
                SlideUpMenuGroup(container.context, "Add To", "addto",
@@ -344,7 +379,7 @@ class UISlideOverlays {
                    SlideUpMenuItem(container.context, R.drawable.ic_watchlist_add, StatePlayer.TYPE_WATCHLATER, "${watchLater.size} videos", "watch later",
                        { StatePlaylists.instance.addToWatchLater(SerializedPlatformVideo.fromVideo(video)); }),
                    SlideUpMenuItem(container.context, R.drawable.ic_download, "Download", "Download the video", "download",
-                        { showDownloadVideoOverlay(video, container); }, false))
+                        { showDownloadVideoOverlay(video, container, true); }, false))
            );

            val playlistItems = arrayListOf<SlideUpMenuItem>();
@@ -6,6 +6,7 @@ import android.content.Intent
 import android.content.res.Resources
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
+import android.icu.util.Output
 import android.os.Build
 import android.os.Looper
 import android.os.OperationCanceledException
@@ -15,6 +16,7 @@ import android.view.WindowInsetsController
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
+import androidx.documentfile.provider.DocumentFile
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.media.IPlatformClient
 import com.futo.platformplayer.api.media.PlatformMultiClientPool
@@ -75,6 +77,16 @@ fun IPlatformClient.fromPool(pool: PlatformMultiClientPool) = pool.getClientPool

 fun IPlatformVideo.withTimestamp(sec: Long) =  PlatformVideoWithTime(this, sec);

+fun DocumentFile.getInputStream(context: Context) = context.contentResolver.openInputStream(this.uri);
+fun DocumentFile.getOutputStream(context: Context) = context.contentResolver.openOutputStream(this.uri);
+fun DocumentFile.copyTo(context: Context, file: DocumentFile) = this.getInputStream(context).use { input ->
+    file.getOutputStream(context)?.use { output -> input?.copyTo(output) }
+};
+fun DocumentFile.readBytes(context: Context) = this.getInputStream(context).use { input -> input?.readBytes() };
+fun DocumentFile.writeBytes(context: Context, byteArray: ByteArray) = context.contentResolver.openOutputStream(this.uri)?.use {
+    it.write(byteArray);
+    it.flush();
+};

 fun loadBitmap(url: String): Bitmap {
    try {
@@ -392,7 +392,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {

    override fun onResume() {
        super.onResume();
-        Logger.i(TAG, "onResume")
+        Logger.v(TAG, "onResume")

        val curOrientation = _orientationManager.orientation;

@@ -408,13 +408,10 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
        val videoToOpen = StateSaved.instance.videoToOpen;

        if (_wasStopped) {
-            Logger.i(TAG, "_wasStopped is true");
-            Logger.i(TAG, "set _wasStopped = false");
            _wasStopped = false;

-            Logger.i(TAG, "onResume videoToOpen=$videoToOpen");
-
            if (videoToOpen != null && _fragVideoDetail.state == VideoDetailFragment.State.CLOSED) {
+                Logger.i(TAG, "onResume videoToOpen=$videoToOpen");
                if (StatePlatform.instance.hasEnabledVideoClient(videoToOpen.url)) {
                    navigate(_fragVideoDetail, UrlVideoWithTime(videoToOpen.url, videoToOpen.timeSeconds, false));
                    _fragVideoDetail.maximizeVideoDetail(true);
@@ -427,13 +424,13 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {

    override fun onPause() {
        super.onPause();
-        Logger.i(TAG, "onPause")
+        Logger.v(TAG, "onPause")
        _isVisible = false;
    }

    override fun onStop() {
        super.onStop()
-        Logger.i(TAG, "_wasStopped = true");
+        Logger.v(TAG, "_wasStopped = true");
        _wasStopped = true;
    }

@@ -722,22 +719,20 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
            }
            _fragVideoDetail.onOrientationChanged(OrientationManager.Orientation.PORTRAIT);
        }
-
-        Logger.i(TAG, "onRestart5");
    }

    override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean, newConfig: Configuration) {
        super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig);

        val isStop: Boolean = lifecycle.currentState == Lifecycle.State.CREATED;
-        Logger.i(TAG, "onPictureInPictureModeChanged isInPictureInPictureMode=$isInPictureInPictureMode isStop=$isStop")
+        Logger.v(TAG, "onPictureInPictureModeChanged isInPictureInPictureMode=$isInPictureInPictureMode isStop=$isStop")
        _fragVideoDetail?.onPictureInPictureModeChanged(isInPictureInPictureMode, isStop, newConfig);
-        Logger.i(TAG, "onPictureInPictureModeChanged Ready");
+        Logger.v(TAG, "onPictureInPictureModeChanged Ready");
    }

    override fun onDestroy() {
        super.onDestroy();
-        Logger.i(TAG, "onDestroy")
+        Logger.v(TAG, "onDestroy")

        _orientationManager.disable();

@@ -10,7 +10,10 @@ import androidx.activity.result.ActivityResult
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.*
+import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.views.Loader
 import com.futo.platformplayer.views.fields.FieldForm
 import com.futo.platformplayer.views.fields.ReadOnlyTextField
 import com.google.android.material.button.MaterialButton
@@ -18,6 +21,7 @@ import com.google.android.material.button.MaterialButton
 class SettingsActivity : AppCompatActivity(), IWithResultLauncher {
    private lateinit var _form: FieldForm;
    private lateinit var _buttonBack: ImageButton;
+    private lateinit var _loader: Loader;

    private lateinit var _devSets: LinearLayout;
    private lateinit var _buttonDev: MaterialButton;
@@ -33,9 +37,10 @@ class SettingsActivity : AppCompatActivity(), IWithResultLauncher {
        _buttonBack = findViewById(R.id.button_back);
        _buttonDev = findViewById(R.id.button_dev);
        _devSets = findViewById(R.id.dev_settings);
+        _loader = findViewById(R.id.loader);

-        _form.fromObject(Settings.instance);
        _form.onChanged.subscribe { field, value ->
+            Logger.i("SettingsActivity", "Setting [${field.field?.name}] changed, saving");
            _form.setObjectValues();
            Settings.instance.save();
        };
@@ -59,6 +64,15 @@ class SettingsActivity : AppCompatActivity(), IWithResultLauncher {
            }
        };
        _lastActivity = this;
+
+        reloadSettings();
+    }
+
+    fun reloadSettings() {
+        _loader.start();
+        _form.fromObject(lifecycleScope, Settings.instance) {
+            _loader.stop();
+        };
    }

    override fun onResume() {
@@ -63,7 +63,7 @@ class ManagedHttpServer(private val _requestedPort: Int = 0) {
            }
        }.start();

-        Logger.i(TAG, "Started ${port}. \n" + getAddresses().map { it.hostAddress }.joinToString("\n"));
+        Logger.i(TAG, "Started HTTP Server ${port}. \n" + getAddresses().map { it.hostAddress }.joinToString("\n"));
    }
    @Synchronized
    fun stop() {
@@ -94,7 +94,10 @@ class LiveChatManager {
                        if(_pager is JSLiveEventPager)
                            nextInterval = _pager.nextRequest.coerceAtLeast(800).toLong();

-                        Logger.i(TAG, "New Live Events (${newEvents.size}) [${newEvents.map { it.type.name }.joinToString(", ")}]");
+                        if(newEvents.size > 0)
+                            Logger.i(TAG, "New Live Events (${newEvents.size}) [${newEvents.map { it.type.name }.joinToString(", ")}]");
+                        else
+                            Logger.v(TAG, "No new Live Events");

                        _scope.launch(Dispatchers.Main) {
                            try {
@@ -11,12 +11,14 @@ class PlatformClientPool {
    private val _parent: JSClient;
    private val _pool: HashMap<JSClient, Int> = hashMapOf();
    private var _poolCounter = 0;
+    private val _poolName: String?;

    var isDead: Boolean = false
        private set;
    val onDead = Event2<JSClient, PlatformClientPool>();

-    constructor(parentClient: IPlatformClient) {
+    constructor(parentClient: IPlatformClient, name: String? = null) {
+        _poolName = name;
        if(parentClient !is JSClient)
            throw IllegalArgumentException("Pooling only supported for JSClients right now");
        Logger.i(TAG, "Pool for ${parentClient.name} was started");
@@ -47,7 +49,7 @@ class PlatformClientPool {
            _poolCounter++;
            reserved = _pool.keys.find { !it.isBusy };
            if(reserved == null && _pool.size < capacity) {
-                Logger.i(TAG, "Started additional [${_parent.name}] client in pool (${_pool.size + 1}/${capacity})");
+                Logger.i(TAG, "Started additional [${_parent.name}] client in pool [${_poolName}] (${_pool.size + 1}/${capacity})");
                reserved = _parent.getCopy();
                reserved?.initialize();
                _pool[reserved!!] = _poolCounter;
@@ -1,12 +1,14 @@
 package com.futo.platformplayer.api.media

 class PlatformMultiClientPool {
+    private val _name: String;
    private val _maxCap: Int;
    private val _clientPools: HashMap<IPlatformClient, PlatformClientPool> = hashMapOf();

    private var _isFake = false;

-    constructor(maxCap: Int = -1) {
+    constructor(name: String, maxCap: Int = -1) {
+        _name = name;
        _maxCap = if(maxCap > 0)
            maxCap
        else 99;
@@ -17,7 +19,7 @@ class PlatformMultiClientPool {
            return parentClient;
        val pool = synchronized(_clientPools) {
            if(!_clientPools.containsKey(parentClient))
-                _clientPools[parentClient] = PlatformClientPool(parentClient).apply {
+                _clientPools[parentClient] = PlatformClientPool(parentClient, _name).apply {
                    this.onDead.subscribe { client, pool ->
                        synchronized(_clientPools) {
                            if(_clientPools[parentClient] == pool)
@@ -42,7 +42,6 @@ open class JSContent : IPlatformContent, IPluginSourced {

        id = PlatformID.fromV8(_pluginConfig, _content.getOrThrow(config, "id", contextName));
        name = HtmlCompat.fromHtml(_content.getOrThrow<String>(config, "name", contextName).decodeUnicode(), HtmlCompat.FROM_HTML_MODE_LEGACY).toString();
-        Logger.i("JSContent", "name=$name");
        author = PlatformAuthorLink.fromV8(_pluginConfig, _content.getOrThrow(config, "author", contextName));

        val datetimeInt = _content.getOrThrow<Int>(config, "datetime", contextName).toLong();
@@ -9,7 +9,7 @@ import com.futo.platformplayer.getOrNull
 import com.futo.platformplayer.getOrThrow
 import com.futo.platformplayer.orNull

-class JSHLSManifestAudioSource : IAudioUrlSource, IHLSManifestAudioSource, JSSource {
+class JSHLSManifestAudioSource : IHLSManifestAudioSource, JSSource {
    override val container : String get() = "application/vnd.apple.mpegurl";
    override val codec: String = "HLS";
    override val name : String;
@@ -31,9 +31,6 @@ class JSHLSManifestAudioSource : IAudioUrlSource, IHLSManifestAudioSource, JSSou
        priority = obj.getOrNull(config, "priority", contextName) ?: false;
    }

-    override fun getAudioUrl(): String {
-        return url;
-    }

    companion object {
        fun fromV8HLSNullable(config: IV8PluginConfig, obj: V8Value?) : JSHLSManifestAudioSource? = obj.orNull { fromV8HLS(config, it as V8ValueObject) };
@@ -7,7 +7,7 @@ import com.futo.platformplayer.engine.IV8PluginConfig
 import com.futo.platformplayer.getOrNull
 import com.futo.platformplayer.getOrThrow

-class JSHLSManifestSource : IVideoUrlSource, IHLSManifestSource, JSSource {
+class JSHLSManifestSource : IHLSManifestSource, JSSource {
    override val width : Int = 0;
    override val height : Int = 0;
    override val container : String get() = "application/vnd.apple.mpegurl";
@@ -28,8 +28,4 @@ class JSHLSManifestSource : IVideoUrlSource, IHLSManifestSource, JSSource {

        priority = obj.getOrNull(config, "priority", contextName) ?: false;
    }
-
-    override fun getVideoUrl(): String {
-        return url;
-    }
 }
@@ -137,11 +137,11 @@ abstract class MultiParallelPager<T> : IPager<T>, IAsyncPager<T> {
                }
            }
        }
-        Logger.i(TAG, "Pager prepare in ${timeForPage}ms");
+        Logger.v(TAG, "Pager prepare in ${timeForPage}ms");
        val timeAwait = measureTimeMillis {
            _currentResults = results.map { it.await() }.mapNotNull { it };
        };
-        Logger.i(TAG, "Pager load in ${timeAwait}ms");
+        Logger.v(TAG, "Pager load in ${timeAwait}ms");

        _currentResultExceptions = exceptions;
        return _currentResults;
@@ -111,7 +111,7 @@ class ChannelContentCache {
        init {
            val results = pager.getResults();

-            Logger.i(TAG, "Caching ${results.size} subscription initial results");
+            Logger.i(TAG, "Caching ${results.size} subscription initial results [${pager.hashCode()}]");
            scope.launch(Dispatchers.IO) {
                try {
                    val newCacheItems = instance.cacheVideos(results);
@@ -64,7 +64,7 @@ class StateCasting {
        }

        override fun serviceResolved(event: ServiceEvent) {
-            Logger.i(TAG, "ChromeCast service resolved: " + event.info);
+            Logger.v(TAG, "ChromeCast service resolved: " + event.info);
            addOrUpdateDevice(event);
        }

@@ -91,7 +91,7 @@ class TaskHandler<TParameter, TResult> {
                    if (!onError.emit(e, parameter)) {
                        Logger.e(TAG, "Uncaught exception handled by TaskHandler.", e);
                    } else {
-                        Logger.w(TAG, "Handled exception in TaskHandler invoke.", e);
+                        //Logger.w(TAG, "Handled exception in TaskHandler invoke.", e); (Prevents duplicate logs)
                    }
                }
            }
@@ -11,6 +11,7 @@ import com.futo.platformplayer.R
 import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StateBackup
 import com.google.android.material.button.MaterialButton

@@ -58,13 +59,13 @@ class AutomaticBackupDialog(context: Context) : AlertDialog(context) {
            }
            clearFocus();
            dismiss();
+
            Logger.i(TAG, "Set AutoBackupPassword");
            Settings.instance.backup.autoBackupPassword = _editPassword.text.toString();
            Settings.instance.backup.didAskAutoBackup = true;
            Settings.instance.save();

            UIDialogs.toast(context, "AutoBackup enabled");
-
            try {
                StateBackup.startAutomaticBackup(true);
            }
@@ -57,7 +57,7 @@ class CommentDialog(context: Context?, val contextUrl: String, val ref: Protocol
            val processHandle = StatePolycentric.instance.processHandle!!
            val eventPointer = processHandle.post(comment, null, ref)

-            StateApp.instance.scopeGetter().launch(Dispatchers.IO) {
+            StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
                try {
                    processHandle.fullyBackfillServers()
                } catch (e: Throwable) {
@@ -1,8 +1,19 @@
 package com.futo.platformplayer.downloads

+import com.futo.platformplayer.api.media.models.video.IPlatformVideo
+
@kotlinx.serialization.Serializable
 data class PlaylistDownloadDescriptor(
    val id: String,
    val targetPxCount: Long?,
    val targetBitrate: Long?
-);
+) {
+    var preventDownload: MutableList<String> = arrayListOf();
+
+    fun getPreventDownloadList(): List<String> = synchronized(preventDownload){ preventDownload };
+    fun shouldDownload(video: IPlatformVideo): Boolean {
+        synchronized(preventDownload) {
+            return !preventDownload.contains(video.url);
+        }
+    }
+}
@@ -13,12 +13,16 @@ import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
 import com.futo.platformplayer.api.media.models.video.SerializedPlatformVideo
 import com.futo.platformplayer.api.media.models.video.SerializedPlatformVideoDetails
 import com.futo.platformplayer.constructs.Event1
+import com.futo.platformplayer.exceptions.DownloadException
+import com.futo.platformplayer.hasAnySource
 import com.futo.platformplayer.helpers.FileHelper.Companion.sanitizeFileName
 import com.futo.platformplayer.helpers.VideoHelper
+import com.futo.platformplayer.isDownloadable
 import com.futo.platformplayer.serializers.OffsetDateTimeNullableSerializer
 import com.futo.platformplayer.serializers.OffsetDateTimeSerializer
 import com.futo.platformplayer.toHumanBitrate
 import com.futo.platformplayer.toHumanBytesSpeed
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
@@ -27,7 +31,6 @@ import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
 import java.time.OffsetDateTime
-import java.util.concurrent.CancellationException
 import java.util.concurrent.ForkJoinPool
 import java.util.concurrent.ForkJoinTask
 import java.util.concurrent.ThreadLocalRandom
@@ -147,27 +150,37 @@ class VideoDownload {
            if(original !is IPlatformVideoDetails)
                throw IllegalStateException("Original content is not media?");

+            if(original.video.hasAnySource() && !original.isDownloadable()) {
+                Logger.i(TAG, "Attempted to download unsupported video [${original.name}]:${original.url}");
+                throw DownloadException("Unsupported video for downloading", false);
+            }
+
            videoDetails = SerializedPlatformVideoDetails.fromVideo(original, if (subtitleSource != null) listOf(subtitleSource!!) else listOf());
            if(videoSource == null && targetPixelCount != null) {
                val vsource = VideoHelper.selectBestVideoSource(videoDetails!!.video, targetPixelCount!!.toInt(), arrayOf())
-                    ?: throw IllegalStateException("Could not find a valid video source for video");
-                if(vsource is IVideoUrlSource)
-                    videoSource = VideoUrlSource.fromUrlSource(vsource);
-                else
-                    throw IllegalStateException("Download video source is not a url source");
+                //    ?: throw IllegalStateException("Could not find a valid video source for video");
+                if(vsource != null) {
+                    if (vsource is IVideoUrlSource)
+                        videoSource = VideoUrlSource.fromUrlSource(vsource);
+                    else
+                        throw DownloadException("Video source is not supported for downloading (yet)", false);
+                }
            }

            if(audioSource == null && targetBitrate != null) {
                val asource = VideoHelper.selectBestAudioSource(videoDetails!!.video, arrayOf(), null, targetPixelCount)
                    ?: if(videoSource != null ) null
-                    else throw IllegalStateException("Could not find a valid audio source for video");
+                    else throw DownloadException("Could not find a valid video or audio source for download")
                if(asource == null)
                    audioSource = null;
                else if(asource is IAudioUrlSource)
                    audioSource = AudioUrlSource.fromUrlSource(asource);
                else
-                    throw IllegalStateException("Download audio source is not a url source");
+                    throw DownloadException("Audio source is not supported for downloading (yet)", false);
            }
+
+            if(videoSource == null && audioSource == null)
+                throw DownloadException("No valid sources found for video/audio");
        }
    }
    suspend fun download(client: ManagedHttpClient, onProgress: ((Double) -> Unit)? = null) = coroutineScope {
@@ -358,7 +371,7 @@ class VideoDownload {
            }

            if (isCancelled)
-                throw IllegalStateException("Cancelled");
+                throw CancellationException("Cancelled");
        } while (read > 0);

        lastSpeed = 0;
@@ -410,7 +423,7 @@ class VideoDownload {
            }

            if(isCancelled)
-                throw IllegalStateException("Cancelled");
+                throw CancellationException("Cancelled", null);
        }
        onProgress(sourceLength, totalRead, 0);
    }
@@ -0,0 +1,12 @@
+package com.futo.platformplayer.exceptions
+
+class DownloadException : Throwable {
+    val isRetryable: Boolean;
+
+    constructor(innerException: Throwable, retryable: Boolean = true): super(innerException) {
+        isRetryable = retryable;
+    }
+    constructor(msg: String, retryable: Boolean = true): super(msg) {
+        isRetryable = retryable;
+    }
+}
@@ -355,7 +355,7 @@ class PostDetailFragment : MainFragment {
                                processHandle.opinion(ref, Opinion.neutral);
                            }

-                            StateApp.instance.scopeGetter().launch(Dispatchers.IO) {
+                            StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
                                try {
                                    processHandle.fullyBackfillServers();
                                } catch (e: Throwable) {
@@ -306,12 +306,12 @@ class VideoDetailFragment : MainFragment {

    override fun onResume() {
        super.onResume();
-        Logger.i(TAG, "onResume");
+        Logger.v(TAG, "onResume");
        _isActive = true;
        _leavingPiP = false;

        _viewDetail?.let {
-            Logger.i(TAG, "onResume preventPictureInPicture=false");
+            Logger.v(TAG, "onResume preventPictureInPicture=false");
            it.preventPictureInPicture = false;

            if (state != State.CLOSED) {
@@ -326,7 +326,7 @@ class VideoDetailFragment : MainFragment {
    }
    override fun onPause() {
        super.onPause();
-        Logger.i(TAG, "onPause");
+        Logger.v(TAG, "onPause");
        _isActive = false;

        if(!isInPictureInPicture && state != State.CLOSED)
@@ -334,7 +334,7 @@ class VideoDetailFragment : MainFragment {
    }

    override fun onStop() {
-        Logger.i(TAG, "onStop");
+        Logger.v(TAG, "onStop");

        stopIfRequired();
        super.onStop();
@@ -352,7 +352,7 @@ class VideoDetailFragment : MainFragment {
            shouldStop = false;
        }

-        Logger.i(TAG, "shouldStop: $shouldStop");
+        Logger.v(TAG, "shouldStop: $shouldStop");
        if(shouldStop) {
            _viewDetail?.let {
                val v = it.video ?: return@let;
@@ -361,13 +361,13 @@ class VideoDetailFragment : MainFragment {

            _viewDetail?.onStop();
            StateCasting.instance.onStop();
-            Logger.i(TAG, "called onStop() shouldStop: $shouldStop");
+            Logger.v(TAG, "called onStop() shouldStop: $shouldStop");
        }
    }

    override fun onDestroyMainView() {
        super.onDestroyMainView();
-        Logger.i(TAG, "onDestroyMainView");
+        Logger.v(TAG, "onDestroyMainView");
        _viewDetail?.let {
            _viewDetail = null;
            it.onDestroy();
@@ -100,6 +100,7 @@ import kotlinx.coroutines.*
 import userpackage.Protocol
 import java.time.OffsetDateTime
 import kotlin.collections.ArrayList
+import kotlin.math.abs
 import kotlin.math.roundToLong
 import kotlin.streams.toList

@@ -232,9 +233,19 @@ class VideoDetailView : ConstraintLayout {

    private val DP_5 = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 5f, resources.displayMetrics);
    private val DP_2 = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 2f, resources.displayMetrics);
+
    private var _retryJob: Job? = null;
    private var _retryCount = 0;
-    private val _retryIntervals: Array<Long> = arrayOf(1, 2, 4, 8, 16, 32);
+    //TODO: Determine better behavior, waiting 60 seconds for an error that is guaranteed to happen is a bit much. (Needed? If so, maybe need special UI for retrying)
+    private val _retryIntervals: Array<Long> = arrayOf(1, 1);//2, 4, 8, 16, 32);
+
+    private var _liveTryJob: Job? = null;
+    private val _liveStreamCheckInterval = listOf(
+        Pair(-10 * 60, 5 * 60), //around 10 minutes, try every 5 minute
+        Pair(-5 * 60, 30), //around 5 minutes, try every 30 seconds
+        Pair(0, 10) //around live, try every 10 seconds
+    );
+

    constructor(context: Context, attrs : AttributeSet? = null) : super(context, attrs) {
        inflate(context, R.layout.fragview_video_detail, this);
@@ -491,7 +502,7 @@ class VideoDetailView : ConstraintLayout {
        MediaControlReceiver.onLowerVolumeReceived.subscribe(this) { handleLowerVolume() };
        MediaControlReceiver.onPlayReceived.subscribe(this) { handlePlay() };
        MediaControlReceiver.onPauseReceived.subscribe(this) { handlePause() };
-        MediaControlReceiver.onNextReceived.subscribe(this) { nextVideo() };
+        MediaControlReceiver.onNextReceived.subscribe(this) { nextVideo(true) };
        MediaControlReceiver.onPreviousReceived.subscribe(this) { prevVideo() };
        MediaControlReceiver.onCloseReceived.subscribe(this) {
            Logger.i(TAG, "MediaControlReceiver.onCloseReceived")
@@ -597,7 +608,7 @@ class VideoDetailView : ConstraintLayout {
            },
            RoundButton(context, R.drawable.ic_download, "Download", TAG_DOWNLOAD) {
                video?.let {
-                    _slideUpOverlay = UISlideOverlays.showDownloadVideoOverlay(context.contentResolver, it, _overlayContainer);
+                    _slideUpOverlay = UISlideOverlays.showDownloadVideoOverlay(it, _overlayContainer, context.contentResolver);
                };
            },
            RoundButton(context, R.drawable.ic_share, "Share", TAG_SHARE) {
@@ -660,7 +671,7 @@ class VideoDetailView : ConstraintLayout {

    //Lifecycle
    fun onResume() {
-        Logger.i(TAG, "onResume");
+        Logger.v(TAG, "onResume");
        _onPauseCalled = false;

        Logger.i(TAG, "_video: ${video?.name ?: "no video"}");
@@ -694,7 +705,7 @@ class VideoDetailView : ConstraintLayout {
        _player.updateRotateLock();
    }
    fun onPause() {
-        Logger.i(TAG, "onPause");
+        Logger.v(TAG, "onPause");

        _onPauseCalled = true;
        _taskLoadVideo.cancel();
@@ -722,6 +733,8 @@ class VideoDetailView : ConstraintLayout {
        _overlay_quality_selector?.hide();
        _retryJob?.cancel();
        _retryJob = null;
+        _liveTryJob?.cancel();
+        _liveTryJob = null;
        _taskLoadVideo.cancel();
        handleStop();
        _didStop = true;
@@ -808,6 +821,8 @@ class VideoDetailView : ConstraintLayout {

        _retryJob?.cancel();
        _retryJob = null;
+        _liveTryJob?.cancel();
+        _liveTryJob = null;
        _retryCount = 0;
        fetchVideo();

@@ -897,6 +912,8 @@ class VideoDetailView : ConstraintLayout {

            _retryJob?.cancel();
            _retryJob = null;
+            _liveTryJob?.cancel();
+            _liveTryJob = null;
            _retryCount = 0;
            fetchVideo();
        }
@@ -1034,7 +1051,7 @@ class VideoDetailView : ConstraintLayout {
                                processHandle.opinion(ref, Opinion.neutral);
                            }

-                            StateApp.instance.scopeGetter().launch(Dispatchers.IO) {
+                            fragment.lifecycleScope.launch(Dispatchers.IO) {
                                try {
                                    processHandle.fullyBackfillServers();
                                } catch (e: Throwable) {
@@ -1130,6 +1147,8 @@ class VideoDetailView : ConstraintLayout {
        if(video.isLive && video.live != null) {
            loadLiveChat(video);
        }
+        if(video.isLive && video.live == null && !video.video.videoSources.any())
+            startLiveTry(video);

        updateMoreButtons();
    }
@@ -1259,7 +1278,7 @@ class VideoDetailView : ConstraintLayout {
        //If LiveStream, set to end
        if(videoSource is IDashManifestSource || videoSource is IHLSManifestSource) {
            if (video?.isLive == true) {
-                _player.seekToEnd(5000);
+                _player.seekToEnd(6000);
            }

            val videoTracks = _player.exoPlayer?.player?.currentTracks?.groups?.firstOrNull { it.mediaTrackGroup.type == C.TRACK_TYPE_VIDEO }
@@ -1344,9 +1363,11 @@ class VideoDetailView : ConstraintLayout {
        }
    }

-    fun nextVideo(): Boolean {
+    fun nextVideo(forceLoop: Boolean = false): Boolean {
        Logger.i(TAG, "nextVideo")
-        val next = StatePlayer.instance.nextQueueItem(_player.duration < 100 || (_player.position.toFloat() / _player.duration) < 0.9);
+        var next = StatePlayer.instance.nextQueueItem(_player.duration < 100 || (_player.position.toFloat() / _player.duration) < 0.9);
+        if(next == null && forceLoop)
+            next = StatePlayer.instance.restartQueue();
        if(next != null) {
            setVideoOverview(next);
            return true;
@@ -1961,7 +1982,7 @@ class VideoDetailView : ConstraintLayout {
    }

    fun setProgressBarOverlayed(isOverlayed: Boolean?) {
-        Logger.i(TAG, "setProgressBarOverlayed(isOverlayed: ${isOverlayed ?: "null"})");
+        Logger.v(TAG, "setProgressBarOverlayed(isOverlayed: ${isOverlayed ?: "null"})");
        isOverlayed?.let{ _cast.setProgressBarOverlayed(it) };

        if(isOverlayed == null) {
@@ -2080,6 +2101,8 @@ class VideoDetailView : ConstraintLayout {
                _retryCount = 0;
                _retryJob?.cancel();
                _retryJob = null;
+                _liveTryJob?.cancel();
+                _liveTryJob = null;
                UIDialogs.showGeneralRetryErrorDialog(context, "Failed to load video (ScriptException)", it, ::fetchVideo);
            }
        }
@@ -2090,6 +2113,8 @@ class VideoDetailView : ConstraintLayout {
                _retryCount = 0;
                _retryJob?.cancel();
                _retryJob = null;
+                _liveTryJob?.cancel();
+                _liveTryJob = null;
                UIDialogs.showGeneralRetryErrorDialog(context, "Failed to load video", it, ::fetchVideo);
            }
        } else TaskHandler(IPlatformVideoDetails::class.java, {fragment.lifecycleScope});
@@ -2107,14 +2132,16 @@ class VideoDetailView : ConstraintLayout {
            Log.i(TAG, "handleErrorOrCall _retryCount=$_retryCount, starting retry job");

            _retryJob?.cancel();
-            _retryJob = StateApp.instance.scopeGetter().launch(Dispatchers.Main) {
+            _retryJob = StateApp.instance.scopeOrNull?.launch(Dispatchers.Main) {
                try {
                    delay(_retryIntervals[_retryCount++] * 1000);
                    fetchVideo();
                } catch (e: Throwable) {
-                    Logger.e(TAG, "Failed to fetch video.", e)
+                    Logger.e(TAG, "Failed to retry fetch video.", e)
                }
            }
+            _liveTryJob?.cancel();
+            _liveTryJob = null;
        } else if (isConnected && nextVideo()) {
            Log.i(TAG, "handleErrorOrCall retries failed, is connected, skipped to next video");
        } else {
@@ -2123,6 +2150,45 @@ class VideoDetailView : ConstraintLayout {
        }
    }

+    private fun startLiveTry(liveTryVideo: IPlatformVideoDetails) {
+        val datetime = liveTryVideo.datetime ?: return;
+        val diffSeconds = datetime.getNowDiffSeconds();
+        val toWait = _liveStreamCheckInterval.toList().sortedBy { abs(diffSeconds - it.first) }.firstOrNull()?.second?.toLong() ?: return;
+
+        fragment.lifecycleScope.launch(Dispatchers.Main){
+            UIDialogs.toast(context, "Not yet available, retrying in ${toWait}s");
+        }
+
+        _liveTryJob?.cancel();
+        _liveTryJob = fragment.lifecycleScope.launch(Dispatchers.IO) {
+            try {
+                delay(toWait * 1000);
+                val videoDetail = StatePlatform.instance.getContentDetails(liveTryVideo.url, true).await();
+                if(videoDetail !is IPlatformVideoDetails)
+                    throw IllegalStateException("Expected media content, found ${video?.contentType}");
+
+                if(videoDetail.datetime != null && videoDetail.live == null && !videoDetail.video.videoSources.any()) {
+                    if(videoDetail.datetime!! > OffsetDateTime.now())
+                        withContext(Dispatchers.Main) {
+                            UIDialogs.toast(context, "Planned in ${videoDetail.datetime?.toHumanNowDiffString(true)}");
+                        }
+                    startLiveTry(liveTryVideo);
+                }
+                else
+                    withContext(Dispatchers.Main) {
+                        setVideoDetails(videoDetail);
+                        _liveTryJob = null;
+                    }
+            }
+            catch(ex: Throwable) {
+                Logger.e(TAG, "Failed to live try fetch video.", ex);
+                withContext(Dispatchers.Main) {
+                    UIDialogs.toast(context, "Failed to retry for live stream");
+                }
+            }
+        }
+    }
+
    fun applyFragment(frag: VideoDetailFragment) {
        fragment = frag;
        fragment.onMinimize.subscribe {
@@ -4,7 +4,10 @@ import android.net.Uri
 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.IVideoSource
+import com.futo.platformplayer.api.media.models.streams.sources.IVideoUrlSource
+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.JSVideoUrlRangeSource
 import com.futo.platformplayer.logging.Logger
@@ -17,6 +20,12 @@ import com.google.android.exoplayer2.upstream.ResolvingDataSource
 class VideoHelper {
    companion object {

+        fun isDownloadable(detail: IPlatformVideoDetails) =
+            (detail.video.videoSources.any { isDownloadable(it) }) ||
+                    (if (detail is VideoUnMuxedSourceDescriptor) detail.audioSources.any { isDownloadable(it) } else false);
+        fun isDownloadable(source: IVideoSource) = source is IVideoUrlSource;
+        fun isDownloadable(source: IAudioSource) = source is IAudioUrlSource;
+
        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? {
            val targetVideo = if(desiredPixelCount > 0)
@@ -12,12 +12,14 @@ import com.futo.platformplayer.*
 import com.futo.platformplayer.activities.MainActivity
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.downloads.VideoDownload
+import com.futo.platformplayer.exceptions.DownloadException
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.Announcement
 import com.futo.platformplayer.states.AnnouncementType
 import com.futo.platformplayer.states.StateAnnouncement
 import com.futo.platformplayer.states.StateDownloads
 import com.futo.platformplayer.stores.FragmentedStorage
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
@@ -134,15 +136,21 @@ class DownloadService : Service() {
                    Logger.w(TAG, "Video had no video or videodetail, removing download");
                    StateDownloads.instance.removeDownload(currentVideo);
                }
+                else if(ex is DownloadException && !ex.isRetryable) {
+                    Logger.w(TAG, "Video had exception that should not be retried");
+                    StateDownloads.instance.removeDownload(currentVideo);
+                    StateDownloads.instance.preventPlaylistDownload(currentVideo);
+                }
                else
                    Logger.e(TAG, "Failed download [${currentVideo.name}]: ${ex.message}", ex);
                currentVideo.error = ex.message;
                currentVideo.changeState(VideoDownload.State.ERROR);
                ignore.add(currentVideo);

-                StateAnnouncement.instance.registerAnnouncement(currentVideo?.id?.value?:"" + currentVideo?.id?.pluginId?:"" + "_FailDownload",
-                    "Download failed",
-                    "Download for [${currentVideo.name}] failed.\nDownloads are automatically retried.\nReason: ${ex.message}", AnnouncementType.SESSION, null, "download");
+                if(ex !is CancellationException)
+                    StateAnnouncement.instance.registerAnnouncement(currentVideo?.id?.value?:"" + currentVideo?.id?.pluginId?:"" + "_FailDownload",
+                        "Download failed",
+                        "Download for [${currentVideo.name}] failed.\nDownloads are automatically retried.\nReason: ${ex.message}", AnnouncementType.SESSION, null, "download");

                //Give it a sec
                Thread.sleep(500);
@@ -50,7 +50,7 @@ class MediaPlaybackService : Service() {
    private var _focusRequest: AudioFocusRequest? = null;

    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        Logger.i(TAG, "onStartCommand");
+        Logger.v(TAG, "onStartCommand");


        if(!FragmentedStorage.isInitialized) {
@@ -91,43 +91,49 @@ class MediaPlaybackService : Service() {
        _mediaSession?.setCallback(object: MediaSessionCompat.Callback() {
            override fun onSeekTo(pos: Long) {
                super.onSeekTo(pos)
-                Log.i(TAG, "Media session callback onSeekTo(pos = $pos)");
+                Logger.i(TAG, "Media session callback onSeekTo(pos = $pos)");
                MediaControlReceiver.onSeekToReceived.emit(pos);
            }

            override fun onPlay() {
                super.onPlay();
-                Log.i(TAG, "Media session callback onPlay()");
+                Logger.i(TAG, "Media session callback onPlay()");
                MediaControlReceiver.onPlayReceived.emit();
            }

            override fun onPause() {
                super.onPause();
-                Log.i(TAG, "Media session callback onPause()");
+                Logger.i(TAG, "Media session callback onPause()");
                MediaControlReceiver.onPauseReceived.emit();
            }

            override fun onStop() {
                super.onStop();
-                Log.i(TAG, "Media session callback onStop()");
+                Logger.i(TAG, "Media session callback onStop()");
                MediaControlReceiver.onCloseReceived.emit();
            }

            override fun onSkipToPrevious() {
                super.onSkipToPrevious();
-                Log.i(TAG, "Media session callback onSkipToPrevious()");
+                Logger.i(TAG, "Media session callback onSkipToPrevious()");
                MediaControlReceiver.onPreviousReceived.emit();
            }
+
+            override fun onSkipToNext() {
+                super.onSkipToNext()
+                Logger.i(TAG, "Media session callback onSkipToNext()");
+                MediaControlReceiver.onNextReceived.emit();
+            }
        });
    }

    override fun onCreate() {
-        Logger.i(TAG, "onCreate called");
+        Logger.v(TAG, "onCreate");
        super.onCreate()
    }

    override fun onDestroy() {
-        Logger.i(TAG, "onDestroy called");
+        Logger.v(TAG, "onDestroy");
        _instance = null;
        MediaControlReceiver.onCloseReceived.emit();
        super.onDestroy();
@@ -138,7 +144,7 @@ class MediaPlaybackService : Service() {
    }

    fun closeMediaSession() {
-        Logger.i(TAG, "closeMediaSession called");
+        Logger.v(TAG, "closeMediaSession");
        stopForeground(true);

        val focusRequest = _focusRequest;
@@ -159,7 +165,7 @@ class MediaPlaybackService : Service() {
    }

    fun updateMediaSession(videoUpdated: IPlatformVideo?) {
-        Logger.i(TAG, "updateMediaSession called");
+        Logger.v(TAG, "updateMediaSession");
        var isUpdating = false;
        val video: IPlatformVideo;
        if(videoUpdated == null) {
@@ -270,7 +276,7 @@ class MediaPlaybackService : Service() {
        val notif = builder.build();
        notif.flags = notif.flags or NotificationCompat.FLAG_ONGOING_EVENT or NotificationCompat.FLAG_NO_CLEAR;

-        Logger.i(TAG, "Updating notification bitmap=${if (bitmap != null) "not null" else "null"} channelId=${channel.id} icon=${icon} video=${video?.name ?: ""} playWhenReady=${playWhenReady} session.sessionToken=${session.sessionToken}");
+        Logger.i(TAG, "Updating notification bitmap=${if (bitmap != null) "yes" else "no."} channelId=${channel.id} icon=${icon} video=${video?.name ?: ""} playWhenReady=${playWhenReady} session.sessionToken=${session.sessionToken}");

        startForeground(MEDIA_NOTIF_ID, notif, ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK);

@@ -285,6 +291,7 @@ class MediaPlaybackService : Service() {
                PlaybackStateCompat.ACTION_PLAY or
                PlaybackStateCompat.ACTION_PAUSE or
                PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS or
+                PlaybackStateCompat.ACTION_SKIP_TO_NEXT or
                PlaybackStateCompat.ACTION_PLAY_PAUSE
            )
            .setState(state, pos, 1f, SystemClock.elapsedRealtime())
@@ -52,10 +52,9 @@ import java.util.concurrent.TimeUnit
 class StateApp {
    val isMainActive: Boolean get() = contextOrNull != null && contextOrNull is MainActivity; //if context is MainActivity, it means its active

+    /*
    private val externalRootDirectory = File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS), "Grayjay");

-
-
    fun getExternalRootDirectory(): File? {
        if(!externalRootDirectory.exists()) {
            val result = externalRootDirectory.mkdirs();
@@ -65,6 +64,57 @@ class StateApp {
        }
        else
            return externalRootDirectory;
+    }*/
+
+    fun getExternalGeneralDirectory(context: Context): DocumentFile? {
+        val generalUri = Settings.instance.storage.getStorageGeneralUri();
+        if(isValidStorageUri(context, generalUri))
+            return DocumentFile.fromTreeUri(context, generalUri!!);
+        return null;
+    }
+    fun changeExternalGeneralDirectory(context: IWithResultLauncher, onChanged: ((DocumentFile?)->Unit)? = null) {
+        if(context is Context)
+            requestDirectoryAccess(context, "General Files", "This directory is used to save auto-backups and other persistent files.", null) {
+                if(it != null)
+                    context.contentResolver.takePersistableUriPermission(it, Intent.FLAG_GRANT_WRITE_URI_PERMISSION.or(Intent.FLAG_GRANT_READ_URI_PERMISSION));
+                if(it != null && isValidStorageUri(context, it)) {
+                    Logger.i(TAG, "Changed external general directory: ${it}");
+                    Settings.instance.storage.storage_general = it.toString();
+                    Settings.instance.save();
+
+                    onChanged?.invoke(getExternalGeneralDirectory(context));
+                }
+                else
+                    StateApp.instance.scopeOrNull?.launch(Dispatchers.Main) {
+                        UIDialogs.toast("Failed to gain access to\n [${it?.lastPathSegment}]");
+                    };
+            };
+    }
+    fun getExternalDownloadDirectory(context: Context): DocumentFile? {
+        val downloadUri = Settings.instance.storage.storage_download?.let { Uri.parse(it) };
+        if(isValidStorageUri(context, downloadUri))
+            return DocumentFile.fromTreeUri(context, downloadUri!!);
+        return null;
+    }
+    fun changeExternalDownloadDirectory(context: IWithResultLauncher, onChanged: ((DocumentFile?)->Unit)? = null) {
+        if(context is Context)
+            requestDirectoryAccess(context, "Download Exports", "This directory is used to export downloads to for external usage.", null) {
+                if(it != null)
+                    context.contentResolver.takePersistableUriPermission(it, Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION.or(Intent.FLAG_GRANT_WRITE_URI_PERMISSION.or(Intent.FLAG_GRANT_READ_URI_PERMISSION)));
+                if(it != null && isValidStorageUri(context, it)) {
+                    Logger.i(TAG, "Changed external download directory: ${it}");
+                    Settings.instance.storage.storage_general = it.toString();
+                    Settings.instance.save();
+
+                    onChanged?.invoke(getExternalDownloadDirectory(context));
+                }
+            };
+    }
+    fun isValidStorageUri(context: Context, uri: Uri?): Boolean {
+        if(uri == null)
+            return false;
+
+        return context.contentResolver.persistedUriPermissions.any { it.uri == uri && it.isReadPermission && it.isWritePermission };
    }

    //Scope
@@ -171,20 +221,20 @@ class StateApp {
        return state;
    }

-    fun requestDirectoryAccess(activity: IWithResultLauncher, name: String, path: Uri?, handle: (Uri?)->Unit)
+    fun requestDirectoryAccess(activity: IWithResultLauncher, name: String, purpose: String? = null, path: Uri?, handle: (Uri?)->Unit)
    {
        if(activity is Context)
        {
-            UIDialogs.showDialog(activity, R.drawable.ic_security, "Missing Access", "Please grant access to ${name}", null, 0,
+            UIDialogs.showDialog(activity, R.drawable.ic_security, "Directory required for\n${name}", "Please select a directory for ${name}.\n${purpose}".trim(), null, 0,
                UIDialogs.Action("Cancel", {}),
                UIDialogs.Action("Ok", {
                    val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
                    if(path != null)
                        intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, path);
                    intent.flags = Intent.FLAG_GRANT_WRITE_URI_PERMISSION
-                        .and(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-                        .and(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION)
-                        .and(Intent.FLAG_GRANT_PREFIX_URI_PERMISSION);
+                        .or(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                        .or(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION)
+                        .or(Intent.FLAG_GRANT_PREFIX_URI_PERMISSION);

                    activity.launchForResult(intent, 99) {
                        if(it.resultCode == Activity.RESULT_OK) {
@@ -299,7 +349,7 @@ class StateApp {
        }

        Logger.onLogSubmitted.subscribe {
-            scopeGetter().launch(Dispatchers.Main) {
+            scopeOrNull?.launch(Dispatchers.Main) {
                try {
                    if (it != null) {
                        UIDialogs.toast("Uploaded " + (it ?: "null"), true);
@@ -377,16 +427,32 @@ class StateApp {
        val interval = Settings.instance.subscriptions.getSubscriptionsBackgroundIntervalMinutes();
        scheduleBackgroundWork(context, interval != 0, interval);

-
        if(!Settings.instance.backup.didAskAutoBackup && !Settings.instance.backup.shouldAutomaticBackup()) {
            StateAnnouncement.instance.registerAnnouncement("backup", "Set Automatic Backup", "Configure daily backups of your data to restore in case of catastrophic failure.", AnnouncementType.SESSION, null, null, "Configure", {
-                UIDialogs.showAutomaticBackupDialog(context);
-                StateAnnouncement.instance.deleteAnnouncement("backup");
+                if(context is IWithResultLauncher && !Settings.instance.storage.isStorageMainValid(context)) {
+                    UIDialogs.toast("Missing general directory");
+                    changeExternalGeneralDirectory(context) {
+                        UIDialogs.showAutomaticBackupDialog(context);
+                        StateAnnouncement.instance.deleteAnnouncement("backup");
+                    };
+                }
+                else {
+                    UIDialogs.showAutomaticBackupDialog(context);
+                    StateAnnouncement.instance.deleteAnnouncement("backup");
+                }
            }, "No Backup", {
                Settings.instance.backup.didAskAutoBackup = true;
                Settings.instance.save();
            });
        }
+        else if(Settings.instance.backup.didAskAutoBackup && Settings.instance.backup.shouldAutomaticBackup() && !Settings.instance.storage.isStorageMainValid(context)) {
+            if(context is IWithResultLauncher) {
+                Logger.i(TAG, "Backup set without general directory, please select general external directory");
+                changeExternalGeneralDirectory(context) {
+                    Logger.i(TAG, "Directory set, Auto-backup should resume to this location");
+                };
+            }
+        }

        instance.scopeOrNull?.launch(Dispatchers.IO) {
            try {
@@ -510,7 +576,6 @@ class StateApp {
                if (_lastNetworkState != NetworkState.DISCONNECTED) {
                    scopeOrNull?.launch(Dispatchers.Main) {
                        try {
-                            Logger.i(TAG, "onConnectionAvailable emitted");
                            onConnectionAvailable.emit();
                        } catch (e: Throwable) {
                            Logger.e(TAG, "Failed to emit onConnectionAvailable", e)
@@ -17,11 +17,17 @@ import com.futo.platformplayer.activities.IWithResultLauncher
 import com.futo.platformplayer.activities.MainActivity
 import com.futo.platformplayer.activities.SettingsActivity
 import com.futo.platformplayer.api.media.models.video.SerializedPlatformVideo
+import com.futo.platformplayer.copyTo
+import com.futo.platformplayer.copyToOutputStream
 import com.futo.platformplayer.encryption.EncryptionProvider
+import com.futo.platformplayer.getInputStream
 import com.futo.platformplayer.getNowDiffHours
+import com.futo.platformplayer.getOutputStream
 import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.readBytes
 import com.futo.platformplayer.stores.FragmentedStorage
 import com.futo.platformplayer.stores.v2.ManagedStore
+import com.futo.platformplayer.writeBytes
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -47,20 +53,22 @@ class StateBackup {

        private val _autoBackupLock = Object();

-        private fun getAutomaticBackupDocumentFiles(context: Context, root: Uri, create: Boolean = false): Pair<DocumentFile?, DocumentFile?> {
-            val dir = DocumentFile.fromTreeUri(context, root);
-            if(dir == null)
-                throw IllegalStateException("Can't access external document files");
+        private fun getAutomaticBackupDocumentFiles(context: Context, create: Boolean = false): Pair<DocumentFile?, DocumentFile?> {
+            if(!Settings.instance.storage.isStorageMainValid(context))
+                return Pair(null, null);
+            val uri = Settings.instance.storage.getStorageGeneralUri() ?: return Pair(null, null);
+            val dir = DocumentFile.fromTreeUri(context, uri) ?: return Pair(null, null);
            val mainBackupFile = dir.findFile("GrayjayBackup.ezip") ?: if(create) dir.createFile("grayjay/ezip", "GrayjayBackup.ezip") else null;
            val secondaryBackupFile = dir.findFile("GrayjayBackup.ezip.old") ?: if(create) dir.createFile("grayjay/ezip", "GrayjayBackup.ezip.old") else null;
            return Pair(mainBackupFile, secondaryBackupFile);
        }
+        /*
        private fun getAutomaticBackupFiles(): Pair<File, File> {
            val dir = StateApp.instance.getExternalRootDirectory();
            if(dir == null)
                throw IllegalStateException("Can't access external files");
            return Pair(File(dir, "GrayjayBackup.ezip"), File(dir, "GrayjayBackup.ezip.old"))
-        }
+        }*/


        fun getAllMigrationStores(): List<ManagedStore<*>> = listOf(
@@ -77,10 +85,11 @@ class StateBackup {
            return password.padStart(32, '9');
        }
        fun hasAutomaticBackup(): Boolean {
-            if(StateApp.instance.getExternalRootDirectory() == null)
+            val context = StateApp.instance.contextOrNull ?: return false;
+            if(!Settings.instance.storage.isStorageMainValid(context))
                return false;
-            val files = getAutomaticBackupFiles();
-            return files.first.exists() || files.second.exists();
+            val files = getAutomaticBackupDocumentFiles(context,);
+            return files.first?.exists() ?: false || files.second?.exists() ?: false;
        }
        fun startAutomaticBackup(force: Boolean = false) {
            val lastBackupHoursAgo = Settings.instance.backup.lastAutoBackupTime.getNowDiffHours();
@@ -93,20 +102,27 @@ class StateBackup {
                try {
                    Logger.i(TAG, "Starting AutoBackup (Last ${lastBackupHoursAgo} ago)");
                    synchronized(_autoBackupLock) {
+                        val context = StateApp.instance.contextOrNull ?: return@synchronized;
                        val data = export();
                        val zip = data.asZip();

                        val encryptedZip = EncryptionProvider.instance.encrypt(zip, getAutomaticBackupPassword());

-                        val backupFiles = getAutomaticBackupFiles();
-                        val exportFile = backupFiles.first;
-                        if (exportFile.exists())
-                            exportFile.copyTo(backupFiles.second, true);
+                        if(!Settings.instance.storage.isStorageMainValid(context)) {
+                            StateApp.instance.scopeOrNull?.launch(Dispatchers.Main) {
+                                UIDialogs.toast("Missing permissions for auto-backup, please set the external general directory in settings");
+                            }
+                        }
+                        else {
+                            val backupFiles = getAutomaticBackupDocumentFiles(context, true);
+                            val exportFile = backupFiles.first;
+                            if (exportFile?.exists() == true && backupFiles.second != null)
+                                exportFile!!.copyTo(context, backupFiles.second!!);
+                            exportFile!!.writeBytes(context, encryptedZip);

-                        exportFile.writeBytes(encryptedZip);
-
-                        Settings.instance.backup.lastAutoBackupTime = OffsetDateTime.now(); //OffsetDateTime.now();
-                        Settings.instance.save();
+                            Settings.instance.backup.lastAutoBackupTime = OffsetDateTime.now(); //OffsetDateTime.now();
+                            Settings.instance.save();
+                        }
                    }
                    Logger.i(TAG, "Finished AutoBackup");
                }
@@ -119,28 +135,22 @@ class StateBackup {
            }
        }

-        //TODO: This contains a temporary workaround to make it semi-compatible with > Android 11. By mixing "File" and "DocumentFile" usage.
-        //TODO: For now this is used to at least recover and gain temporary access to docs after losing access (due to permission lost after reinstall)
-        //TODO: Should be replaced with a more re-usable system that leverages OPEN_DOCUMENT_TREE once, and somehow persist this content after uninstall
-        //TODO: DocumentFiles are not compatible with normal files and require its own system.
-        //TODO: Investigate persistence of DOCUMENT_TREE files after uninstall...
-        fun restoreAutomaticBackup(context: Context, scope: CoroutineScope, password: String, ifExists: Boolean = false, withStream: InputStream? = null) {
+        //TODO: This goes has recently changed to use DocumentFiles and DocumentTree, and might need additional checks/edgecases covered.
+        fun restoreAutomaticBackup(context: Context, scope: CoroutineScope, password: String, ifExists: Boolean = false) {
            if(ifExists && !hasAutomaticBackup()) {
                Logger.i(TAG, "No AutoBackup exists, not restoring");
                return;
            }

-            //TODO: Sadly on reinstalls of app this fails on file permissions.
-
            Logger.i(TAG, "Starting AutoBackup restore");
            synchronized(_autoBackupLock) {

-                val backupFiles = getAutomaticBackupFiles();
+                val backupFiles = getAutomaticBackupDocumentFiles(StateApp.instance.context, false);
                try {
-                    if (!backupFiles.first.exists() && withStream == null)
+                    if (backupFiles.first?.exists() != true)
                        throw IllegalStateException("Backup file does not exist");

-                    val backupBytesEncrypted = if(withStream != null) withStream.readBytes() else backupFiles.first.readBytes();
+                    val backupBytesEncrypted = backupFiles.first!!.readBytes(context) ?: throw IllegalStateException("Could not read stream of [${backupFiles.first?.uri}]");
                    val backupBytes = EncryptionProvider.instance.decrypt(backupBytesEncrypted, getAutomaticBackupPassword(password));
                    importZipBytes(context, scope, backupBytes);
                    Logger.i(TAG, "Finished AutoBackup restore");
@@ -154,21 +164,21 @@ class StateBackup {
                    else null;
                    if(activity != null) {
                        if(activity is IWithResultLauncher)
-                            StateApp.instance.requestDirectoryAccess(activity, "Grayjay Backup Directory", backupFiles.first.parent?.toUri()) {
+                            StateApp.instance.requestDirectoryAccess(activity, "Grayjay Backup Directory", "Allows restoring of a backup", backupFiles.first?.parentFile?.uri) {
                                if(it != null) {
-                                    val customFiles = StateBackup.getAutomaticBackupDocumentFiles(activity, it);
+                                    val customFiles = StateBackup.getAutomaticBackupDocumentFiles(activity);
                                    if(customFiles.first != null && customFiles.first!!.isFile && customFiles.first!!.exists() && customFiles.first!!.canRead())
-                                        restoreAutomaticBackup(context, scope, password, ifExists, activity.contentResolver.openInputStream(customFiles.first!!.uri));
+                                        restoreAutomaticBackup(context, scope, password, ifExists);
                                }
                            };
                    }
                }
                catch (ex: Throwable) {
                    Logger.e(TAG, "Failed main AutoBackup restore", ex)
-                    if (!backupFiles.second.exists())
+                    if (backupFiles.second?.exists() != true)
                        throw ex;

-                    val backupBytesEncrypted = backupFiles.second.readBytes();
+                    val backupBytesEncrypted = backupFiles.second!!.readBytes(context) ?: throw IllegalStateException("Could not read stream of [${backupFiles.second?.uri}]");
                    val backupBytes = EncryptionProvider.instance.decrypt(backupBytesEncrypted, getAutomaticBackupPassword(password));
                    importZipBytes(context, scope, backupBytes);
                    Logger.i(TAG, "Finished AutoBackup restore");
@@ -1,12 +1,16 @@
 package com.futo.platformplayer.states

+import android.content.ContentResolver
+import android.net.Uri
 import android.os.StatFs
 import com.futo.platformplayer.R
 import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
+import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.media.PlatformID
 import com.futo.platformplayer.api.media.exceptions.AlreadyQueuedException
 import com.futo.platformplayer.api.media.models.streams.sources.*
+import com.futo.platformplayer.api.media.models.subtitles.ISubtitleSource
 import com.futo.platformplayer.api.media.models.video.IPlatformVideo
 import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
 import com.futo.platformplayer.constructs.Event0
@@ -108,6 +112,11 @@ class StateDownloads {
    fun getPlaylistDownload(playlistId: String): PlaylistDownloadDescriptor? {
        return _downloadPlaylists.findItem { it.id == playlistId };
    }
+    fun savePlaylistDownload(playlistDownload: PlaylistDownloadDescriptor) {
+        synchronized(playlistDownload.preventDownload) {
+            _downloadPlaylists.save(playlistDownload);
+        }
+    }
    fun deleteCachedPlaylist(id: String) {
        val pdl = getPlaylistDownload(id);
        if(pdl != null)
@@ -142,6 +151,19 @@ class StateDownloads {
        _downloading.delete(download);
        onDownloadsChanged.emit();
    }
+    fun preventPlaylistDownload(download: VideoDownload) {
+        if(download.video != null && download.groupID != null && download.groupType == VideoDownload.GROUP_PLAYLIST) {
+            getPlaylistDownload(download.groupID!!)?.let {
+                synchronized(it.preventDownload) {
+                    if(download.video?.url != null && !it.preventDownload.contains(download.video!!.url)) {
+                        it.preventDownload.add(download.video!!.url);
+                        savePlaylistDownload(it);
+                        Logger.w(TAG, "Preventing further download attempts in playlist [${it.id}] for [${download.name}]:${download.video?.url}");
+                    }
+                }
+            }
+        }
+    }

    fun checkForDownloadsTodos() {
        val hasPlaylistChanged = checkForOutdatedPlaylists();
@@ -157,12 +179,15 @@ class StateDownloads {
        val playlistsDownloaded = getCachedPlaylists();
        for(playlist in playlistsDownloaded) {
            val playlistDownload = getPlaylistDownload(playlist.playlist.id) ?: continue;
-
-            if(playlist.playlist.videos.any{ getCachedVideo(it.id) == null }) {
-                Logger.i(TAG, "Found new videos on playlist [${playlist.playlist.name}]");
+            val toIgnore = playlistDownload.getPreventDownloadList();
+            val missingVideoCount = playlist.playlist.videos.count { !toIgnore.contains(it.url) && getCachedVideo(it.id) == null };
+            if(missingVideoCount > 0) {
+                Logger.i(TAG, "Found new videos (${missingVideoCount}) on playlist [${playlist.playlist.name}] to download");
                continueDownload(playlistDownload, playlist.playlist);
                hasChanged = true;
            }
+            else
+                Logger.v(TAG, "Offline playlist [${playlist.playlist.name}] is up to date");
        }
        return hasChanged;
    }
@@ -171,6 +196,11 @@ class StateDownloads {
        var hasNew = false;
        for(item in playlist.videos) {
            val existing = getCachedVideo(item.id);
+
+            if(!playlistDownload.shouldDownload(item)) {
+                Logger.i(TAG, "Not downloading for playlist [${playlistDownload.id}] Video [${item.name}]:${item.url}")
+                continue;
+            }
            if(existing == null) {
                val ongoingDownload = getDownloading().find { it.id.value == item.id.value && it.id.value != null };
                if(ongoingDownload != null) {
@@ -291,6 +321,32 @@ class StateDownloads {
        }
    }

+    suspend fun downloadSubtitles(subtitle: ISubtitleSource, contentResolver: ContentResolver): SubtitleRawSource? {
+        val subtitleUri = subtitle.getSubtitlesURI();
+        if(subtitleUri == null)
+            return null;
+        var subtitles: String? = null;
+        if ("file" == subtitleUri.scheme) {
+            val inputStream = contentResolver.openInputStream(subtitleUri);
+            inputStream?.use { stream ->
+                val reader = stream.bufferedReader();
+                subtitles = reader.use { it.readText() };
+            }
+        } else if ("http" == subtitleUri.scheme || "https" == subtitleUri.scheme) {
+            val client = ManagedHttpClient();
+            val subtitleResponse = client.get(subtitleUri.toString());
+            if (!subtitleResponse.isOk) {
+                throw Exception("Cannot fetch subtitles from source '${subtitleUri}': ${subtitleResponse.code}");
+            }
+
+            subtitles = subtitleResponse.body?.toString()
+                ?: throw Exception("Subtitles are invalid '${subtitleUri}': ${subtitleResponse.code}");
+        } else {
+            throw NotImplementedError("Unsuported scheme");
+        }
+        return if (subtitles != null) SubtitleRawSource(subtitle.name, subtitle.format, subtitles!!) else null;
+    }
+
    fun cleanupDownloads(): Pair<Int, Long> {
        val expected = getDownloadedVideos();
        val validFiles = HashSet(expected.flatMap { it.videoSource.map { it.filePath } + it.audioSource.map { it.filePath } });
@@ -70,11 +70,11 @@ class StatePlatform {
    //Pools always follow the behavior of the base client. So if user disables a plugin, it kills all pooled clients.
    //Each pooled client adds additional memory usage.
    //WARNING: Be careful with pooling some calls, as they might use the plugin subsequently afterwards. For example pagers might block plugins in future calls.
-    private val _mainClientPool = PlatformMultiClientPool(2); //Used for all main user events, generally user critical
-    private val _pagerClientPool = PlatformMultiClientPool(2); //Used primarily for calls that result in front-end pagers, preventing them from blocking other calls.
-    private val _channelClientPool = PlatformMultiClientPool(15); //Used primarily for subscription/background channel fetches
-    private val _trackerClientPool = PlatformMultiClientPool(1); //Used exclusively for playback trackers
-    private val _liveEventClientPool = PlatformMultiClientPool(1); //Used exclusively for live events
+    private val _mainClientPool = PlatformMultiClientPool("Main", 2); //Used for all main user events, generally user critical
+    private val _pagerClientPool = PlatformMultiClientPool("Pagers", 2); //Used primarily for calls that result in front-end pagers, preventing them from blocking other calls.
+    private val _channelClientPool = PlatformMultiClientPool("Channels", 15); //Used primarily for subscription/background channel fetches
+    private val _trackerClientPool = PlatformMultiClientPool("Trackers", 1); //Used exclusively for playback trackers
+    private val _liveEventClientPool = PlatformMultiClientPool("LiveEvents", 1); //Used exclusively for live events


    private val _primaryClientPersistent = FragmentedStorage.get<StringStorage>("primaryClient");
@@ -25,7 +25,7 @@ class StatePlayer {
    private val MIN_BUFFER_DURATION = 10000;
    private val MAX_BUFFER_DURATION = 60000;
    private val MIN_PLAYBACK_START_BUFFER = 500;
-    private val MIN_PLAYBACK_RESUME_BUFFER = 1000;
+    private val MIN_PLAYBACK_RESUME_BUFFER = 2500;
    private val BUFFER_SIZE = 1024 * 64;

    var isOpen : Boolean = false
@@ -27,12 +27,20 @@ class StatePlugins {
    private val TAG = "StatePlugins";

    private val FORCE_REINSTALL_EMBEDDED = false;
+    private var _isFirstEmbedUpdate = true;

    private val _pluginScripts = FragmentedStorage.getDirectory<PluginScriptsDirectory>();
    private var _plugins = FragmentedStorage.storeJson<SourcePluginDescriptor>("plugins")
        .load();
    private val iconsDir = FragmentedStorage.getDirectory<PluginIconStorage>();

+
+    private val _syncObject = Object()
+    private var _embeddedSources: Map<String, String>? = null
+    private var _embeddedSourcesDefault: List<String>? = null
+    private var _sourcesUnderConstruction: Map<String, ImageVariable>? = null
+
+
    fun getPluginIconOrNull(id: String): ImageVariable? {
        if(iconsDir.hasIcon(id))
            return iconsDir.getIconBinary(id);
@@ -53,18 +61,6 @@ class StatePlugins {
        }
    }

-    @Serializable
-    private data class PluginConfig(
-        val SOURCES_EMBEDDED: Map<String, String>,
-        val SOURCES_EMBEDDED_DEFAULT: List<String>,
-        val SOURCES_UNDER_CONSTRUCTION: Map<String, String>
-    )
-
-    private val _syncObject = Object()
-    private var _embeddedSources: Map<String, String>? = null
-    private var _embeddedSourcesDefault: List<String>? = null
-    private var _sourcesUnderConstruction: Map<String, ImageVariable>? = null
-
    private fun ensureSourcesConfigLoaded(context: Context) {
        if (_embeddedSources != null && _embeddedSourcesDefault != null && _sourcesUnderConstruction != null) {
            return
@@ -122,8 +118,11 @@ class StatePlugins {
                    Logger.i(TAG, "Found outdated embedded plugin [${existing.config.id}] ${existing.config.name}, deleting and reinstalling");
                    deletePlugin(embedded.key);
                }
+                else if(existing != null && _isFirstEmbedUpdate)
+                    Logger.i(TAG, "Embedded plugin [${existing.config.id}] ${existing.config.name}, up to date (${existing.config.version} >= ${embeddedConfig?.version})");
            }
        }
+        _isFirstEmbedUpdate = false;
    }
    fun installMissingEmbeddedPlugins(context: Context) {
        val plugins = getPlugins();
@@ -422,6 +421,13 @@ class StatePlugins {
    }


+    @Serializable
+    private data class PluginConfig(
+        val SOURCES_EMBEDDED: Map<String, String>,
+        val SOURCES_EMBEDDED_DEFAULT: List<String>,
+        val SOURCES_UNDER_CONSTRUCTION: Map<String, String>
+    )
+
    companion object {
        private var _instance : StatePlugins? = null;
        val instance : StatePlugins
@@ -67,7 +67,7 @@ class StateSubscriptions {
        return Pair(_lastGlobalSubscriptionProgress, _lastGlobalSubscriptionTotal);
    }
    fun updateSubscriptionFeed(scope: CoroutineScope, onlyIfNull: Boolean = false, onProgress: ((Int, Int)->Unit)? = null) {
-        Logger.i(TAG, "updateSubscriptionFeed");
+        Logger.v(TAG, "updateSubscriptionFeed");
        scope.launch(Dispatchers.IO) {
            synchronized(_globalSubscriptionsLock) {
                if (isGlobalUpdating || (onlyIfNull && _globalSubscriptionFeed != null)) {
@@ -5,8 +5,10 @@ import android.graphics.drawable.Animatable
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.LinearLayout
+import androidx.core.view.updateLayoutParams
 import com.futo.platformplayer.R

 class Loader : LinearLayout {
@@ -15,7 +17,7 @@ class Loader : LinearLayout {
    private val _animatable: Animatable;

    constructor(context: Context, attrs: AttributeSet? = null) : super(context, attrs) {
-        LayoutInflater.from(context).inflate(R.layout.view_loader, this, true);
+        inflate(context, R.layout.view_loader, this);
        _imageLoader = findViewById(R.id.image_loader);
        _animatable = _imageLoader.drawable as Animatable;

@@ -29,6 +31,18 @@ class Loader : LinearLayout {

        visibility = View.GONE;
    }
+    constructor(context: Context, automatic: Boolean, height: Int = -1) : super(context) {
+        inflate(context, R.layout.view_loader, this);
+        _imageLoader = findViewById(R.id.image_loader);
+        _animatable = _imageLoader.drawable as Animatable;
+        _automatic = automatic;
+
+        if(height > 0) {
+            layoutParams = ViewGroup.LayoutParams(LayoutParams.MATCH_PARENT, height);
+        }
+
+        visibility = View.GONE;
+    }

    override fun onAttachedToWindow() {
        super.onAttachedToWindow()
@@ -67,7 +67,7 @@ class CommentViewHolder : ViewHolder {
                processHandle.opinion(c.reference, Opinion.neutral);
            }

-            StateApp.instance.scopeGetter().launch(Dispatchers.IO) {
+            StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
                try {
                    processHandle.fullyBackfillServers();
                } catch (e: Throwable) {
@@ -78,8 +78,6 @@ class AnnouncementView : LinearLayout {
    }

    override fun onAttachedToWindow() {
-        Logger.i(TAG, "onAttachedToWindow");
-
        super.onAttachedToWindow()
        StateAnnouncement.instance.onAnnouncementChanged.subscribe(this) {
            _scope?.launch(Dispatchers.Main) {
@@ -91,14 +89,12 @@ class AnnouncementView : LinearLayout {
    }

    override fun onDetachedFromWindow() {
-        Logger.i(TAG, "onDetachedFromWindow");
-
        super.onDetachedFromWindow()
        StateAnnouncement.instance.onAnnouncementChanged.remove(this)
    }

    private fun refresh() {
-        Logger.i(TAG, "refresh");
+        Logger.v(TAG, "refresh");
        val announcements = StateAnnouncement.instance.getVisibleAnnouncements(_category);
        setAnnouncement(announcements.firstOrNull(), announcements.size);
    }
@@ -107,7 +107,7 @@ class GestureControlView : LinearLayout {
                } else {
                    val rx = p0.x / width;
                    val ry = p0.y / height;
-                    Logger.i(TAG, "rx = $rx, ry = $ry, _isFullScreen = $_isFullScreen")
+                    Logger.v(TAG, "rx = $rx, ry = $ry, _isFullScreen = $_isFullScreen")
                    if (ry > 0.1 && ry < 0.9) {
                        if (_isFullScreen && rx < 0.4) {
                            startAdjustingBrightness();
@@ -8,6 +8,10 @@ import com.futo.platformplayer.R
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.constructs.Event2
 import com.futo.platformplayer.logging.Logger
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import java.lang.reflect.Field
@@ -33,6 +37,28 @@ class FieldForm : LinearLayout {
        _root = findViewById(R.id.field_form_root);
    }

+    fun fromObject(scope: CoroutineScope, obj : Any, onLoaded: (()->Unit)? = null) {
+        _root.removeAllViews();
+
+        scope.launch(Dispatchers.Default) {
+            val newFields = getFieldsFromObject(context, obj);
+
+            withContext(Dispatchers.Main) {
+                for (field in newFields) {
+                    if (field !is View)
+                        throw java.lang.IllegalStateException("Only views can be IFields");
+
+                    _root.addView(field as View);
+                    field.onChanged.subscribe { a1, a2 ->
+                        onChanged.emit(a1, a2);
+                    };
+                }
+                _fields = newFields;
+
+                onLoaded?.invoke();
+            }
+        }
+    }
    fun fromObject(obj : Any) {
        _root.removeAllViews();
        val newFields = getFieldsFromObject(context, obj);
@@ -68,6 +68,7 @@ class ActiveDownloadItem: LinearLayout {

        _videoCancel.setOnClickListener {
            StateDownloads.instance.removeDownload(_download);
+            StateDownloads.instance.preventPlaylistDownload(_download);
        };

        _download.onProgressChanged.subscribe(this) {
@@ -40,7 +40,7 @@ class SlideUpMenuOverlay : RelativeLayout {
        _groupItems = listOf();
    }

-    constructor(context: Context, parent: ViewGroup, titleText: String, okText: String?, animated: Boolean, items: List<View>): super(context){
+    constructor(context: Context, parent: ViewGroup, titleText: String, okText: String?, animated: Boolean, items: List<View>, hideButtons: Boolean = false): super(context){
        init(animated, okText);
        _container = parent;
        if(!_container!!.children.contains(this)) {
@@ -50,6 +50,12 @@ class SlideUpMenuOverlay : RelativeLayout {
        _textTitle.text = titleText;
        _groupItems = items;

+        if(hideButtons) {
+            _textCancel.visibility = GONE;
+            _textOK.visibility = GONE;
+            _textTitle.textAlignment = TextView.TEXT_ALIGNMENT_CENTER;
+        }
+
        setItems(items);
    }

@@ -328,7 +328,7 @@ class FutoVideoPlayer : FutoVideoPlayerBase {
    }

    override fun onPlaybackStateChanged(playbackState: Int) {
-        Logger.i(TAG, "onPlaybackStateChanged $playbackState");
+        Logger.v(TAG, "onPlaybackStateChanged $playbackState");
        val timeLeft = abs(position - duration);

        if (playbackState == ExoPlayer.STATE_ENDED) {
@@ -130,9 +130,9 @@ abstract class FutoVideoPlayerBase : RelativeLayout {
    override fun onAttachedToWindow() {
        super.onAttachedToWindow();

-        Logger.i(TAG, "Attached onConnectionAvailable listener.");
+        Logger.v(TAG, "Attached onConnectionAvailable listener.");
        StateApp.instance.onConnectionAvailable.subscribe(_referenceObject) {
-            Logger.i(TAG, "onConnectionAvailable");
+            Logger.v(TAG, "onConnectionAvailable");

            val pos = position;
            val dur = duration;
@@ -52,6 +52,13 @@
            android:orientation="vertical"
            android:layout_width="match_parent"
            android:layout_height="wrap_content">
+            <com.futo.platformplayer.views.Loader
+                android:id="@+id/loader"
+                android:layout_marginBottom="15dp"
+                android:layout_marginTop="15dp"
+                android:layout_width="match_parent"
+                android:layout_height="60dp" />
+
            <com.futo.platformplayer.views.fields.FieldForm
                android:id="@+id/settings_form"
                android:layout_width="match_parent"
@@ -8,8 +8,8 @@

    <LinearLayout android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:paddingStart="18dp"
-        android:paddingEnd="18dp"
+        android:paddingStart="15dp"
+        android:paddingEnd="15dp"
        android:paddingTop="8dp"
        android:paddingBottom="8dp">

@@ -66,6 +66,7 @@
            android:orientation="horizontal"
            android:gravity="end"
            android:layout_marginTop="28dp"
-            android:layout_marginBottom="28dp" />
+            android:layout_marginBottom="28dp">
+        </LinearLayout>
    </LinearLayout>
 </LinearLayout>
@@ -11,7 +11,7 @@
        android:id="@+id/field_group_title"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:textSize="16dp"
+        android:textSize="20dp"
        android:textColor="@color/white"
        android:fontFamily="@font/inter_light"
        android:text="@string/defaults"
@@ -303,6 +303,7 @@
                        android:id="@+id/videodetail_channel_button"
                        android:layout_width="0dp"
                        android:layout_height="wrap_content"
+                        android:layout_marginTop="7dp"
                        android:orientation="horizontal"
                        app:layout_constraintTop_toTopOf="parent"
                        app:layout_constraintLeft_toLeftOf="parent"
@@ -311,21 +312,22 @@

                        <com.futo.platformplayer.views.others.CreatorThumbnail
                            android:id="@+id/creator_thumbnail"
-                            android:layout_width="27dp"
-                            android:layout_height="27dp" />
+                            android:layout_width="35dp"
+                            android:layout_height="35dp" />
                        <LinearLayout
                            android:layout_width="0dp"
                            android:layout_height="wrap_content"
                            android:layout_weight="1"
-                            android:layout_marginStart="6dp"
+                            android:layout_marginStart="10dp"
+                            android:layout_marginTop="5dp"
                            android:orientation="vertical">
                            <TextView
                                android:id="@+id/videodetail_channel_name"
                                android:layout_width="match_parent"
                                android:layout_height="wrap_content"
+                                android:paddingEnd="10dp"
                                android:textColor="@color/white"
                                android:layout_gravity="center"
-                                android:layout_marginTop="-4dp"
                                android:ellipsize="end"
                                android:maxLines="1"
                                tools:text="Channel Name" />
@@ -0,0 +1,62 @@
+# Authentication
+Grayjay supports offering platform login for a plugin. This however comes with several security concerns that we attempt to alleviate partially.
+
+The goal of the authentication system is to provide plugins the ability to make authenticated requests without directly exposing credentials and tokens to the plugin. This is done by keeping all this data on the app side, and never passing it to the plugin.
+
+>:warning: **This is not bulletproof**  
+>Depending on the platform, the plugin still has full access to making authenticated requests, including ones that may expose your account to danger (like changing settings). Or if a platform exposes values (insecurely) in the response data (not headers).
+>
+>You should always only login (and install for that matter) plugins you trust.
+
+How to actually use the authenticated client is described in the Http package documentation  (See [Package: Http](_blank)).
+This documentation will exclusively focus on configuring authentication and how it behaves.
+
+## How it works
+The authentication system works by allowing plugins to provide a login url, and a set of required headers/cookies/urls. When the user tries to log in, it will open the provided login url in an in-app webbrowser. Once all requirements are met, it will close this webbrowser and save the required data encrypted to app storage.
+
+These authentication configs are put in the plugin config under the ```authentication``` property.
+## Example
+Here is an example of such an authentication configuration:
+
+```json
+	"authentication": {
+		"loginUrl": "https://platform.com/some/login/url",
+		"completionUrl": "https://platform.com/some/required/page", //Optional
+		"loginButton": ".someContainer div .someButton" //Optional
+		"userAgent": "Some User Agent", //Optional
+		"domainHeadersToFind": { //Optional
+			".platform.com": ["authorization"],
+			"subdomain.platform.com": ["someHeader"],
+			".somerelatedplatform.com": ["someOtherHeader"],
+		},
+		"cookiesToFind": ["someCookieToFind", "someOtherCookieToFind"], //Optional
+		//"cookiesExclOthers": false //Optional
+		//"allowedDomains": ["platform.com", "subdomain.platform.com"] //Optional
+	}
+```
+Most platforms will only need a single header or cookie to function, but for some you may need very specific cookies for specific subdomains. 
+
+| | Property | Usage |
+|--|--|--|
+| **Mandatory** | ```loginUrl``` | Used to set the initial url for the login browser. |
+| Optional | ```completionUrl``` | Can be used to set a url that needs to be visited before concluding login. |
+| Optional | ```loginButton``` | Can be used to trigger a html element by providing a query selector to a single html element. This button is then "clicked" after the page finishes loading. This supports full query selector including classes, ids, tags, and more advanced like :first-child. |
+| Optional | ```userAgent``` | Can be used to set the user-agent of the browser during login. |
+| Optional | ```domainHeadersToFind``` | Can be used to find headers for specific subdomains. |
+| Optional | ```cookiesToFind``` |  Can be used to find specific cookies. |
+| Optional | ```cookiesExclOthers``` |Can be used in the niche scenario where all other cookies should be disgarded when authenticated request are used. This is rather uncommon. |
+| Optional | ```allowedDomains``` | Can be used to only fulfill the above requirements on the domains specified in this property, any other domains may be cancelled. (NOT USEFUL FOR MOST PLUGINS) |
+
+
+## Header Behavior
+Headers are exclusively applied to the domains they are retrieved from. A plugin CANNOT send a header to a domain that it is not related to. 
+
+>:warning: **Plugins can elevate a header to a parent domain**  
+>However a plugin can elevate a header to a parent domain. Meaning that if a header is retrieved in a request to ```somedomain.platform.com```, by defining the header for ```.platform.com``` it will be send to all requests of to any ```platform.com``` domain. This might be required for some platforms.
+
+## Cookie Behavior
+By default, when authentication requests are made, the authenticated client will behave similar to that of a normal browser. Meaning that if the server you are communicating with sets new cookies, the client will use those cookies instead. These new cookies are NOT saved to disk, meaning that whenever that plugin reloads the cookies will revert to those assigned at login.
+
+This behavior can be modified by using custom http clients as described in the http package documentation.
+ (See [Package: Http](_blank))
+
Author	SHA1	Message	Date
Kelvin	9ffdf39f13	Permanently stop playlist video download on cancel, Use detailed video download overlay in overviews	2023-10-13 19:09:07 +02:00
Kelvin	8bb1ff87c0	Fix issues with attempting to download sources that are not supported (including mixed playlists)	2023-10-13 18:00:01 +02:00
Kelvin	67e29999ef	Add missing use	2023-10-12 19:21:14 +02:00
Kelvin	f3f13a71dc	New auto-backup storage using the Storage Access Framework, minor dialog tweaks, minor settings ui tweaks	2023-10-12 19:18:56 +02:00
Kelvin	5155423a1e	Improve auth doc	2023-10-11 23:48:03 +02:00
Kelvin	a7d558e48d	Additional docs	2023-10-11 23:30:29 +02:00
Kelvin	7afd75c712	Fix missing next override for headphone controls	2023-10-11 22:50:36 +02:00
Kelvin	10a661ad4c	Minor UI tweak, allow for settings reload, async settings load (with loader)	2023-10-11 22:15:52 +02:00
Kelvin	201fe6f0df	Minor fix/comment	2023-10-11 18:01:49 +02:00
Kelvin	f76a5b5f01	Cleaning up some logs, reducing retry intervals, planned live stream auto refresh, tweak some buffer timings, fixing some scopes	2023-10-11 17:58:04 +02:00