Merge pull request #307 from bravenewpipe/use-serviceId-to-determine-…

…youtube-service sponsorblock: use serviceId instead of string comparison to determine…
polymorphicshade · Apr 8, 2023 · 5c4f0f4 · 5c4f0f4
2 parents 5f701c8 + d74cc92
commit 5c4f0f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/app/src/main/java/org/schabi/newpipe/util/ReturnYouTubeDislikeUtils.java b/app/src/main/java/org/schabi/newpipe/util/ReturnYouTubeDislikeUtils.java
@@ -12,6 +12,7 @@
 import org.schabi.newpipe.DownloaderImpl;
 import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.ServiceList;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 
 public final class ReturnYouTubeDislikeUtils {
@@ -35,7 +36,7 @@ public static int getDislikes(final Context context,
             return -1;
         }
 
-        if (!streamInfo.getUrl().startsWith("https://www.youtube.com")) {
+        if (streamInfo.getServiceId() != ServiceList.YouTube.getServiceId()) {
             return -1;
         }
 

diff --git a/app/src/main/java/org/schabi/newpipe/util/SponsorBlockUtils.java b/app/src/main/java/org/schabi/newpipe/util/SponsorBlockUtils.java
@@ -18,6 +18,7 @@
 import org.schabi.newpipe.DownloaderImpl;
 import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.ServiceList;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.player.playqueue.PlayQueueItem;
 import org.schabi.newpipe.views.MarkableSeekBar;
@@ -56,7 +57,7 @@ public static VideoSegment[] getYouTubeVideoSegments(final Context context,
         final String apiUrl = prefs.getString(context
                 .getString(R.string.sponsor_block_api_url_key), null);
 
-        if (!streamInfo.getUrl().startsWith("https://www.youtube.com")
+        if (streamInfo.getServiceId() != ServiceList.YouTube.getServiceId()
                 || apiUrl == null
                 || apiUrl.isEmpty()) {
             return null;