Castopod/AntennaPod
1
0
Fork 0
mirror of https://github.com/AntennaPod/AntennaPod.git synced 2024-12-26 16:52:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3101 from orionlee/bugfix_add_podcast_by_url_case_no_feed_in_html_3099

Browse Source 
bugfix - add podcast by URL - show error dialog when URL points to no feed
This commit is contained in:
Martin Fietz 2019-04-08 18:53:32 +02:00 committed by GitHub
commit f5956bcd56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
View File

@ -342,8 +342,13 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
} catch (UnsupportedFeedtypeException e) {
Log.d(TAG, "Unsupported feed type detected");
if ("html".equalsIgnoreCase(e.getRootElement())) {
showFeedDiscoveryDialog(new File(feed.getFile_url()), feed.getDownload_url());
return Optional.empty();
boolean dialogShown = showFeedDiscoveryDialog(new File(feed.getFile_url()), feed.getDownload_url());
if (dialogShown) {
return Optional.empty();
} else {
Log.d(TAG, "Supplied feed is an HTML web page that has no references to any feed");
throw e;
}
} else {
throw e;
}
@ -539,21 +544,25 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
}
}
private void showFeedDiscoveryDialog(File feedFile, String baseUrl) {
/**
*
* @return true if a FeedDiscoveryDialog is shown, false otherwise (e.g., due to no feed found).
*/
private boolean showFeedDiscoveryDialog(File feedFile, String baseUrl) {
FeedDiscoverer fd = new FeedDiscoverer();
final Map<String, String> urlsMap;
try {
urlsMap = fd.findLinks(feedFile, baseUrl);
if (urlsMap == null || urlsMap.isEmpty()) {
return;
return false;
}
} catch (IOException e) {
e.printStackTrace();
return;
return false;
}
if (isPaused || isFinishing()) {
return;
return false;
}
final List<String> titles = new ArrayList<>();
@ -589,6 +598,7 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
}
dialog = ab.show();
});
return true;
}
private class FeedViewAuthenticationDialog extends AuthenticationDialog {