Added basic tag editor UI

3 files changed, 6 insertions, 3 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedFilter.java b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedFilter.java
index 28161ac9b..020ffb270 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedFilter.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedFilter.java
@@ -1,11 +1,12 @@
 package de.danoeh.antennapod.core.feed;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class FeedFilter {
+public class FeedFilter implements Serializable {
 
     private static final String TAG = "FeedFilter";
 
diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedPreferences.java b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedPreferences.java
index 794c71cf3..3ee91adf5 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedPreferences.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedPreferences.java
@@ -7,6 +7,7 @@ import android.text.TextUtils;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.storage.PodDBAdapter;
 
+import java.io.Serializable;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
@@ -14,11 +15,11 @@ import java.util.Set;
 /**
  * Contains preferences for a single feed.
  */
-public class FeedPreferences {
+public class FeedPreferences implements Serializable {
 
     public static final float SPEED_USE_GLOBAL = -1;
     public static final String TAG_ROOT = "#root";
-    public static final String TAG_SEPARATOR = ",";
+    public static final String TAG_SEPARATOR = "\u001e";
 
     public enum AutoDeleteAction {
         GLOBAL,
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 2efc36809..6511fa496 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -736,6 +736,7 @@
     <string name="authentication_descr">Change your username and password for this podcast and its episodes.</string>
     <string name="feed_folders_label">Folders</string>
     <string name="feed_folders_summary">Change the folders in which this podcast is displayed.</string>
+    <string name="feed_folders_include_root">Show in main list</string>
     <string name="auto_download_settings_label">Auto Download Settings</string>
     <string name="episode_filters_label">Episode Filter</string>
     <string name="episode_filters_description">List of terms used to decide if an episode should be included or excluded when auto downloading</string>