Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FeedPreferences.getCurrentAutoDelete() now calls UserPreferences.isAutoDelete() by itself, instead of receiving it as a parameter.

Browse Source
This commit is contained in:
Udi Finkelstein 2015-07-07 22:13:32 +03:00
parent 153ac4e12c
commit a22fa8660b
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java
View File

@ -97,7 +97,7 @@ public class NewEpisodesFragment extends AllEpisodesFragment {
long itemId = token.getFeedItemId(); long itemId = token.getFeedItemId();
FeedItem item = DBReader.getFeedItem(context, itemId); FeedItem item = DBReader.getFeedItem(context, itemId);
FeedMedia media = item.getMedia(); FeedMedia media = item.getMedia();
if(media != null && media.hasAlmostEnded() && item.getFeed().getPreferences().getCurrentAutoDelete(UserPreferences.isAutoDelete())) { if(media != null && media.hasAlmostEnded() && item.getFeed().getPreferences().getCurrentAutoDelete()) {
DBWriter.deleteFeedMediaOfItem(context, media.getId()); DBWriter.deleteFeedMediaOfItem(context, media.getId());
} }
} }

2
app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
View File

@ -431,7 +431,7 @@ public class QueueFragment extends Fragment {
long itemId = token.getFeedItemId(); long itemId = token.getFeedItemId();
FeedItem item = DBReader.getFeedItem(context, itemId); FeedItem item = DBReader.getFeedItem(context, itemId);
FeedMedia media = item.getMedia(); FeedMedia media = item.getMedia();
if(media != null && media.hasAlmostEnded() && item.getFeed().getPreferences().getCurrentAutoDelete(UserPreferences.isAutoDelete())) { if(media != null && media.hasAlmostEnded() && item.getFeed().getPreferences().getCurrentAutoDelete()) {
DBWriter.deleteFeedMediaOfItem(context, media.getId()); DBWriter.deleteFeedMediaOfItem(context, media.getId());
} }
} }

2
app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetService.java
View File

@ -62,7 +62,7 @@ public class PlayerWidgetService extends Service {
DBWriter.markItemRead(this, item, true, false); DBWriter.markItemRead(this, item, true, false);
DBWriter.removeQueueItem(this, item, false); DBWriter.removeQueueItem(this, item, false);
DBWriter.addItemToPlaybackHistory(this, media); DBWriter.addItemToPlaybackHistory(this, media);
if (item.getFeed().getPreferences().getCurrentAutoDelete(UserPreferences.isAutoDelete())) { if (item.getFeed().getPreferences().getCurrentAutoDelete()) {
Log.d(TAG, "Delete " + media.toString()); Log.d(TAG, "Delete " + media.toString());
DBWriter.deleteFeedMediaOfItem(this, media.getId()); DBWriter.deleteFeedMediaOfItem(this, media.getId());
} }

5
core/src/main/java/de/danoeh/antennapod/core/feed/FeedPreferences.java
View File

@ -3,6 +3,7 @@ package de.danoeh.antennapod.core.feed;
import android.content.Context; import android.content.Context;
import de.danoeh.antennapod.core.storage.DBWriter; import de.danoeh.antennapod.core.storage.DBWriter;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import de.danoeh.antennapod.core.preferences.UserPreferences;
/** /**
* Contains preferences for a single feed. * Contains preferences for a single feed.
@ -82,10 +83,10 @@ public class FeedPreferences {
this.auto_delete_action = auto_delete_action; this.auto_delete_action = auto_delete_action;
} }
public boolean getCurrentAutoDelete(boolean isAutoDelete) { public boolean getCurrentAutoDelete() {
switch (auto_delete_action) { switch (auto_delete_action) {
case GLOBAL: case GLOBAL:
return isAutoDelete; return UserPreferences.isAutoDelete();
case YES: case YES:
return true; return true;

2
core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
View File

@ -584,7 +584,7 @@ public class PlaybackService extends Service {
} }
// Delete episode if enabled // Delete episode if enabled
if(item.getFeed().getPreferences().getCurrentAutoDelete(UserPreferences.isAutoDelete())) { if(item.getFeed().getPreferences().getCurrentAutoDelete()) {
DBWriter.deleteFeedMediaOfItem(PlaybackService.this, media.getId()); DBWriter.deleteFeedMediaOfItem(PlaybackService.this, media.getId());
Log.d(TAG, "Episode Deleted"); Log.d(TAG, "Episode Deleted");
} }

2
core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceMediaPlayer.java
View File

@ -196,7 +196,7 @@ public class PlaybackServiceMediaPlayer {
DBWriter.markItemRead(context, item, true, false); DBWriter.markItemRead(context, item, true, false);
DBWriter.removeQueueItem(context, item, false); DBWriter.removeQueueItem(context, item, false);
DBWriter.addItemToPlaybackHistory(context, oldMedia); DBWriter.addItemToPlaybackHistory(context, oldMedia);
if (item.getFeed().getPreferences().getCurrentAutoDelete(UserPreferences.isAutoDelete())) { if (item.getFeed().getPreferences().getCurrentAutoDelete()) {
Log.d(TAG, "Delete " + oldMedia.toString()); Log.d(TAG, "Delete " + oldMedia.toString());
DBWriter.deleteFeedMediaOfItem(context, oldMedia.getId()); DBWriter.deleteFeedMediaOfItem(context, oldMedia.getId());
} }