Handles the case where both v and list params are present in the url (#…

…475)
xbmc · Oct 24, 2017 · 8f6541e · 8f6541e
1 parent 206b5c9
commit 8f6541e
Showing 1 changed file with 29 additions and 17 deletions.
diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/remote/RemoteActivity.java b/app/src/main/java/org/xbmc/kore/ui/sections/remote/RemoteActivity.java
@@ -501,7 +501,35 @@ private Uri getYouTubeUri(String extraText) {
      */
     private String toPluginUrl(Uri playuri) {
         String host = playuri.getHost();
-        if (host.endsWith("svtplay.se")) {
+        if (host.endsWith("youtube.com")) {
+            String videoId = playuri.getQueryParameter("v");
+            String playlistId = playuri.getQueryParameter("list");
+            Uri.Builder pluginUri = new Uri.Builder()
+                    .scheme("plugin")
+                    .authority("plugin.video.youtube")
+                    .path("play/");
+            boolean valid = false;
+            if (videoId != null) {
+                valid = true;
+                pluginUri.appendQueryParameter("video_id", videoId);
+            }
+            if (playlistId != null) {
+                valid = true;
+                pluginUri.appendQueryParameter("playlist_id", playlistId)
+                        .appendQueryParameter("order", "default");
+            }
+            if (valid) {
+                return pluginUri.build().toString();
+            }
+        } else if (host.endsWith("youtu.be")) {
+            return "plugin://plugin.video.youtube/play/?video_id="
+                    + playuri.getLastPathSegment();
+        } else if (host.endsWith("vimeo.com")) {
+            String last = playuri.getLastPathSegment();
+            if (last.matches("\\d+")) {
+                return "plugin://plugin.video.vimeo/play/?video_id=" + last;
+            }
+        } else if (host.endsWith("svtplay.se")) {
             Pattern pattern = Pattern.compile(
                     "^(?:https?:\\/\\/)?(?:www\\.)?svtplay\\.se\\/video\\/(\\d+\\/.*)",
                     Pattern.CASE_INSENSITIVE);
@@ -510,22 +538,6 @@ private String toPluginUrl(Uri playuri) {
                 return "plugin://plugin.video.svtplay/?url=%2Fvideo%2F"
                         + URLEncoder.encode(matcher.group(1)) + "&mode=video";
             }
-        } else if (host.endsWith("vimeo.com")) {
-            String last = playuri.getLastPathSegment();
-            if (last.matches("\\d+")) {
-                return "plugin://plugin.video.vimeo/play/?video_id=" + last;
-            }
-        } else if (host.endsWith("youtube.com")) {
-            if (playuri.getPathSegments().contains("playlist")) {
-                return "plugin://plugin.video.youtube/play/?order=default&playlist_id="
-                        + playuri.getQueryParameter("list");
-            } else {
-                return "plugin://plugin.video.youtube/play/?video_id="
-                        + playuri.getQueryParameter("v");
-            }
-        } else if (host.endsWith("youtu.be")) {
-            return "plugin://plugin.video.youtube/play/?video_id="
-                    + playuri.getLastPathSegment();
         }
         return null;
     }