diff options
author | orionlee <orionlee@yahoo.com> | 2019-10-04 13:13:46 -0700 |
---|---|---|
committer | orionlee <orionlee@yahoo.com> | 2019-11-05 12:34:11 -0800 |
commit | 2f82a5d46421a602044b6fcd728e4394a2ad77ea (patch) | |
tree | 3ddc39e0f92ca4cd8d58a538a55a9d4e8ecfaea9 /core/src/main/java | |
parent | cd3d20d61338180bfa585fbf8fcc2b13261df709 (diff) | |
download | AntennaPod-2f82a5d46421a602044b6fcd728e4394a2ad77ea.zip |
refactor - rename FeedFileDownloadStatusRequesterInterface to a more generic DownloadStateProvider.
Diffstat (limited to 'core/src/main/java')
-rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/storage/DownloadRequester.java | 7 | ||||
-rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/storage/DownloadStateProvider.java (renamed from core/src/main/java/de/danoeh/antennapod/core/storage/FeedFileDownloadStatusRequesterInterface.java) | 5 | ||||
-rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/storage/ItemEnqueuePositionCalculator.java | 7 |
3 files changed, 10 insertions, 9 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DownloadRequester.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DownloadRequester.java index 8d4a197ad..c61abc168 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/storage/DownloadRequester.java +++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DownloadRequester.java @@ -3,12 +3,13 @@ package de.danoeh.antennapod.core.storage; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import android.text.TextUtils; import android.util.Log; import android.webkit.URLUtil; +import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; + import org.apache.commons.io.FilenameUtils; import java.io.File; @@ -31,7 +32,7 @@ import de.danoeh.antennapod.core.util.URLChecker; * Sends download requests to the DownloadService. This class should always be used for starting downloads, * otherwise they won't work correctly. */ -public class DownloadRequester implements FeedFileDownloadStatusRequesterInterface { +public class DownloadRequester implements DownloadStateProvider { private static final String TAG = "DownloadRequester"; private static final String FEED_DOWNLOADPATH = "cache/"; diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/FeedFileDownloadStatusRequesterInterface.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DownloadStateProvider.java index b331fc4d7..ece40353f 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/storage/FeedFileDownloadStatusRequesterInterface.java +++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DownloadStateProvider.java @@ -4,7 +4,10 @@ import androidx.annotation.NonNull; import de.danoeh.antennapod.core.feed.FeedFile; -public interface FeedFileDownloadStatusRequesterInterface { +/** + * Allow callers to query the states of downloads, but not affect them. + */ +public interface DownloadStateProvider { /** * @return {@code true} if the named feedfile is in the downloads list */ diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/ItemEnqueuePositionCalculator.java b/core/src/main/java/de/danoeh/antennapod/core/storage/ItemEnqueuePositionCalculator.java index 6e7843836..e69a1adf3 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/storage/ItemEnqueuePositionCalculator.java +++ b/core/src/main/java/de/danoeh/antennapod/core/storage/ItemEnqueuePositionCalculator.java @@ -41,11 +41,8 @@ class ItemEnqueuePositionCalculator { private final @NonNull Options options; - /** - * The logic needs to use {@link DownloadRequester#isDownloadingFile(FeedFile)} method only - */ @VisibleForTesting - FeedFileDownloadStatusRequesterInterface requester = DownloadRequester.getInstance(); + DownloadStateProvider downloadStateProvider = DownloadRequester.getInstance(); public ItemEnqueuePositionCalculator(@NonNull Options options) { this.options = options; @@ -100,7 +97,7 @@ class ItemEnqueuePositionCalculator { if (curItem != null && curItem.getMedia() != null && - requester.isDownloadingFile(curItem.getMedia())) { + downloadStateProvider.isDownloadingFile(curItem.getMedia())) { return true; } else { return false; |