Channels section: remove channel fix

Author: yuliskov

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/ChannelPresenter.java

@@ -333,10 +333,12 @@ private void extractChannelId(Video item, OnChannelId callback) {
                                 // Filter collaborative items
                                 MediaItem first = Helpers.findFirst(mediaItems, mediaItem -> Helpers.startsWith(mediaItem.getAuthor(), item.getAuthor()));
 
+                                if (first == null && mediaItems != null && !mediaItems.isEmpty()) {
+                                    first = mediaItems.get(0);
+                                }
+
                                 if (first != null) {
                                     extractChannelId(Video.from(first), callback);
-                                } else if (mediaItems != null && !mediaItems.isEmpty()) {
-                                    extractChannelId(Video.from(mediaItems.get(0)), callback);
                                 }
 
                                 return;

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/dialogs/menu/ChannelUploadsMenuPresenter.java

@@ -4,6 +4,7 @@
 import com.liskovsoft.mediaserviceinterfaces.MediaItemService;
 import com.liskovsoft.mediaserviceinterfaces.ServiceManager;
 import com.liskovsoft.mediaserviceinterfaces.data.MediaItem;
+import com.liskovsoft.sharedutils.helpers.Helpers;
 import com.liskovsoft.sharedutils.helpers.MessageHelpers;
 import com.liskovsoft.sharedutils.rx.RxHelper;
 import com.liskovsoft.smartyoutubetv2.common.R;
@@ -115,8 +116,15 @@ private void appendUnsubscribeButton() {
                                 if (group.getChannelId() == null) {
                                     List<MediaItem> mediaItems = group.getMediaItems();
 
-                                    if (mediaItems != null && !mediaItems.isEmpty()) {
-                                        mServiceManager.loadMetadata(mediaItems.get(0), metadata -> {
+                                    // Filter collaborative content
+                                    MediaItem first = Helpers.findFirst(mediaItems, mediaItem -> Helpers.startsWith(mediaItem.getAuthor(), mVideo.getAuthor()));
+
+                                    if (first == null && mediaItems != null && !mediaItems.isEmpty()) {
+                                        first = mediaItems.get(0);
+                                    }
+
+                                    if (first != null) {
+                                        mServiceManager.loadMetadata(first, metadata -> {
                                             unsubscribe(metadata.getChannelId());
                                             mVideo.channelId = metadata.getChannelId();
                                         });