Rename generatedBySystem to initiatedByUser

6 files changed, 12 insertions, 12 deletions

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 a3978b4e0..9951eee23 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, false);
+                startFeedDownload(feedUrl, null, null, true);
             } else {
-                startFeedDownload(feedUrl, savedInstanceState.getString("username"), savedInstanceState.getString("password"), false);
+                startFeedDownload(feedUrl, savedInstanceState.getString("username"), savedInstanceState.getString("password"), true);
             }
         }
     }
@@ -223,7 +223,7 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
         return super.onOptionsItemSelected(item);
     }
 
-    private void startFeedDownload(String url, String username, String password, boolean generatedBysystem) {
+    private void startFeedDownload(String url, String username, String password, boolean initiatedByUser) {
         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, generatedBysystem);
+                true, null, initiatedByUser);
 
         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(), false);
+                startFeedDownload(selectedUrl, prefs.getUsername(), prefs.getPassword(), true);
             } else {
-                startFeedDownload(selectedUrl, null, null, false);
+                startFeedDownload(selectedUrl, null, null, true);
             }
         };
 
@@ -627,7 +627,7 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
 
         @Override
         protected void onConfirmed(String username, String password, boolean saveUsernamePassword) {
-            startFeedDownload(feedUrl, username, password, false);
+            startFeedDownload(feedUrl, username, password, true);
         }
     }
 
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 4b2fbab05..491118c98 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, false);
+                            DBTasks.forceRefreshFeed(context, feed, true);
                         } catch (DownloadRequestException e) {
                             e.printStackTrace();
                         }
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DownloadActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DownloadActionButton.java
index f70d41a97..44435c02e 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DownloadActionButton.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DownloadActionButton.java
@@ -71,7 +71,7 @@ public class DownloadActionButton extends ItemActionButton {
 
     private void downloadEpisode(Context context) {
         try {
-            DownloadRequester.getInstance().downloadMedia(context, item);
+            DownloadRequester.getInstance().downloadMedia(context, true, item);
         } catch (DownloadRequestException e) {
             e.printStackTrace();
             DownloadRequestErrorDialogCreator.newRequestErrorDialog(context, e.getMessage());
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 5040029f5..80ecd4994 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, false, item);
+            DownloadRequester.getInstance().downloadMedia(context, true, 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 cdeea2c64..d48a6a4a6 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(), false, toDownload.toArray(new FeedItem[0]));
+            DownloadRequester.getInstance().downloadMedia(getActivity(), true, 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 54af0b963..bcf202c05 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, false);
+                DBTasks.forceRefreshFeed(context, selectedFeed, true);
                 break;
             case R.id.refresh_complete_item:
                 DBTasks.forceRefreshCompleteFeed(context, selectedFeed);