Block channel: improve performance if the channel list is empty; upd MediaServiceCore

Author: yuliskov

MediaServiceCore

@@ -472,17 +472,25 @@ public void add(int idx, Video video) {
     }
 
     private boolean isChannelBlocked(Video video) {
-        // Filter out videos from blacklisted channels
-        String channelId = video.channelId;
-        String channelName = video.getAuthor();
-        if (!Helpers.allNulls(channelId, channelName)) {
-            try {
-                BlockedChannelData blockedChannelData = BlockedChannelData.instance(GlobalPreferences.context());
-                return blockedChannelData != null && blockedChannelData.containsChannel(channelId, channelName);
-            } catch (Exception e) {
-                // If BlockedChannelData isn't initialized yet, allow the video through
-                // This can happen during early app startup
+        if (video.isChapter) {
+            return false;
+        }
+
+        try {
+            BlockedChannelData blockedChannelData = BlockedChannelData.instance(GlobalPreferences.context());
+
+            if (blockedChannelData == null || blockedChannelData.isEmpty()) {
+                return false;
             }
+
+            // Filter out videos from blacklisted channels
+            String channelId = video.channelId;
+            String channelName = video.getAuthor();
+
+            return blockedChannelData.containsChannel(channelId, channelName);
+        } catch (Exception e) {
+            // If BlockedChannelData isn't initialized yet, allow the video through
+            // This can happen during early app startup
         }
 
         return false;

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/data/VideoGroup.java

@@ -90,7 +90,7 @@ public static BlockedChannelData instance(Context context) {
      * Add a channel to the block list
      */
     public void addChannel(String channelId, String channelName) {
-        if (channelId == null && channelName == null) {
+        if (Helpers.allNulls(channelId, channelName)) {
             return;
         }
 
@@ -106,7 +106,7 @@ public void addChannel(String channelId, String channelName) {
      * Remove a channel from the list
      */
     public void removeChannel(String channelId, String channelName) {
-        if (channelId == null && channelName == null) {
+        if (Helpers.allNulls(channelId, channelName) || mChannels.isEmpty()) {
             return;
         }
 
@@ -120,7 +120,11 @@ public void removeChannel(String channelId, String channelName) {
      * Check if a channel is blocked
      */
     public boolean containsChannel(String channelId, String channelName) {
-        return !mChannels.isEmpty() && mChannels.contains(new Channel(channelId, channelName));
+        if (Helpers.allNulls(channelId, channelName) || mChannels.isEmpty()) {
+            return false;
+        }
+
+        return mChannels.contains(new Channel(channelId, channelName));
     }
 
     /**
@@ -147,6 +151,10 @@ public int getChannelCount() {
         return mChannels.size();
     }
 
+    public boolean isEmpty() {
+        return mChannels.isEmpty();
+    }
+
     /**
      * Clear all blacklisted channels
      */