Merge branch 'master' of https://github.com/TeamNewPipe/NewPipe into sponsorblock

Newpipe 0.26.1

app/build.gradle

@@ -20,8 +20,8 @@ android {
         resValue "string", "app_name", "NewPipe SponsorBlock"
         minSdk 21
         targetSdk 33
-        versionCode 995
+        versionCode 996
-        versionName "0.26.0"
+        versionName "0.26.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelTabFragment.java

@@ -17,6 +17,7 @@ import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.channel.tabs.ChannelTabInfo;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
+import org.schabi.newpipe.extractor.linkhandler.ListLinkHandlerFactory;
 import org.schabi.newpipe.extractor.linkhandler.ReadyChannelTabListLinkHandler;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
@@ -128,10 +129,13 @@ public class ChannelTabFragment extends BaseListInfoFragment<InfoItem, ChannelTa
                 // once `handleResult` is called, the parsed data was already saved to cache, so
                 // we can discard any raw data in ReadyChannelTabListLinkHandler and create a
                 // link handler with identical properties, but without any raw data
-                tabHandler = result.getService()
+                final ListLinkHandlerFactory channelTabLHFactory = result.getService()
-                        .getChannelTabLHFactory()
+                        .getChannelTabLHFactory();
-                        .fromQuery(tabHandler.getId(), tabHandler.getContentFilters(),
+                if (channelTabLHFactory != null) {
-                                tabHandler.getSortFilter());
+                    // some services do not not have a ChannelTabLHFactory
+                    tabHandler = channelTabLHFactory.fromQuery(tabHandler.getId(),
+                            tabHandler.getContentFilters(), tabHandler.getSortFilter());
+                }
             } catch (final ParsingException e) {
                 // silently ignore the error, as the app can continue to function normally
                 Log.w(TAG, "Could not recreate channel tab handler", e);

fastlane/metadata/android/en-US/changelogs/996.txt

@@ -0,0 +1,2 @@
+Fixed a NullPointerException when opening a channel / conference in media.ccc.de.
+The Grinch tried to break our Christmas gift to you, but we fixed it.