1 files changed, 30 insertions, 6 deletions

diff --git a/src/de/danoeh/antennapod/util/id3reader/ChapterReader.java b/src/de/danoeh/antennapod/util/id3reader/ChapterReader.java
index e1cafe85d..f897f886c 100644
--- a/src/de/danoeh/antennapod/util/id3reader/ChapterReader.java
+++ b/src/de/danoeh/antennapod/util/id3reader/ChapterReader.java
@@ -2,18 +2,24 @@ package de.danoeh.antennapod.util.id3reader;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.List;
 
+import android.util.Log;
+
+import de.danoeh.antennapod.AppConfig;
 import de.danoeh.antennapod.feed.Chapter;
 import de.danoeh.antennapod.feed.ID3Chapter;
 import de.danoeh.antennapod.util.id3reader.model.FrameHeader;
 import de.danoeh.antennapod.util.id3reader.model.TagHeader;
 
 public class ChapterReader extends ID3Reader {
+    private static final String TAG = "ID3ChapterReader";
 
 	private static final String FRAME_ID_CHAPTER = "CHAP";
 	private static final String FRAME_ID_TITLE = "TIT2";
+    private static final String FRAME_ID_LINK = "WXXX";
 
 	private List<Chapter> chapters;
 	private ID3Chapter currentChapter;
@@ -33,27 +39,45 @@ public class ChapterReader extends ID3Reader {
 			if (currentChapter != null) {
 				if (!hasId3Chapter(currentChapter)) {
 					chapters.add(currentChapter);
-					System.out.println("Found chapter: " + currentChapter);
+                    if (AppConfig.DEBUG) Log.d(TAG, "Found chapter: " + currentChapter);
 					currentChapter = null;
 				}
 			}
-			String elementId = readISOString(input, Integer.MAX_VALUE);
+            StringBuffer elementId = new StringBuffer();
+			readISOString(elementId, input, Integer.MAX_VALUE);
 			char[] startTimeSource = readBytes(input, 4);
 			long startTime = ((int) startTimeSource[0] << 24)
 					| ((int) startTimeSource[1] << 16)
 					| ((int) startTimeSource[2] << 8) | startTimeSource[3];
-			currentChapter = new ID3Chapter(elementId, startTime);
+			currentChapter = new ID3Chapter(elementId.toString(), startTime);
 			skipBytes(input, 12);
 			return ID3Reader.ACTION_DONT_SKIP;
 		} else if (header.getId().equals(FRAME_ID_TITLE)) {
 			if (currentChapter != null && currentChapter.getTitle() == null) {
+                StringBuffer title = new StringBuffer();
+                readString(title, input, header.getSize());
 				currentChapter
-						.setTitle(readString(input, header.getSize()));
-				System.out.println("Found title: " + currentChapter.getTitle());
+						.setTitle(title.toString());
+				if (AppConfig.DEBUG) Log.d(TAG, "Found title: " + currentChapter.getTitle());
 
 				return ID3Reader.ACTION_DONT_SKIP;
 			}
-		}
+		} else if (header.getId().equals(FRAME_ID_LINK)) {
+            if (currentChapter != null) {
+                // skip description
+                int descriptionLength = readString(null, input, header.getSize());
+                StringBuffer link = new StringBuffer();
+                readISOString(link, input, header.getSize() - descriptionLength);
+                String decodedLink = URLDecoder.decode(link.toString(), "UTF-8");
+
+                currentChapter.setLink(decodedLink);
+
+                if (AppConfig.DEBUG) Log.d(TAG, "Found link: " + currentChapter.getLink());
+                return ID3Reader.ACTION_DONT_SKIP;
+            }
+        } else if (header.getId().equals("APIC")) {
+            Log.d(TAG, header.toString());
+        }
 
 		return super.onStartFrameHeader(header, input);
 	}