Merge branch 'migration' into develop

Non-GUI classes have been moved into the 'core' project in order to allow AntennaPod SP to reference it as a subproject.

Conflicts:
	app/src/main/AndroidManifest.xml
	build.gradle
	core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
	core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSSimpleChapters.java
	core/src/main/java/de/danoeh/antennapod/core/util/ChapterUtils.java
	gradle/wrapper/gradle-wrapper.properties
	pom.xml

6 files changed, 0 insertions, 460 deletions

diff --git a/src/de/danoeh/antennapod/util/id3reader/ChapterReader.java b/src/de/danoeh/antennapod/util/id3reader/ChapterReader.java
deleted file mode 100644
index 257635129..000000000
--- a/src/de/danoeh/antennapod/util/id3reader/ChapterReader.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package de.danoeh.antennapod.util.id3reader;
-
-import android.util.Log;
-import de.danoeh.antennapod.BuildConfig;
-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;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.List;
-
-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;
-
-	@Override
-	public int onStartTagHeader(TagHeader header) {
-		chapters = new ArrayList<Chapter>();
-		System.out.println(header.toString());
-		return ID3Reader.ACTION_DONT_SKIP;
-	}
-
-	@Override
-	public int onStartFrameHeader(FrameHeader header, InputStream input)
-			throws IOException, ID3ReaderException {
-		System.out.println(header.toString());
-		if (header.getId().equals(FRAME_ID_CHAPTER)) {
-			if (currentChapter != null) {
-				if (!hasId3Chapter(currentChapter)) {
-					chapters.add(currentChapter);
-                    if (BuildConfig.DEBUG) Log.d(TAG, "Found chapter: " + currentChapter);
-					currentChapter = null;
-				}
-			}
-            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.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(title.toString());
-				if (BuildConfig.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 (BuildConfig.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);
-	}
-
-	private boolean hasId3Chapter(ID3Chapter chapter) {
-		for (Chapter c : chapters) {
-			if (((ID3Chapter) c).getId3ID().equals(chapter.getId3ID())) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public void onEndTag() {
-		if (currentChapter != null) {
-			if (!hasId3Chapter(currentChapter)) {
-				chapters.add(currentChapter);
-			}
-		}
-		System.out.println("Reached end of tag");
-		if (chapters != null) {
-			for (Chapter c : chapters) {
-				System.out.println(c.toString());
-			}
-		}
-	}
-
-	@Override
-	public void onNoTagHeaderFound() {
-		System.out.println("No tag header found");
-		super.onNoTagHeaderFound();
-	}
-
-	public List<Chapter> getChapters() {
-		return chapters;
-	}
-
-}
diff --git a/src/de/danoeh/antennapod/util/id3reader/ID3Reader.java b/src/de/danoeh/antennapod/util/id3reader/ID3Reader.java
deleted file mode 100644
index 252d64107..000000000
--- a/src/de/danoeh/antennapod/util/id3reader/ID3Reader.java
+++ /dev/null
@@ -1,250 +0,0 @@
-package de.danoeh.antennapod.util.id3reader;
-
-import de.danoeh.antennapod.util.id3reader.model.FrameHeader;
-import de.danoeh.antennapod.util.id3reader.model.TagHeader;
-import org.apache.commons.io.IOUtils;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-
-/**
- * Reads the ID3 Tag of a given file. In order to use this class, you should
- * create a subclass of it and overwrite the onStart* - or onEnd* - methods.
- */
-public class ID3Reader {
-	private static final int HEADER_LENGTH = 10;
-	private static final int ID3_LENGTH = 3;
-	private static final int FRAME_ID_LENGTH = 4;
-
-	protected static final int ACTION_SKIP = 1;
-	protected static final int ACTION_DONT_SKIP = 2;
-
-	protected int readerPosition;
-
-	private static final byte ENCODING_UTF16_WITH_BOM = 1;
-    private static final byte ENCODING_UTF16_WITHOUT_BOM = 2;
-    private static final byte ENCODING_UTF8 = 3;
-
-    private TagHeader tagHeader;
-
-	public ID3Reader() {
-	}
-
-	public final void readInputStream(InputStream input) throws IOException,
-			ID3ReaderException {
-		int rc;
-		readerPosition = 0;
-		char[] tagHeaderSource = readBytes(input, HEADER_LENGTH);
-		tagHeader = createTagHeader(tagHeaderSource);
-		if (tagHeader == null) {
-			onNoTagHeaderFound();
-		} else {
-			rc = onStartTagHeader(tagHeader);
-			if (rc == ACTION_SKIP) {
-				onEndTag();
-			} else {
-				while (readerPosition < tagHeader.getSize()) {
-					FrameHeader frameHeader = createFrameHeader(readBytes(
-							input, HEADER_LENGTH));
-					if (checkForNullString(frameHeader.getId())) {
-						break;
-					} else {
-						rc = onStartFrameHeader(frameHeader, input);
-						if (rc == ACTION_SKIP) {
-
-							if (frameHeader.getSize() + readerPosition > tagHeader
-									.getSize()) {
-								break;
-							} else {
-								skipBytes(input, frameHeader.getSize());
-							}
-						}
-					}
-				}
-				onEndTag();
-			}
-		}
-	}
-
-	/** Returns true if string only contains null-bytes. */
-	private boolean checkForNullString(String s) {
-		if (!s.isEmpty()) {
-			int i = 0;
-			if (s.charAt(i) == 0) {
-				for (i = 1; i < s.length(); i++) {
-					if (s.charAt(i) != 0) {
-						return false;
-					}
-				}
-				return true;
-			}
-			return false;
-		} else {
-			return true;
-		}
-
-	}
-
-	/**
-	 * Read a certain number of bytes from the given input stream. This method
-	 * changes the readerPosition-attribute.
-	 */
-	protected char[] readBytes(InputStream input, int number)
-			throws IOException, ID3ReaderException {
-		char[] header = new char[number];
-		for (int i = 0; i < number; i++) {
-			int b = input.read();
-			readerPosition++;
-			if (b != -1) {
-				header[i] = (char) b;
-			} else {
-				throw new ID3ReaderException("Unexpected end of stream");
-			}
-		}
-		return header;
-	}
-
-	/**
-	 * Skip a certain number of bytes on the given input stream. This method
-	 * changes the readerPosition-attribute.
-	 */
-	protected void skipBytes(InputStream input, int number) throws IOException {
-		if (number <= 0) {
-			number = 1;
-		}
-		IOUtils.skipFully(input, number);
-
-		readerPosition += number;
-	}
-
-	private TagHeader createTagHeader(char[] source) throws ID3ReaderException {
-		boolean hasTag = (source[0] == 0x49) && (source[1] == 0x44)
-				&& (source[2] == 0x33);
-		if (source.length != HEADER_LENGTH) {
-			throw new ID3ReaderException("Length of header must be "
-					+ HEADER_LENGTH);
-		}
-		if (hasTag) {
-			String id = new String(source, 0, ID3_LENGTH);
-			char version = (char) ((source[3] << 8) | source[4]);
-			byte flags = (byte) source[5];
-			int size = (source[6] << 24) | (source[7] << 16) | (source[8] << 8)
-					| source[9];
-            size = unsynchsafe(size);
-			return new TagHeader(id, size, version, flags);
-		} else {
-			return null;
-		}
-	}
-
-	private FrameHeader createFrameHeader(char[] source)
-			throws ID3ReaderException {
-		if (source.length != HEADER_LENGTH) {
-			throw new ID3ReaderException("Length of header must be "
-					+ HEADER_LENGTH);
-		}
-		String id = new String(source, 0, FRAME_ID_LENGTH);
-
-        int size = (((int) source[4]) << 24) | (((int) source[5]) << 16)
-                    | (((int) source[6]) << 8) | source[7];
-        if (tagHeader != null && tagHeader.getVersion() >= 0x0400) {
-            size = unsynchsafe(size);
-        }
-		char flags = (char) ((source[8] << 8) | source[9]);
-		return new FrameHeader(id, size, flags);
-	}
-
-    private int unsynchsafe(int in) {
-        int out = 0;
-        int mask = 0x7F000000;
-
-        while (mask != 0) {
-            out >>= 1;
-            out |= in & mask;
-            mask >>= 8;
-        }
-
-        return out;
-    }
-
-	protected int readString(StringBuffer buffer, InputStream input, int max) throws IOException,
-			ID3ReaderException {
-		if (max > 0) {
-			char[] encoding = readBytes(input, 1);
-			max--;
-			
-			if (encoding[0] == ENCODING_UTF16_WITH_BOM || encoding[0] == ENCODING_UTF16_WITHOUT_BOM) {
-                return readUnicodeString(buffer, input, max, Charset.forName("UTF-16")) + 1; // take encoding byte into account
-			} else if (encoding[0] == ENCODING_UTF8) {
-                return readUnicodeString(buffer, input, max, Charset.forName("UTF-8")) + 1; // take encoding byte into account
-            } else {
-				return readISOString(buffer, input, max) + 1; // take encoding byte into account
-			}
-		} else {
-            if (buffer != null) {
-                buffer.append("");
-            }
-			return 0;
-		}
-	}
-
-	protected int readISOString(StringBuffer buffer, InputStream input, int max)
-			throws IOException, ID3ReaderException {
-
-		int bytesRead = 0;
-		char c;
-		while (++bytesRead <= max && (c = (char) input.read()) > 0) {
-            if (buffer != null) {
-			    buffer.append(c);
-            }
-		}
-		return bytesRead;
-	}
-
-	private int readUnicodeString(StringBuffer strBuffer, InputStream input, int max, Charset charset)
-			throws IOException, ID3ReaderException {
-		byte[] buffer = new byte[max];
-        int c, cZero = -1;
-        int i = 0;
-        for (; i < max; i++) {
-            c = input.read();
-            if (c == -1) {
-                break;
-            } else if (c == 0) {
-                if (cZero == 0) {
-                    // termination character found
-                    break;
-                } else {
-                    cZero = 0;
-                }
-            } else {
-                buffer[i] = (byte) c;
-                cZero = -1;
-            }
-        }
-        if (strBuffer != null) {
-		    strBuffer.append(charset.newDecoder().decode(ByteBuffer.wrap(buffer)).toString());
-        }
-        return i;
-	}
-
-	public int onStartTagHeader(TagHeader header) {
-		return ACTION_SKIP;
-	}
-
-	public int onStartFrameHeader(FrameHeader header, InputStream input)
-			throws IOException, ID3ReaderException {
-		return ACTION_SKIP;
-	}
-
-	public void onEndTag() {
-
-	}
-
-	public void onNoTagHeaderFound() {
-
-	}
-
-}
diff --git a/src/de/danoeh/antennapod/util/id3reader/ID3ReaderException.java b/src/de/danoeh/antennapod/util/id3reader/ID3ReaderException.java
deleted file mode 100644
index c458540ee..000000000
--- a/src/de/danoeh/antennapod/util/id3reader/ID3ReaderException.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package de.danoeh.antennapod.util.id3reader;
-
-public class ID3ReaderException extends Exception {
-
-	public ID3ReaderException() {
-	}
-
-	public ID3ReaderException(String arg0) {
-		super(arg0);
-	}
-
-	public ID3ReaderException(Throwable arg0) {
-		super(arg0);
-	}
-
-	public ID3ReaderException(String arg0, Throwable arg1) {
-		super(arg0, arg1);
-	}
-
-}
diff --git a/src/de/danoeh/antennapod/util/id3reader/model/FrameHeader.java b/src/de/danoeh/antennapod/util/id3reader/model/FrameHeader.java
deleted file mode 100644
index df73393a5..000000000
--- a/src/de/danoeh/antennapod/util/id3reader/model/FrameHeader.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package de.danoeh.antennapod.util.id3reader.model;
-
-public class FrameHeader extends Header {
-
-	protected char flags;
-
-	public FrameHeader(String id, int size, char flags) {
-		super(id, size);
-		this.flags = flags;
-	}
-
-	@Override
-	public String toString() {
-        return String.format("FrameHeader [flags=%s, id=%s, size=%s]", Integer.toBinaryString(flags), id, Integer.toBinaryString(size));
-    }
-
-}
diff --git a/src/de/danoeh/antennapod/util/id3reader/model/Header.java b/src/de/danoeh/antennapod/util/id3reader/model/Header.java
deleted file mode 100644
index 22d5b6376..000000000
--- a/src/de/danoeh/antennapod/util/id3reader/model/Header.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package de.danoeh.antennapod.util.id3reader.model;
-
-public abstract class Header {
-
-	protected String id;
-	protected int size;
-
-	public Header(String id, int size) {
-		super();
-		this.id = id;
-		this.size = size;
-	}
-
-	public String getId() {
-		return id;
-	}
-
-	public int getSize() {
-		return size;
-	}
-
-	@Override
-	public String toString() {
-		return "Header [id=" + id + ", size=" + size + "]";
-	}
-	
-	
-
-}
diff --git a/src/de/danoeh/antennapod/util/id3reader/model/TagHeader.java b/src/de/danoeh/antennapod/util/id3reader/model/TagHeader.java
deleted file mode 100644
index ec99ef14e..000000000
--- a/src/de/danoeh/antennapod/util/id3reader/model/TagHeader.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package de.danoeh.antennapod.util.id3reader.model;
-
-public class TagHeader extends Header {
-
-	protected char version;
-	protected byte flags;
-
-	public TagHeader(String id, int size, char version, byte flags) {
-		super(id, size);
-		this.version = version;
-		this.flags = flags;
-	}
-
-	@Override
-	public String toString() {
-		return "TagHeader [version=" + version + ", flags=" + flags + ", id="
-				+ id + ", size=" + size + "]";
-	}
-
-	public char getVersion() {
-		return version;
-	}
-
-	
-
-}