blocked channels: remove immediately

Author: yuliskov

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

@@ -311,7 +311,7 @@ public String getCardImageUrl() {
     }
 
     public String getAuthor() {
-        if (author != null && !Helpers.startsWith(author, "@")) {
+        if (author != null && !Helpers.startsWith(author, "@")) { // not a channel handle (alias)
             return extractAuthor(author);
         }
 

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

@@ -407,7 +407,7 @@ private void appendBlockChannelButton() {
         String channelId = mVideo.channelId;
         String channelName = mVideo.getAuthor();
 
-        if (Helpers.allNulls(channelId, channelName)) {
+        if (channelName == null) {
             return;
         }
 
@@ -424,27 +424,15 @@ private void appendBlockChannelButton() {
                         // Remove from blacklist
                         blockedChannelData.removeChannel(channelId, channelName);
                         MessageHelpers.showMessage(getContext(), R.string.channel_unblocked);
-                        if (mCallback != null) {
-                            mCallback.onItemAction(mVideo, VideoMenuCallback.ACTION_REMOVE);
-                        }
-                        mDialogPresenter.closeDialog();
                     } else {
-                        // Show confirmation dialog before blocking
-                        String confirmMessage = getContext().getString(R.string.confirm_block_channel, channelName);
-
-                        AppDialogUtil.showConfirmationDialog(
-                                getContext(),
-                                confirmMessage,
-                                () -> {
-                                    blockedChannelData.addChannel(channelId, channelName);
-                                    MessageHelpers.showMessage(getContext(), R.string.channel_blocked);
-
-                                    if (mCallback != null) {
-                                        mCallback.onItemAction(mVideo, VideoMenuCallback.ACTION_REMOVE);
-                                    }
-                                    mDialogPresenter.closeDialog();
-                                });
+                        blockedChannelData.addChannel(channelId, channelName);
+                        MessageHelpers.showMessage(getContext(), R.string.channel_blocked);
                     }
+
+                    if (mCallback != null) {
+                        mCallback.onItemAction(mVideo, VideoMenuCallback.ACTION_REMOVE);
+                    }
+                    mDialogPresenter.closeDialog();
                 }));
     }
 

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/prefs/BlockedChannelData.java

@@ -96,7 +96,7 @@ public void addChannel(String channelId, String channelName) {
 
         Channel channel = new Channel(channelId, channelName);
         mChannels.remove(channel);
-        mChannels.add(channel);
+        mChannels.add(0, channel);
 
         persistState();
         notifyListeners();