atv channels refactor

yuliskov · Nov 8, 2024 · b618756 · b618756
1 parent dad1fcf
commit b618756
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/MediaServiceCore b/MediaServiceCore
diff --git a/...ckassistant/src/main/java/com/liskovsoft/leanbackassistant/channels/ChannelsProvider.java b/...ckassistant/src/main/java/com/liskovsoft/leanbackassistant/channels/ChannelsProvider.java
@@ -224,25 +224,25 @@ public static void deleteWatchNextContinue(Context context, String clipId) {
 
     @WorkerThread
     public static void createOrUpdateChannel(Context context, Playlist playlist) {
-        long oldChannelId = playlist.getPublishedId();
+        long publishedId = playlist.getPublishedId();
 
-        Channel channel = findChannelByProviderId(context, playlist.getPlaylistId());
-
-        if (oldChannelId != -1) {
-            Log.d(TAG, "Oops: channel already published. Doing update instead... oldChannelId: " + oldChannelId);
+        if (publishedId != -1) {
+            Log.d(TAG, "Oops: channel already published. Doing update instead... publishedId: " + publishedId);
             updateChannel(context, playlist);
-            addClipsToChannel(context, oldChannelId, Helpers.isGoogleTVLauncher(context) || channel.isBrowsable() ? playlist.getClips() : Collections.emptyList());
+            //addClipsToChannel(context, publishedId, Helpers.isGoogleTVLauncher(context) || channel.isBrowsable() ? playlist.getClips() : Collections.emptyList());
+            addClipsToChannel(context, publishedId, playlist.getClips());
             return;
-            //return oldChannelId;
         }
 
+        Channel channel = findChannelByProviderId(context, playlist.getPlaylistId());
+
         if (channel != null) {
             Log.d(TAG, "Oops: channel already published but not memorized by the app. Doing update instead... foundId: " + channel.getId());
             playlist.setPublishedId(channel.getId());
             updateChannel(context, playlist);
-            addClipsToChannel(context, channel.getId(), Helpers.isGoogleTVLauncher(context) || channel.isBrowsable() ? playlist.getClips() : Collections.emptyList());
+            //addClipsToChannel(context, channel.getId(), Helpers.isGoogleTVLauncher(context) || channel.isBrowsable() ? playlist.getClips() : Collections.emptyList());
+            addClipsToChannel(context, channel.getId(), playlist.getClips());
             return;
-            //return channel.getId();
         }
 
         Log.d(TAG, "Creating channel: " + playlist.getName());
@@ -252,8 +252,6 @@ public static void createOrUpdateChannel(Context context, Playlist playlist) {
         // The channels are disabled by default (don't populate to save resources)
         //addClipsToChannel(context, channelId, Collections.emptyList());
         addClipsToChannel(context, channelId, playlist.getClips());
-
-        //return channelId;
     }
 
     private static long createChannel(Context context, Playlist playlist) {

diff --git a/smarttubetv/build.gradle b/smarttubetv/build.gradle
@@ -60,8 +60,8 @@ android {
         applicationId "com.liskovsoft.smarttubetv"
         minSdkVersion project.properties.minSdkVersion
         targetSdkVersion project.properties.targetSdkVersion
-        versionCode 1646
-        versionName "24.56"
+        versionCode 1647
+        versionName "24.57"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField "long", "TIMESTAMP", System.currentTimeMillis() + "L"