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

Merge pull request #1132 from TomHennen/onlyADalg

Browse Source 
Remove selective downloading of new things
This commit is contained in:
Tom Hennen 2015-08-26 18:06:04 -04:00
commit b3719199f8
1 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,11 +113,6 @@ public class DownloadService extends Service {
*/ */
public static final String EXTRA_REQUEST = "request"; public static final String EXTRA_REQUEST = "request";
/**
* Stores new media files that will be queued for auto-download if possible.
*/
private List<Long> newMediaFiles;
/** /**
* Contains all completed downloads that have not been included in the report yet. * Contains all completed downloads that have not been included in the report yet.
*/ */
@ -171,7 +166,7 @@ public class DownloadService extends Service {
} }
private Thread downloadCompletionThread = new Thread() { private Thread downloadCompletionThread = new Thread() {
private static final String TAG = "downloadCompletionThread"; private static final String TAG = "downloadCompletionThd";
@Override @Override
public void run() { public void run() {
@ -241,7 +236,6 @@ public class DownloadService extends Service {
Log.d(TAG, "Service started"); Log.d(TAG, "Service started");
isRunning = true; isRunning = true;
handler = new Handler(); handler = new Handler();
newMediaFiles = Collections.synchronizedList(new ArrayList<Long>());
reportQueue = Collections.synchronizedList(new ArrayList<DownloadStatus>()); reportQueue = Collections.synchronizedList(new ArrayList<DownloadStatus>());
downloads = Collections.synchronizedList(new ArrayList<Downloader>()); downloads = Collections.synchronizedList(new ArrayList<Downloader>());
numberOfDownloads = new AtomicInteger(0); numberOfDownloads = new AtomicInteger(0);
@ -325,16 +319,8 @@ public class DownloadService extends Service {
cancelNotificationUpdater(); cancelNotificationUpdater();
unregisterReceiver(cancelDownloadReceiver); unregisterReceiver(cancelDownloadReceiver);
// TODO: I'm not sure this is actually needed. // start auto download in case anything new has shown up
// We could just invoke the autodownloadUndownloadeditems method DBTasks.autodownloadUndownloadedItems(getApplicationContext());
// and it would get everything it's supposed to. By sending it the
// items in newMediaFiles we're overriding the download algorithm,
// which is not something we should probably do.
if (!newMediaFiles.isEmpty()) {
Log.d(TAG, "newMediaFiles exist, autodownload them");
DBTasks.autodownloadUndownloadedItems(getApplicationContext(),
ArrayUtils.toPrimitive(newMediaFiles.toArray(new Long[newMediaFiles.size()])));
}
} }
@SuppressLint("NewApi") @SuppressLint("NewApi")
@ -783,16 +769,6 @@ public class DownloadService extends Service {
for (int i = 0; i < savedFeeds.length; i++) { for (int i = 0; i < savedFeeds.length; i++) {
Feed savedFeed = savedFeeds[i]; Feed savedFeed = savedFeeds[i];
// queue new media files for automatic download
for (FeedItem item : savedFeed.getItems()) {
if(item.getPubDate() == null) {
Log.d(TAG, item.toString());
}
if (item.isNew() && item.hasMedia() && !item.getMedia().isDownloaded()) {
newMediaFiles.add(item.getMedia().getId());
}
}
// If loadAllPages=true, check if another page is available and queue it for download // If loadAllPages=true, check if another page is available and queue it for download
final boolean loadAllPages = results.get(i).first.getArguments().getBoolean(DownloadRequester.REQUEST_ARG_LOAD_ALL_PAGES); final boolean loadAllPages = results.get(i).first.getArguments().getBoolean(DownloadRequester.REQUEST_ARG_LOAD_ALL_PAGES);
final Feed feed = results.get(i).second.feed; final Feed feed = results.get(i).second.feed;