Merge branch 'develop' into 2085-auto-enable-sleep-timer

14 files changed, 226 insertions, 41 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/asynctask/FeedRemover.java b/core/src/main/java/de/danoeh/antennapod/core/asynctask/FeedRemover.java
index e475e696c..67c460e78 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/asynctask/FeedRemover.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/asynctask/FeedRemover.java
@@ -38,10 +38,11 @@ public class FeedRemover extends AsyncTask<Void, Void, Void> {
 	
 	@Override
 	protected void onPostExecute(Void result) {
-		dialog.dismiss();
+        if(dialog != null && dialog.isShowing()) {
+            dialog.dismiss();
+        }
 		if(skipOnCompletion) {
-			context.sendBroadcast(new Intent(
-					PlaybackService.ACTION_SKIP_CURRENT_EPISODE));
+			context.sendBroadcast(new Intent(PlaybackService.ACTION_SKIP_CURRENT_EPISODE));
 		}
 	}
 
diff --git a/core/src/main/java/de/danoeh/antennapod/core/backup/OpmlBackupAgent.java b/core/src/main/java/de/danoeh/antennapod/core/backup/OpmlBackupAgent.java
index 982015314..80ce6cf56 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/backup/OpmlBackupAgent.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/backup/OpmlBackupAgent.java
@@ -8,6 +8,7 @@ import android.content.Context;
 import android.os.ParcelFileDescriptor;
 import android.util.Log;
 
+import org.apache.commons.io.IOUtils;
 import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.ByteArrayOutputStream;
@@ -27,10 +28,10 @@ import java.util.ArrayList;
 import java.util.Arrays;
 
 import de.danoeh.antennapod.core.BuildConfig;
+import de.danoeh.antennapod.core.export.opml.OpmlElement;
+import de.danoeh.antennapod.core.export.opml.OpmlReader;
+import de.danoeh.antennapod.core.export.opml.OpmlWriter;
 import de.danoeh.antennapod.core.feed.Feed;
-import de.danoeh.antennapod.core.opml.OpmlElement;
-import de.danoeh.antennapod.core.opml.OpmlReader;
-import de.danoeh.antennapod.core.opml.OpmlWriter;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DownloadRequestException;
 import de.danoeh.antennapod.core.storage.DownloadRequester;
@@ -56,7 +57,9 @@ public class OpmlBackupAgent extends BackupAgentHelper {
         }
     }
 
