From 55a2af20ad10588f4a319a0358cc05517c15aa72 Mon Sep 17 00:00:00 2001 From: TobiGr Date: Sat, 19 Aug 2023 19:53:32 +0200 Subject: [PATCH] [media.ccc.de] Fix wrong ListLinkHandlerFactories for kiosks Regression introduced in #1082 --- .../services/media_ccc/MediaCCCService.java | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/MediaCCCService.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/MediaCCCService.java index 3e3a4726e..43cb434e2 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/MediaCCCService.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/MediaCCCService.java @@ -29,6 +29,8 @@ import org.schabi.newpipe.extractor.services.media_ccc.extractors.MediaCCCSearch import org.schabi.newpipe.extractor.services.media_ccc.extractors.MediaCCCStreamExtractor; import org.schabi.newpipe.extractor.services.media_ccc.linkHandler.MediaCCCConferenceLinkHandlerFactory; import org.schabi.newpipe.extractor.services.media_ccc.linkHandler.MediaCCCConferencesListLinkHandlerFactory; +import org.schabi.newpipe.extractor.services.media_ccc.linkHandler.MediaCCCLiveListLinkHandlerFactory; +import org.schabi.newpipe.extractor.services.media_ccc.linkHandler.MediaCCCRecentListLinkHandlerFactory; import org.schabi.newpipe.extractor.services.media_ccc.linkHandler.MediaCCCSearchQueryHandlerFactory; import org.schabi.newpipe.extractor.services.media_ccc.linkHandler.MediaCCCStreamLinkHandlerFactory; import org.schabi.newpipe.extractor.stream.StreamExtractor; @@ -112,37 +114,41 @@ public class MediaCCCService extends StreamingService { @Override public KioskList getKioskList() throws ExtractionException { final KioskList list = new KioskList(this); - final ListLinkHandlerFactory h = MediaCCCConferencesListLinkHandlerFactory.getInstance(); + final ListLinkHandlerFactory conferenceLLHF = MediaCCCConferencesListLinkHandlerFactory + .getInstance(); + final ListLinkHandlerFactory recentLLHF = MediaCCCRecentListLinkHandlerFactory + .getInstance(); + final ListLinkHandlerFactory liveLLHF = MediaCCCLiveListLinkHandlerFactory.getInstance(); // add kiosks here e.g.: try { list.addKioskEntry( (streamingService, url, kioskId) -> new MediaCCCConferenceKiosk( MediaCCCService.this, - h.fromUrl(url), + conferenceLLHF.fromUrl(url), kioskId ), - h, + conferenceLLHF, MediaCCCConferenceKiosk.KIOSK_ID ); list.addKioskEntry( (streamingService, url, kioskId) -> new MediaCCCRecentKiosk( MediaCCCService.this, - h.fromUrl(url), + recentLLHF.fromUrl(url), kioskId ), - h, + recentLLHF, MediaCCCRecentKiosk.KIOSK_ID ); list.addKioskEntry( (streamingService, url, kioskId) -> new MediaCCCLiveStreamKiosk( MediaCCCService.this, - h.fromUrl(url), + liveLLHF.fromUrl(url), kioskId ), - h, + liveLLHF, MediaCCCLiveStreamKiosk.KIOSK_ID );