Peertube
/
NewPipe-app-android
mirror of https://github.com/TeamNewPipe/NewPipe/
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into dev

This commit is contained in:
Stypox 2023-12-29 10:48:37 +01:00
parent 2b4357fa87 49429ff40a
commit 845e72bf4a
No known key found for this signature in database
GPG Key ID: 4BDF1B40A49FDD23
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

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

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

@ -17,6 +17,7 @@ import org.schabi.newpipe.extractor.ListExtractor;
import org.schabi.newpipe.extractor.channel.tabs.ChannelTabInfo; import org.schabi.newpipe.extractor.channel.tabs.ChannelTabInfo;
import org.schabi.newpipe.extractor.exceptions.ParsingException; import org.schabi.newpipe.extractor.exceptions.ParsingException;
import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler; 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.linkhandler.ReadyChannelTabListLinkHandler;
import org.schabi.newpipe.extractor.stream.StreamInfoItem; import org.schabi.newpipe.extractor.stream.StreamInfoItem;
import org.schabi.newpipe.fragments.list.BaseListInfoFragment; 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 // once `handleResult` is called, the parsed data was already saved to cache, so
// we can discard any raw data in ReadyChannelTabListLinkHandler and create a // we can discard any raw data in ReadyChannelTabListLinkHandler and create a
// link handler with identical properties, but without any raw data // 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) { } catch (final ParsingException e) {
// silently ignore the error, as the app can continue to function normally // silently ignore the error, as the app can continue to function normally
Log.w(TAG, "Could not recreate channel tab handler", e); Log.w(TAG, "Could not recreate channel tab handler", e);

2
fastlane/metadata/android/en-US/changelogs/996.txt Normal file
View File

@ -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.