Add option to export subscriptions as HTML

3 files changed, 27 insertions, 14 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlExportWorker.java b/app/src/main/java/de/danoeh/antennapod/asynctask/ExportWorker.java
index 05ff70e4a..192df8ca5 100644
--- a/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlExportWorker.java
+++ b/app/src/main/java/de/danoeh/antennapod/asynctask/ExportWorker.java
@@ -1,5 +1,6 @@
 package de.danoeh.antennapod.asynctask;
 
+import android.support.annotation.NonNull;
 import android.util.Log;
 
 import java.io.File;
@@ -7,7 +8,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 
-import de.danoeh.antennapod.core.export.opml.OpmlWriter;
+import de.danoeh.antennapod.core.export.ExportWriter;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.util.LangUtils;
@@ -16,18 +17,22 @@ import rx.Observable;
 /**
  * Writes an OPML file into the export directory in the background.
  */
-public class OpmlExportWorker {
+public class ExportWorker {
 
-    public static final String EXPORT_DIR = "export/";
-    private static final String TAG = "OpmlExportWorker";
-    private static final String DEFAULT_OUTPUT_NAME = "antennapod-feeds.opml";
+    private static final String EXPORT_DIR = "export/";
+    private static final String TAG = "ExportWorker";
+    private static final String DEFAULT_OUTPUT_NAME = "antennapod-feeds";
+
+    private ExportWriter exportWriter;
     private File output;
 
-    public OpmlExportWorker() {
-        this(new File(UserPreferences.getDataFolder(EXPORT_DIR), DEFAULT_OUTPUT_NAME));
+    public ExportWorker(ExportWriter exportWriter) {
+        this(exportWriter, new File(UserPreferences.getDataFolder(EXPORT_DIR),
+                DEFAULT_OUTPUT_NAME + "." + exportWriter.fileExtension()));
     }
 
-    public OpmlExportWorker(File output) {
+    public ExportWorker(ExportWriter exportWriter, @NonNull File output) {
+        this.exportWriter = exportWriter;
         this.output = output;
     }
 
@@ -36,12 +41,11 @@ public class OpmlExportWorker {
             Log.w(TAG, "Overwriting previously exported file.");
             output.delete();
         }
-        OpmlWriter opmlWriter = new OpmlWriter();
         return Observable.create(subscriber -> {
             OutputStreamWriter writer = null;
             try {
                 writer = new OutputStreamWriter(new FileOutputStream(output), LangUtils.UTF_8);
-                opmlWriter.writeDocument(DBReader.getFeedList(), writer);
+                exportWriter.writeDocument(DBReader.getFeedList(), writer);
                 subscriber.onNext(output);
             } catch (IOException e) {
                 subscriber.onError(e);
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index 3e5095a62..818b3a625 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -55,7 +55,10 @@ import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.activity.PreferenceActivity;
 import de.danoeh.antennapod.activity.PreferenceActivityGingerbread;
 import de.danoeh.antennapod.activity.StatisticsActivity;
-import de.danoeh.antennapod.asynctask.OpmlExportWorker;
+import de.danoeh.antennapod.asynctask.ExportWorker;
+import de.danoeh.antennapod.core.export.ExportWriter;
+import de.danoeh.antennapod.core.export.html.HtmlWriter;
+import de.danoeh.antennapod.core.export.opml.OpmlWriter;
 import de.danoeh.antennapod.core.preferences.GpodnetPreferences;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.service.GpodnetSyncService;
@@ -85,6 +88,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
     private static final String PREF_FLATTR_REVOKE = "prefRevokeAccess";
     private static final String PREF_AUTO_FLATTR_PREFS = "prefAutoFlattrPrefs";
     private static final String PREF_OPML_EXPORT = "prefOpmlExport";
+    private static final String PREF_HTML_EXPORT = "prefHtmlExport";
     private static final String STATISTICS = "statistics";
     private static final String PREF_ABOUT = "prefAbout";
     private static final String PREF_CHOOSE_DATA_DIR = "prefChooseDataDir";
@@ -181,7 +185,9 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                 }
         );
         ui.findPreference(PreferenceController.PREF_OPML_EXPORT).setOnPreferenceClickListener(
-                preference -> exportOpml());
+                preference -> export(new OpmlWriter()));
+        ui.findPreference(PreferenceController.PREF_HTML_EXPORT).setOnPreferenceClickListener(
+                preference -> export(new HtmlWriter()));
         ui.findPreference(PreferenceController.PREF_CHOOSE_DATA_DIR).setOnPreferenceClickListener(
                 preference -> {
                     if (Build.VERSION_CODES.KITKAT <= Build.VERSION.SDK_INT &&
@@ -438,7 +444,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
         setSelectedNetworksEnabled(UserPreferences.isEnableAutodownloadWifiFilter());
     }
 
-    private boolean exportOpml() {
+    private boolean export(ExportWriter exportWriter) {
         Context context = ui.getActivity();
         final ProgressDialog progressDialog = new ProgressDialog(context);
         progressDialog.setMessage(context.getString(R.string.exporting_label));
@@ -446,7 +452,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
         progressDialog.show();
         final AlertDialog.Builder alert = new AlertDialog.Builder(context)
                 .setNeutralButton(android.R.string.ok, (dialog, which) -> dialog.dismiss());
-        Observable<File> observable = new OpmlExportWorker().exportObservable();
+        Observable<File> observable = new ExportWorker(exportWriter).exportObservable();
         subscription = observable.subscribeOn(Schedulers.newThread())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(output -> {
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 5f56b14df..fab96338e 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -289,6 +289,9 @@
             android:key="prefOpmlExport"
             android:title="@string/opml_export_label"/>
         <Preference
+            android:key="prefHtmlExport"
+            android:title="@string/html_export_label"/>
+        <Preference
             android:key="statistics"
             android:title="@string/statistics_label"/>
     </PreferenceCategory>