Try to correct a problem when saving a note where unprintable characters would be...

diff --git a/src/cx/fbn/nevernote/evernote/EnmlConverter.java b/src/cx/fbn/nevernote/evernote/EnmlConverter.java
index 36e8129..6e0311b 100644 (file)
--- a/src/cx/fbn/nevernote/evernote/EnmlConverter.java
+++ b/src/cx/fbn/nevernote/evernote/EnmlConverter.java
@@ -141,6 +141,7 @@ public class EnmlConverter {
                tidy.setMessageListener(tidyListener);\r
                tidy.getStderr().close();  // the listener will capture messages\r
                tidy.setXmlTags(true);\r
+               tidy.setXHTML(true);\r
                \r
                QTextCodec codec;\r
                codec = QTextCodec.codecForName("UTF-8");\r

diff --git a/src/cx/fbn/nevernote/sql/NoteTable.java b/src/cx/fbn/nevernote/sql/NoteTable.java
index 477a794..c1725df 100644 (file)
--- a/src/cx/fbn/nevernote/sql/NoteTable.java
+++ b/src/cx/fbn/nevernote/sql/NoteTable.java
@@ -534,9 +534,10 @@ public class NoteTable {
                        logger.log(logger.MEDIUM, query.lastError());\r
                }\r
                \r
-               QTextCodec codec = QTextCodec.codecForLocale();\r
-               codec = QTextCodec.codecForName("UTF-8");\r
-               query.bindValue(":content", codec.fromUnicode(content).toString());\r
+//             QTextCodec codec = QTextCodec.codecForLocale();\r
+//             codec = QTextCodec.codecForName("UTF-8");\r
+//             query.bindValue(":content", codec.fromUnicode(content).toString());\r
+               query.bindValue(":content", content);\r
                query.bindValue(":guid", guid);\r
 \r
                check = query.exec();\r

diff --git a/src/cx/fbn/nevernote/xml/XMLCleanup.java b/src/cx/fbn/nevernote/xml/XMLCleanup.java
index 159381d..29584f0 100644 (file)
--- a/src/cx/fbn/nevernote/xml/XMLCleanup.java
+++ b/src/cx/fbn/nevernote/xml/XMLCleanup.java
@@ -128,7 +128,8 @@ public class XMLCleanup {
                                element.setTagName("span");\r
                        }\r
                }\r
-               content = doc.toString();\r
+               // Replace the XML carrage returns that the toString() creates.\r
+               content = doc.toString().replace( "
", "" );\r
 \r
        }\r
        // Start looking through the tree.\r