Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactoring: Remove callback functions with constant value

This commit is contained in:
Herbert Reiter 2020-11-15 14:26:07 +01:00
parent 3f31764f58
commit d68b45fd30
6 changed files with 3 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/de/danoeh/antennapod/config/DownloadServiceCallbacksImpl.java
View File

@ -54,9 +54,4 @@ public class DownloadServiceCallbacksImpl implements DownloadServiceCallbacks {
return PendingIntent.getActivity(context, R.id.pending_intent_download_service_autodownload_report,
intent, PendingIntent.FLAG_UPDATE_CURRENT);
}
@Override
public boolean shouldCreateReport() {
return true;
}
}

6
app/src/main/java/de/danoeh/antennapod/config/PlaybackServiceCallbacksImpl.java
View File

@ -22,10 +22,4 @@ public class PlaybackServiceCallbacksImpl implements PlaybackServiceCallbacks {
return i;
}
}
@Override
public boolean useQueue() {
return true;
}
}

10
core/src/main/java/de/danoeh/antennapod/core/DownloadServiceCallbacks.java
View File

@ -37,7 +37,7 @@ public interface DownloadServiceCallbacks {
* <p/>
* The PendingIntent takes users to an activity where they can look at all successful and failed downloads.
*
* @return A non-null PendingIntent for the notification or null if shouldCreateReport()==false
* @return A non-null PendingIntent for the notification
*/
PendingIntent getReportNotificationContentIntent(Context context);
@ -47,14 +47,8 @@ public interface DownloadServiceCallbacks {
* <p/>
* The PendingIntent takes users to an activity where they can look at their episode queue.
*
* @return A non-null PendingIntent for the notification or null if shouldCreateReport()==false
* @return A non-null PendingIntent for the notification
*/
PendingIntent getAutoDownloadReportNotificationContentIntent(Context context);
/**
* Returns true if the DownloadService should create a report that shows the number of failed
* downloads when the service shuts down.
*/
boolean shouldCreateReport();
}

7
core/src/main/java/de/danoeh/antennapod/core/PlaybackServiceCallbacks.java
View File

@ -19,11 +19,4 @@ public interface PlaybackServiceCallbacks {
* @return A non-null activity intent.
*/
Intent getPlayerActivityIntent(Context context, MediaType mediaType, boolean remotePlayback);
/**
* Returns true if the PlaybackService should load new episodes from the queue when playback ends
* and false if the PlaybackService should ignore the queue and load no more episodes when playback
* finishes.
*/
boolean useQueue();
}

3
core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
View File

@ -205,8 +205,7 @@ public class DownloadService extends Service {
isRunning = false;
boolean showAutoDownloadReport = UserPreferences.showAutoDownloadReport();
if (ClientConfig.downloadServiceCallbacks.shouldCreateReport()
&& (UserPreferences.showDownloadReport() || showAutoDownloadReport)) {
if (UserPreferences.showDownloadReport() || showAutoDownloadReport) {
notificationManager.updateReport(reportQueue, showAutoDownloadReport);
reportQueue.clear();
}

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

@ -973,10 +973,6 @@ public class PlaybackService extends MediaBrowserServiceCompat {
Log.d(TAG, "getNextInQueue(), but playable not an instance of FeedMedia, so not proceeding");
return null;
}
if (!ClientConfig.playbackServiceCallbacks.useQueue()) {
Log.d(TAG, "getNextInQueue(), but queue not in use by this app");
return null;
}
Log.d(TAG, "getNextInQueue()");
FeedMedia media = (FeedMedia) currentMedia;
try {