From 9dfdace2300f7e39c81e73d150cd1648df965f99 Mon Sep 17 00:00:00 2001
From: Randy Baumgarte <randy@fbn.cx>
Date: Mon, 1 Aug 2011 07:34:49 -0400
Subject: [PATCH] Unicode fix for editing source HTML.

---
 src/cx/fbn/nevernote/NeverNote.java          |  2 +-
 src/cx/fbn/nevernote/gui/BrowserWindow.java  | 25 +++++++++++++++++++++++--
 src/cx/fbn/nevernote/sql/NoteTable.java      | 14 ++++----------
 src/cx/fbn/nevernote/threads/SyncRunner.java |  5 ++++-
 src/cx/fbn/nevernote/xml/ExportData.java     |  2 +-
 5 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/src/cx/fbn/nevernote/NeverNote.java b/src/cx/fbn/nevernote/NeverNote.java
index 76c373d..3ca3c48 100644
--- a/src/cx/fbn/nevernote/NeverNote.java
+++ b/src/cx/fbn/nevernote/NeverNote.java
@@ -4884,7 +4884,7 @@ public class NeverNote extends QMainWindow{
 		
 		Note oldNote = conn.getNoteTable().getNote(guid, true, false,false,false,true);
 		List<Resource> resList = conn.getNoteTable().noteResourceTable.getNoteResources(guid, true);
-		oldNote.setContent(conn.getNoteTable().getNoteContentBinary(guid));
+		oldNote.setContent(conn.getNoteTable().getNoteContentNoUTFConversion(guid));
 		oldNote.setResources(resList);
 		duplicateNote(oldNote);
 	}
diff --git a/src/cx/fbn/nevernote/gui/BrowserWindow.java b/src/cx/fbn/nevernote/gui/BrowserWindow.java
index 2741c49..2c2157c 100644
--- a/src/cx/fbn/nevernote/gui/BrowserWindow.java
+++ b/src/cx/fbn/nevernote/gui/BrowserWindow.java
@@ -38,6 +38,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.StringTokenizer;
 
+import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 
 import com.evernote.edam.limits.Constants;
@@ -3384,9 +3385,12 @@ public class BrowserWindow extends QWidget {
 	// Source edited
 	@SuppressWarnings("unused")
 	private void sourceEdited() {
-		QByteArray data = new QByteArray(sourceEditHeader+sourceEdit.toPlainText()+"</body></html>");
+		QTextCodec codec = QTextCodec.codecForLocale();
+		codec = QTextCodec.codecForName("UTF-8");
+        String content =  codec.fromUnicode(sourceEdit.toHtml()).toString();
+		content = StringEscapeUtils.unescapeHtml(removeTags(content));
+		QByteArray data = new QByteArray(sourceEditHeader+content+"</body></html>");
 		getBrowser().setContent(data);
-
 		checkNoteTitle();
 		noteSignal.noteChanged.emit(currentNote.getGuid(), sourceEdit.toPlainText()); 
 	}
@@ -3412,4 +3416,21 @@ public class BrowserWindow extends QWidget {
 	public void showSource(boolean value) {
 		sourceEdit.setVisible(value);
 	}
+
+	// Remove HTML tags
+	private String removeTags(String text) {
+		StringBuffer buffer = new StringBuffer(text);
+		boolean inTag = false;
+		int bodyPosition = text.indexOf("<body");
+		for (int i=buffer.length()-1; i>=0; i--) {
+			if (buffer.charAt(i) == '>')
+				inTag = true;
+			if (buffer.charAt(i) == '<')
+				inTag = false;
+			if (inTag || buffer.charAt(i) == '<' || i<bodyPosition)
+				buffer.deleteCharAt(i);
+		}
+		
+		return buffer.toString();
+	}
 }
diff --git a/src/cx/fbn/nevernote/sql/NoteTable.java b/src/cx/fbn/nevernote/sql/NoteTable.java
index 6e919f4..bd27b1d 100644
--- a/src/cx/fbn/nevernote/sql/NoteTable.java
+++ b/src/cx/fbn/nevernote/sql/NoteTable.java
@@ -210,15 +210,7 @@ public class NoteTable {
 		}
 	}
 
-	// Get a note's content in raw, binary format for the sync.
-	public String getNoteContentBinary(String guid) {
-		NSqlQuery query = new NSqlQuery(db.getConnection());
-		query.prepare("Select content from note where guid=:guid");
-		query.bindValue(":guid", guid);
-		query.exec();		
-		query.next();
-		return query.valueString(0);
-	}
+
 	// Get a note's content in blob format for index.
 	public String getNoteContentNoUTFConversion(String guid) {
 		NSqlQuery query = new NSqlQuery(db.getConnection());
@@ -542,7 +534,9 @@ public class NoteTable {
 			logger.log(logger.MEDIUM, query.lastError());
 		}
 		
-		query.bindValue(":content", content);
+		QTextCodec codec = QTextCodec.codecForLocale();
+		codec = QTextCodec.codecForName("UTF-8");
+		query.bindValue(":content", codec.fromUnicode(content).toString());
 		query.bindValue(":guid", guid);
 
 		check = query.exec();
diff --git a/src/cx/fbn/nevernote/threads/SyncRunner.java b/src/cx/fbn/nevernote/threads/SyncRunner.java
index 8acd108..d2d4f59 100644
--- a/src/cx/fbn/nevernote/threads/SyncRunner.java
+++ b/src/cx/fbn/nevernote/threads/SyncRunner.java
@@ -72,6 +72,7 @@ import com.trolltech.qt.core.QByteArray;
 import com.trolltech.qt.core.QFile;
 import com.trolltech.qt.core.QIODevice.OpenModeFlag;
 import com.trolltech.qt.core.QObject;
+import com.trolltech.qt.core.QTextCodec;
 import com.trolltech.qt.gui.QMessageBox;
 
 import cx.fbn.nevernote.signals.NoteIndexSignal;
@@ -1672,7 +1673,9 @@ public class SyncRunner extends QObject implements Runnable {
 	}
     
     private Note getNoteContent(Note n) {
-    	n.setContent(conn.getNoteTable().getNoteContentBinary(n.getGuid()));
+		QTextCodec codec = QTextCodec.codecForLocale();
+		codec = QTextCodec.codecForName("UTF-8");
+    	n.setContent(codec.toUnicode(new QByteArray(n.getContent())));
     	return n;
     }
 
diff --git a/src/cx/fbn/nevernote/xml/ExportData.java b/src/cx/fbn/nevernote/xml/ExportData.java
index ee36b19..2601015 100644
--- a/src/cx/fbn/nevernote/xml/ExportData.java
+++ b/src/cx/fbn/nevernote/xml/ExportData.java
@@ -341,7 +341,7 @@ public class ExportData {
 		
 		logger.log(logger.EXTREME, "Writing content");
 		writer.writeStartElement("Content");
-		writer.writeCDATA(conn.getNoteTable().getNoteContentBinary(note.getGuid()));
+		writer.writeCDATA(conn.getNoteTable().getNoteContentNoUTFConversion(note.getGuid()));
 		writer.writeEndElement();
 		writer.writeEndElement();
 	}
-- 
2.11.0