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

Add issue template for bugs, docs, feature requests

See merge request videostreaming/grayjay!22

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,80 @@
+name: Bug Report
+description: Let us know about an unexpected error, a crash, or an incorrect behavior.
+labels: ["bug", "new"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        # Thank you for taking the time to fill out this bug report.
+        
+        The [grayjay-android](https://github.com/futo-org/grayjay-android) issue tracker is reserved for issues relating to the Grayjay Android Application
+
+        For general usage questions, please see: [The Official FUTO Grayjay Zulip Channel](https://chat.futo.org/#narrow/stream/46-Grayjay)
+
+        ## Filing a bug report
+
+        To fix your issues faster, we need clear reproduction cases - ideally allowing us to make it happen locally. 
+        * Please include all needed context. For example, Device, OS, Application, your Grayjay Configurations and Plugin versioning info.
+        * if you've found out a particular series of UI interactions can introduce buggy behavior, please label those steps 1-n with markdown
+
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: What did you expect to happen?
+      placeholder: Tell us what you see!
+    validations:
+      required: true
+
+  - type: input
+    id: grayjay-version
+    attributes:
+      label: Grayjay Version
+      description: In the application, select More > Settings, scroll to the bottom and locate the value next to "Version Name".
+      placeholder: "242"
+    validations:
+      required: true
+
+  - type: dropdown
+    id: plugin
+    attributes:
+      label: What plugins are you seeing the problem on?
+      multiple: true
+      options:
+        - All
+        - Youtube
+        - BiliBili (CN)
+        - Twitch
+        - Odysee
+        - Rumble
+        - Kick
+        - PeerTube
+        - Patreon
+        - Nebula
+        - SoundCloud
+        - Other
+    validations:
+      required: true
+
+  - type: input
+    id: plugin-version
+    attributes:
+      label: Plugin Version
+      description: In the application, select Sources > [the broken plugin], write down the value under "Version".
+      placeholder: "12"
+
+  - type: checkboxes
+    id: login
+    attributes:
+      label: When do you experience the issue?
+      options:
+      - label: While logged in
+      - label: While logged out
+      - label: N/A
+
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: shell

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Need a Grayjay License?
+    url: https://pay.futo.org/api/PaymentPortal
+    about: Purchase a Grayjay license with FutoPay
+  - name: Plugin Building, Usage, or other Questions
+    url: https://chat.futo.org/#narrow/stream/46-Grayjay
+    about: Grayjays Community Chat

.github/ISSUE_TEMPLATE/documentation_issue.yml

@@ -0,0 +1,63 @@
+name: Documentation Issue
+description: Report an issue or suggest a change in the documentation.
+labels: ["documentation", "new"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        # Thank you for opening a documentation change request.
+
+        The [grayjay-android](https://github.com/futo-org/grayjay-android) issue tracker is reserved for issues relating to the Grayjay Android Application. Use the `Documentation` issue type to report problems with the documentation in our code repositories, inside the application, or on [https://grayjay.app](https://grayjay.app) 
+        Technical writers monitor this issue type, so report Grayjay bugs or feature requests with the `Bug report` or `Feature Request` issue types instead to get engineering attention.
+
+        For general usage questions, please see: [The Official FUTO Grayjay Zulip Channel](https://chat.futo.org/#narrow/stream/46-Grayjay)
+
+  - type: textarea
+    id: grayjay-affected-pages
+    attributes:
+      label: Affected Pages
+      description: |
+          Link to or describe the pages relevant to your documentation change request.
+      placeholder:
+      value:
+    validations:
+      required: false
+
+  - type: textarea
+    id: grayjay-problem
+    attributes:
+      label: What is the docs issue?
+      description: What problems or suggestions do you have about the documentation?
+      placeholder:
+      value:
+    validations:
+      required: true
+
+  - type: textarea
+    id: grayjay-proposal
+    attributes:
+      label: Proposal
+      description: What documentation changes would fix this issue and where would you expect to find them? Are one or more page headings unclear? Do one or more pages need additional context, examples, or warnings? Do we need a new page or section dedicated to a specific topic?  Your ideas help us understand what you and other users need from our documentation and how we can improve the content.
+      placeholder:
+      value:
+    validations:
+      required: false
+
+  - type: textarea
+    id: grayjay-references
+    attributes:
+      label: References
+      description: |
+        Are there any other open or closed GitLab/GitHub issues related to the problem or solution you described? If so, list them below. For example:
+        ```
+          - #6017
+        ```
+      placeholder:
+      value:
+    validations:
+      required: false
+
+  - type: markdown
+    attributes:
+      value: |
+        **Note:** If the submit button is disabled and you have filled out all required fields, please check that you did not forget a **Title** for the issue.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,58 @@
+name: Feature Request
+description: Suggest a new feature or other enhancement.
+labels: ["enhancement", "new"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        # Thank you for opening a feature request.
+
+        The [grayjay-android](https://github.com/futo-org/grayjay-android) issue tracker is reserved for issues relating to the Grayjay Android Application
+
+        [External Contributions are closed at this time](https://github.com/tom-futo/grayjay-android/blob/master/CONTRIBUTION.md#contributing-to-core)
+
+        For discussion related to enhancements, please see: [The FUTO Grayjay Zulip Channel](https://chat.futo.org/#narrow/stream/46-Grayjay)
+
+  - type: textarea
+    id: grayjay-use-case
+    attributes:
+      label: Use Cases
+      description: |
+        In order to properly evaluate a feature request, it is necessary to understand the use cases for it. Please describe below the _end goal_ you are trying to achieve that has led you to request this feature. Please keep this section focused on the problem and not on the suggested solution.
+      placeholder:
+      value:
+    validations:
+      required: true
+
+  - type: textarea
+    id: grayjay-proposal
+    attributes:
+      label: Proposal
+      description: |
+          If you have an idea for a way to address the problem via a change to Grayjay features, please describe it below.
+
+          In this section, it's helpful to include specific examples of how what you are suggesting might look in the application, this allows us to understand the full picture of what you are proposing. If you're not sure of some details, don't worry! When we evaluate the feature request we may suggest modifications as necessary to work within the design constraints of the Grayjay Core Application.
+      placeholder:
+      value:
+    validations:
+      required: false
+
+  - type: textarea
+    id: grayjay-references
+    attributes:
+      label: References
+      description: |
+        Are there any other GitHub issues, whether open or closed, that are related to the problem you've described above or to the suggested solution? If so, please create a list below that mentions each of them. For example:
+        ```
+          - #10
+        ```
+      placeholder:
+      value:
+    validations:
+      required: false
+
+  - type: markdown
+    attributes:
+      value: |
+        **Note:** If the submit button is disabled and you have filled out all required fields, please check that you did not forget a **Title** for the issue.
+        

.github/workflows/labeler.yml

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

app/src/main/AndroidManifest.xml

@@ -41,9 +41,6 @@
         <service android:name=".services.DownloadService"
             android:enabled="true"
             android:foregroundServiceType="dataSync" />
-        <service android:name=".services.ExportingService"
-            android:enabled="true"
-            android:foregroundServiceType="dataSync" />
 
         <receiver android:name=".receivers.MediaControlReceiver" />
         <receiver android:name=".receivers.AudioNoisyReceiver" />

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

@@ -436,7 +436,7 @@ class PlatformPlaylist extends PlatformContent {
     constructor(obj) {
         super(obj, 4);
         this.plugin_type = "PlatformPlaylist";
-        this.videoCount = obj.videoCount ?? 0;
+        this.videoCount = obj.videoCount ?? -1;
         this.thumbnail = obj.thumbnail;
     }
 }

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

@@ -525,6 +525,10 @@ class Settings : FragmentedStorageFileJson() {
         @Serializable(with = FlexibleBooleanSerializer::class)
         var keepScreenOn: Boolean = true;
 
+        @FormField(R.string.always_proxy_requests, FieldForm.TOGGLE, R.string.always_proxy_requests_description, 1)
+        @Serializable(with = FlexibleBooleanSerializer::class)
+        var alwaysProxyRequests: Boolean = false;
+
         /*TODO: Should we have a different casting quality?
         @FormField("Preferred Casting Quality", FieldForm.DROPDOWN, "", 3)
         @DropdownFieldOptionsId(R.array.preferred_quality_array)

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

@@ -14,6 +14,6 @@ open class JSPlaylist : JSContent, IPlatformPlaylist {
     constructor(config: SourcePluginConfig, obj: V8ValueObject) : super(config, obj) {
         val contextName = "Playlist";
         thumbnail = obj.getOrDefault(config, "thumbnail", contextName, null);
-        videoCount = obj.getOrDefault(config, "videoCount", contextName, 0)!!;
+        videoCount = obj.getOrDefault(config, "videoCount", contextName, -1)!!;
     }
 }

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

@@ -7,6 +7,7 @@ import android.os.Looper
 import android.util.Base64
 import android.util.Log
 import com.futo.platformplayer.BuildConfig
+import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.http.server.ManagedHttpServer
@@ -452,14 +453,22 @@ class StateCasting {
                 }
             }
         } else {
+            val proxyStreams = Settings.instance.casting.alwaysProxyRequests;
+            val url = "http://${ad.localAddress.toString().trim('/')}:${_castServer.port}";
+            val id = UUID.randomUUID();
+
             if (videoSource is IVideoUrlSource) {
+                val videoPath = "/video-${id}"
+                val videoUrl = if(proxyStreams) url + videoPath else videoSource.getVideoUrl();
                 Logger.i(TAG, "Casting as singular video");
-                ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", videoSource.container, videoSource.getVideoUrl(), resumePosition, video.duration.toDouble(), speed);
+                ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", videoSource.container, videoUrl, resumePosition, video.duration.toDouble(), speed);
             } else if (audioSource is IAudioUrlSource) {
+                val audioPath = "/audio-${id}"
+                val audioUrl = if(proxyStreams) url + audioPath else audioSource.getAudioUrl();
                 Logger.i(TAG, "Casting as singular audio");
-                ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", audioSource.container, audioSource.getAudioUrl(), resumePosition, video.duration.toDouble(), speed);
+                ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", audioSource.container, audioUrl, resumePosition, video.duration.toDouble(), speed);
             } else if(videoSource is IHLSManifestSource) {
-                if (ad is ChromecastCastingDevice) {
+                if (proxyStreams || ad is ChromecastCastingDevice) {
                     Logger.i(TAG, "Casting as proxied HLS");
                     castProxiedHls(video, videoSource.url, videoSource.codec, resumePosition, speed);
                 } else {
@@ -467,7 +476,7 @@ class StateCasting {
                     ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", videoSource.container, videoSource.url, resumePosition, video.duration.toDouble(), speed);
                 }
             } else if(audioSource is IHLSManifestAudioSource) {
-                if (ad is ChromecastCastingDevice) {
+                if (proxyStreams || ad is ChromecastCastingDevice) {
                     Logger.i(TAG, "Casting as proxied audio HLS");
                     castProxiedHls(video, audioSource.url, audioSource.codec, resumePosition, speed);
                 } else {
@@ -667,8 +676,11 @@ class StateCasting {
         val audioUrl = url + audioPath;
         val subtitleUrl = url + subtitlePath;
 
+        val dashContent = DashBuilder.generateOnDemandDash(videoSource, videoUrl, audioSource, audioUrl, subtitleSource, subtitleUrl);
+        Logger.v(TAG) { "Dash manifest: $dashContent" };
+
         _castServer.addHandlerWithAllowAllOptions(
-                HttpConstantHandler("GET", dashPath, DashBuilder.generateOnDemandDash(videoSource, videoUrl, audioSource, audioUrl, subtitleSource, subtitleUrl),
+                HttpConstantHandler("GET", dashPath, dashContent,
                     "application/dash+xml")
                     .withHeader("Access-Control-Allow-Origin", "*"), true
             ).withTag("cast");
@@ -699,13 +711,17 @@ class StateCasting {
 
     private suspend fun castDashDirect(contentResolver: ContentResolver, video: IPlatformVideoDetails, videoSource: IVideoUrlSource?, audioSource: IAudioUrlSource?, subtitleSource: ISubtitleSource?, resumePosition: Double, speed: Double?) : List<String> {
         val ad = activeDevice ?: return listOf();
+        val proxyStreams = Settings.instance.casting.alwaysProxyRequests || ad !is FCastCastingDevice;
 
         val url = "http://${ad.localAddress.toString().trim('/')}:${_castServer.port}";
         val id = UUID.randomUUID();
-        val subtitlePath = "/subtitle-${id}";
 
-        val videoUrl = videoSource?.getVideoUrl();
-        val audioUrl = audioSource?.getAudioUrl();
+        val videoPath = "/video-${id}"
+        val audioPath = "/audio-${id}"
+        val subtitlePath = "/subtitle-${id}"
+
+        val videoUrl = if(proxyStreams) url + videoPath else videoSource?.getVideoUrl();
+        val audioUrl = if(proxyStreams) url + audioPath else audioSource?.getAudioUrl();
 
         val subtitlesUri = if (subtitleSource != null) withContext(Dispatchers.IO) {
             return@withContext subtitleSource.getSubtitlesURI();
@@ -734,13 +750,28 @@ class StateCasting {
             }
         }
 
+        if (videoSource != null) {
+            _castServer.addHandlerWithAllowAllOptions(
+                HttpProxyHandler("GET", videoPath, videoSource.getVideoUrl(), true)
+                    .withInjectedHost()
+                    .withHeader("Access-Control-Allow-Origin", "*"), true
+            ).withTag("cast");
+        }
+        if (audioSource != null) {
+            _castServer.addHandlerWithAllowAllOptions(
+                HttpProxyHandler("GET", audioPath, audioSource.getAudioUrl(), true)
+                    .withInjectedHost()
+                    .withHeader("Access-Control-Allow-Origin", "*"), true
+            ).withTag("cast");
+        }
+
         val content = DashBuilder.generateOnDemandDash(videoSource, videoUrl, audioSource, audioUrl, subtitleSource, subtitlesUrl);
 
         Logger.i(TAG, "Direct dash cast to casting device (videoUrl: $videoUrl, audioUrl: $audioUrl).");
+        Logger.v(TAG) { "Dash manifest: $content" };
         ad.loadContent("application/dash+xml", content, resumePosition, video.duration.toDouble(), speed);
 
-        return listOf(videoSource?.getVideoUrl() ?: "", audioSource?.getAudioUrl() ?: "");
-    }
+        return listOf(videoUrl ?: "", audioUrl ?: "", subtitlesUrl ?: "", videoSource?.getVideoUrl() ?: "", audioSource?.getAudioUrl() ?: "", subtitlesUri.toString());    }
 
     private fun castProxiedHls(video: IPlatformVideoDetails, sourceUrl: String, codec: String?, resumePosition: Double, speed: Double?): List<String> {
         _castServer.removeAllHandlers("castProxiedHlsMaster")
@@ -1044,7 +1075,7 @@ class StateCasting {
 
     private suspend fun castDashIndirect(contentResolver: ContentResolver, video: IPlatformVideoDetails, videoSource: IVideoUrlSource?, audioSource: IAudioUrlSource?, subtitleSource: ISubtitleSource?, resumePosition: Double, speed: Double?) : List<String> {
         val ad = activeDevice ?: return listOf();
-        val proxyStreams = ad !is FCastCastingDevice;
+        val proxyStreams = Settings.instance.casting.alwaysProxyRequests || ad !is FCastCastingDevice;
 
         val url = "http://${ad.localAddress.toString().trim('/')}:${_castServer.port}";
         val id = UUID.randomUUID();
@@ -1090,8 +1121,11 @@ class StateCasting {
             }
         }
 
+        val dashContent = DashBuilder.generateOnDemandDash(videoSource, videoUrl, audioSource, audioUrl, subtitleSource, subtitlesUrl);
+        Logger.v(TAG) { "Dash manifest: $dashContent" };
+
         _castServer.addHandlerWithAllowAllOptions(
-            HttpConstantHandler("GET", dashPath, DashBuilder.generateOnDemandDash(videoSource, videoUrl, audioSource, audioUrl, subtitleSource, subtitlesUrl),
+            HttpConstantHandler("GET", dashPath, dashContent,
                 "application/dash+xml")
                 .withHeader("Access-Control-Allow-Origin", "*"), true
         ).withTag("cast");

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

@@ -1,47 +1,37 @@
 package com.futo.platformplayer.downloads
 
 import android.content.Context
-import android.net.Uri
-import android.os.Environment
 import androidx.documentfile.provider.DocumentFile
-import com.arthenica.ffmpegkit.*
-import com.futo.platformplayer.api.media.models.streams.sources.*
-import com.futo.platformplayer.constructs.Event1
+import com.arthenica.ffmpegkit.FFmpegKit
+import com.arthenica.ffmpegkit.LogCallback
+import com.arthenica.ffmpegkit.ReturnCode
+import com.arthenica.ffmpegkit.StatisticsCallback
+import com.futo.platformplayer.api.media.models.streams.sources.LocalAudioSource
+import com.futo.platformplayer.api.media.models.streams.sources.LocalSubtitleSource
+import com.futo.platformplayer.api.media.models.streams.sources.LocalVideoSource
 import com.futo.platformplayer.helpers.FileHelper.Companion.sanitizeFileName
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.toHumanBitrate
-import kotlinx.coroutines.*
-import java.io.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.withContext
+import java.io.File
+import java.io.FileInputStream
+import java.io.IOException
+import java.io.OutputStream
 import java.util.UUID
-import java.util.concurrent.CancellationException
 import java.util.concurrent.Executors
 import kotlin.coroutines.resumeWithException
 
 @kotlinx.serialization.Serializable
 class VideoExport {
-    var state: State = State.QUEUED;
-
     var videoLocal: VideoLocal;
     var videoSource: LocalVideoSource?;
     var audioSource: LocalAudioSource?;
     var subtitleSource: LocalSubtitleSource?;
 
-    var progress: Double = 0.0;
-    var isCancelled = false;
-
-    var error: String? = null;
-
-    @kotlinx.serialization.Transient
-    val onStateChanged = Event1<State>();
-    @kotlinx.serialization.Transient
-    val onProgressChanged = Event1<Double>();
-
-    fun changeState(newState: State) {
-        state = newState;
-        onStateChanged.emit(newState);
-    }
-
     constructor(videoLocal: VideoLocal, videoSource: LocalVideoSource?, audioSource: LocalAudioSource?, subtitleSource: LocalSubtitleSource?) {
         this.videoLocal = videoLocal;
         this.videoSource = videoSource;
@@ -50,8 +40,6 @@ class VideoExport {
     }
 
     suspend fun export(context: Context, onProgress: ((Double) -> Unit)? = null): DocumentFile = coroutineScope {
-        if(isCancelled) throw CancellationException("Export got cancelled");
-
         val v = videoSource;
         val a = audioSource;
         val s = subtitleSource;
@@ -107,7 +95,6 @@ class VideoExport {
             throw Exception("Cannot export when no audio or video source is set.");
         }
 
-        onProgressChanged.emit(100.0);
         return@coroutineScope outputFile;
     }
 

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

@@ -8,7 +8,7 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.RecyclerView
-import com.futo.platformplayer.*
+import com.futo.platformplayer.R
 import com.futo.platformplayer.downloads.VideoDownload
 import com.futo.platformplayer.downloads.VideoLocal
 import com.futo.platformplayer.logging.Logger
@@ -16,12 +16,13 @@ import com.futo.platformplayer.models.Playlist
 import com.futo.platformplayer.states.StateDownloads
 import com.futo.platformplayer.states.StatePlayer
 import com.futo.platformplayer.states.StatePlaylists
+import com.futo.platformplayer.toHumanBytesSize
 import com.futo.platformplayer.views.AnyInsertedAdapterView
 import com.futo.platformplayer.views.AnyInsertedAdapterView.Companion.asAnyWithTop
-import com.futo.platformplayer.views.others.ProgressBar
 import com.futo.platformplayer.views.adapters.viewholders.VideoDownloadViewHolder
 import com.futo.platformplayer.views.items.ActiveDownloadItem
 import com.futo.platformplayer.views.items.PlaylistDownloadItem
+import com.futo.platformplayer.views.others.ProgressBar
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
@@ -64,16 +65,6 @@ class DownloadsFragment : MainFragment() {
                 }
             }
         };
-        StateDownloads.instance.onExportsChanged.subscribe(this) {
-            lifecycleScope.launch(Dispatchers.Main) {
-                try {
-                    Logger.i(TAG, "Reloading UI for exports");
-                    _view?.reloadUI()
-                } catch (e: Throwable) {
-                    Logger.e(TAG, "Failed to reload UI for exports", e)
-                }
-            }
-        };
     }
 
     override fun onPause() {
@@ -81,7 +72,6 @@ class DownloadsFragment : MainFragment() {
 
         StateDownloads.instance.onDownloadsChanged.remove(this);
         StateDownloads.instance.onDownloadedChanged.remove(this);
-        StateDownloads.instance.onExportsChanged.remove(this);
     }
 
     private class DownloadsView : LinearLayout {

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

@@ -14,6 +14,7 @@ import com.futo.platformplayer.api.media.models.video.IPlatformVideo
 import com.futo.platformplayer.api.media.models.video.SerializedPlatformVideo
 import com.futo.platformplayer.constructs.TaskHandler
 import com.futo.platformplayer.downloads.VideoDownload
+import com.futo.platformplayer.fragment.mainactivity.topbar.NavigationTopBarFragment
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.Playlist
 import com.futo.platformplayer.states.StateApp
@@ -144,53 +145,62 @@ class PlaylistFragment : MainFragment() {
         }
 
         fun onShown(parameter: Any?) {
-            _taskLoadPlaylist.cancel();
+            _taskLoadPlaylist.cancel()
 
             if (parameter is Playlist?) {
-                _playlist = parameter;
-                _url = null;
+                _playlist = parameter
+                _url = null
 
-                if(parameter != null) {
-                    setName(parameter.name);
-                    setVideos(parameter.videos, true);
-                    setVideoCount(parameter.videos.size);
-                    setButtonDownloadVisible(true);
-                    setButtonEditVisible(true);
+                if (parameter != null) {
+                    setName(parameter.name)
+                    setVideos(parameter.videos, true)
+                    setVideoCount(parameter.videos.size)
+                    setButtonDownloadVisible(true)
+                    setButtonEditVisible(true)
+
+                    if (!StatePlaylists.instance.playlistStore.getItems().contains(parameter)) {
+                        _fragment.topBar?.assume<NavigationTopBarFragment>()
+                            ?.setMenuItems(arrayListOf(Pair(R.drawable.ic_copy) {
+                                StatePlaylists.instance.playlistStore.save(parameter)
+                                _fragment.topBar?.assume<NavigationTopBarFragment>()?.setMenuItems(
+                                    arrayListOf()
+                                )
+                                UIDialogs.toast("Playlist saved")
+                            }))
+                    }
                 } else {
-                    setName(null);
-                    setVideos(null, false);
-                    setVideoCount(-1);
-                    setButtonDownloadVisible(false);
-                    setButtonEditVisible(false);
+                    setName(null)
+                    setVideos(null, false)
+                    setVideoCount(-1)
+                    setButtonDownloadVisible(false)
+                    setButtonEditVisible(false)
                 }
-
-                //TODO: Do I have to remove the showConvertPlaylistButton(); button here?
             } else if (parameter is IPlatformPlaylist) {
-                _playlist = null;
-                _url = parameter.url;
+                _playlist = null
+                _url = parameter.url
 
-                setVideoCount(parameter.videoCount);
-                setName(parameter.name);
-                setVideos(null, false);
-                setButtonDownloadVisible(false);
-                setButtonEditVisible(false);
+                setVideoCount(parameter.videoCount)
+                setName(parameter.name)
+                setVideos(null, false)
+                setButtonDownloadVisible(false)
+                setButtonEditVisible(false)
 
-                fetchPlaylist();
+                fetchPlaylist()
             } else if (parameter is String) {
-                _playlist = null;
-                _url = parameter;
+                _playlist = null
+                _url = parameter
 
-                setName(null);
-                setVideos(null, false);
-                setVideoCount(-1);
-                setButtonDownloadVisible(false);
-                setButtonEditVisible(false);
+                setName(null)
+                setVideos(null, false)
+                setVideoCount(-1)
+                setButtonDownloadVisible(false)
+                setButtonEditVisible(false)
 
-                fetchPlaylist();
+                fetchPlaylist()
             }
 
             _playlist?.let {
-                updateDownloadState(VideoDownload.GROUP_PLAYLIST, it.id, this::download);
+                updateDownloadState(VideoDownload.GROUP_PLAYLIST, it.id, this::download)
             }
         }
 

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

@@ -31,12 +31,16 @@ import com.futo.platformplayer.images.GlideHelper.Companion.crossfade
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StatePlatform
+import com.futo.platformplayer.states.StatePlayer
 import com.futo.platformplayer.states.StatePlaylists
 import com.futo.platformplayer.views.adapters.InsertedViewAdapterWithLoader
 import com.futo.platformplayer.views.adapters.VideoListEditorViewHolder
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
+
+enum class Action {
+    PLAY_ALL, SHUFFLE, PLAY, NONE
+}
 
 class RemotePlaylistFragment : MainFragment() {
     override val isMainView : Boolean = true;
@@ -85,6 +89,8 @@ class RemotePlaylistFragment : MainFragment() {
         private val _adapterVideos: InsertedViewAdapterWithLoader<VideoListEditorViewHolder>;
         private val _scrollListener: RecyclerView.OnScrollListener
 
+
+
         constructor(fragment: RemotePlaylistFragment, inflater: LayoutInflater) : super(inflater.context) {
             inflater.inflate(R.layout.fragment_remote_playlist, this);
 
@@ -97,18 +103,25 @@ class RemotePlaylistFragment : MainFragment() {
             _imageLoader = findViewById(R.id.image_loader);
             _recyclerPlaylist = findViewById(R.id.recycler_playlist);
             _llmPlaylist = LinearLayoutManager(context);
-            _adapterVideos = InsertedViewAdapterWithLoader(context, arrayListOf(), arrayListOf(),
+            _adapterVideos = InsertedViewAdapterWithLoader(context,
+                arrayListOf(),
+                arrayListOf(),
                 childCountGetter = { _videos.size },
-                childViewHolderBinder = { viewHolder, position -> viewHolder.bind(_videos[position], false); },
+                childViewHolderBinder = { viewHolder, position ->
+                    viewHolder.bind(
+                        _videos[position],
+                        false
+                    )
+                },
                 childViewHolderFactory = { viewGroup, _ ->
-                    val view = LayoutInflater.from(viewGroup.context).inflate(R.layout.list_playlist, viewGroup, false);
-                    val holder = VideoListEditorViewHolder(view, null);
+                    val view = LayoutInflater.from(viewGroup.context)
+                        .inflate(R.layout.list_playlist, viewGroup, false)
+                    val holder = VideoListEditorViewHolder(view, null)
                     holder.onClick.subscribe {
-                        showConvertConfirmationModal();
-                    };
-                    return@InsertedViewAdapterWithLoader holder;
-                }
-            );
+                        convertPlaylist(false, Action.PLAY, holder.video)
+                    }
+                    return@InsertedViewAdapterWithLoader holder
+                })
 
             _recyclerPlaylist.adapter = _adapterVideos;
             _recyclerPlaylist.layoutManager = _llmPlaylist;
@@ -128,10 +141,10 @@ class RemotePlaylistFragment : MainFragment() {
             };
 
             buttonPlayAll.setOnClickListener {
-                showConvertConfirmationModal();
+                convertPlaylist(false, Action.PLAY_ALL);
             };
             buttonShuffle.setOnClickListener {
-                showConvertConfirmationModal();
+                convertPlaylist(false, Action.SHUFFLE);
             };
 
             _taskLoadPlaylist = TaskHandler<String, IPlatformPlaylistDetails>(
@@ -253,48 +266,76 @@ class RemotePlaylistFragment : MainFragment() {
             }
         }
 
-        private fun showConvertConfirmationModal() {
-            val remotePlaylist = _remotePlaylist;
+        private fun convertPlaylist(
+            savePlaylist: Boolean, action: Action, video: IPlatformVideo? = null
+        ) {
+            val remotePlaylist = _remotePlaylist
             if (remotePlaylist == null) {
-                UIDialogs.toast(context.getString(R.string.please_wait_for_playlist_to_finish_loading));
-                return;
+                UIDialogs.toast(context.getString(R.string.please_wait_for_playlist_to_finish_loading))
+                return
             }
 
-            val c = context ?: return;
-            UIDialogs.showConfirmationDialog(c, "Conversion to local playlist is required for this action", {
-                setLoading(true);
+            val convert = {
+                setLoading(true)
 
                 UIDialogs.showDialogProgress(context) {
-                    it.setText("Converting playlist..");
-                    it.setProgress(0f);
+                    it.setText("Converting playlist..")
+                    it.setProgress(0f)
 
                     _fragment.lifecycleScope.launch(Dispatchers.IO) {
                         try {
-                            val playlist = remotePlaylist.toPlaylist() { progress ->
+                            val playlist = remotePlaylist.toPlaylist { progress ->
                                 _fragment.lifecycleScope.launch(Dispatchers.Main) {
-                                    it.setProgress(progress.toDouble() / remotePlaylist.videoCount);
+                                    it.setProgress(progress.toDouble() / remotePlaylist.videoCount)
                                 }
-                            };
-
-                            StatePlaylists.instance.playlistStore.save(playlist);
-
-                            withContext(Dispatchers.Main) {
-                                UIDialogs.toast("Playlist converted");
-                                it.dismiss();
-                                _fragment.navigate<PlaylistFragment>(playlist);
                             }
-                        }
-                        catch(ex: Throwable) {
-                            UIDialogs.appToast("Failed to convert playlist.\n" + ex.message);
+
+                            if (savePlaylist) {
+                                StatePlaylists.instance.playlistStore.save(playlist)
+                            }
+
+                            _fragment.lifecycleScope.launch(Dispatchers.Main) {
+                                UIDialogs.toast("Playlist converted")
+                                it.dismiss()
+                                _fragment.navigate<PlaylistFragment>(playlist)
+                                when (action) {
+                                    Action.SHUFFLE -> StatePlayer.instance.setPlaylist(
+                                        playlist, focus = true, shuffle = true
+                                    )
+
+                                    Action.PLAY_ALL -> StatePlayer.instance.setPlaylist(
+                                        playlist, focus = true
+                                    )
+
+                                    Action.PLAY -> {
+                                        StatePlayer.instance.setPlaylist(
+                                            playlist, _videos.indexOf(video), true
+                                        )
+                                    }
+
+                                    Action.NONE -> {}
+                                }
+                            }
+                        } catch (ex: Throwable) {
+                            UIDialogs.appToast("Failed to convert playlist.\n" + ex.message)
                         }
                     }
                 }
-            });
+            }
+
+            if (remotePlaylist.videoCount > 100) {
+                val c = context ?: return
+                UIDialogs.showConfirmationDialog(
+                    c, "Conversion to local playlist is required for this action", convert
+                )
+            } else {
+                convert()
+            }
         }
 
         private fun showConvertPlaylistButton() {
             _fragment.topBar?.assume<NavigationTopBarFragment>()?.setMenuItems(arrayListOf(Pair(R.drawable.ic_copy) {
-                showConvertConfirmationModal();
+                convertPlaylist(true, Action.NONE);
             }));
         }
 

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

@@ -59,8 +59,11 @@ import com.futo.platformplayer.api.media.models.playback.IPlaybackTracker
 import com.futo.platformplayer.api.media.models.ratings.RatingLikeDislikes
 import com.futo.platformplayer.api.media.models.ratings.RatingLikes
 import com.futo.platformplayer.api.media.models.streams.VideoUnMuxedSourceDescriptor
+import com.futo.platformplayer.api.media.models.streams.sources.DashManifestSource
+import com.futo.platformplayer.api.media.models.streams.sources.HLSManifestSource
 import com.futo.platformplayer.api.media.models.streams.sources.IAudioSource
 import com.futo.platformplayer.api.media.models.streams.sources.IDashManifestSource
+import com.futo.platformplayer.api.media.models.streams.sources.IHLSManifestAudioSource
 import com.futo.platformplayer.api.media.models.streams.sources.IHLSManifestSource
 import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
 import com.futo.platformplayer.api.media.models.streams.sources.LocalAudioSource
@@ -158,6 +161,7 @@ import java.time.OffsetDateTime
 import kotlin.math.abs
 import kotlin.math.roundToLong
 
+@androidx.media3.common.util.UnstableApi
 class VideoDetailView : ConstraintLayout {
     private val TAG = "VideoDetailView"
 
@@ -1768,14 +1772,18 @@ class VideoDetailView : ConstraintLayout {
             }
         }
 
-        val bestVideoSources = videoSources?.map { it.height * it.width }
+        val bestVideoSources = (videoSources?.map { it.height * it.width }
             ?.distinct()
             ?.map { x -> VideoHelper.selectBestVideoSource(videoSources.filter { x == it.height * it.width }, -1, FutoVideoPlayerBase.PREFERED_VIDEO_CONTAINERS) }
+            ?.plus(videoSources.filter { it is IHLSManifestSource || it is IDashManifestSource }))
+            ?.distinct()
             ?.filter { it != null }
             ?.toList() ?: listOf();
         val bestAudioContainer = audioSources?.let { VideoHelper.selectBestAudioSource(it, FutoVideoPlayerBase.PREFERED_AUDIO_CONTAINERS)?.container };
         val bestAudioSources = audioSources
             ?.filter { it.container == bestAudioContainer }
+            ?.plus(audioSources.filter { it is IHLSManifestAudioSource || it is IDashManifestSource })
+            ?.distinct()
             ?.toList() ?: listOf();
 
         val canSetSpeed = !_isCasting || StateCasting.instance.activeDevice?.canSetSpeed == true

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

@@ -127,7 +127,7 @@ class VideoHelper {
         }
 
         @OptIn(UnstableApi::class)
-        fun convertItagSourceToChunkedDashSource(videoSource: JSVideoUrlRangeSource) : MediaSource {
+        fun convertItagSourceToChunkedDashSource(videoSource: JSVideoUrlRangeSource) : Pair<MediaSource, String> {
             val urlToUse = videoSource.getVideoUrl();
             val manifestConfig = ProgressiveDashManifestCreator.fromVideoProgressiveStreamingUrl(urlToUse,
                 videoSource.duration * 1000,
@@ -145,10 +145,10 @@ class VideoHelper {
             );
 
             val manifest = DashManifestParser().parse(Uri.parse(""), manifestConfig.byteInputStream());
-            return DashMediaSource.Factory(ResolvingDataSource.Factory(videoSource.getHttpDataSourceFactory(), ResolvingDataSource.Resolver { dataSpec ->
+            return Pair(DashMediaSource.Factory(ResolvingDataSource.Factory(videoSource.getHttpDataSourceFactory(), ResolvingDataSource.Resolver { dataSpec ->
                 Logger.v("PLAYBACK", "Video REQ Range [" + dataSpec.position + "-" + (dataSpec.position + dataSpec.length) + "](" + dataSpec.length + ")", null);
                 return@Resolver dataSpec;
-            })).createMediaSource(manifest, MediaItem.Builder().setUri(Uri.parse(videoSource.getVideoUrl())).build())
+            })).createMediaSource(manifest, MediaItem.Builder().setUri(Uri.parse(videoSource.getVideoUrl())).build()), manifestConfig);
         }
 
         fun getMediaMetadata(media: IPlatformVideoDetails): MediaMetadata {

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

@@ -1,236 +0,0 @@
-package com.futo.platformplayer.services
-
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.app.PendingIntent
-import android.app.Service
-import android.content.Context
-import android.content.Intent
-import android.content.pm.ServiceInfo
-import android.os.Build
-import android.os.IBinder
-import androidx.core.app.NotificationCompat
-import com.futo.platformplayer.R
-import com.futo.platformplayer.activities.MainActivity
-import com.futo.platformplayer.api.http.ManagedHttpClient
-import com.futo.platformplayer.downloads.VideoExport
-import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.share
-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.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.cancel
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import java.time.OffsetDateTime
-import java.util.UUID
-
-
-class ExportingService : Service() {
-    private val TAG = "ExportingService";
-
-    private val EXPORT_NOTIF_ID = 4;
-    private val EXPORT_NOTIF_TAG = "export";
-    private val EXPORT_NOTIF_CHANNEL_ID = "exportChannel";
-    private val EXPORT_NOTIF_CHANNEL_NAME = "Export";
-
-    //Context
-    private val _scope: CoroutineScope = CoroutineScope(Dispatchers.Default);
-    private var _notificationManager: NotificationManager? = null;
-    private var _notificationChannel: NotificationChannel? = null;
-
-    private val _client = ManagedHttpClient();
-
-    private var _started = false;
-
-    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        Logger.i(TAG, "onStartCommand");
-
-        synchronized(this) {
-            if(_started)
-                return START_STICKY;
-
-            if(!FragmentedStorage.isInitialized) {
-                closeExportSession();
-                return START_NOT_STICKY;
-            }
-
-            _started = true;
-        }
-        setupNotificationRequirements();
-
-        _callOnStarted?.invoke(this);
-        _instance = this;
-
-        _scope.launch {
-            try {
-                doExporting();
-            }
-            catch(ex: Throwable) {
-                try {
-                    StateAnnouncement.instance.registerAnnouncementSession(
-                        Announcement(
-                            "rootExportException",
-                            "An root export service exception happened",
-                            ex.message ?: "",
-                            AnnouncementType.SESSION,
-                            OffsetDateTime.now()
-                        )
-                    );
-                } catch(_: Throwable){}
-            }
-        };
-
-        return START_STICKY;
-    }
-    fun setupNotificationRequirements() {
-        _notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager;
-        _notificationChannel = NotificationChannel(EXPORT_NOTIF_CHANNEL_ID, EXPORT_NOTIF_CHANNEL_NAME, NotificationManager.IMPORTANCE_DEFAULT).apply {
-            this.enableVibration(false);
-            this.setSound(null, null);
-        };
-        _notificationManager!!.createNotificationChannel(_notificationChannel!!);
-    }
-
-    override fun onCreate() {
-        Logger.i(TAG, "onCreate");
-        super.onCreate()
-    }
-
-    override fun onBind(p0: Intent?): IBinder? {
-        return null;
-    }
-
-    private suspend fun doExporting() {
-        Logger.i(TAG, "doExporting - Starting Exports");
-        val ignore = mutableListOf<VideoExport>();
-        var currentExport: VideoExport? = StateDownloads.instance.getExporting().firstOrNull();
-        while (currentExport != null)
-        {
-            try{
-                notifyExport(currentExport);
-                doExport(applicationContext, currentExport);
-            }
-            catch(ex: Throwable) {
-                Logger.e(TAG, "Failed export [${currentExport.videoLocal.name}]: ${ex.message}", ex);
-                currentExport.error = ex.message;
-                currentExport.changeState(VideoExport.State.ERROR);
-                ignore.add(currentExport);
-
-                //Give it a sec
-                Thread.sleep(500);
-            }
-
-            currentExport = StateDownloads.instance.getExporting().filter { !ignore.contains(it) }.firstOrNull();
-        }
-        Logger.i(TAG, "doExporting - Ending Exports");
-        stopService(this);
-    }
-
-    private suspend fun doExport(context: Context, export: VideoExport) {
-        Logger.i(TAG, "Exporting [${export.videoLocal.name}] started");
-
-        export.changeState(VideoExport.State.EXPORTING);
-
-        var lastNotifyTime: Long = 0L;
-        val file = export.export(context) { progress ->
-            export.progress = progress;
-
-            val currentTime = System.currentTimeMillis();
-            if (currentTime - lastNotifyTime > 500) {
-                notifyExport(export);
-                lastNotifyTime = currentTime;
-            }
-        }
-        export.changeState(VideoExport.State.COMPLETED);
-        Logger.i(TAG, "Export [${export.videoLocal.name}] finished");
-        StateDownloads.instance.removeExport(export);
-        notifyExport(export);
-
-        withContext(Dispatchers.Main) {
-            StateAnnouncement.instance.registerAnnouncement(UUID.randomUUID().toString(), "File exported", "Exported [${file.uri}]", AnnouncementType.SESSION, time = null, category = "download", actionButton = "Open") {
-                file.share(this@ExportingService);
-            };
-        }
-    }
-
-    private fun notifyExport(export: VideoExport) {
-        val channel = _notificationChannel ?: return;
-
-        val bringUpIntent = Intent(this, MainActivity::class.java);
-        bringUpIntent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-        bringUpIntent.action = "TAB";
-        bringUpIntent.putExtra("TAB", "Exports");
-
-        var builder = NotificationCompat.Builder(this, EXPORT_NOTIF_TAG)
-            .setSmallIcon(R.drawable.ic_export)
-            .setOngoing(true)
-            .setSilent(true)
-            .setContentIntent(PendingIntent.getActivity(this, 5, bringUpIntent, PendingIntent.FLAG_IMMUTABLE))
-            .setContentTitle("${export.state}: ${export.videoLocal.name}")
-            .setContentText(export.getExportInfo())
-            .setProgress(100, (export.progress * 100).toInt(), export.progress == 0.0)
-            .setChannelId(channel.id)
-
-        val notif = builder.build();
-        notif.flags = notif.flags or NotificationCompat.FLAG_ONGOING_EVENT or NotificationCompat.FLAG_NO_CLEAR;
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            startForeground(EXPORT_NOTIF_ID, notif, ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC);
-        } else {
-            startForeground(EXPORT_NOTIF_ID, notif);
-        }
-    }
-
-    fun closeExportSession() {
-        Logger.i(TAG, "closeExportSession");
-        stopForeground(STOP_FOREGROUND_REMOVE);
-        _notificationManager?.cancel(EXPORT_NOTIF_ID);
-        stopService();
-        _started = false;
-        super.stopSelf();
-    }
-    override fun onDestroy() {
-        Logger.i(TAG, "onDestroy");
-        _instance = null;
-        _scope.cancel("onDestroy");
-        super.onDestroy();
-    }
-
-    companion object {
-        private var _instance: ExportingService? = null;
-        private var _callOnStarted: ((ExportingService)->Unit)? = null;
-
-        @Synchronized
-        fun getOrCreateService(context: Context, handle: ((ExportingService)->Unit)? = null) {
-            if(!FragmentedStorage.isInitialized)
-                return;
-            if(_instance == null) {
-                _callOnStarted = handle;
-                val intent = Intent(context, ExportingService::class.java);
-                context.startForegroundService(intent);
-            }
-            else _instance?.let {
-                if(handle != null)
-                    handle(it);
-            }
-        }
-        @Synchronized
-        fun getService() : ExportingService? {
-            return _instance;
-        }
-
-        @Synchronized
-        fun stopService(service: ExportingService? = null) {
-            (service ?: _instance)?.let {
-                if(_instance == it)
-                    _instance = null;
-                it.closeExportSession();
-            }
-        }
-    }
-}

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

@@ -15,7 +15,9 @@ import android.media.AudioManager
 import android.media.AudioManager.OnAudioFocusChangeListener
 import android.media.MediaMetadata
 import android.os.Build
+import android.os.Handler
 import android.os.IBinder
+import android.os.Looper
 import android.os.SystemClock
 import android.support.v4.media.MediaMetadataCompat
 import android.support.v4.media.session.MediaSessionCompat
@@ -57,6 +59,15 @@ class MediaPlaybackService : Service() {
     private var _audioFocusLossTime_ms: Long? = null
     private var _playbackState = PlaybackStateCompat.STATE_NONE;
 
+    private val _updateIntervalMs: Long = 5 * 60 * 1000
+    private val _handler: Handler = Handler(Looper.getMainLooper())
+    private val _updateRunnable: Runnable = object : Runnable {
+        override fun run() {
+            updateMediaSession(null)
+            _handler.postDelayed(this, _updateIntervalMs)
+        }
+    }
+
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         Logger.v(TAG, "onStartCommand");
 
@@ -74,6 +85,8 @@ class MediaPlaybackService : Service() {
 
             _callOnStarted?.invoke(this);
             _instance = this;
+
+            _handler.postDelayed(_updateRunnable, _updateIntervalMs)
         }
         catch(ex: Throwable) {
             Logger.e(TAG, "Failed to start MediaPlaybackService due to: " + ex.message, ex);
@@ -143,6 +156,7 @@ class MediaPlaybackService : Service() {
     override fun onDestroy() {
         Logger.v(TAG, "onDestroy");
         _instance = null;
+        _handler.removeCallbacks(_updateRunnable)
         MediaControlReceiver.onPauseReceived.emit();
         super.onDestroy();
     }

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

@@ -445,9 +445,6 @@ class StateApp {
                 DownloadService.getOrCreateService(context);
         }
 
-        Logger.i(TAG, "MainApp Started: Check [Exports]");
-        StateDownloads.instance.checkForExportTodos();
-
         Logger.i(TAG, "MainApp Started: Initialize [AutoUpdate]");
         val autoUpdateEnabled = Settings.instance.autoUpdate.isAutoUpdateEnabled();
         val shouldDownload = Settings.instance.autoUpdate.shouldDownload();

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

@@ -1,13 +1,13 @@
 package com.futo.platformplayer.states
 
 import android.content.ContentResolver
+import android.content.Context
 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.IAudioUrlSource
 import com.futo.platformplayer.api.media.models.streams.sources.IVideoUrlSource
 import com.futo.platformplayer.api.media.models.streams.sources.LocalAudioSource
@@ -27,10 +27,14 @@ import com.futo.platformplayer.models.DiskUsage
 import com.futo.platformplayer.models.Playlist
 import com.futo.platformplayer.models.PlaylistDownloaded
 import com.futo.platformplayer.services.DownloadService
-import com.futo.platformplayer.services.ExportingService
+import com.futo.platformplayer.share
 import com.futo.platformplayer.stores.FragmentedStorage
 import com.futo.platformplayer.stores.v2.ManagedStore
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import java.io.File
+import java.util.UUID
 
 /***
  * Used to maintain downloads
@@ -50,12 +54,8 @@ class StateDownloads {
     private val _downloadPlaylists = FragmentedStorage.storeJson<PlaylistDownloadDescriptor>("playlistDownloads")
         .load();
 
-    private val _exporting = FragmentedStorage.storeJson<VideoExport>("exporting")
-        .load();
-
     private lateinit var _downloadedSet: HashSet<PlatformID>;
 
-    val onExportsChanged = Event0();
     val onDownloadsChanged = Event0();
     val onDownloadedChanged = Event0();
 
@@ -457,17 +457,6 @@ class StateDownloads {
             }
         }
 
-        try {
-            val currentDownloads = _downloaded.getItems().map { it.url }.toHashSet();
-            val exporting = _exporting.findItems { !currentDownloads.contains(it.videoLocal.url) };
-            for (export in exporting)
-                _exporting.delete(export);
-        }
-        catch(ex: Throwable) {
-            Logger.e(TAG, "Failed to delete dangling export:", ex);
-            UIDialogs.toast("Failed to delete dangling export:\n" + ex);
-        }
-
         return Pair(totalDeletedCount, totalDeleted);
     }
 
@@ -475,66 +464,41 @@ class StateDownloads {
         return _downloadsDirectory;
     }
 
+    fun export(context: Context, videoLocal: VideoLocal, videoSource: LocalVideoSource?, audioSource: LocalAudioSource?, subtitleSource: LocalSubtitleSource?) {
+        var lastNotifyTime = -1L;
 
+        UIDialogs.showDialogProgress(context) {
+            it.setText("Exporting content..");
+            it.setProgress(0f);
+            StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
+                val export = VideoExport(videoLocal, videoSource, audioSource, subtitleSource);
+                try {
+                    Logger.i(TAG, "Exporting [${export.videoLocal.name}] started");
 
-    //Export
-    fun getExporting(): List<VideoExport> {
-        return _exporting.getItems();
-    }
-    fun checkForExportTodos() {
-        if(_exporting.hasItems()) {
-            StateApp.withContext {
-                ExportingService.getOrCreateService(it);
+                    val file = export.export(context) { progress ->
+                        val now = System.currentTimeMillis();
+                        if (lastNotifyTime == -1L || now - lastNotifyTime > 100) {
+                            it.setProgress(progress);
+                            lastNotifyTime = now;
+                        }
+                    }
+
+                    withContext(Dispatchers.Main) {
+                        it.setProgress(100.0f)
+                        it.dismiss()
+
+                        StateAnnouncement.instance.registerAnnouncement(UUID.randomUUID().toString(), "File exported", "Exported [${file.uri}]", AnnouncementType.SESSION, time = null, category = "download", actionButton = "Open") {
+                            file.share(context);
+                        };
+                    }
+                } catch(ex: Throwable) {
+                    Logger.e(TAG, "Failed export [${export.videoLocal.name}]: ${ex.message}", ex);
+
+                }
             }
         }
     }
 
-    fun validateExport(export: VideoExport) {
-        if(_exporting.hasItem { it.videoLocal.url == export.videoLocal.url })
-            throw AlreadyQueuedException("Video [${export.videoLocal.name}] is already queued for export");
-    }
-    fun export(videoLocal: VideoLocal, videoSource: LocalVideoSource?, audioSource: LocalAudioSource?, subtitleSource: LocalSubtitleSource?, notify: Boolean = true) {
-        val shortName = if(videoLocal.name.length > 23)
-            videoLocal.name.substring(0, 20) + "...";
-        else
-            videoLocal.name;
-
-        val videoExport = VideoExport(videoLocal, videoSource, audioSource, subtitleSource);
-
-        try {
-            validateExport(videoExport);
-            _exporting.save(videoExport);
-
-            if(notify) {
-                UIDialogs.toast("Exporting [${shortName}]");
-                StateApp.withContext { ExportingService.getOrCreateService(it) };
-                onExportsChanged.emit();
-            }
-        }
-        catch (ex: AlreadyQueuedException) {
-            Logger.e(TAG, "File is already queued for export.", ex);
-            StateApp.withContext { ExportingService.getOrCreateService(it) };
-        }
-        catch(ex: Throwable) {
-            StateApp.withContext {
-                UIDialogs.showDialog(
-                    it,
-                    R.drawable.ic_error,
-                    "Failed to start export due to:\n${ex.message}", null, null,
-                    0,
-                    UIDialogs.Action("Ok", {}, UIDialogs.ActionStyle.PRIMARY)
-                );
-            }
-        }
-    }
-
-
-    fun removeExport(export: VideoExport) {
-        _exporting.delete(export);
-        export.isCancelled = true;
-        onExportsChanged.emit();
-    }
-
     companion object {
         const val TAG = "StateDownloads";
 

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

@@ -1,7 +1,6 @@
 package com.futo.platformplayer.views
 
 import android.content.Context
-import android.content.Intent
 import android.net.Uri
 import android.util.AttributeSet
 import android.view.View
@@ -49,6 +48,7 @@ class MonetizationView : LinearLayout {
 
     private val _taskLoadMerchandise = TaskHandler<String, List<StoreItem>>(StateApp.instance.scopeGetter, { url ->
         val client = ManagedHttpClient();
+        Logger.i(TAG, "Loading https://storecache.grayjay.app/StoreData?url=$url")
         val result = client.get("https://storecache.grayjay.app/StoreData?url=$url")
         if (!result.isOk) {
             throw Exception("Failed to retrieve store data.");

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

@@ -33,6 +33,7 @@ open class PlaylistView : LinearLayout {
     protected val _platformIndicator: PlatformIndicator;
     protected val _textPlaylistName: TextView
     protected val _textVideoCount: TextView
+    protected val _textVideoCountLabel: TextView;
     protected val _textPlaylistItems: TextView
     protected val _textChannelName: TextView
     protected var _neopassAnimator: ObjectAnimator? = null;
@@ -62,6 +63,7 @@ open class PlaylistView : LinearLayout {
         _platformIndicator = findViewById(R.id.thumbnail_platform);
         _textPlaylistName = findViewById(R.id.text_playlist_name);
         _textVideoCount = findViewById(R.id.text_video_count);
+        _textVideoCountLabel = findViewById(R.id.text_video_count_label);
         _textChannelName = findViewById(R.id.text_channel_name);
         _textPlaylistItems = findViewById(R.id.text_playlist_items);
         _imageNeopassChannel = findViewById(R.id.image_neopass_channel);
@@ -137,7 +139,15 @@ open class PlaylistView : LinearLayout {
                     .crossfade()
                     .into(_imageThumbnail);
 
-            _textVideoCount.text = content.videoCount.toString();
+            if(content.videoCount >= 0) {
+                _textVideoCount.text = content.videoCount.toString();
+                _textVideoCount.visibility = View.VISIBLE;
+                _textVideoCountLabel.visibility = VISIBLE;
+            }
+            else {
+                _textVideoCount.visibility = View.GONE;
+                _textVideoCountLabel.visibility = GONE;
+            }
         }
         else {
             currentPlaylist = null;

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

@@ -1,6 +1,7 @@
 package com.futo.platformplayer.views.adapters.viewholders
 
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.LinearLayout
@@ -46,7 +47,12 @@ class ImportPlaylistsViewHolder(private val _viewGroup: ViewGroup) : AnyAdapter.
 
     override fun bind(value: SelectablePlaylist) {
         _textName.text = value.playlist.name;
-        _textMetadata.text = "${value.playlist.videoCount} " + _view.context.getString(R.string.videos);
+        if(value.playlist.videoCount >= 0) {
+            _textMetadata.text = "${value.playlist.videoCount} " + _view.context.getString(R.string.videos);
+            _textMetadata.visibility = View.VISIBLE;
+        }
+        else
+            _textMetadata.visibility = View.GONE;
         _checkbox.value = value.selected;
 
         val thumbnail = value.playlist.thumbnail;

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

@@ -16,6 +16,8 @@ import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StateDownloads
 import com.futo.platformplayer.states.StatePlayer
 import com.futo.platformplayer.views.adapters.AnyAdapter
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 
 
 class VideoDownloadViewHolder(_viewGroup: ViewGroup) : AnyAdapter.AnyViewHolder<VideoLocal>(
@@ -57,10 +59,14 @@ class VideoDownloadViewHolder(_viewGroup: ViewGroup) : AnyAdapter.AnyViewHolder<
                         return@changeExternalDownloadDirectory;
                     }
 
-                    StateDownloads.instance.export(v, v.videoSource.firstOrNull(), v.audioSource.firstOrNull(), v.subtitlesSources.firstOrNull());
+                    StateApp.instance.scopeOrNull?.launch(Dispatchers.Main) {
+                        StateDownloads.instance.export(_viewGroup.context, v, v.videoSource.firstOrNull(), v.audioSource.firstOrNull(), v.subtitlesSources.firstOrNull());
+                    }
                 };
             } else {
-                StateDownloads.instance.export(v, v.videoSource.firstOrNull(), v.audioSource.firstOrNull(), v.subtitlesSources.firstOrNull());
+                StateApp.instance.scopeOrNull?.launch(Dispatchers.Main) {
+                    StateDownloads.instance.export(_viewGroup.context, v, v.videoSource.firstOrNull(), v.audioSource.firstOrNull(), v.subtitlesSources.firstOrNull());
+                }
             }
         }
     }

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

@@ -14,6 +14,7 @@ import androidx.media3.common.text.CueGroup
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.datasource.DefaultDataSource
 import androidx.media3.datasource.DefaultHttpDataSource
+import androidx.media3.datasource.HttpDataSource
 import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.exoplayer.dash.DashMediaSource
 import androidx.media3.exoplayer.drm.DefaultDrmSessionManagerProvider
@@ -26,6 +27,7 @@ import androidx.media3.exoplayer.trackselection.DefaultTrackSelector
 import com.futo.platformplayer.Settings
 import com.futo.platformplayer.api.media.models.chapters.IChapter
 import com.futo.platformplayer.api.media.models.streams.VideoMuxedSourceDescriptor
+import com.futo.platformplayer.api.media.models.streams.sources.AudioUrlSource
 import com.futo.platformplayer.api.media.models.streams.sources.IAudioSource
 import com.futo.platformplayer.api.media.models.streams.sources.IAudioUrlSource
 import com.futo.platformplayer.api.media.models.streams.sources.IAudioUrlWidevineSource
@@ -36,17 +38,21 @@ import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
 import com.futo.platformplayer.api.media.models.streams.sources.IVideoUrlSource
 import com.futo.platformplayer.api.media.models.streams.sources.LocalAudioSource
 import com.futo.platformplayer.api.media.models.streams.sources.LocalVideoSource
+import com.futo.platformplayer.api.media.models.streams.sources.VideoUrlSource
 import com.futo.platformplayer.api.media.models.subtitles.ISubtitleSource
 import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
 import com.futo.platformplayer.api.media.platforms.js.models.sources.JSAudioUrlRangeSource
 import com.futo.platformplayer.api.media.platforms.js.models.sources.JSHLSManifestAudioSource
 import com.futo.platformplayer.api.media.platforms.js.models.sources.JSSource
 import com.futo.platformplayer.api.media.platforms.js.models.sources.JSVideoUrlRangeSource
+import com.futo.platformplayer.api.media.platforms.js.models.sources.JSVideoUrlSource
 import com.futo.platformplayer.constructs.Event1
+import com.futo.platformplayer.engine.dev.V8RemoteObject
 import com.futo.platformplayer.helpers.VideoHelper
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.video.PlayerManager
+import com.google.gson.Gson
 import getHttpDataSourceFactory
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -68,6 +74,7 @@ abstract class FutoVideoPlayerBase : RelativeLayout {
         private set;
 
     private var _lastVideoMediaSource: MediaSource? = null;
+    private var _lastGeneratedDash: String? = null;
     private var _lastAudioMediaSource: MediaSource? = null;
     private var _lastSubtitleMediaSource: MediaSource? = null;
     private var _shouldPlaybackRestartOnConnectivity: Boolean = false;
@@ -375,6 +382,7 @@ abstract class FutoVideoPlayerBase : RelativeLayout {
 
 
     private fun swapSourceInternal(videoSource: IVideoSource?) {
+        _lastGeneratedDash = null;
         when(videoSource) {
             is LocalVideoSource -> swapVideoSourceLocal(videoSource);
             is JSVideoUrlRangeSource -> swapVideoSourceUrlRange(videoSource);
@@ -415,7 +423,9 @@ abstract class FutoVideoPlayerBase : RelativeLayout {
         if(videoSource.hasItag) {
             //Temporary workaround for Youtube
             try {
-                _lastVideoMediaSource = VideoHelper.convertItagSourceToChunkedDashSource(videoSource);
+                val results = VideoHelper.convertItagSourceToChunkedDashSource(videoSource);
+                _lastGeneratedDash = results.second;
+                _lastVideoMediaSource = results.first;
                 return;
             }
             //If it fails to create the dash workaround, fallback to standard progressive
@@ -635,6 +645,16 @@ abstract class FutoVideoPlayerBase : RelativeLayout {
 
         when (error.errorCode) {
             PlaybackException.ERROR_CODE_IO_BAD_HTTP_STATUS -> {
+                if(error.cause is HttpDataSource.InvalidResponseCodeException) {
+                    val cause = error.cause as HttpDataSource.InvalidResponseCodeException
+
+                    Logger.v(TAG, null) {
+                        "ERROR BAD HTTP ${cause.responseCode},\n" +
+                                "Video Source: ${V8RemoteObject.gsonStandard.toJson(lastVideoSource)}\n" +
+                                "Audio Source: ${V8RemoteObject.gsonStandard.toJson(lastAudioSource)}\n" +
+                                "Dash: ${_lastGeneratedDash}"
+                    };
+                }
                 onDatasourceError.emit(error);
             }
             //PlaybackException.ERROR_CODE_IO_CLEARTEXT_NOT_PERMITTED,

app/src/main/java/com/futo/platformplayer/views/video/datasources/JSHttpDataSource.java

@@ -25,6 +25,7 @@ import androidx.media3.datasource.HttpDataSource;
 import androidx.media3.datasource.HttpUtil;
 import androidx.media3.datasource.TransferListener;
 
+import com.futo.platformplayer.logging.Logger;
 import com.google.common.base.Predicate;
 import com.google.common.collect.ForwardingMap;
 import com.google.common.collect.ImmutableMap;
@@ -582,6 +583,8 @@ public class JSHttpDataSource extends BaseDataSource implements HttpDataSource {
             requestHeaders = result.getHeaders();
         }
 
+        Logger.Companion.v("JSHttpDataSource", "DataSource REQ: " + requestUrl, null);
+
         HttpURLConnection connection = openConnection(new URL(requestUrl));
         connection.setConnectTimeout(connectTimeoutMillis);
         connection.setReadTimeout(readTimeoutMillis);

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

@@ -68,6 +68,7 @@
                     android:textColor="@color/gray_7f"/>
 
                 <TextView
+                    android:id="@+id/text_video_count_label"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textSize="8dp"

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

@@ -66,8 +66,8 @@
                     android:fontFamily="@font/inter_light"
                     tools:text="100"
                     android:textColor="@color/gray_7f"
-                    app:layout_constraintRight_toLeftOf="@id/text_videos"
-                    app:layout_constraintBottom_toBottomOf="@id/text_videos" />
+                    app:layout_constraintRight_toLeftOf="@id/text_video_count_label"
+                    app:layout_constraintBottom_toBottomOf="@id/text_video_count_label" />
 
                 <TextView
                     android:id="@+id/text_playlist"
@@ -80,10 +80,10 @@
                     android:textColor="@color/gray_e0"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintBottom_toTopOf="@id/text_videos"/>
+                    app:layout_constraintBottom_toTopOf="@id/text_video_count_label"/>
 
                 <TextView
-                    android:id="@+id/text_videos"
+                    android:id="@+id/text_video_count_label"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textSize="12dp"

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

@@ -66,6 +66,8 @@
     <string name="enabled">Enabled</string>
     <string name="keep_screen_on">Keep screen on</string>
     <string name="keep_screen_on_while_casting">Keep screen on while casting</string>
+    <string name="always_proxy_requests">Always proxy requests</string>
+    <string name="always_proxy_requests_description">Always proxy requests when casting data through the device.</string>
     <string name="discover">Discover</string>
     <string name="find_new_video_sources_to_add">Find new video sources to add</string>
     <string name="these_sources_have_been_disabled">These sources have been disabled</string>

docs/packages/packageHttp.md

@@ -2,12 +2,12 @@
 Package http is the main way for a plugin to make web requests, and is likely a package you will always need.
 It offers several ways to make web requests as well as websocket connections.
 
-Before you can use http you need to register it in your plugin config. See [Packages](_blank).
+Before you can use http you need to register it in your plugin config. See [Packages](/app/src/main/java/com/futo/platformplayer/engine/packages).
 
 ## Basic Info
 Underneath the http package by default exist two web clients. An authenticated client and a unauthenticated client.
 The authenticated client has will apply headers and cookies if the user is logged in with your plugin. 
-See [Plugin Authentication](_blank).
+See [Plugin Authentication](/docs/Authentication.md).
 These two clients are always available even when the user is not logged in, meaning it behaves similar to the unauthenticated client and can safely use it either way.
 
 >:warning: **Requests are synchronous**