garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

simpler support for single quotes (#681)

Browse Source
This commit is contained in:
Athou
2014-11-26 15:25:38 +01:00
parent 77c3ec0bbe
commit cca300e419
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/commafeed/backend/feed/FeedUtils.java
View File

@@ -184,13 +184,13 @@ public class FeedUtils {
return null;
}
String pi = new String(ArrayUtils.subarray(bytes, 0, index + 1));
index = StringUtils.indexOf(pi, "encoding=");
String pi = new String(ArrayUtils.subarray(bytes, 0, index + 1)).replace('\'', '"');
index = StringUtils.indexOf(pi, "encoding=\"");
if (index == -1) {
return null;
}
String encoding = pi.substring(index + 10, pi.length());
encoding = encoding.substring(0, Math.max(encoding.indexOf(' ') - 1, 0));
encoding = encoding.substring(0, encoding.indexOf('"'));
return encoding;
}

2
src/test/java/com/commafeed/backend/feed/FeedUtilsTest.java
View File

@@ -60,6 +60,6 @@ public class FeedUtilsTest {
Assert.assertNull(FeedUtils.extractDeclaredEncoding("<feed></feed>".getBytes()));
Assert.assertEquals("UTF-8", FeedUtils.extractDeclaredEncoding("<?xml encoding=\"UTF-8\" ?>".getBytes()));
Assert.assertEquals("UTF-8", FeedUtils.extractDeclaredEncoding("<?xml encoding='UTF-8' ?>".getBytes()));
Assert.assertEquals("UTF-8", FeedUtils.extractDeclaredEncoding("<?xml encoding='UTF-8'?>".getBytes()));
}
}