Use data folder for initial subscriptions
This was already implemented in 31c0f90d07
but apparently got overwritten by a merge conflict with the download
service rewrite.
This commit is contained in:
parent
bf412dcd84
commit
c60ba6a6f7
|
@ -50,7 +50,6 @@ import de.danoeh.antennapod.core.service.download.HttpDownloader;
|
|||
import de.danoeh.antennapod.core.service.playback.PlaybackService;
|
||||
import de.danoeh.antennapod.core.storage.DBReader;
|
||||
import de.danoeh.antennapod.core.storage.DBWriter;
|
||||
import de.danoeh.antennapod.core.util.FileNameGenerator;
|
||||
import de.danoeh.antennapod.parser.feed.FeedHandler;
|
||||
import de.danoeh.antennapod.parser.feed.FeedHandlerResult;
|
||||
import de.danoeh.antennapod.core.util.DownloadError;
|
||||
|
@ -291,12 +290,11 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
|
|||
Log.d(TAG, "Starting feed download");
|
||||
url = URLChecker.prepareURL(url);
|
||||
feed = new Feed(url, null);
|
||||
String fileUrl = new File(getExternalCacheDir(),
|
||||
FileNameGenerator.generateFileName(feed.getDownload_url())).toString();
|
||||
feed.setFile_url(fileUrl);
|
||||
final DownloadRequest request = new DownloadRequest(feed.getFile_url(),
|
||||
feed.getDownload_url(), "OnlineFeed", 0, Feed.FEEDFILETYPE_FEED, username, password,
|
||||
true, null, true);
|
||||
DownloadRequest request = DownloadRequestCreator.create(feed)
|
||||
.withAuthentication(username, password)
|
||||
.withInitiatedByUser(true)
|
||||
.build();
|
||||
feed.setFile_url(request.getDestination());
|
||||
|
||||
download = Observable.fromCallable(() -> {
|
||||
feeds = DBReader.getFeedList();
|
||||
|
|
|
@ -290,8 +290,9 @@ public class DownloadRequest implements Parcelable {
|
|||
this.feedfileType = feed.getTypeAsInt();
|
||||
}
|
||||
|
||||
public void setInitiatedByUser(boolean initiatedByUser) {
|
||||
public Builder withInitiatedByUser(boolean initiatedByUser) {
|
||||
this.initiatedByUser = initiatedByUser;
|
||||
return this;
|
||||
}
|
||||
|
||||
public void setForce(boolean force) {
|
||||
|
|
|
@ -500,7 +500,7 @@ public class DownloadService extends Service {
|
|||
for (Feed feed : feeds) {
|
||||
if (feed.getPreferences().getKeepUpdated()) {
|
||||
DownloadRequest.Builder builder = DownloadRequestCreator.create(feed);
|
||||
builder.setInitiatedByUser(initiatedByUser);
|
||||
builder.withInitiatedByUser(initiatedByUser);
|
||||
addNewRequest(builder.build());
|
||||
}
|
||||
}
|
||||
|
|
|
@ -96,7 +96,7 @@ public class AutomaticDownloadAlgorithm {
|
|||
List<DownloadRequest> requests = new ArrayList<>();
|
||||
for (FeedItem episode : itemsToDownload) {
|
||||
DownloadRequest.Builder request = DownloadRequestCreator.create(episode.getMedia());
|
||||
request.setInitiatedByUser(false);
|
||||
request.withInitiatedByUser(false);
|
||||
requests.add(request.build());
|
||||
}
|
||||
DownloadService.download(context, false, requests.toArray(new DownloadRequest[0]));
|
||||
|
|
|
@ -161,7 +161,7 @@ public final class DBTasks {
|
|||
|
||||
private static void forceRefreshFeed(Context context, Feed feed, boolean loadAllPages, boolean initiatedByUser) {
|
||||
DownloadRequest.Builder builder = DownloadRequestCreator.create(feed);
|
||||
builder.setInitiatedByUser(initiatedByUser);
|
||||
builder.withInitiatedByUser(initiatedByUser);
|
||||
builder.setForce(true);
|
||||
builder.loadAllPages(loadAllPages);
|
||||
DownloadService.download(context, false, builder.build());
|
||||
|
|
Loading…
Reference in New Issue