summaryrefslogtreecommitdiff
path: root/app/src
diff options
context:
space:
mode:
authorH. Lehmann <ByteHamster@users.noreply.github.com>2019-08-30 14:44:44 +0200
committerGitHub <noreply@github.com>2019-08-30 14:44:44 +0200
commitd317090a923eb8001adb8fc1ab63fe3a4729a38e (patch)
tree97d9528f7d5d65df67ce67b0952689c3afb5b82b /app/src
parentb74c6083c0eded15758b73514e3f6cecfa3f3ba7 (diff)
parente58dbfbd15f71e72904bcab85461e7c7c6a580ed (diff)
downloadAntennaPod-d317090a923eb8001adb8fc1ab63fe3a4729a38e.zip
Merge pull request #3350 from ByteHamster/delete-media-while-playing
Allow to delete currently playing media
Diffstat (limited to 'app/src')
-rw-r--r--app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java8
-rw-r--r--app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java9
2 files changed, 0 insertions, 17 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
index cd636af43..98d55dd97 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
@@ -100,14 +100,6 @@ public class DownloadedEpisodesListAdapter extends BaseAdapter {
String pubDateStr = DateUtils.formatAbbrev(context, item.getPubDate());
holder.pubDate.setText(pubDateStr);
- FeedItem.State state = item.getState();
- if (state == FeedItem.State.PLAYING && PlaybackService.isRunning) {
- holder.butSecondary.setEnabled(false);
- holder.butSecondary.setAlpha(0.5f);
- } else {
- holder.butSecondary.setEnabled(true);
- holder.butSecondary.setAlpha(1.0f);
- }
holder.butSecondary.setFocusable(false);
holder.butSecondary.setTag(item);
holder.butSecondary.setOnClickListener(secondaryActionListener);
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
index 432ada44e..bdaf46e03 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
@@ -446,15 +446,6 @@ public class ItemFragment extends Fragment implements OnSwipeGesture {
}
}
- FeedItem.State state = item.getState();
- if (butAction2Text == R.string.delete_label && state == FeedItem.State.PLAYING && PlaybackService.isRunning) {
- butAction2.setEnabled(false);
- butAction2.setAlpha(0.5f);
- } else {
- butAction2.setEnabled(true);
- butAction2.setAlpha(1.0f);
- }
-
if(butAction1Icon != null && butAction1Text != 0) {
butAction1.setText(butAction1Icon +"\u0020\u0020" + getActivity().getString(butAction1Text));
Iconify.addIcons(butAction1);