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

Remove dependency from other classes to DownloadService

This commit is contained in:
ByteHamster 2022-11-05 13:40:44 +01:00
parent ae3971a58f
commit 11292b598c
24 changed files with 163 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/androidTest/java/de/test/antennapod/service/download/DownloadServiceTest.java
View File

@ -9,6 +9,7 @@ import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import de.danoeh.antennapod.core.service.download.DownloadRequestCreator;
import de.danoeh.antennapod.core.service.download.DownloadServiceInterface;
import de.test.antennapod.EspressoTestUtils;
import org.awaitility.Awaitility;
import org.awaitility.core.ConditionTimeoutException;
@ -80,7 +81,7 @@ public class DownloadServiceTest {
public void tearDown() throws Exception {
DownloadService.setDownloaderFactory(origFactory);
Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
DownloadService.cancelAll(context);
DownloadServiceInterface.get().cancelAll(context);
context.stopService(new Intent(context, DownloadService.class));
EspressoTestUtils.tryKillDownloadService();
}
@ -113,7 +114,8 @@ public class DownloadServiceTest {
assertFalse("The media in test should not yet been downloaded",
DBReader.getFeedMedia(testMedia11.getId()).isDownloaded());
DownloadService.download(InstrumentationRegistry.getInstrumentation().getTargetContext(), false,
DownloadServiceInterface.get()
.download(InstrumentationRegistry.getInstrumentation().getTargetContext(), false,
DownloadRequestCreator.create(testMedia11).build());
Awaitility.await()
.atMost(5000, TimeUnit.MILLISECONDS)
@ -158,7 +160,8 @@ public class DownloadServiceTest {
}
withFeedItemEventListener(feedItemEventListener -> {
DownloadService.download(InstrumentationRegistry.getInstrumentation().getTargetContext(), false,
DownloadServiceInterface.get()
.download(InstrumentationRegistry.getInstrumentation().getTargetContext(), false,
DownloadRequestCreator.create(testMedia11).build());
withDownloadEventListener(downloadEventListener ->
Awaitility.await("download is actually running")
@ -175,7 +178,7 @@ public class DownloadServiceTest {
.atMost(2000, TimeUnit.MILLISECONDS)
.until(() -> feedItemEventListener.getEvents().size() >= 1);
}
DownloadService.cancel(context, testMedia11.getDownload_url());
DownloadServiceInterface.get().cancel(context, testMedia11.getDownload_url());
final int totalNumEventsExpected = itemAlreadyInQueue ? 1 : 3;
Awaitility.await("item dequeue event + download termination event")
.atMost(2000, TimeUnit.MILLISECONDS)

5
app/src/main/java/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java
View File

@ -4,7 +4,7 @@ import android.os.Bundle;
import android.text.TextUtils;
import androidx.appcompat.app.AppCompatActivity;
import de.danoeh.antennapod.R;
import de.danoeh.antennapod.core.service.download.DownloadService;
import de.danoeh.antennapod.core.service.download.DownloadServiceInterface;
import de.danoeh.antennapod.model.feed.FeedMedia;
import de.danoeh.antennapod.model.feed.FeedPreferences;
import de.danoeh.antennapod.core.preferences.UserPreferences;
@ -62,7 +62,8 @@ public class DownloadAuthenticationActivity extends AppCompatActivity {
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(() -> {
DownloadService.download(DownloadAuthenticationActivity.this, false, request);
DownloadServiceInterface.get()
.download(DownloadAuthenticationActivity.this, false, request);
finish();
});
}

3
app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
View File

@ -35,6 +35,7 @@ import de.danoeh.antennapod.core.event.DownloadEvent;
import de.danoeh.antennapod.core.service.download.DownloadService;
import de.danoeh.antennapod.core.service.download.DownloadRequestCreator;
import de.danoeh.antennapod.core.feed.FeedUrlNotFoundException;
import de.danoeh.antennapod.core.service.download.DownloadServiceInterface;
import de.danoeh.antennapod.core.service.playback.PlaybackServiceInterface;
import de.danoeh.antennapod.core.util.DownloadErrorLabel;
import de.danoeh.antennapod.event.FeedListUpdateEvent;
@ -455,7 +456,7 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
openFeed();
} else {
Feed f = new Feed(selectedDownloadUrl, null, feed.getTitle());
DownloadService.download(this, false, DownloadRequestCreator.create(f)
DownloadServiceInterface.get().download(this, false, DownloadRequestCreator.create(f)
.withAuthentication(username, password)
.build());
didPressSubscribe = true;

4
app/src/main/java/de/danoeh/antennapod/activity/OpmlImportActivity.java
View File

@ -28,8 +28,8 @@ import de.danoeh.antennapod.core.export.opml.OpmlElement;
import de.danoeh.antennapod.core.export.opml.OpmlReader;
import de.danoeh.antennapod.core.preferences.UserPreferences;
import de.danoeh.antennapod.core.service.download.DownloadService;
import de.danoeh.antennapod.core.service.download.DownloadRequestCreator;
import de.danoeh.antennapod.core.service.download.DownloadServiceInterface;
import de.danoeh.antennapod.databinding.OpmlSelectionBinding;
import de.danoeh.antennapod.model.feed.Feed;
import io.reactivex.Completable;
@ -96,7 +96,7 @@ public class OpmlImportActivity extends AppCompatActivity {
}
OpmlElement element = readElements.get(checked.keyAt(i));
Feed feed = new Feed(element.getXmlUrl(), null, element.getText());
DownloadService.download(this, false, DownloadRequestCreator.create(feed).build());
DownloadServiceInterface.get().download(this, false, DownloadRequestCreator.create(feed).build());
}
})
.subscribeOn(Schedulers.io())

7
app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java
View File

@ -13,7 +13,7 @@ import de.danoeh.antennapod.R;
import de.danoeh.antennapod.activity.MainActivity;
import de.danoeh.antennapod.core.service.download.DownloadRequest;
import de.danoeh.antennapod.core.service.download.DownloadRequestCreator;
import de.danoeh.antennapod.core.service.download.DownloadService;
import de.danoeh.antennapod.core.service.download.DownloadServiceInterface;
import de.danoeh.antennapod.core.service.download.Downloader;
import de.danoeh.antennapod.core.storage.DBReader;
import de.danoeh.antennapod.core.storage.DBTasks;
@ -139,7 +139,8 @@ public class DownloadLogAdapter extends BaseAdapter {
Log.e(TAG, "Could not find feed media for feed id: " + status.getFeedfileId());
return;
}
DownloadService.download(context, true, DownloadRequestCreator.create(media).build());
DownloadServiceInterface.get()
.download(context, true, DownloadRequestCreator.create(media).build());
((MainActivity) context).showSnackbarAbovePlayer(
R.string.status_downloading_label, Toast.LENGTH_SHORT);
});
@ -156,7 +157,7 @@ public class DownloadLogAdapter extends BaseAdapter {
holder.secondaryActionButton.setVisibility(View.VISIBLE);
holder.secondaryActionButton.setTag(downloader);
holder.secondaryActionButton.setOnClickListener(v -> {
DownloadService.cancel(context, request.getSource());
DownloadServiceInterface.get().cancel(context, request.getSource());
if (request.getFeedfileType() == FeedMedia.FEEDFILETYPE_FEEDMEDIA) {
FeedMedia media = DBReader.getFeedMedia(request.getFeedfileId());
FeedItem feedItem = media.getItem();

4
app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/CancelDownloadActionButton.java
View File

@ -5,7 +5,7 @@ import androidx.annotation.DrawableRes;
import androidx.annotation.StringRes;
import de.danoeh.antennapod.R;
import de.danoeh.antennapod.core.service.download.DownloadService;
import de.danoeh.antennapod.core.service.download.DownloadServiceInterface;
import de.danoeh.antennapod.model.feed.FeedItem;
import de.danoeh.antennapod.model.feed.FeedMedia;
import de.danoeh.antennapod.core.preferences.UserPreferences;
@ -32,7 +32,7 @@ public class CancelDownloadActionButton extends ItemActionButton {
@Override
public void onClick(Context context) {
FeedMedia media = item.getMedia();
DownloadService.cancel(context, media.getDownload_url());
DownloadServiceInterface.get().cancel(context, media.getDownload_url());
if (UserPreferences.isEnableAutodownload()) {
item.disableAutoDownload();
DBWriter.setFeedItem(item);

4
app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DownloadActionButton.java
View File

@ -11,6 +11,7 @@ import androidx.annotation.StringRes;
import de.danoeh.antennapod.R;
import de.danoeh.antennapod.core.service.download.DownloadRequestCreator;
import de.danoeh.antennapod.core.service.download.DownloadService;
import de.danoeh.antennapod.core.service.download.DownloadServiceInterface;
import de.danoeh.antennapod.model.feed.FeedItem;
import de.danoeh.antennapod.model.feed.FeedMedia;
import de.danoeh.antennapod.core.preferences.UsageStatistics;
@ -50,7 +51,8 @@ public class DownloadActionButton extends ItemActionButton {
UsageStatistics.logAction(UsageStatistics.ACTION_DOWNLOAD);
if (NetworkUtils.isEpisodeDownloadAllowed() || MobileDownloadHelper.userAllowedMobileDownloads()) {
DownloadService.download(context, false, DownloadRequestCreator.create(item.getMedia()).build());
DownloadServiceInterface.get()
.download(context, false, DownloadRequestCreator.create(item.getMedia()).build());
} else if (MobileDownloadHelper.userChoseAddToQueue() && !item.isTagged(FeedItem.TAG_QUEUE)) {
DBWriter.addQueueItem(context, item);
Toast.makeText(context, R.string.added_to_queue_label, Toast.LENGTH_SHORT).show();

4
app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/MobileDownloadHelper.java
View File

@ -5,7 +5,7 @@ import android.content.Context;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import de.danoeh.antennapod.R;
import de.danoeh.antennapod.core.service.download.DownloadRequestCreator;
import de.danoeh.antennapod.core.service.download.DownloadService;
import de.danoeh.antennapod.core.service.download.DownloadServiceInterface;
import de.danoeh.antennapod.model.feed.FeedItem;
import de.danoeh.antennapod.core.storage.DBReader;
import de.danoeh.antennapod.core.storage.DBWriter;
@ -44,6 +44,6 @@ class MobileDownloadHelper {
private static void downloadFeedItems(Context context, FeedItem item) {
allowMobileDownloadTimestamp = System.currentTimeMillis();
DownloadService.download(context, true, DownloadRequestCreator.create(item.getMedia()).build());
DownloadServiceInterface.get().download(context, true, DownloadRequestCreator.create(item.getMedia()).build());
}
}

4
app/src/main/java/de/danoeh/antennapod/fragment/actions/EpisodeMultiSelectActionHandler.java
View File

@ -13,7 +13,7 @@ import de.danoeh.antennapod.R;
import de.danoeh.antennapod.activity.MainActivity;
import de.danoeh.antennapod.core.service.download.DownloadRequest;
import de.danoeh.antennapod.core.service.download.DownloadRequestCreator;
import de.danoeh.antennapod.core.service.download.DownloadService;
import de.danoeh.antennapod.core.service.download.DownloadServiceInterface;
import de.danoeh.antennapod.core.storage.DBWriter;
import de.danoeh.antennapod.core.util.LongList;
import de.danoeh.antennapod.model.feed.FeedItem;
@ -99,7 +99,7 @@ public class EpisodeMultiSelectActionHandler {
requests.add(DownloadRequestCreator.create(episode.getMedia()).build());
}
}
DownloadService.download(activity, true, requests.toArray(new DownloadRequest[0]));
DownloadServiceInterface.get().download(activity, true, requests.toArray(new DownloadRequest[0]));
showMessage(R.plurals.downloading_batch_label, requests.size());
}

4
app/src/main/java/de/danoeh/antennapod/receiver/PowerConnectionReceiver.java
View File

@ -7,7 +7,7 @@ import android.util.Log;
import de.danoeh.antennapod.core.ClientConfigurator;
import de.danoeh.antennapod.core.preferences.UserPreferences;
import de.danoeh.antennapod.core.service.download.DownloadService;
import de.danoeh.antennapod.core.service.download.DownloadServiceInterface;
import de.danoeh.antennapod.core.storage.DBTasks;
// modified from http://developer.android.com/training/monitoring-device-state/battery-monitoring.html
@ -37,7 +37,7 @@ public class PowerConnectionReceiver extends BroadcastReceiver {
// if we're not supposed to be auto-downloading when we're not charging, stop it
if (!UserPreferences.isEnableAutodownloadOnBattery()) {
Log.d(TAG, "not charging anymore, canceling auto-download");
DownloadService.cancelAll(context);
DownloadServiceInterface.get().cancelAll(context);
} else {
Log.d(TAG, "not charging anymore, but the user allows auto-download " +
"when on battery so we'll keep going");

4
app/src/main/java/de/danoeh/antennapod/receiver/SPAReceiver.java
View File

@ -11,8 +11,8 @@ import java.util.Arrays;
import de.danoeh.antennapod.R;
import de.danoeh.antennapod.core.ClientConfigurator;
import de.danoeh.antennapod.core.service.download.DownloadService;
import de.danoeh.antennapod.core.service.download.DownloadRequestCreator;
import de.danoeh.antennapod.core.service.download.DownloadServiceInterface;
import de.danoeh.antennapod.model.feed.Feed;
/**
@ -44,7 +44,7 @@ public class SPAReceiver extends BroadcastReceiver{
ClientConfigurator.initialize(context);
for (String url : feedUrls) {
Feed f = new Feed(url, null);
DownloadService.download(context, false, DownloadRequestCreator.create(f).build());
DownloadServiceInterface.get().download(context, false, DownloadRequestCreator.create(f).build());
}
Toast.makeText(context, R.string.sp_apps_importing_feeds_msg, Toast.LENGTH_LONG).show();
}

3
core/src/main/java/de/danoeh/antennapod/core/ClientConfigurator.java
View File

@ -6,6 +6,8 @@ import de.danoeh.antennapod.core.preferences.SleepTimerPreferences;
import de.danoeh.antennapod.core.preferences.UsageStatistics;
import de.danoeh.antennapod.core.preferences.UserPreferences;
import de.danoeh.antennapod.core.service.download.AntennapodHttpClient;
import de.danoeh.antennapod.core.service.download.DownloadServiceInterface;
import de.danoeh.antennapod.core.service.download.DownloadServiceInterfaceImpl;
import de.danoeh.antennapod.core.sync.SyncService;
import de.danoeh.antennapod.core.sync.queue.SynchronizationQueueSink;
import de.danoeh.antennapod.core.util.NetworkUtils;
@ -30,6 +32,7 @@ public class ClientConfigurator {
SslProviderInstaller.install(context);
NetworkUtils.init(context);
NetworkConnectionChangeHandler.init(context);
DownloadServiceInterface.setImpl(new DownloadServiceInterfaceImpl());
SynchronizationQueueSink.setServiceStarterImpl(() -> SyncService.sync(context));
AntennapodHttpClient.setCacheDirectory(new File(context.getCacheDir(), "okhttp"));
AntennapodHttpClient.setProxyConfig(UserPreferences.getProxyConfig());

4
core/src/main/java/de/danoeh/antennapod/core/backup/OpmlBackupAgent.java
View File

@ -9,8 +9,8 @@ import android.os.ParcelFileDescriptor;
import android.util.Log;
import de.danoeh.antennapod.core.service.download.DownloadRequest;
import de.danoeh.antennapod.core.service.download.DownloadService;
import de.danoeh.antennapod.core.service.download.DownloadRequestCreator;
import de.danoeh.antennapod.core.service.download.DownloadServiceInterface;
import org.apache.commons.io.IOUtils;
import org.xmlpull.v1.XmlPullParserException;
@ -145,7 +145,7 @@ public class OpmlBackupAgent extends BackupAgentHelper {
for (OpmlElement opmlElem : opmlElements) {
Feed feed = new Feed(opmlElem.getXmlUrl(), null, opmlElem.getText());
DownloadRequest request = DownloadRequestCreator.create(feed).build();
DownloadService.download(mContext, false, request);
DownloadServiceInterface.get().download(mContext, false, request);
}
} catch (XmlPullParserException e) {
Log.e(TAG, "Error while parsing the OPML file", e);

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

@ -17,8 +17,6 @@ import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.core.app.ServiceCompat;
import androidx.core.content.ContextCompat;
import de.danoeh.antennapod.core.BuildConfig;
import de.danoeh.antennapod.core.R;
import de.danoeh.antennapod.core.feed.LocalFeedUpdater;
import de.danoeh.antennapod.core.storage.EpisodeCleanupAlgorithmFactory;
@ -141,58 +139,6 @@ public class DownloadService extends Service {
}
}
public static void download(Context context, boolean cleanupMedia, DownloadRequest... requests) {
ArrayList<DownloadRequest> requestsToSend = new ArrayList<>();
for (DownloadRequest request : requests) {
if (!isDownloadingFile(request.getSource())) {
requestsToSend.add(request);
}
}
if (requestsToSend.isEmpty()) {
return;
} else if (requestsToSend.size() > 100) {
if (BuildConfig.DEBUG) {
throw new IllegalArgumentException("Android silently drops intent payloads that are too large");
} else {
Log.d(TAG, "Too many download requests. Dropping some to avoid Android dropping all.");
requestsToSend = new ArrayList<>(requestsToSend.subList(0, 100));
}
}
Intent launchIntent = new Intent(context, DownloadService.class);
launchIntent.putParcelableArrayListExtra(DownloadService.EXTRA_REQUESTS, requestsToSend);
if (cleanupMedia) {
launchIntent.putExtra(DownloadService.EXTRA_CLEANUP_MEDIA, true);
}
ContextCompat.startForegroundService(context, launchIntent);
}
public static void refreshAllFeeds(Context context, boolean initiatedByUser) {
Intent launchIntent = new Intent(context, DownloadService.class);
launchIntent.putExtra(DownloadService.EXTRA_REFRESH_ALL, true);
launchIntent.putExtra(DownloadService.EXTRA_INITIATED_BY_USER, initiatedByUser);
ContextCompat.startForegroundService(context, launchIntent);
}
public static void cancel(Context context, String url) {
if (!isRunning) {
return;
}
Intent cancelIntent = new Intent(DownloadService.ACTION_CANCEL_DOWNLOAD);
cancelIntent.putExtra(DownloadService.EXTRA_DOWNLOAD_URL, url);
cancelIntent.setPackage(context.getPackageName());
context.sendBroadcast(cancelIntent);
}
public static void cancelAll(Context context) {
if (!isRunning) {
return;
}
Intent cancelIntent = new Intent(DownloadService.ACTION_CANCEL_ALL_DOWNLOADS);
cancelIntent.setPackage(context.getPackageName());
context.sendBroadcast(cancelIntent);
}
public static boolean isDownloadingFeeds() {
if (!isRunning) {
return false;
@ -373,7 +319,7 @@ public class DownloadService extends Service {
Log.d(TAG, "Requested invalid range, restarting download from the beginning");
FileUtils.deleteQuietly(new File(downloader.getDownloadRequest().getDestination()));
download(this, false, downloader.getDownloadRequest());
DownloadServiceInterface.get().download(this, false, downloader.getDownloadRequest());
} else {
Log.e(TAG, "Download failed");
saveDownloadStatus(status);

23
core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadServiceInterface.java Normal file
View File

@ -0,0 +1,23 @@
package de.danoeh.antennapod.core.service.download;
import android.content.Context;
public abstract class DownloadServiceInterface {
private static DownloadServiceInterface impl;
public static DownloadServiceInterface get() {
return impl;
}
public static void setImpl(DownloadServiceInterface impl) {
DownloadServiceInterface.impl = impl;
}
public abstract void download(Context context, boolean cleanupMedia, DownloadRequest... requests);
public abstract void refreshAllFeeds(Context context, boolean initiatedByUser);
public abstract void cancel(Context context, String url);
public abstract void cancelAll(Context context);
}

67
core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadServiceInterfaceImpl.java Normal file
View File

@ -0,0 +1,67 @@
package de.danoeh.antennapod.core.service.download;
import android.content.Context;
import android.content.Intent;
import androidx.core.content.ContextCompat;
import com.google.android.exoplayer2.util.Log;
import de.danoeh.antennapod.core.BuildConfig;
import java.util.ArrayList;
import static de.danoeh.antennapod.core.service.download.DownloadService.isDownloadingFile;
public class DownloadServiceInterfaceImpl extends DownloadServiceInterface {
private static final String TAG = "DownloadServiceInterface";
public void download(Context context, boolean cleanupMedia, DownloadRequest... requests) {
ArrayList<DownloadRequest> requestsToSend = new ArrayList<>();
for (DownloadRequest request : requests) {
if (!isDownloadingFile(request.getSource())) {
requestsToSend.add(request);
}
}
if (requestsToSend.isEmpty()) {
return;
} else if (requestsToSend.size() > 100) {
if (BuildConfig.DEBUG) {
throw new IllegalArgumentException("Android silently drops intent payloads that are too large");
} else {
Log.d(TAG, "Too many download requests. Dropping some to avoid Android dropping all.");
requestsToSend = new ArrayList<>(requestsToSend.subList(0, 100));
}
}
Intent launchIntent = new Intent(context, DownloadService.class);
launchIntent.putParcelableArrayListExtra(DownloadService.EXTRA_REQUESTS, requestsToSend);
if (cleanupMedia) {
launchIntent.putExtra(DownloadService.EXTRA_CLEANUP_MEDIA, true);
}
ContextCompat.startForegroundService(context, launchIntent);
}
public void refreshAllFeeds(Context context, boolean initiatedByUser) {
Intent launchIntent = new Intent(context, DownloadService.class);
launchIntent.putExtra(DownloadService.EXTRA_REFRESH_ALL, true);
launchIntent.putExtra(DownloadService.EXTRA_INITIATED_BY_USER, initiatedByUser);
ContextCompat.startForegroundService(context, launchIntent);
}
public void cancel(Context context, String url) {
if (!DownloadService.isRunning) {
return;
}
Intent cancelIntent = new Intent(DownloadService.ACTION_CANCEL_DOWNLOAD);
cancelIntent.putExtra(DownloadService.EXTRA_DOWNLOAD_URL, url);
cancelIntent.setPackage(context.getPackageName());
context.sendBroadcast(cancelIntent);
}
public void cancelAll(Context context) {
if (!DownloadService.isRunning) {
return;
}
Intent cancelIntent = new Intent(DownloadService.ACTION_CANCEL_ALL_DOWNLOADS);
cancelIntent.setPackage(context.getPackageName());
context.sendBroadcast(cancelIntent);
}
}

4
core/src/main/java/de/danoeh/antennapod/core/storage/AutomaticDownloadAlgorithm.java
View File

@ -9,7 +9,7 @@ import java.util.List;
import de.danoeh.antennapod.core.service.download.DownloadRequest;
import de.danoeh.antennapod.core.service.download.DownloadRequestCreator;
import de.danoeh.antennapod.core.service.download.DownloadService;
import de.danoeh.antennapod.core.service.download.DownloadServiceInterface;
import de.danoeh.antennapod.core.util.PlaybackStatus;
import de.danoeh.antennapod.model.feed.FeedItem;
import de.danoeh.antennapod.model.feed.FeedPreferences;
@ -100,7 +100,7 @@ public class AutomaticDownloadAlgorithm {
request.withInitiatedByUser(false);
requests.add(request.build());
}
DownloadService.download(context, false, requests.toArray(new DownloadRequest[0]));
DownloadServiceInterface.get().download(context, false, requests.toArray(new DownloadRequest[0]));
}
}
};

8
core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java
View File

@ -12,7 +12,7 @@ import androidx.annotation.VisibleForTesting;
import de.danoeh.antennapod.core.service.download.DownloadRequest;
import de.danoeh.antennapod.core.service.download.DownloadRequestCreator;
import de.danoeh.antennapod.core.service.download.DownloadService;
import de.danoeh.antennapod.core.service.download.DownloadServiceInterface;
import de.danoeh.antennapod.storage.database.PodDBAdapter;
import de.danoeh.antennapod.storage.database.mapper.FeedCursorMapper;
import org.greenrobot.eventbus.EventBus;
@ -113,7 +113,7 @@ public final class DBTasks {
* @param initiatedByUser a boolean indicating if the refresh was triggered by user action.
*/
public static void refreshAllFeeds(final Context context, boolean initiatedByUser) {
DownloadService.refreshAllFeeds(context, initiatedByUser);
DownloadServiceInterface.get().refreshAllFeeds(context, initiatedByUser);
SharedPreferences prefs = context.getSharedPreferences(PREF_NAME, MODE_PRIVATE);
prefs.edit().putLong(PREF_LAST_REFRESH, System.currentTimeMillis()).apply();
@ -145,7 +145,7 @@ public final class DBTasks {
DownloadRequest.Builder builder = DownloadRequestCreator.create(nextFeed);
builder.loadAllPages(loadAllPages);
DownloadService.download(context, false, builder.build());
DownloadServiceInterface.get().download(context, false, builder.build());
} else {
Log.e(TAG, "loadNextPageOfFeed: Feed was either not paged or contained no nextPageLink");
}
@ -164,7 +164,7 @@ public final class DBTasks {
builder.withInitiatedByUser(initiatedByUser);
builder.setForce(true);
builder.loadAllPages(loadAllPages);
DownloadService.download(context, false, builder.build());
DownloadServiceInterface.get().download(context, false, builder.build());
}
/**

4
core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java
View File

@ -8,7 +8,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.app.NotificationManagerCompat;
import de.danoeh.antennapod.core.service.download.DownloadService;
import de.danoeh.antennapod.core.service.download.DownloadServiceInterface;
import de.danoeh.antennapod.core.service.playback.PlaybackServiceInterface;
import de.danoeh.antennapod.storage.database.PodDBAdapter;
import org.greenrobot.eventbus.EventBus;
@ -206,7 +206,7 @@ public class DBWriter {
if (item.getMedia().isDownloaded()) {
deleteFeedMediaSynchronous(context, item.getMedia());
}
DownloadService.cancel(context, item.getMedia().getDownload_url());
DownloadServiceInterface.get().cancel(context, item.getMedia().getDownload_url());
}
}

3
core/src/main/java/de/danoeh/antennapod/core/sync/SyncService.java
View File

@ -23,6 +23,7 @@ import androidx.work.WorkerParameters;
import de.danoeh.antennapod.core.service.download.DownloadRequest;
import de.danoeh.antennapod.core.service.download.DownloadService;
import de.danoeh.antennapod.core.service.download.DownloadRequestCreator;
import de.danoeh.antennapod.core.service.download.DownloadServiceInterface;
import org.apache.commons.lang3.StringUtils;
import org.greenrobot.eventbus.EventBus;
@ -152,7 +153,7 @@ public class SyncService extends Worker {
if (!URLChecker.containsUrl(localSubscriptions, downloadUrl) && !queuedRemovedFeeds.contains(downloadUrl)) {
Feed feed = new Feed(downloadUrl, null);
DownloadRequest.Builder builder = DownloadRequestCreator.create(feed);
DownloadService.download(getApplicationContext(), false, builder.build());
DownloadServiceInterface.get().download(getApplicationContext(), false, builder.build());
}
}

4
core/src/main/java/de/danoeh/antennapod/core/util/download/NetworkConnectionChangeHandler.java
View File

@ -2,7 +2,7 @@ package de.danoeh.antennapod.core.util.download;
import android.content.Context;
import com.google.android.exoplayer2.util.Log;
import de.danoeh.antennapod.core.service.download.DownloadService;
import de.danoeh.antennapod.core.service.download.DownloadServiceInterface;
import de.danoeh.antennapod.core.storage.DBTasks;
import de.danoeh.antennapod.core.util.NetworkUtils;
@ -22,7 +22,7 @@ public abstract class NetworkConnectionChangeHandler {
// otherwise cancel all downloads
if (NetworkUtils.isNetworkRestricted()) {
Log.i(TAG, "Device is no longer connected to Wi-Fi. Cancelling ongoing downloads");
DownloadService.cancelAll(context);
DownloadServiceInterface.get().cancelAll(context);
}
}
}

3
core/src/test/java/de/danoeh/antennapod/core/feed/LocalFeedUpdaterTest.java
View File

@ -10,6 +10,8 @@ import androidx.annotation.NonNull;
import androidx.test.platform.app.InstrumentationRegistry;
import de.danoeh.antennapod.core.preferences.PlaybackPreferences;
import de.danoeh.antennapod.core.service.download.DownloadServiceInterface;
import de.danoeh.antennapod.core.service.download.DownloadServiceInterfaceStub;
import de.danoeh.antennapod.core.util.FastDocumentFile;
import de.danoeh.antennapod.model.feed.Feed;
import de.danoeh.antennapod.model.feed.FeedItem;
@ -75,6 +77,7 @@ public class LocalFeedUpdaterTest {
Application app = (Application) context;
ClientConfig.applicationCallbacks = mock(ApplicationCallbacks.class);
when(ClientConfig.applicationCallbacks.getApplicationInstance()).thenReturn(app);
DownloadServiceInterface.setImpl(new DownloadServiceInterfaceStub());
// Initialize database
PodDBAdapter.init(context);

18
core/src/test/java/de/danoeh/antennapod/core/service/download/DownloadServiceInterfaceStub.java Normal file
View File

@ -0,0 +1,18 @@
package de.danoeh.antennapod.core.service.download;
import android.content.Context;
public class DownloadServiceInterfaceStub extends DownloadServiceInterface {
public void download(Context context, boolean cleanupMedia, DownloadRequest... requests) {
}
public void refreshAllFeeds(Context context, boolean initiatedByUser) {
}
public void cancel(Context context, String url) {
}
public void cancelAll(Context context) {
}
}

3
core/src/test/java/de/danoeh/antennapod/core/storage/DbWriterTest.java
View File

@ -10,6 +10,8 @@ import androidx.core.util.Consumer;
import androidx.preference.PreferenceManager;
import androidx.test.platform.app.InstrumentationRegistry;
import de.danoeh.antennapod.core.service.download.DownloadServiceInterface;
import de.danoeh.antennapod.core.service.download.DownloadServiceInterfaceStub;
import de.danoeh.antennapod.storage.database.PodDBAdapter;
import org.awaitility.Awaitility;
import org.junit.After;
@ -65,6 +67,7 @@ public class DbWriterTest {
Application app = (Application) context;
ClientConfig.applicationCallbacks = mock(ApplicationCallbacks.class);
when(ClientConfig.applicationCallbacks.getApplicationInstance()).thenReturn(app);
DownloadServiceInterface.setImpl(new DownloadServiceInterfaceStub());
// create new database
PodDBAdapter.init(context);