-    /** Class for backing up and restoring the OPML file. */
+    /**
+     * Class for backing up and restoring the OPML file.
+     */
     private static class OpmlBackupHelper implements BackupHelper {
         private static final String TAG = "OpmlBackupHelper";
 
@@ -64,7 +67,9 @@ public class OpmlBackupAgent extends BackupAgentHelper {
 
         private final Context mContext;
 
-        /** Checksum of restored OPML file */
+        /**
+         * Checksum of restored OPML file
+         */
         private byte[] mChecksum;
 
         public OpmlBackupHelper(Context context) {
@@ -170,12 +175,7 @@ public class OpmlBackupAgent extends BackupAgentHelper {
             } catch (IOException e) {
                 Log.e(TAG, "Failed to restore OPML backup", e);
             } finally {
-                if (reader != null) {
-                    try {
-                        reader.close();
-                    } catch (IOException e) {
-                    }
-                }
+                IOUtils.closeQuietly(reader);
             }
         }
 
diff --git a/core/src/main/java/de/danoeh/antennapod/core/export/CommonSymbols.java b/core/src/main/java/de/danoeh/antennapod/core/export/CommonSymbols.java
new file mode 100644
index 000000000..020a0671f
--- /dev/null
+++ b/core/src/main/java/de/danoeh/antennapod/core/export/CommonSymbols.java
@@ -0,0 +1,22 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package de.danoeh.antennapod.core.export;
+
+public class CommonSymbols {
+
+    public static final String HEAD = "head";
+    public static final String BODY = "body";
+    public static final String TITLE = "title";
+
+}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/export/ExportWriter.java b/core/src/main/java/de/danoeh/antennapod/core/export/ExportWriter.java
new file mode 100644
index 000000000..d6a187b21
--- /dev/null
+++ b/core/src/main/java/de/danoeh/antennapod/core/export/ExportWriter.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package de.danoeh.antennapod.core.export;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.util.List;
+
+import de.danoeh.antennapod.core.feed.Feed;
+
+public interface ExportWriter {
+
+	void writeDocument(List<Feed> feeds, Writer writer)
+			throws IllegalArgumentException, IllegalStateException, IOException;
+
+	String fileExtension();
+
+}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/export/html/HtmlSymbols.java b/core/src/main/java/de/danoeh/antennapod/core/export/html/HtmlSymbols.java
new file mode 100644
index 000000000..b8807a686
--- /dev/null
+++ b/core/src/main/java/de/danoeh/antennapod/core/export/html/HtmlSymbols.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package de.danoeh.antennapod.core.export.html;
+
+import de.danoeh.antennapod.core.export.CommonSymbols;
+
+class HtmlSymbols extends CommonSymbols {
+
+    static final String HTML = "html";
+
+    static final String ORDERED_LIST = "ol";
+    static final String LIST_ITEM = "li";
+
+    static String HEADING = "h1";
+
+    static final String LINK = "a";
+    static final String LINK_DESTINATION = "href";
+
+}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/export/html/HtmlWriter.java b/core/src/main/java/de/danoeh/antennapod/core/export/html/HtmlWriter.java
new file mode 100644
index 000000000..2fdd8ffa6
--- /dev/null
+++ b/core/src/main/java/de/danoeh/antennapod/core/export/html/HtmlWriter.java
@@ -0,0 +1,92 @@
+package de.danoeh.antennapod.core.export.html;
+
+import android.text.TextUtils;
+import android.util.Log;
+import android.util.Xml;
+
+import org.xmlpull.v1.XmlSerializer;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.util.List;
+
+import de.danoeh.antennapod.core.export.ExportWriter;
+import de.danoeh.antennapod.core.feed.Feed;
+
+/** Writes HTML documents. */
+public class HtmlWriter implements ExportWriter {
+
+    private static final String TAG = "HtmlWriter";
+    private static final String ENCODING = "UTF-8";
+    private static final String HTML_TITLE = "AntennaPod Subscriptions";
+
+    /**
+     * Takes a list of feeds and a writer and writes those into an HTML
+     * document.
+     *
+     * @throws IOException
+     * @throws IllegalStateException
+     * @throws IllegalArgumentException
+     */
+    @Override
+    public void writeDocument(List<Feed> feeds, Writer writer)
+            throws IllegalArgumentException, IllegalStateException, IOException {
+        Log.d(TAG, "Starting to write document");
+        XmlSerializer xs = Xml.newSerializer();
+        xs.setOutput(writer);
+
+        xs.startDocument(ENCODING, false);
+        xs.text("\n");
+        xs.startTag(null, HtmlSymbols.HTML);
+        xs.text("\n");
+        xs.startTag(null, HtmlSymbols.HEAD);
+        xs.text("\n");
+        xs.startTag(null, HtmlSymbols.TITLE);
+        xs.text(HTML_TITLE);
+        xs.endTag(null, HtmlSymbols.TITLE);
+        xs.text("\n");
+        xs.endTag(null, HtmlSymbols.HEAD);
+        xs.text("\n");
+
+        xs.startTag(null, HtmlSymbols.BODY);
+        xs.text("\n");
+        xs.startTag(null, HtmlSymbols.HEADING);
+        xs.text(HTML_TITLE);
+        xs.endTag(null, HtmlSymbols.HEADING);
+        xs.text("\n");
+        xs.startTag(null, HtmlSymbols.ORDERED_LIST);
+        xs.text("\n");
+        for (Feed feed : feeds) {
+            xs.startTag(null, HtmlSymbols.LIST_ITEM);
+            xs.text(feed.getTitle());
+            if (!TextUtils.isEmpty(feed.getLink())) {
+                xs.text(" [");
+                xs.startTag(null, HtmlSymbols.LINK);
+                xs.attribute(null, HtmlSymbols.LINK_DESTINATION, feed.getLink());
+                xs.text("Website");
+                xs.endTag(null, HtmlSymbols.LINK);
+                xs.text("]");
+            }
+            xs.text(" [");
+            xs.startTag(null, HtmlSymbols.LINK);
+            xs.attribute(null, HtmlSymbols.LINK_DESTINATION, feed.getDownload_url());
+            xs.text("Feed");
+            xs.endTag(null, HtmlSymbols.LINK);
+            xs.text("]");
+            xs.endTag(null, HtmlSymbols.LIST_ITEM);
+            xs.text("\n");
+        }
+        xs.endTag(null, HtmlSymbols.ORDERED_LIST);
+        xs.endTag(null, HtmlSymbols.BODY);
+        xs.text("\n");
+        xs.endTag(null, HtmlSymbols.HTML);
+        xs.text("\n");
+        xs.endDocument();
+        Log.d(TAG, "Finished writing document");
+    }
+
+    public String fileExtension() {
+        return "html";
+    }
+
+}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/opml/OpmlElement.java b/core/src/main/java/de/danoeh/antennapod/core/export/opml/OpmlElement.java
index 8d0a4a842..61eb4d0c9 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/opml/OpmlElement.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/export/opml/OpmlElement.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.core.opml;
+package de.danoeh.antennapod.core.export.opml;
 
 /** Represents a single feed in an OPML file. */
 public class OpmlElement {
diff --git a/core/src/main/java/de/danoeh/antennapod/core/opml/OpmlReader.java b/core/src/main/java/de/danoeh/antennapod/core/export/opml/OpmlReader.java
index 17afc7904..a17fedd7d 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/opml/OpmlReader.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/export/opml/OpmlReader.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.core.opml;
+package de.danoeh.antennapod.core.export.opml;
 
 import android.util.Log;
 
diff --git a/core/src/main/java/de/danoeh/antennapod/core/export/opml/OpmlSymbols.java b/core/src/main/java/de/danoeh/antennapod/core/export/opml/OpmlSymbols.java
new file mode 100644
index 000000000..40b0e23b8
--- /dev/null
+++ b/core/src/main/java/de/danoeh/antennapod/core/export/opml/OpmlSymbols.java
@@ -0,0 +1,21 @@
+package de.danoeh.antennapod.core.export.opml;
+
+import de.danoeh.antennapod.core.export.CommonSymbols;
+
+/** Contains symbols for reading and writing OPML documents. */
+public final class OpmlSymbols extends CommonSymbols {
+	
+	public static final String OPML = "opml";
+	static final String OUTLINE = "outline";
+	static final String TEXT = "text";
+	static final String XMLURL = "xmlUrl";
+	static final String HTMLURL = "htmlUrl";
+	static final String TYPE = "type";
+	static final String VERSION = "version";
+	static final String DATE_CREATED = "dateCreated";
+	
+	private OpmlSymbols() {
+		
+	}
+
+}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/opml/OpmlWriter.java b/core/src/main/java/de/danoeh/antennapod/core/export/opml/OpmlWriter.java
index 673c602df..afd652cff 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/opml/OpmlWriter.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/export/opml/OpmlWriter.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.core.opml;
+package de.danoeh.antennapod.core.export.opml;
 
 import android.util.Log;
 import android.util.Xml;
@@ -10,11 +10,13 @@ import java.io.Writer;
 import java.util.Date;
 import java.util.List;
 
+import de.danoeh.antennapod.core.export.ExportWriter;
 import de.danoeh.antennapod.core.feed.Feed;
 import de.danoeh.antennapod.core.util.DateUtils;
 
 /** Writes OPML documents. */
-public class OpmlWriter {
+public class OpmlWriter implements ExportWriter {
+
 	private static final String TAG = "OpmlWriter";
 	private static final String ENCODING = "UTF-8";
 	private static final String OPML_VERSION = "2.0";
@@ -28,6 +30,7 @@ public class OpmlWriter {
 	 * @throws IllegalStateException
 	 * @throws IllegalArgumentException
 	 */
+	@Override
 	public void writeDocument(List<Feed> feeds, Writer writer)
 			throws IllegalArgumentException, IllegalStateException, IOException {
 		Log.d(TAG, "Starting to write document");
@@ -83,4 +86,9 @@ public class OpmlWriter {
 		xs.endDocument();
 		Log.d(TAG, "Finished writing document");
 	}
+
+	public String fileExtension() {
+		return "opml";
+	}
+
 }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/opml/OpmlSymbols.java b/core/src/main/java/de/danoeh/antennapod/core/opml/OpmlSymbols.java
deleted file mode 100644
index c973713cb..000000000
--- a/core/src/main/java/de/danoeh/antennapod/core/opml/OpmlSymbols.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package de.danoeh.antennapod.core.opml;
-
-/** Contains symbols for reading and writing OPML documents. */
-public final class OpmlSymbols {
-	
-	public static final String OPML = "opml";
-	public static final String BODY = "body";
-	public static final String OUTLINE = "outline";
-	public static final String TEXT = "text";
-	public static final String XMLURL = "xmlUrl";
-	public static final String HTMLURL = "htmlUrl";
-	public static final String TYPE = "type";
-	public static final String VERSION = "version";
-	public static final String HEAD = "head";
-	public static final String TITLE = "title";
-	public static final String DATE_CREATED = "dateCreated";
-	
-	private OpmlSymbols() {
-		
-	}
-
-}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/LocalPSMP.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/LocalPSMP.java
index 0871758d0..cad67539b 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/LocalPSMP.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/LocalPSMP.java
@@ -383,6 +383,9 @@ public class LocalPSMP extends PlaybackServiceMediaPlayer {
             statusBeforeSeeking = playerStatus;
             setPlayerStatus(PlayerStatus.SEEKING, media, getPosition());
             mediaPlayer.seekTo(t);
+            if (statusBeforeSeeking == PlayerStatus.PREPARED) {
+                media.setPosition(t);
+            }
             try {
                 seekLatch.await(3, TimeUnit.SECONDS);
             } catch (InterruptedException e) {
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
index 13aadf027..6251cc4a0 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
@@ -216,7 +216,7 @@ public abstract class PlaybackController {
                 Intent serviceIntent = new Intent(activity, PlaybackService.class);
                 serviceIntent.putExtra(PlaybackService.EXTRA_PLAYABLE, media);
                 serviceIntent.putExtra(PlaybackService.EXTRA_START_WHEN_PREPARED, false);
-                serviceIntent.putExtra(PlaybackService.EXTRA_PREPARE_IMMEDIATELY, false);
+                serviceIntent.putExtra(PlaybackService.EXTRA_PREPARE_IMMEDIATELY, true);
                 boolean fileExists = media.localFileAvailable();
                 boolean lastIsStream = PlaybackPreferences.getCurrentEpisodeIsStream();
                 if (!fileExists && !lastIsStream && media instanceof FeedMedia) {
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 2347ce5f9..29cb9b610 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -451,6 +451,7 @@
     <string name="choose_file_from_filesystem">From local filesystem</string>
     <string name="choose_file_from_external_application">Use external application</string>
     <string name="opml_export_label">OPML export</string>
+    <string name="html_export_label">HTML export</string>
     <string name="exporting_label">Exporting&#8230;</string>
     <string name="export_error_label">Export error</string>
     <string name="opml_export_success_title">OPML Export successful.</string>