Unicode fix for editing source HTML.

[neighbornote/NeighborNote.git] / src / cx / fbn / nevernote / threads / SyncRunner.java

diff --git a/src/cx/fbn/nevernote/threads/SyncRunner.java b/src/cx/fbn/nevernote/threads/SyncRunner.java
index 70e2f7c..d2d4f59 100644 (file)
--- a/src/cx/fbn/nevernote/threads/SyncRunner.java
+++ b/src/cx/fbn/nevernote/threads/SyncRunner.java
@@ -1,5 +1,5 @@
 /*\r
- * This file is part of NeverNote \r
+ * This file is part of NixNote \r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
@@ -72,6 +72,7 @@ import com.trolltech.qt.core.QByteArray;
 import com.trolltech.qt.core.QFile;\r
 import com.trolltech.qt.core.QIODevice.OpenModeFlag;\r
 import com.trolltech.qt.core.QObject;\r
+import com.trolltech.qt.core.QTextCodec;\r
 import com.trolltech.qt.gui.QMessageBox;\r
 \r
 import cx.fbn.nevernote.signals.NoteIndexSignal;\r
@@ -98,7 +99,7 @@ public class SyncRunner extends QObject implements Runnable {
                public volatile boolean                 keepRunning;\r
                public volatile String                  authToken;\r
                private long                                    evernoteUpdateCount;\r
-               private final String userAgent = "NeverNote/" + System.getProperty("os.name")\r
+               private final String userAgent = "NixNote/" + System.getProperty("os.name")\r
                                                                +"/"+System.getProperty("java.vendor") + "/"\r
                                                                + System.getProperty("java.version") +";";\r
                \r
@@ -1532,7 +1533,7 @@ public class SyncRunner extends QObject implements Runnable {
                \r
            boolean versionOk = false;\r
                try {\r
-                       versionOk = userStore.checkVersion("NeverNote", \r
+                       versionOk = userStore.checkVersion("NixNote", \r
                    com.evernote.edam.userstore.Constants.EDAM_VERSION_MAJOR, \r
                      com.evernote.edam.userstore.Constants.EDAM_VERSION_MINOR);\r
                } catch (TException e) {\r
@@ -1672,7 +1673,9 @@ public class SyncRunner extends QObject implements Runnable {
        }\r
     \r
     private Note getNoteContent(Note n) {\r
-       n.setContent(conn.getNoteTable().getNoteContentBinary(n.getGuid()));\r
+               QTextCodec codec = QTextCodec.codecForLocale();\r
+               codec = QTextCodec.codecForName("UTF-8");\r
+       n.setContent(codec.toUnicode(new QByteArray(n.getContent())));\r
        return n;\r
     }\r
 \r