Fix --noutf, fix onAction being called to many times, lot of small fixes

[jvcard.git] / src / be / nikiroo / jvcard / tui / panes / ContactDetailsRaw.java

diff --git a/src/be/nikiroo/jvcard/tui/panes/ContactDetails.java b/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java
similarity index 92%
rename from src/be/nikiroo/jvcard/tui/panes/ContactDetails.java
rename to src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java
index 1fad960e46730006273c8ab47943fab1a85eb11d..506eeff96f28481b2c5a9c0303ccde3e40e6ad83 100644 (file)
--- a/src/be/nikiroo/jvcard/tui/panes/ContactDetails.java
+++ b/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java
@@ -10,16 +10,17 @@ import be.nikiroo.jvcard.Data;
 import be.nikiroo.jvcard.TypeInfo;
 import be.nikiroo.jvcard.i18n.Trans;
 import be.nikiroo.jvcard.tui.KeyAction;
+import be.nikiroo.jvcard.tui.UiColors;
 import be.nikiroo.jvcard.tui.KeyAction.DataType;
 import be.nikiroo.jvcard.tui.KeyAction.Mode;
 import be.nikiroo.jvcard.tui.StringUtils;
 import be.nikiroo.jvcard.tui.UiColors.Element;
 
-public class ContactDetails extends MainContentList {
+public class ContactDetailsRaw extends MainContentList {
        private Contact contact;
        private int mode;
 
-       public ContactDetails(Contact contact) {
+       public ContactDetailsRaw(Contact contact) {
                super(null, null);
 
                this.contact = contact;
@@ -79,6 +80,9 @@ public class ContactDetails extends MainContentList {
 
                value = valueBuilder.toString();
 
+               name = StringUtils.sanitize(name, UiColors.getInstance().isUnicode());
+               value = StringUtils.sanitize(value, UiColors.getInstance().isUnicode());
+
                name = StringUtils.padString(name, SIZE_COL_1);
                value = StringUtils.padString(value, width - SIZE_COL_1
                                - getSeparator().length() - 2);