Merge branch 'master' into develop

8 files changed, 88 insertions, 112 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java
index b2d635df3..4fa8acc43 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java
@@ -66,7 +66,7 @@ public class ChaptersListAdapter extends RecyclerView.Adapter<ChaptersListAdapte
         holder.duration.setText(context.getString(R.string.chapter_duration,
                 Converter.getDurationStringLocalized(context, (int) duration)));
 
-        if (sc.getLink() == null) {
+        if (TextUtils.isEmpty(sc.getLink())) {
             holder.link.setVisibility(View.GONE);
         } else {
             holder.link.setVisibility(View.VISIBLE);
@@ -74,6 +74,7 @@ public class ChaptersListAdapter extends RecyclerView.Adapter<ChaptersListAdapte
             holder.link.setOnClickListener(v -> IntentUtils.openInBrowser(context, sc.getLink()));
         }
         holder.secondaryActionIcon.setImageResource(ThemeUtils.getDrawableFromAttr(context, R.attr.av_play));
+        holder.secondaryActionButton.setContentDescription(context.getString(R.string.play_chapter));
         holder.secondaryActionButton.setOnClickListener(v -> {
             if (callback != null) {
                 callback.onPlayChapterButtonClicked(position);
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/FilterDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/FilterDialog.java
index 82010637f..80df87891 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/FilterDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/FilterDialog.java
@@ -3,6 +3,7 @@ package de.danoeh.antennapod.dialog;
 import android.content.Context;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
+import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.RadioButton;
 
@@ -34,18 +35,19 @@ public abstract class FilterDialog {
         builder.setTitle(R.string.filter);
 
         LayoutInflater inflater = LayoutInflater.from(this.context);
-        LinearLayout layout = (LinearLayout) inflater.inflate(R.layout.filter_dialog, null, false);
+        View layout = inflater.inflate(R.layout.filter_dialog, null, false);
+        LinearLayout rows = layout.findViewById(R.id.filter_rows);
         builder.setView(layout);
 
         for (FeedItemFilterGroup item : FeedItemFilterGroup.values()) {
-            RecursiveRadioGroup row = (RecursiveRadioGroup) inflater.inflate(R.layout.filter_dialog_row, null);
+            RecursiveRadioGroup row = (RecursiveRadioGroup) inflater.inflate(R.layout.filter_dialog_row, null, false);
             RadioButton filter1 = row.findViewById(R.id.filter_dialog_radioButton1);
             RadioButton filter2 = row.findViewById(R.id.filter_dialog_radioButton2);
             filter1.setText(item.values[0].displayName);
             filter1.setTag(item.values[0].filterId);
             filter2.setText(item.values[1].displayName);
             filter2.setTag(item.values[1].filterId);
-            layout.addView(row);
+            rows.addView(row);
         }
 
         for (String filterId : filterValues) {
@@ -56,11 +58,11 @@ public abstract class FilterDialog {
 
         builder.setPositiveButton(R.string.confirm_label, (dialog, which) -> {
             filterValues.clear();
-            for (int i = 0; i < layout.getChildCount(); i++) {
-                if (!(layout.getChildAt(i) instanceof RecursiveRadioGroup)) {
+            for (int i = 0; i < rows.getChildCount(); i++) {
+                if (!(rows.getChildAt(i) instanceof RecursiveRadioGroup)) {
                     continue;
                 }
-                RecursiveRadioGroup group = (RecursiveRadioGroup) layout.getChildAt(i);
+                RecursiveRadioGroup group = (RecursiveRadioGroup) rows.getChildAt(i);
                 if (group.getCheckedButton() != null) {
                     String tag = (String) group.getCheckedButton().getTag();
                     if (tag != null) { // Clear buttons use no tag
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/RemoveFeedDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/RemoveFeedDialog.java
new file mode 100644
index 000000000..156c1dba8
--- /dev/null
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/RemoveFeedDialog.java
@@ -0,0 +1,52 @@
+package de.danoeh.antennapod.dialog;
+
+import android.app.ProgressDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.util.Log;
+import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.core.dialog.ConfirmationDialog;
+import de.danoeh.antennapod.core.feed.Feed;
+import de.danoeh.antennapod.core.storage.DBWriter;
+import io.reactivex.Completable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
+
+public class RemoveFeedDialog {
+    private static final String TAG = "RemoveFeedDialog";
+
+    public static void show(Context context, Feed feed, Runnable onSuccess) {
+        int messageId = feed.isLocalFeed() ? R.string.feed_delete_confirmation_local_msg
+                : R.string.feed_delete_confirmation_msg;
+        String message = context.getString(messageId, feed.getTitle());
+
+        ConfirmationDialog dialog = new ConfirmationDialog(context, R.string.remove_feed_label, message) {
+            @Override
+            public void onConfirmButtonPressed(DialogInterface clickedDialog) {
+                clickedDialog.dismiss();
+
+                ProgressDialog progressDialog = new ProgressDialog(context);
+                progressDialog.setMessage(context.getString(R.string.feed_remover_msg));
+                progressDialog.setIndeterminate(true);
+                progressDialog.setCancelable(false);
+                progressDialog.show();
+
+                Completable.fromCallable(() -> DBWriter.deleteFeed(context, feed.getId()).get())
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(
+                            () -> {
+                                Log.d(TAG, "Feed was deleted");
+                                if (onSuccess != null) {
+                                    onSuccess.run();
+                                }
+                                progressDialog.dismiss();
+                            }, error -> {
+                                Log.e(TAG, Log.getStackTraceString(error));
+                                progressDialog.dismiss();
+                            });
+            }
+        };
+        dialog.createNewDialog().show();
+    }
+}
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/SubscriptionsFilterDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/SubscriptionsFilterDialog.java
index a8915480c..8a87fef25 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/SubscriptionsFilterDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/SubscriptionsFilterDialog.java
@@ -30,7 +30,8 @@ public class SubscriptionsFilterDialog {
         builder.setTitle(context.getString(R.string.pref_filter_feed_title));
 
         LayoutInflater inflater = LayoutInflater.from(context);
-        LinearLayout layout = (LinearLayout) inflater.inflate(R.layout.filter_dialog, null, false);
+        View layout = inflater.inflate(R.layout.filter_dialog, null, false);
+        LinearLayout rows = layout.findViewById(R.id.filter_rows);
         builder.setView(layout);
 
         for (SubscriptionsFilterGroup item : SubscriptionsFilterGroup.values()) {
@@ -45,7 +46,7 @@ public class SubscriptionsFilterDialog {
             } else {
                 filter2.setVisibility(View.GONE);
             }
-            layout.addView(row);
+            rows.addView(row);
         }
 
         for (String filterId : filterValues) {
@@ -56,11 +57,11 @@ public class SubscriptionsFilterDialog {
 
         builder.setPositiveButton(R.string.confirm_label, (dialog, which) -> {
             filterValues.clear();
-            for (int i = 0; i < layout.getChildCount(); i++) {
-                if (!(layout.getChildAt(i) instanceof RecursiveRadioGroup)) {
+            for (int i = 0; i < rows.getChildCount(); i++) {
+                if (!(rows.getChildAt(i) instanceof RecursiveRadioGroup)) {
                     continue;
                 }
-                RecursiveRadioGroup group = (RecursiveRadioGroup) layout.getChildAt(i);
+                RecursiveRadioGroup group = (RecursiveRadioGroup) rows.getChildAt(i);
                 if (group.getCheckedButton() != null) {
                     String tag = (String) group.getCheckedButton().getTag();
                     if (tag != null) { // Clear buttons use no tag
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java
index 681d3a88e..550e4761e 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java
@@ -36,8 +36,6 @@ import com.joanzapata.iconify.widget.IconTextView;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.adapter.EpisodeItemListAdapter;
-import de.danoeh.antennapod.core.asynctask.FeedRemover;
-import de.danoeh.antennapod.core.dialog.ConfirmationDialog;
 import de.danoeh.antennapod.core.dialog.DownloadRequestErrorDialogCreator;
 import de.danoeh.antennapod.core.event.DownloadEvent;
 import de.danoeh.antennapod.core.event.DownloaderUpdate;
@@ -65,6 +63,7 @@ import de.danoeh.antennapod.core.util.ThemeUtils;
 import de.danoeh.antennapod.core.util.gui.MoreContentListFooterUtil;
 import de.danoeh.antennapod.dialog.EpisodesApplyActionFragment;
 import de.danoeh.antennapod.dialog.FilterDialog;
+import de.danoeh.antennapod.dialog.RemoveFeedDialog;
 import de.danoeh.antennapod.dialog.RenameFeedDialog;
 import de.danoeh.antennapod.menuhandler.FeedItemMenuHandler;
 import de.danoeh.antennapod.menuhandler.FeedMenuHandler;
@@ -298,28 +297,8 @@ public class FeedItemlistFragment extends Fragment implements AdapterView.OnItem
                 new RenameFeedDialog(getActivity(), feed).show();
                 return true;
             case R.id.remove_item:
-                final FeedRemover remover = new FeedRemover(
-                        getActivity(), feed) {
-                    @Override
-                    protected void onPostExecute(Void result) {
-                        super.onPostExecute(result);
-                        ((MainActivity) getActivity()).loadFragment(EpisodesFragment.TAG, null);
-                    }
-                };
-                int messageId = feed.isLocalFeed() ? R.string.feed_delete_confirmation_local_msg
-                        : R.string.feed_delete_confirmation_msg;
-                ConfirmationDialog conDialog = new ConfirmationDialog(getActivity(),
-                        R.string.remove_feed_label,
-                        getString(messageId, feed.getTitle())) {
-
-                    @Override
-                    public void onConfirmButtonPressed(
-                            DialogInterface dialog) {
-                        dialog.dismiss();
-                        remover.executeAsync();
-                    }
-                };
-                conDialog.createNewDialog().show();
+                RemoveFeedDialog.show(getContext(), feed, () ->
+                        ((MainActivity) getActivity()).loadFragment(EpisodesFragment.TAG, null));
                 return true;
             default:
                 return false;
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/NavDrawerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/NavDrawerFragment.java
index 4f99e8130..c69d46265 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/NavDrawerFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/NavDrawerFragment.java
@@ -26,19 +26,15 @@ import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.activity.PreferenceActivity;
 import de.danoeh.antennapod.adapter.NavListAdapter;
-import de.danoeh.antennapod.core.asynctask.FeedRemover;
 import de.danoeh.antennapod.core.dialog.ConfirmationDialog;
 import de.danoeh.antennapod.core.event.FeedListUpdateEvent;
 import de.danoeh.antennapod.core.event.QueueEvent;
 import de.danoeh.antennapod.core.event.UnreadItemsUpdateEvent;
 import de.danoeh.antennapod.core.feed.Feed;
-import de.danoeh.antennapod.core.preferences.PlaybackPreferences;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
-import de.danoeh.antennapod.core.service.playback.PlaybackService;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DBWriter;
-import de.danoeh.antennapod.core.util.FeedItemUtil;
-import de.danoeh.antennapod.core.util.IntentUtils;
+import de.danoeh.antennapod.dialog.RemoveFeedDialog;
 import de.danoeh.antennapod.dialog.SubscriptionsFilterDialog;
 import de.danoeh.antennapod.dialog.RenameFeedDialog;
 import io.reactivex.Observable;
@@ -192,41 +188,15 @@ public class NavDrawerFragment extends Fragment implements AdapterView.OnItemCli
                 new RenameFeedDialog(getActivity(), feed).show();
                 return true;
             case R.id.remove_item:
-                final FeedRemover remover = new FeedRemover(getContext(), feed) {
-                    @Override
-                    protected void onPostExecute(Void result) {
-                        super.onPostExecute(result);
-                        if (selectedNavListIndex == position) {
-                            if (getActivity() instanceof MainActivity) {
-                                ((MainActivity) getActivity()).loadFragment(EpisodesFragment.TAG, null);
-                            } else {
-                                showMainActivity(EpisodesFragment.TAG);
-                            }
-                        }
-                    }
-                };
-                int messageId = feed.isLocalFeed() ? R.string.feed_delete_confirmation_local_msg
-                        : R.string.feed_delete_confirmation_msg;
-                ConfirmationDialog conDialog = new ConfirmationDialog(getContext(),
-                        R.string.remove_feed_label,
-                        getString(messageId, feed.getTitle())) {
-                    @Override
-                    public void onConfirmButtonPressed(DialogInterface dialog) {
-                        dialog.dismiss();
-                        long mediaId = PlaybackPreferences.getCurrentlyPlayingFeedMediaId();
-                        if (mediaId > 0 && FeedItemUtil.indexOfItemWithMediaId(feed.getItems(), mediaId) >= 0) {
-                            Log.d(TAG, "Currently playing episode is about to be deleted, skipping");
-                            remover.skipOnCompletion = true;
-                            int playerStatus = PlaybackPreferences.getCurrentPlayerStatus();
-                            if (playerStatus == PlaybackPreferences.PLAYER_STATUS_PLAYING) {
-                                IntentUtils.sendLocalBroadcast(getContext(),
-                                        PlaybackService.ACTION_PAUSE_PLAY_CURRENT_EPISODE);
-                            }
+                RemoveFeedDialog.show(getContext(), feed, () -> {
+                    if (selectedNavListIndex == position) {
+                        if (getActivity() instanceof MainActivity) {
+                            ((MainActivity) getActivity()).loadFragment(EpisodesFragment.TAG, null);
+                        } else {
+                            showMainActivity(EpisodesFragment.TAG);
                         }
-                        remover.executeAsync();
                     }
-                };
-                conDialog.createNewDialog().show();
+                });
                 return true;
             default:
                 return super.onContextItemSelected(item);
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java
index 4549e2a09..973fcb978 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java
@@ -20,6 +20,7 @@ import de.danoeh.antennapod.core.event.FeedItemEvent;
 import de.danoeh.antennapod.core.event.PlaybackHistoryEvent;
 import de.danoeh.antennapod.core.event.PlaybackPositionEvent;
 import de.danoeh.antennapod.core.event.PlayerStatusEvent;
+import de.danoeh.antennapod.core.event.UnreadItemsUpdateEvent;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DBWriter;
@@ -180,6 +181,12 @@ public class PlaybackHistoryFragment extends Fragment implements Toolbar.OnMenuI
         refreshToolbarState();
     }
 
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onUnreadItemsChanged(UnreadItemsUpdateEvent event) {
+        loadItems();
+        refreshToolbarState();
+    }
+
     private void onFragmentLoaded() {
         adapter.notifyDataSetChanged();
         refreshToolbarState();
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
index 3b4246e3a..4735cab42 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
@@ -33,22 +33,18 @@ import java.util.concurrent.Callable;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.adapter.SubscriptionsAdapter;
-import de.danoeh.antennapod.core.asynctask.FeedRemover;
 import de.danoeh.antennapod.core.dialog.ConfirmationDialog;
 import de.danoeh.antennapod.core.event.DownloadEvent;
 import de.danoeh.antennapod.core.event.FeedListUpdateEvent;
 import de.danoeh.antennapod.core.event.UnreadItemsUpdateEvent;
 import de.danoeh.antennapod.core.feed.Feed;
-import de.danoeh.antennapod.core.preferences.PlaybackPreferences;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.service.download.DownloadService;
-import de.danoeh.antennapod.core.service.playback.PlaybackService;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.storage.DownloadRequester;
-import de.danoeh.antennapod.core.util.FeedItemUtil;
-import de.danoeh.antennapod.core.util.IntentUtils;
 import de.danoeh.antennapod.core.util.download.AutoUpdateManager;
+import de.danoeh.antennapod.dialog.RemoveFeedDialog;
 import de.danoeh.antennapod.dialog.SubscriptionsFilterDialog;
 import de.danoeh.antennapod.dialog.FeedSortDialog;
 import de.danoeh.antennapod.dialog.RenameFeedDialog;
@@ -299,45 +295,13 @@ public class SubscriptionFragment extends Fragment implements Toolbar.OnMenuItem
                 new RenameFeedDialog(getActivity(), feed).show();
                 return true;
             case R.id.remove_item:
-                displayRemoveFeedDialog(feed);
+                RemoveFeedDialog.show(getContext(), feed, null);
                 return true;
             default:
                 return super.onContextItemSelected(item);
         }
     }
 
-    private void displayRemoveFeedDialog(Feed feed) {
-        final FeedRemover remover = new FeedRemover(getContext(), feed) {
-            @Override
-            protected void onPostExecute(Void result) {
-                super.onPostExecute(result);
-                loadSubscriptions();
-            }
-        };
-
-        int messageId = feed.isLocalFeed() ? R.string.feed_delete_confirmation_local_msg
-                : R.string.feed_delete_confirmation_msg;
-        String message = getString(messageId, feed.getTitle());
-        ConfirmationDialog dialog = new ConfirmationDialog(getContext(), R.string.remove_feed_label, message) {
-            @Override
-            public void onConfirmButtonPressed(DialogInterface clickedDialog) {
-                clickedDialog.dismiss();
-                long mediaId = PlaybackPreferences.getCurrentlyPlayingFeedMediaId();
-                if (mediaId > 0 && FeedItemUtil.indexOfItemWithMediaId(feed.getItems(), mediaId) >= 0) {
-                    Log.d(TAG, "Currently playing episode is about to be deleted, skipping");
-                    remover.skipOnCompletion = true;
-                    int playerStatus = PlaybackPreferences.getCurrentPlayerStatus();
-                    if(playerStatus == PlaybackPreferences.PLAYER_STATUS_PLAYING) {
-                        IntentUtils.sendLocalBroadcast(getContext(), PlaybackService.ACTION_PAUSE_PLAY_CURRENT_EPISODE);
-
-                    }
-                }
-                remover.executeAsync();
-            }
-        };
-        dialog.createNewDialog().show();
-    }
-
     private <T> void displayConfirmationDialog(@StringRes int title, @StringRes int message, Callable<? extends T> task) {
         ConfirmationDialog dialog = new ConfirmationDialog(getActivity(), title, message) {
             @Override