From b5244bbe99e423bfe5a2377728a086343a4c2fff Mon Sep 17 00:00:00 2001 From: Nathan Mascitelli Date: Fri, 7 Feb 2020 10:55:08 -0500 Subject: Add generatedBySystem to DownloadRequest --- .../danoeh/antennapod/activity/OnlineFeedViewActivity.java | 14 +++++++------- .../de/danoeh/antennapod/adapter/DownloadLogAdapter.java | 2 +- .../adapter/actionbutton/MobileDownloadHelper.java | 2 +- .../antennapod/dialog/EpisodesApplyActionFragment.java | 2 +- .../de/danoeh/antennapod/menuhandler/FeedMenuHandler.java | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) (limited to 'app/src/main/java') diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java index 7257537b1..a3978b4e0 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java @@ -137,9 +137,9 @@ public class OnlineFeedViewActivity extends AppCompatActivity { feedUrl = feedUrl.replaceFirst("((www.)?(subscribeonandroid.com/))", ""); } if (savedInstanceState == null) { - startFeedDownload(feedUrl, null, null); + startFeedDownload(feedUrl, null, null, false); } else { - startFeedDownload(feedUrl, savedInstanceState.getString("username"), savedInstanceState.getString("password")); + startFeedDownload(feedUrl, savedInstanceState.getString("username"), savedInstanceState.getString("password"), false); } } } @@ -223,7 +223,7 @@ public class OnlineFeedViewActivity extends AppCompatActivity { return super.onOptionsItemSelected(item); } - private void startFeedDownload(String url, String username, String password) { + private void startFeedDownload(String url, String username, String password, boolean generatedBysystem) { Log.d(TAG, "Starting feed download"); url = URLChecker.prepareURL(url); feed = new Feed(url, null); @@ -235,7 +235,7 @@ public class OnlineFeedViewActivity extends AppCompatActivity { 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, null, generatedBysystem); download = Observable.fromCallable(() -> { feeds = DBReader.getFeedList(); @@ -589,9 +589,9 @@ public class OnlineFeedViewActivity extends AppCompatActivity { resetIntent(selectedUrl, titles.get(which)); FeedPreferences prefs = feed.getPreferences(); if(prefs != null) { - startFeedDownload(selectedUrl, prefs.getUsername(), prefs.getPassword()); + startFeedDownload(selectedUrl, prefs.getUsername(), prefs.getPassword(), false); } else { - startFeedDownload(selectedUrl, null, null); + startFeedDownload(selectedUrl, null, null, false); } }; @@ -627,7 +627,7 @@ public class OnlineFeedViewActivity extends AppCompatActivity { @Override protected void onConfirmed(String username, String password, boolean saveUsernamePassword) { - startFeedDownload(feedUrl, username, password); + startFeedDownload(feedUrl, username, password, false); } } diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java index a827c4c04..4b2fbab05 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java @@ -101,7 +101,7 @@ public class DownloadLogAdapter extends BaseAdapter { return; } try { - DBTasks.forceRefreshFeed(context, feed); + DBTasks.forceRefreshFeed(context, feed, false); } catch (DownloadRequestException e) { e.printStackTrace(); } diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/MobileDownloadHelper.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/MobileDownloadHelper.java index 77efd9023..5040029f5 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/MobileDownloadHelper.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/MobileDownloadHelper.java @@ -48,7 +48,7 @@ class MobileDownloadHelper { private static void downloadFeedItems(Context context, FeedItem item) { allowMobileDownloadTimestamp = System.currentTimeMillis(); try { - DownloadRequester.getInstance().downloadMedia(context, item); + DownloadRequester.getInstance().downloadMedia(context, false, item); Toast.makeText(context, R.string.status_downloading_label, Toast.LENGTH_SHORT).show(); } catch (DownloadRequestException e) { e.printStackTrace(); diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java b/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java index 9514ea5eb..cdeea2c64 100644 --- a/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java @@ -449,7 +449,7 @@ public class EpisodesApplyActionFragment extends Fragment { } } try { - DownloadRequester.getInstance().downloadMedia(getActivity(), toDownload.toArray(new FeedItem[0])); + DownloadRequester.getInstance().downloadMedia(getActivity(), false, toDownload.toArray(new FeedItem[0])); } catch (DownloadRequestException e) { e.printStackTrace(); DownloadRequestErrorDialogCreator.newRequestErrorDialog(getActivity(), e.getMessage()); diff --git a/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedMenuHandler.java b/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedMenuHandler.java index 44b6453e5..54af0b963 100644 --- a/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedMenuHandler.java +++ b/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedMenuHandler.java @@ -64,7 +64,7 @@ public class FeedMenuHandler { final Feed selectedFeed) throws DownloadRequestException { switch (item.getItemId()) { case R.id.refresh_item: - DBTasks.forceRefreshFeed(context, selectedFeed); + DBTasks.forceRefreshFeed(context, selectedFeed, false); break; case R.id.refresh_complete_item: DBTasks.forceRefreshCompleteFeed(context, selectedFeed); -- cgit v1.2.3