From 0cbba642465e04d01b181340602aadcf4cbe4cd0 Mon Sep 17 00:00:00 2001 From: lado Date: Tue, 25 Feb 2014 12:56:39 +0100 Subject: http://projects.vdr-developer.org/issues/1736 --- vdrmanager/src/de/bjusystems/vdrmanager/data/Channel.java | 7 ++++--- vdrmanager/src/de/bjusystems/vdrmanager/data/Epg.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'vdrmanager') diff --git a/vdrmanager/src/de/bjusystems/vdrmanager/data/Channel.java b/vdrmanager/src/de/bjusystems/vdrmanager/data/Channel.java index d8ca9ec..8aadb16 100644 --- a/vdrmanager/src/de/bjusystems/vdrmanager/data/Channel.java +++ b/vdrmanager/src/de/bjusystems/vdrmanager/data/Channel.java @@ -10,6 +10,7 @@ import com.j256.ormlite.table.DatabaseTable; import de.bjusystems.vdrmanager.StringUtils; import de.bjusystems.vdrmanager.app.C; +import static de.bjusystems.vdrmanager.gui.Utils.mapSpecialChars; @DatabaseTable public class Channel implements Parcelable { @@ -67,8 +68,8 @@ public class Channel implements Parcelable { C.DATA_SEPARATOR); this.number = Integer.valueOf(words[0].substring(1)); if (words.length > 2) { - this.name = words[1]; - this.provider = words[2]; + this.name = mapSpecialChars(words[1]); + this.provider = mapSpecialChars(words[2]); this.id = words[3]; this.rawAudio = words[4]; if (words.length > 5) { @@ -77,7 +78,7 @@ public class Channel implements Parcelable { this.source = "Default"; } } else { - this.name = words[1]; + this.name = mapSpecialChars(words[1]); this.id = "-1"; this.provider = "Unknown"; this.rawAudio = ""; diff --git a/vdrmanager/src/de/bjusystems/vdrmanager/data/Epg.java b/vdrmanager/src/de/bjusystems/vdrmanager/data/Epg.java index 7fc873b..bfc0c6c 100644 --- a/vdrmanager/src/de/bjusystems/vdrmanager/data/Epg.java +++ b/vdrmanager/src/de/bjusystems/vdrmanager/data/Epg.java @@ -31,7 +31,7 @@ public class Epg extends Event implements Timerable { final String[] words = StringUtils.splitPreserveAllTokens(line, C.DATA_SEPARATOR); channelNumber = Long.valueOf(words[0].substring(1)); - channelName = words[1]; + channelName = Utils.mapSpecialChars(words[1]); start = new Date(Long.parseLong(words[2]) * 1000); stop = new Date(Long.parseLong(words[3]) * 1000); title = mapSpecialChars(words[4]); -- cgit v1.2.3