Migrate (album) artists and live tv channel rows to SDK

app/src/main/java/org/jellyfin/androidtv/data/model/FilterOptions.kt

@@ -6,9 +6,9 @@ class FilterOptions {
  var isFavoriteOnly = false
  var isUnwatchedOnly = false
 
- val filters: Array<ItemFilter>?
+ val filters: Array<ItemFilter>
  get() {
- if (!isUnwatchedOnly && !isFavoriteOnly) return null
+ if (!isUnwatchedOnly && !isFavoriteOnly) return emptyArray()
 
  return buildList {
  if (isFavoriteOnly) add(ItemFilter.IsFavorite)

app/src/main/java/org/jellyfin/androidtv/data/querying/AdditionalPartsQuery.kt → app/src/main/java/org/jellyfin/androidtv/data/querying/GetAdditionalPartsRequest.kt

@@ -2,6 +2,6 @@ package org.jellyfin.androidtv.data.querying;
 
 import java.util.UUID
 
-data class AdditionalPartsQuery(
+data class GetAdditionalPartsRequest(
  val itemId: UUID,
 )

app/src/main/java/org/jellyfin/androidtv/data/querying/SpecialsQuery.kt → app/src/main/java/org/jellyfin/androidtv/data/querying/GetSpecialsRequest.kt

@@ -2,6 +2,6 @@ package org.jellyfin.androidtv.data.querying
 
 import java.util.UUID
 
-data class SpecialsQuery(
+data class GetSpecialsRequest(
  val itemId: UUID,
 )

app/src/main/java/org/jellyfin/androidtv/data/querying/TrailersQuery.kt → app/src/main/java/org/jellyfin/androidtv/data/querying/GetTrailersRequest.kt

@@ -2,6 +2,6 @@ package org.jellyfin.androidtv.data.querying
 
 import java.util.UUID
 
-data class TrailersQuery(
+data class GetTrailersRequest(
  val itemId: UUID,
 )

app/src/main/java/org/jellyfin/androidtv/data/querying/ViewQuery.kt → app/src/main/java/org/jellyfin/androidtv/data/querying/GetUserViewsRequest.kt

@@ -1,3 +1,3 @@
 package org.jellyfin.androidtv.data.querying
 
-data object ViewQuery
+data object GetUserViewsRequest

app/src/main/java/org/jellyfin/androidtv/ui/browsing/BrowseGridFragment.java

@@ -38,9 +38,8 @@
 import org.jellyfin.androidtv.constant.PosterSize;
 import org.jellyfin.androidtv.constant.QueryType;
 import org.jellyfin.androidtv.data.model.FilterOptions;
-import org.jellyfin.androidtv.data.querying.AlbumArtistsQuery;
+import org.jellyfin.androidtv.data.querying.GetUserViewsRequest;
 import org.jellyfin.androidtv.data.querying.StdItemQuery;
-import org.jellyfin.androidtv.data.querying.ViewQuery;
 import org.jellyfin.androidtv.data.repository.CustomMessageRepository;
 import org.jellyfin.androidtv.data.repository.UserViewsRepository;
 import org.jellyfin.androidtv.data.service.BackgroundService;
@@ -63,7 +62,6 @@
 import org.jellyfin.androidtv.util.KeyProcessor;
 import org.jellyfin.androidtv.util.Utils;
 import org.jellyfin.androidtv.util.apiclient.EmptyLifecycleAwareResponse;
-import org.jellyfin.apiclient.model.querying.ArtistsQuery;
 import org.jellyfin.apiclient.model.querying.ItemFields;
 import org.jellyfin.sdk.api.client.ApiClient;
 import org.jellyfin.sdk.model.api.BaseItemDto;
@@ -578,26 +576,10 @@ private void setupQueries() {
  //Special queries needed for album artists
  String includeType = getArguments().getString(Extras.IncludeType);
  if ("AlbumArtist".equals(includeType)) {
- AlbumArtistsQuery albumArtists = new AlbumArtistsQuery();
- albumArtists.setUserId(userRepository.getValue().getCurrentUser().getValue().getId().toString());
- albumArtists.setFields(new ItemFields[]{
- ItemFields.PrimaryImageAspectRatio,
- ItemFields.ItemCounts,
- ItemFields.ChildCount,
- });
- albumArtists.setParentId(mParentId.toString());
- setRowDef(new BrowseRowDef("", albumArtists, CHUNK_SIZE_MINIMUM, new ChangeTriggerType[]{}));
+ setRowDef(new BrowseRowDef("", BrowsingUtils.createAlbumArtistsRequest(mParentId), CHUNK_SIZE_MINIMUM, new ChangeTriggerType[]{}));
  return;
  } else if ("Artist".equals(includeType)) {
- ArtistsQuery artists = new ArtistsQuery();
- artists.setUserId(userRepository.getValue().getCurrentUser().getValue().getId().toString());
- artists.setFields(new ItemFields[]{
- ItemFields.PrimaryImageAspectRatio,
- ItemFields.ItemCounts,
- ItemFields.ChildCount
- });
- artists.setParentId(mParentId.toString());
- setRowDef(new BrowseRowDef("", artists, CHUNK_SIZE_MINIMUM, new ChangeTriggerType[]{}));
+ setRowDef(new BrowseRowDef("", BrowsingUtils.createArtistsRequest(mParentId), CHUNK_SIZE_MINIMUM, new ChangeTriggerType[]{}));
  return;
  }
  query.setIncludeItemTypes(new String[]{includeType != null ? includeType : "MusicAlbum"});
@@ -674,7 +656,7 @@ private void buildAdapter() {
  mAdapter = new ItemRowAdapter(requireContext(), mRowDef.getNextUpQuery(), true, mCardPresenter, null);
  break;
  case Views:
- mAdapter = new ItemRowAdapter(requireContext(), ViewQuery.INSTANCE, mCardPresenter, null);
+ mAdapter = new ItemRowAdapter(requireContext(), GetUserViewsRequest.INSTANCE, mCardPresenter, null);
  break;
  case SimilarSeries:
  mAdapter = new ItemRowAdapter(requireContext(), mRowDef.getSimilarQuery(), QueryType.SimilarSeries, mCardPresenter, null);

app/src/main/java/org/jellyfin/androidtv/ui/browsing/BrowseRowDef.java

@@ -2,14 +2,14 @@
 
 import org.jellyfin.androidtv.constant.ChangeTriggerType;
 import org.jellyfin.androidtv.constant.QueryType;
-import org.jellyfin.androidtv.data.querying.AlbumArtistsQuery;
 import org.jellyfin.androidtv.data.querying.GetSeriesTimersRequest;
-import org.jellyfin.androidtv.data.querying.SpecialsQuery;
-import org.jellyfin.androidtv.data.querying.ViewQuery;
-import org.jellyfin.apiclient.model.livetv.LiveTvChannelQuery;
-import org.jellyfin.apiclient.model.querying.ArtistsQuery;
+import org.jellyfin.androidtv.data.querying.GetSpecialsRequest;
+import org.jellyfin.androidtv.data.querying.GetUserViewsRequest;
 import org.jellyfin.apiclient.model.querying.ItemQuery;
+import org.jellyfin.sdk.model.api.request.GetAlbumArtistsRequest;
+import org.jellyfin.sdk.model.api.request.GetArtistsRequest;
 import org.jellyfin.sdk.model.api.request.GetLatestMediaRequest;
+import org.jellyfin.sdk.model.api.request.GetLiveTvChannelsRequest;
 import org.jellyfin.sdk.model.api.request.GetNextUpRequest;
 import org.jellyfin.sdk.model.api.request.GetRecommendedProgramsRequest;
 import org.jellyfin.sdk.model.api.request.GetRecordingsRequest;
@@ -22,15 +22,15 @@
  private GetNextUpRequest nextUpQuery;
  private GetSimilarItemsRequest similarQuery;
  private GetLatestMediaRequest latestItemsQuery;
- private LiveTvChannelQuery tvChannelQuery;
+ private GetLiveTvChannelsRequest tvChannelQuery;
  private GetRecommendedProgramsRequest programQuery;
  private GetRecordingsRequest recordingQuery;
  private GetSeriesTimersRequest seriesTimerQuery;
 
- private ArtistsQuery artistsQuery;
- private AlbumArtistsQuery albumArtistsQuery;
+ private GetArtistsRequest artistsQuery;
+ private GetAlbumArtistsRequest albumArtistsQuery;
  private GetResumeItemsRequest resumeQuery;
- private SpecialsQuery specialsQuery;
+ private GetSpecialsRequest specialsQuery;
  private QueryType queryType;
 
  private int chunkSize = 0;
@@ -70,15 +70,15 @@
  this.changeTriggers = changeTriggers;
  }
 
- public BrowseRowDef(String header, ArtistsQuery query, int chunkSize, ChangeTriggerType[] changeTriggers) {
+ public BrowseRowDef(String header, GetArtistsRequest query, int chunkSize, ChangeTriggerType[] changeTriggers) {
  headerText = header;
  this.artistsQuery = query;
  this.chunkSize = chunkSize;
  this.queryType = QueryType.Artists;
  this.changeTriggers = changeTriggers;
  }
 
- public BrowseRowDef(String header, AlbumArtistsQuery query, int chunkSize, ChangeTriggerType[] changeTriggers) {
+ public BrowseRowDef(String header, GetAlbumArtistsRequest query, int chunkSize, ChangeTriggerType[] changeTriggers) {
  headerText = header;
  this.albumArtistsQuery = query;
  this.chunkSize = chunkSize;
@@ -109,7 +109,7 @@
  this.changeTriggers = changeTriggers;
  }
 
- public BrowseRowDef(String header, LiveTvChannelQuery query) {
+ public BrowseRowDef(String header, GetLiveTvChannelsRequest query) {
  headerText = header;
  this.tvChannelQuery = query;
  this.queryType = QueryType.LiveTvChannel;
@@ -139,7 +139,7 @@
  this.queryType = type;
  }
 
- public BrowseRowDef(String header, ViewQuery query) {
+ public BrowseRowDef(String header, GetUserViewsRequest query) {
  headerText = header;
  this.staticHeight = true;
  this.queryType = QueryType.Views;
@@ -155,7 +155,7 @@
  this.changeTriggers = changeTriggers;
  }
 
- public BrowseRowDef(String header, SpecialsQuery query) {
+ public BrowseRowDef(String header, GetSpecialsRequest query) {
  headerText = header;
  this.specialsQuery = query;
  this.queryType = QueryType.Specials;
@@ -187,7 +187,7 @@
  return queryType;
  }
 
- public LiveTvChannelQuery getTvChannelQuery() {
+ public GetLiveTvChannelsRequest getTvChannelQuery() {
  return tvChannelQuery;
  }
 
@@ -199,14 +199,14 @@
 
  public boolean getPreferParentThumb() { return preferParentThumb; }
 
- public ArtistsQuery getArtistsQuery() { return artistsQuery; }
- public AlbumArtistsQuery getAlbumArtistsQuery() { return albumArtistsQuery; }
+ public GetArtistsRequest getArtistsQuery() { return artistsQuery; }
+ public GetAlbumArtistsRequest getAlbumArtistsQuery() { return albumArtistsQuery; }
 
  public GetSeriesTimersRequest getSeriesTimerQuery() { return seriesTimerQuery; }
 
  public GetResumeItemsRequest getResumeQuery() { return resumeQuery; }
 
- public SpecialsQuery getSpecialsQuery() { return specialsQuery; }
+ public GetSpecialsRequest getSpecialsQuery() { return specialsQuery; }
 
  public ChangeTriggerType[] getChangeTriggers() {
  return changeTriggers;

app/src/main/java/org/jellyfin/androidtv/ui/browsing/BrowseViewFragment.java

@@ -28,7 +28,6 @@
 import org.jellyfin.apiclient.model.dto.BaseItemType;
 import org.jellyfin.apiclient.model.entities.LocationType;
 import org.jellyfin.apiclient.model.entities.SortOrder;
-import org.jellyfin.apiclient.model.livetv.LiveTvChannelQuery;
 import org.jellyfin.apiclient.model.livetv.RecordingQuery;
 import org.jellyfin.apiclient.model.livetv.TimerInfoDto;
 import org.jellyfin.apiclient.model.livetv.TimerQuery;
@@ -234,17 +233,10 @@ protected void setupQueries(final RowLoader rowLoader) {
  mRows.add(new BrowseRowDef(getString(R.string.lbl_coming_up), BrowsingUtils.createLiveTVUpcomingRequest()));
 
  //Fav Channels
- LiveTvChannelQuery favTv = new LiveTvChannelQuery();
- favTv.setUserId(KoinJavaComponent.<UserRepository>get(UserRepository.class).getCurrentUser().getValue().getId().toString());
- favTv.setEnableFavoriteSorting(true);
- favTv.setIsFavorite(true);
- mRows.add(new BrowseRowDef(getString(R.string.lbl_favorite_channels), favTv));
+ mRows.add(new BrowseRowDef(getString(R.string.lbl_favorite_channels), BrowsingUtils.createLiveTVChannelsRequest(true)));
 
  //Other Channels
- LiveTvChannelQuery otherTv = new LiveTvChannelQuery();
- otherTv.setUserId(KoinJavaComponent.<UserRepository>get(UserRepository.class).getCurrentUser().getValue().getId().toString());
- otherTv.setIsFavorite(false);
- mRows.add(new BrowseRowDef(getString(R.string.lbl_other_channels), otherTv));
+ mRows.add(new BrowseRowDef(getString(R.string.lbl_other_channels), BrowsingUtils.createLiveTVChannelsRequest(false)));
 
  //Latest Recordings
  RecordingQuery recordings = new RecordingQuery();

app/src/main/java/org/jellyfin/androidtv/ui/browsing/BrowsingUtils.kt

@@ -10,7 +10,10 @@ import org.jellyfin.sdk.model.api.BaseItemDto
 import org.jellyfin.sdk.model.api.BaseItemKind
 import org.jellyfin.sdk.model.api.ItemFields
 import org.jellyfin.sdk.model.api.ItemSortBy
+import org.jellyfin.sdk.model.api.request.GetAlbumArtistsRequest
+import org.jellyfin.sdk.model.api.request.GetArtistsRequest
 import org.jellyfin.sdk.model.api.request.GetLatestMediaRequest
+import org.jellyfin.sdk.model.api.request.GetLiveTvChannelsRequest
 import org.jellyfin.sdk.model.api.request.GetNextUpRequest
 import org.jellyfin.sdk.model.api.request.GetRecommendedProgramsRequest
 import org.jellyfin.sdk.model.api.request.GetRecordingsRequest
@@ -209,4 +212,29 @@ object BrowsingUtils {
  limit = 60,
  isKids = true,
  )
+
+ @JvmStatic
+ fun createLiveTVChannelsRequest(isFavorite: Boolean) = GetLiveTvChannelsRequest(
+ isFavorite = isFavorite,
+ )
+
+ @JvmStatic
+ fun createAlbumArtistsRequest(parentId: UUID) = GetAlbumArtistsRequest(
+ fields = setOf(
+ ItemFields.PRIMARY_IMAGE_ASPECT_RATIO,
+ ItemFields.ITEM_COUNTS,
+ ItemFields.CHILD_COUNT,
+ ),
+ parentId = parentId,
+ )
+
+ @JvmStatic
+ fun createArtistsRequest(parentId: UUID) = GetArtistsRequest(
+ fields = setOf(
+ ItemFields.PRIMARY_IMAGE_ASPECT_RATIO,
+ ItemFields.ITEM_COUNTS,
+ ItemFields.CHILD_COUNT,
+ ),
+ parentId = parentId,
+ )
 }

app/src/main/java/org/jellyfin/androidtv/ui/browsing/EnhancedBrowseFragment.java

@@ -34,7 +34,7 @@
 import org.jellyfin.androidtv.constant.LiveTvOption;
 import org.jellyfin.androidtv.constant.QueryType;
 import org.jellyfin.androidtv.data.model.DataRefreshService;
-import org.jellyfin.androidtv.data.querying.ViewQuery;
+import org.jellyfin.androidtv.data.querying.GetUserViewsRequest;
 import org.jellyfin.androidtv.data.repository.CustomMessageRepository;
 import org.jellyfin.androidtv.data.service.BackgroundService;
 import org.jellyfin.androidtv.databinding.EnhancedDetailBrowseBinding;
@@ -237,7 +237,7 @@ public void loadRows(List<BrowseRowDef> rows) {
  rowAdapter = new ItemRowAdapter(requireContext(), def.getLatestItemsQuery(), true, mCardPresenter, mRowsAdapter);
  break;
  case Views:
- rowAdapter = new ItemRowAdapter(requireContext(), ViewQuery.INSTANCE, mCardPresenter, mRowsAdapter);
+ rowAdapter = new ItemRowAdapter(requireContext(), GetUserViewsRequest.INSTANCE, mCardPresenter, mRowsAdapter);
  break;
  case SimilarSeries:
  rowAdapter = new ItemRowAdapter(requireContext(), def.getSimilarQuery(), QueryType.SimilarSeries, mCardPresenter, mRowsAdapter);

app/src/main/java/org/jellyfin/androidtv/ui/browsing/GenericFolderFragment.java

@@ -3,7 +3,7 @@
 import android.os.Bundle;
 
 import org.jellyfin.androidtv.R;
-import org.jellyfin.androidtv.data.querying.SpecialsQuery;
+import org.jellyfin.androidtv.data.querying.GetSpecialsRequest;
 import org.jellyfin.androidtv.data.querying.StdItemQuery;
 import org.jellyfin.androidtv.util.Utils;
 import org.jellyfin.apiclient.model.entities.SortOrder;
@@ -62,7 +62,7 @@ protected void setupQueries(RowLoader rowLoader) {
  mRows.add(new BrowseRowDef(header, byName, 100));
 
  if (mFolder.getType() == BaseItemKind.SEASON) {
- SpecialsQuery specials = new SpecialsQuery(mFolder.getId());
+ GetSpecialsRequest specials = new GetSpecialsRequest(mFolder.getId());
  mRows.add(new BrowseRowDef(getString(R.string.lbl_specials), specials));
  }
 

app/src/main/java/org/jellyfin/androidtv/ui/home/HomeFragmentBrowseRowDefRow.kt

@@ -5,7 +5,7 @@ import androidx.leanback.widget.HeaderItem
 import androidx.leanback.widget.ListRow
 import androidx.leanback.widget.Row
 import org.jellyfin.androidtv.constant.QueryType
-import org.jellyfin.androidtv.data.querying.ViewQuery
+import org.jellyfin.androidtv.data.querying.GetUserViewsRequest
 import org.jellyfin.androidtv.preference.UserPreferences
 import org.jellyfin.androidtv.ui.browsing.BrowseRowDef
 import org.jellyfin.androidtv.ui.itemhandling.ItemRowAdapter
@@ -27,7 +27,7 @@ class HomeFragmentBrowseRowDefRow(
  val rowAdapter = when (browseRowDef.queryType) {
  QueryType.NextUp -> ItemRowAdapter(context, browseRowDef.nextUpQuery, preferParentThumb, cardPresenter, rowsAdapter)
  QueryType.LatestItems -> ItemRowAdapter(context, browseRowDef.latestItemsQuery, userPreferences[UserPreferences.seriesThumbnailsEnabled], cardPresenter, rowsAdapter)
- QueryType.Views -> ItemRowAdapter(context, ViewQuery, cardPresenter, rowsAdapter)
+ QueryType.Views -> ItemRowAdapter(context, GetUserViewsRequest, cardPresenter, rowsAdapter)
  QueryType.SimilarSeries -> ItemRowAdapter(context, browseRowDef.similarQuery, QueryType.SimilarSeries, cardPresenter, rowsAdapter)
  QueryType.SimilarMovies -> ItemRowAdapter(context, browseRowDef.similarQuery, QueryType.SimilarMovies, cardPresenter, rowsAdapter)
  QueryType.LiveTvChannel -> ItemRowAdapter(context, browseRowDef.tvChannelQuery, 40, cardPresenter, rowsAdapter)

app/src/main/java/org/jellyfin/androidtv/ui/home/HomeFragmentHelper.kt

@@ -4,7 +4,7 @@ import android.content.Context
 import org.jellyfin.androidtv.R
 import org.jellyfin.androidtv.auth.repository.UserRepository
 import org.jellyfin.androidtv.constant.ChangeTriggerType
-import org.jellyfin.androidtv.data.querying.ViewQuery
+import org.jellyfin.androidtv.data.querying.GetUserViewsRequest
 import org.jellyfin.androidtv.data.repository.UserViewsRepository
 import org.jellyfin.androidtv.ui.browsing.BrowseRowDef
 import org.jellyfin.sdk.model.api.ItemFields
@@ -25,7 +25,7 @@ class HomeFragmentHelper(
  }
 
  fun loadLibraryTiles(): HomeFragmentRow {
- return HomeFragmentBrowseRowDefRow(BrowseRowDef(context.getString(R.string.lbl_my_media), ViewQuery))
+ return HomeFragmentBrowseRowDefRow(BrowseRowDef(context.getString(R.string.lbl_my_media), GetUserViewsRequest))
  }
 
  fun loadResume(title: String, includeMediaTypes: Collection<MediaType>): HomeFragmentRow {