If removing currently playing episode, (pause and) skip the same

3 files changed, 40 insertions, 0 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
index 417d49e83..b87870c69 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
@@ -45,11 +45,13 @@ import de.danoeh.antennapod.core.dialog.ConfirmationDialog;
 import de.danoeh.antennapod.core.feed.Chapter;
 import de.danoeh.antennapod.core.feed.EventDistributor;
 import de.danoeh.antennapod.core.feed.Feed;
+import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.feed.MediaType;
 import de.danoeh.antennapod.core.feed.SimpleChapter;
 import de.danoeh.antennapod.core.glide.ApGlideSettings;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.service.playback.PlaybackService;
+import de.danoeh.antennapod.core.service.playback.PlayerStatus;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.util.playback.ExternalMedia;
@@ -742,6 +744,20 @@ public class AudioplayerActivity extends MediaplayerActivity implements ItemDesc
                     public void onConfirmButtonPressed(
                             DialogInterface dialog) {
                         dialog.dismiss();
+                        if (controller != null) {
+                            Playable playable = controller.getMedia();
+                            if (playable != null && playable instanceof FeedMedia) {
+                                FeedMedia media = (FeedMedia) playable;
+                                if (media.getItem().getFeed().getId() == feed.getId()) {
+                                    Log.d(TAG, "Currently playing episode is about to be deleted, skipping");
+                                    remover.skipOnCompletion = true;
+                                    if(controller.getStatus() == PlayerStatus.PLAYING) {
+                                        sendBroadcast(new Intent(
+                                                PlaybackService.ACTION_PAUSE_PLAY_CURRENT_EPISODE));
+                                    }
+                                }
+                            }
+                        }
                         remover.executeAsync();
                     }
                 };
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index bcbabffcf..d860f2b01 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -44,10 +44,16 @@ import de.danoeh.antennapod.core.event.ProgressEvent;
 import de.danoeh.antennapod.core.feed.EventDistributor;
 import de.danoeh.antennapod.core.feed.Feed;
 import de.danoeh.antennapod.core.event.QueueEvent;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.service.playback.PlaybackService;
+import de.danoeh.antennapod.core.service.playback.PlayerStatus;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.util.StorageUtils;
+import de.danoeh.antennapod.core.util.playback.Playable;
+import de.danoeh.antennapod.core.util.playback.PlaybackController;
 import de.danoeh.antennapod.fragment.AddFeedFragment;
 import de.danoeh.antennapod.fragment.DownloadsFragment;
 import de.danoeh.antennapod.fragment.EpisodesFragment;
@@ -558,6 +564,23 @@ public class MainActivity extends ActionBarActivity implements NavDrawerActivity
                     public void onConfirmButtonPressed(
                             DialogInterface dialog) {
                         dialog.dismiss();
+                        if (externalPlayerFragment != null) {
+                            PlaybackController controller = externalPlayerFragment.getPlaybackControllerTestingOnly();
+                            if (controller != null) {
+                                Playable playable = controller.getMedia();
+                                if (playable != null && playable instanceof FeedMedia) {
+                                    FeedMedia media = (FeedMedia) playable;
+                                    if (media.getItem().getFeed().getId() == feed.getId()) {
+                                        Log.d(TAG, "Currently playing episode is about to be deleted, skipping");
+                                        remover.skipOnCompletion = true;
+                                        if(controller.getStatus() == PlayerStatus.PLAYING) {
+                                            sendBroadcast(new Intent(
+                                                    PlaybackService.ACTION_PAUSE_PLAY_CURRENT_EPISODE));
+                                        }
+                                    }
+                                }
+                            }
+                        }
                         remover.executeAsync();
                     }
                 };
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
index 709d7038a..79879ffeb 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
@@ -149,6 +149,7 @@ public class QueueFragment extends Fragment {
                 recyclerAdapter.notifyDataSetChanged();
                 break;
             case REMOVED:
+            case IRREVERSIBLE_REMOVED:
                 int position = FeedItemUtil.indexOfItemWithId(queue, event.item.getId());
                 queue.remove(position);
                 recyclerAdapter.notifyItemRemoved(position);