diff options
| author | Martin Fietz <Martin.Fietz@gmail.com> | 2018-04-05 18:47:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-05 18:47:14 +0200 |
| commit | 3dc2fc16c91e982922274319acd1f6f1d6d3b297 (patch) | |
| tree | 6aa38216cb45c905ed86ba0e830c58a85facbf60 /app/src | |
| parent | 57b7b094bd61ecd8074046b980ecdadbb1dd57eb (diff) | |
| parent | 15d93f01c98cee7457a022e6ef85532621b03c90 (diff) | |
| download | AntennaPod-3dc2fc16c91e982922274319acd1f6f1d6d3b297.zip | |
Merge pull request #2624 from ByteHamster/opml-import
Added OPML import option next to the export option
Diffstat (limited to 'app/src')
| -rw-r--r-- | app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java | 7 | ||||
| -rw-r--r-- | app/src/main/res/xml/preferences.xml | 3 |
2 files changed, 10 insertions, 0 deletions
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 2877fe521..2c7d738dd 100644 --- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java +++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java @@ -39,6 +39,7 @@ import android.widget.Toast; import com.afollestad.materialdialogs.MaterialDialog; import de.danoeh.antennapod.activity.ImportExportActivity; +import de.danoeh.antennapod.activity.OpmlImportFromPathActivity; import org.apache.commons.lang3.ArrayUtils; import java.io.File; @@ -89,6 +90,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_OPML_IMPORT = "prefOpmlImport"; private static final String PREF_HTML_EXPORT = "prefHtmlExport"; private static final String STATISTICS = "statistics"; private static final String IMPORT_EXPORT = "importExport"; @@ -185,6 +187,11 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc preference -> export(new OpmlWriter())); ui.findPreference(PreferenceController.PREF_HTML_EXPORT).setOnPreferenceClickListener( preference -> export(new HtmlWriter())); + ui.findPreference(PreferenceController.PREF_OPML_IMPORT).setOnPreferenceClickListener( + preference -> { + activity.startActivity(new Intent(activity, OpmlImportFromPathActivity.class)); + return true; + }); ui.findPreference(PreferenceController.PREF_CHOOSE_DATA_DIR).setOnPreferenceClickListener( preference -> { if (Build.VERSION_CODES.KITKAT <= Build.VERSION.SDK_INT && diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 8ed7da731..ba389fc3c 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -313,6 +313,9 @@ android:key="prefOpmlExport" android:title="@string/opml_export_label"/> <Preference + android:key="prefOpmlImport" + android:title="@string/opml_import_label"/> + <Preference android:key="prefHtmlExport" android:title="@string/html_export_label"/> <Preference |