This commit is contained in:
CypherpunkSamurai 2023-03-10 14:51:32 +05:30
parent 79728ef106
commit b40ea3ba7d
4 changed files with 2570 additions and 21 deletions

View File

@ -40,6 +40,13 @@ public class DefaultKioskFragment extends KioskFragment {
final KioskList kioskList = NewPipe.getService(serviceId).getKioskList();
kioskId = kioskList.getDefaultKioskId();
if (kioskId == null) {
url = "";
name = "";
currentInfo = null;
currentNextPage = null;
return;
}
url = kioskList.getListLinkHandlerFactoryByType(kioskId).fromId(kioskId).getUrl();
kioskTranslatedName = KioskTranslator.getTranslatedKioskName(kioskId, requireContext());

View File

@ -433,29 +433,30 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
Log.w(TAG, "onCreateOptionsMenu() called with null service");
updateService();
}
for (final String filter : service.getSearchQHFactory().getAvailableContentFilter()) {
if (filter.equals(YoutubeSearchQueryHandlerFactory.MUSIC_SONGS)) {
final MenuItem musicItem = menu.add(2,
if (service.getSearchQHFactory() != null) {
for (final String filter : service.getSearchQHFactory().getAvailableContentFilter()) {
if (filter.equals(YoutubeSearchQueryHandlerFactory.MUSIC_SONGS)) {
final MenuItem musicItem = menu.add(2,
itemId++,
0,
"YouTube Music");
musicItem.setEnabled(false);
} else if (filter.equals(PeertubeSearchQueryHandlerFactory.SEPIA_VIDEOS)) {
final MenuItem sepiaItem = menu.add(2,
itemId++,
0,
"Sepia Search");
sepiaItem.setEnabled(false);
}
menuItemToFilterName.put(itemId, filter);
final MenuItem item = menu.add(1,
itemId++,
0,
"YouTube Music");
musicItem.setEnabled(false);
} else if (filter.equals(PeertubeSearchQueryHandlerFactory.SEPIA_VIDEOS)) {
final MenuItem sepiaItem = menu.add(2,
itemId++,
0,
"Sepia Search");
sepiaItem.setEnabled(false);
}
menuItemToFilterName.put(itemId, filter);
final MenuItem item = menu.add(1,
itemId++,
0,
ServiceHelper.getTranslatedFilterString(filter, c));
if (isFirstItem) {
item.setChecked(true);
isFirstItem = false;
ServiceHelper.getTranslatedFilterString(filter, c));
if (isFirstItem) {
item.setChecked(true);
isFirstItem = false;
}
}
}
menu.setGroupCheckable(1, true, true);

View File

@ -61,6 +61,9 @@ public final class KioskTranslator {
}
public static int getKioskIcon(final String kioskId) {
if (kioskId == null) {
return R.drawable.ic_add_circle_outline;
}
switch (kioskId) {
case "Trending":
case "Top 50":

2538
hs_err_pid2452.log Normal file

File diff suppressed because it is too large Load Diff