summaryrefslogtreecommitdiff
path: root/app/src/main
diff options
context:
space:
mode:
authorNathan Mascitelli <mascitelli.nathan@gmail.com>2020-02-10 09:31:53 -0500
committerNathan Mascitelli <mascitelli.nathan@gmail.com>2020-03-22 16:25:57 -0400
commitbd4631126d55aa91df2b83aebd5afa1e8ef0c841 (patch)
tree65f00beb6a653be1be3c3888229aa0964725a08b /app/src/main
parent5d70a3cc38f561a95050fb552194d8b4ab4ef56d (diff)
downloadAntennaPod-bd4631126d55aa91df2b83aebd5afa1e8ef0c841.zip
Updates based on QA feedback
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java14
-rw-r--r--app/src/main/res/xml/preferences_network.xml10
2 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 9951eee23..1f0039189 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, true);
+ startFeedDownload(feedUrl, null, null);
} else {
- startFeedDownload(feedUrl, savedInstanceState.getString("username"), savedInstanceState.getString("password"), true);
+ startFeedDownload(feedUrl, savedInstanceState.getString("username"), savedInstanceState.getString("password"));
}
}
}
@@ -223,7 +223,7 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
return super.onOptionsItemSelected(item);
}
- private void startFeedDownload(String url, String username, String password, boolean initiatedByUser) {
+ private void startFeedDownload(String url, String username, String password) {
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, initiatedByUser);
+ true, null, true);
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(), true);
+ startFeedDownload(selectedUrl, prefs.getUsername(), prefs.getPassword());
} else {
- startFeedDownload(selectedUrl, null, null, true);
+ startFeedDownload(selectedUrl, null, null);
}
};
@@ -627,7 +627,7 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
@Override
protected void onConfirmed(String username, String password, boolean saveUsernamePassword) {
- startFeedDownload(feedUrl, username, password, true);
+ startFeedDownload(feedUrl, username, password);
}
}
diff --git a/app/src/main/res/xml/preferences_network.xml b/app/src/main/res/xml/preferences_network.xml
index bd52c2929..5d1831ef0 100644
--- a/app/src/main/res/xml/preferences_network.xml
+++ b/app/src/main/res/xml/preferences_network.xml
@@ -36,11 +36,11 @@
android:summary="@string/pref_showDownloadReport_sum"
android:title="@string/pref_showDownloadReport_title"/>
<SwitchPreference
- android:defaultValue="false"
- android:enabled="true"
- android:key="prefShowAutoDownloadReport"
- android:summary="@string/pref_showAutoDownloadReport_sum"
- android:title="@string/pref_showAutoDownloadReport_title"/>
+ android:defaultValue="false"
+ android:enabled="true"
+ android:key="prefShowAutoDownloadReport"
+ android:summary="@string/pref_showAutoDownloadReport_sum"
+ android:title="@string/pref_showAutoDownloadReport_title"/>
<Preference
android:key="prefProxy"
android:summary="@string/pref_proxy_sum"