Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SyndHandler wasn't always selecting the correct namespace handler

Browse Source
This commit is contained in:
daniel oeh 2012-09-02 14:39:29 +02:00
parent 8f37a19875
commit 7e97934764
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/de/danoeh/antennapod/syndication/handler/SyndHandler.java
View File

@ -33,7 +33,7 @@ public class SyndHandler extends DefaultHandler {
public void startElement(String uri, String localName, String qName, public void startElement(String uri, String localName, String qName,
Attributes attributes) throws SAXException { Attributes attributes) throws SAXException {
state.contentBuf = new StringBuffer(); state.contentBuf = new StringBuffer();
Namespace handler = getHandlingNamespace(uri); Namespace handler = getHandlingNamespace(uri, qName);
if (handler != null) { if (handler != null) {
SyndElement element = handler.handleElementStart(localName, state, SyndElement element = handler.handleElementStart(localName, state,
attributes); attributes);
@ -58,7 +58,7 @@ public class SyndHandler extends DefaultHandler {
@Override @Override
public void endElement(String uri, String localName, String qName) public void endElement(String uri, String localName, String qName)
throws SAXException { throws SAXException {
Namespace handler = getHandlingNamespace(uri); Namespace handler = getHandlingNamespace(uri, qName);
if (handler != null) { if (handler != null) {
handler.handleElementEnd(localName, state); handler.handleElementEnd(localName, state);
state.tagstack.pop(); state.tagstack.pop();
@ -107,9 +107,9 @@ public class SyndHandler extends DefaultHandler {
} }
} }
private Namespace getHandlingNamespace(String uri) { private Namespace getHandlingNamespace(String uri, String qName) {
Namespace handler = state.namespaces.get(uri); Namespace handler = state.namespaces.get(uri);
if (handler == null && !state.defaultNamespaces.empty()) { if (handler == null && !state.defaultNamespaces.empty() && !qName.contains(":")) {
handler = state.defaultNamespaces.peek(); handler = state.defaultNamespaces.peek();
} }
return handler; return handler;

9
tests/src/de/danoeh/antennapod/test/FeedHandlerTest.java
View File

@ -24,6 +24,7 @@ public class FeedHandlerTest extends AndroidTestCase {
private static final String FEEDS_DIR = "testfeeds"; private static final String FEEDS_DIR = "testfeeds";
private static final String[] urls = { private static final String[] urls = {
"http://feeds.feedburner.com/buildanalyze",
"http://www.blacksweetstories.com/feed/podcast/", "http://www.blacksweetstories.com/feed/podcast/",
"http://bitlove.org/ranzzeit/ranz/feed", "http://bitlove.org/ranzzeit/ranz/feed",
"http://bitlove.org/importthis/mp3/feed", "http://bitlove.org/importthis/mp3/feed",
@ -451,6 +452,14 @@ public class FeedHandlerTest extends AndroidTestCase {
Log.e(TAG, "Feed has invalid items"); Log.e(TAG, "Feed has invalid items");
return false; return false;
} }
if (feed.getLink() == null) {
Log.e(TAG, "Feed has no link");
return false;
}
if (feed.getLink() != null && feed.getLink().length() == 0) {
Log.e(TAG, "Feed has empty link");
return false;
}
return true; return true;
} }