From 7566c924fd58591dd04877b22a826d53eedaeea2 Mon Sep 17 00:00:00 2001
From: Page Asgardius <asgardius@asgardius.company>
Date: Sat, 7 Jan 2023 19:24:38 -0700
Subject: [PATCH] playback fix

---
 .../main/java/asgardius/page/s3manager/VideoPlayer.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/asgardius/page/s3manager/VideoPlayer.java b/app/src/main/java/asgardius/page/s3manager/VideoPlayer.java
index 0a7c8a4..3622bd4 100644
--- a/app/src/main/java/asgardius/page/s3manager/VideoPlayer.java
+++ b/app/src/main/java/asgardius/page/s3manager/VideoPlayer.java
@@ -152,7 +152,7 @@ public class VideoPlayer extends AppCompatActivity {
         if (isplaylist) {
             for (int i = 0; i < queue.size(); i++) {
                 if (names.get(i).endsWith(".m3u8")) {
-                    MediaItem mediaItem = MediaItem.fromUri(queue.get(i));
+                    MediaItem mediaItem = MediaItem.fromUri(Share.URLify(queue.get(i)));
                     player.addMediaItem(mediaItem);
                 } else {
                     mediaSource = new ProgressiveMediaSource.Factory(
@@ -161,7 +161,7 @@ public class VideoPlayer extends AppCompatActivity {
                                     .setUpstreamDataSourceFactory(new DefaultHttpDataSource.Factory()
                                             .setUserAgent("S3 Manager"))
                                     .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
-                    ).createMediaSource(MediaItem.fromUri(Uri.parse(queue.get(i))));
+                    ).createMediaSource(MediaItem.fromUri(Share.URLify(queue.get(i))));
                     player.addMediaSource(mediaSource);
                 }
             }
@@ -169,7 +169,7 @@ public class VideoPlayer extends AppCompatActivity {
             player.seekTo(names.indexOf(title), 0);
         } else {
             if (title.endsWith(".m3u8")) {
-                MediaItem mediaItem = MediaItem.fromUri(videoURL);
+                MediaItem mediaItem = MediaItem.fromUri(Share.URLify(videoURL));
                 player.setMediaItem(mediaItem);
             } else {
                 mediaSource = new ProgressiveMediaSource.Factory(
@@ -178,7 +178,7 @@ public class VideoPlayer extends AppCompatActivity {
                                 .setUpstreamDataSourceFactory(new DefaultHttpDataSource.Factory()
                                         .setUserAgent("S3 Manager"))
                                 .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
-                ).createMediaSource(MediaItem.fromUri(Uri.parse(videoURL)));
+                ).createMediaSource(MediaItem.fromUri(Share.URLify(videoURL)));
                 player.setMediaSource(mediaSource);
             }
             player.prepare();