browse: route subscriptions to channelgroup service

yuliskov · Jan 8, 2025 · 58847ea · 58847ea
1 parent aff928c
commit 58847ea
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 36 deletions.
diff --git a/MediaServiceCore b/MediaServiceCore
diff --git a/...n/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/BrowsePresenter.java b/...n/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/BrowsePresenter.java
@@ -193,8 +193,8 @@ private void initSectionMapping() {
             mSectionsMapping.put(MediaGroup.TYPE_NEWS, new BrowseSection(MediaGroup.TYPE_NEWS, getContext().getString(R.string.header_news), BrowseSection.TYPE_ROW, R.drawable.icon_news));
         }
         mSectionsMapping.put(MediaGroup.TYPE_MUSIC, new BrowseSection(MediaGroup.TYPE_MUSIC, getContext().getString(R.string.header_music), BrowseSection.TYPE_ROW, R.drawable.icon_music));
-        mSectionsMapping.put(MediaGroup.TYPE_CHANNEL_UPLOADS, new BrowseSection(MediaGroup.TYPE_CHANNEL_UPLOADS, getContext().getString(R.string.header_channels), uploadsType, R.drawable.icon_channels, true));
-        mSectionsMapping.put(MediaGroup.TYPE_SUBSCRIPTIONS, new BrowseSection(MediaGroup.TYPE_SUBSCRIPTIONS, getContext().getString(R.string.header_subscriptions), BrowseSection.TYPE_GRID, R.drawable.icon_subscriptions, true));
+        mSectionsMapping.put(MediaGroup.TYPE_CHANNEL_UPLOADS, new BrowseSection(MediaGroup.TYPE_CHANNEL_UPLOADS, getContext().getString(R.string.header_channels), uploadsType, R.drawable.icon_channels, false));
+        mSectionsMapping.put(MediaGroup.TYPE_SUBSCRIPTIONS, new BrowseSection(MediaGroup.TYPE_SUBSCRIPTIONS, getContext().getString(R.string.header_subscriptions), BrowseSection.TYPE_GRID, R.drawable.icon_subscriptions, false));
         mSectionsMapping.put(MediaGroup.TYPE_HISTORY, new BrowseSection(MediaGroup.TYPE_HISTORY, getContext().getString(R.string.header_history), BrowseSection.TYPE_GRID, R.drawable.icon_history, true));
         mSectionsMapping.put(MediaGroup.TYPE_USER_PLAYLISTS, new BrowseSection(MediaGroup.TYPE_USER_PLAYLISTS, getContext().getString(R.string.header_playlists), BrowseSection.TYPE_ROW, R.drawable.icon_playlist, true));
         mSectionsMapping.put(MediaGroup.TYPE_NOTIFICATIONS, new BrowseSection(MediaGroup.TYPE_NOTIFICATIONS, getContext().getString(R.string.header_notifications), BrowseSection.TYPE_GRID, R.drawable.icon_notification, false));
@@ -810,11 +810,6 @@ private void authCheck(boolean check, Runnable callback) {
                 videoGroup.setType(MediaGroup.TYPE_HISTORY);
                 appendLocalHistory(videoGroup);
                 getView().updateSection(videoGroup);
-            } else if (isSubscriptionsSection() && !ChannelGroupServiceWrapper.instance(getContext()).isEmpty()) {
-                appendLocalSubscriptions();
-            } else if (isMultiGridChannelUploadsSection() && !ChannelGroupServiceWrapper.instance(getContext()).isEmpty()) {
-                getView().showProgressBar(false);
-                appendLocalChannels();
             } else if (getView().isProgressBarShowing()) {
                 getView().showProgressBar(false);
                 getView().showError(new SignInError(getContext()));
@@ -1131,24 +1126,4 @@ private void appendLocalHistory(VideoGroup videoGroup) {
             videoGroup.add(0, state.video);
         }
     }
-
-    private void appendLocalSubscriptions() {
-        updateVideoGrid(getCurrentSection(),
-                mContentService.getSubscriptionsObserve(
-                        ChannelGroupServiceWrapper.instance(getContext()).getSubscribedChannelIds()), -1);
-    }
-
-    private void appendLocalChannels() {
-        ItemGroup subscriptions = ChannelGroupServiceWrapper.instance(getContext()).getSubscribedChannelGroup();
-        if (subscriptions != null) {
-            List<Video> channels = new ArrayList<>();
-            for (Item channel : subscriptions.getItems()) {
-                channels.add(Video.from(channel));
-            }
-            VideoGroup group = VideoGroup.from(channels, 0);
-            //group.setAction(VideoGroup.ACTION_REPLACE);
-            group.setType(MediaGroup.TYPE_CHANNEL_UPLOADS);
-            getView().updateSection(group);
-        }
-    }
 }
diff --git a/...common/app/presenters/dialogs/menu/providers/channelgroup/ChannelGroupServiceWrapper.java b/...common/app/presenters/dialogs/menu/providers/channelgroup/ChannelGroupServiceWrapper.java
@@ -55,14 +55,6 @@ public String[] findChannelIdsForGroup(int channelGroupId) {
         return mService.findChannelIdsForGroup(channelGroupId);
     }
 
-    public String[] getSubscribedChannelIds() {
-        return mService.getSubscribedChannelIds();
-    }
-
-    public ItemGroup getSubscribedChannelGroup() {
-        return mService.getSubscribedChannelGroup();
-    }
-
     public ItemGroup findChannelGroup(int channelGroupId) {
         return mService.findChannelGroup(channelGroupId);
     }
+0 −2		mediaserviceinterfaces/src/main/java/com/liskovsoft/mediaserviceinterfaces/yt/ChannelGroupService.java
+10 −10		youtubeapi/src/main/java/com/liskovsoft/youtubeapi/browse/v2/BrowseApi.kt
+9 −30		youtubeapi/src/main/java/com/liskovsoft/youtubeapi/browse/v2/BrowseService2.kt
+65 −0		youtubeapi/src/main/java/com/liskovsoft/youtubeapi/browse/v2/BrowseService2Wrapper.kt
+6 −6		youtubeapi/src/main/java/com/liskovsoft/youtubeapi/channelgroups/ChannelGroupServiceImpl.kt
+1 −1		youtubeapi/src/main/java/com/liskovsoft/youtubeapi/chat/LiveChatApi.kt
+5 −5		youtubeapi/src/main/java/com/liskovsoft/youtubeapi/next/v2/WatchNextApi.kt
+3 −2		youtubeapi/src/main/java/com/liskovsoft/youtubeapi/rss/RssService.kt
+32 −33		youtubeapi/src/main/java/com/liskovsoft/youtubeapi/service/YouTubeContentService.java
+27 −27		youtubeapi/src/test/java/com/liskovsoft/youtubeapi/browse/v2/BrowseApiTest.kt
+10 −7		youtubeapi/src/test/java/com/liskovsoft/youtubeapi/browse/v2/BrowseService2Test.kt
+7 −7		youtubeapi/src/test/java/com/liskovsoft/youtubeapi/chat/LiveChatApiTest.kt