Upgrade apache & evernote libraries

diff --git a/.classpath b/.classpath
index 4cbb438..1c8c489 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -2,12 +2,11 @@
 <classpath>\r
        <classpathentry kind="src" path="src"/>\r
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
-       <classpathentry kind="lib" path="lib/evernote.jar"/>\r
-       <classpathentry kind="lib" path="lib/h2-1.2.147.jar"/>\r
+       <classpathentry kind="lib" path="lib/evernote-api-1.19.jar"/>\r
+       <classpathentry kind="lib" path="lib/h2-1.3.158.jar"/>\r
        <classpathentry kind="lib" path="lib/libthrift.jar"/>\r
        <classpathentry kind="lib" path="lib/log4j-1.2.14.jar"/>\r
-       <classpathentry kind="lib" path="lib/PDFRenderer.jar"/>\r
-       <classpathentry kind="lib" path="lib/commons-lang-2.4.jar"/>\r
+       <classpathentry kind="lib" path="lib/commons-lang3-3.0.jar"/>\r
        <classpathentry kind="lib" path="lib/jtidy-r938.jar"/>\r
        <classpathentry kind="var" path="QT_JAMBI/qtjambi-4.5.0_01.jar"/>\r
        <classpathentry kind="var" path="QT_JAMBI/qtjambi-win32-msvc2005-4.5.0_01.jar"/>\r
@@ -15,18 +14,18 @@
        <classpathentry kind="lib" path="lib/poi-3.7-20101029.jar"/>\r
        <classpathentry kind="lib" path="lib/poi-ooxml-schemas-3.7-20101029.jar"/>\r
        <classpathentry kind="lib" path="lib/xmlbeans-2.3.0.jar"/>\r
-       <classpathentry kind="lib" path="lib/commons-compress-1.1.jar"/>\r
+       <classpathentry kind="lib" path="lib/commons-compress-1.2.jar"/>\r
        <classpathentry kind="lib" path="lib/poi-ooxml-3.7.jar"/>\r
        <classpathentry kind="lib" path="lib/jaxen-1.1.3.jar"/>\r
        <classpathentry kind="lib" path="lib/xsdlib-20060615.jar"/>\r
        <classpathentry kind="lib" path="lib/jazzy.jar"/>\r
        <classpathentry kind="lib" path="lib/tika.jar"/>\r
        <classpathentry kind="lib" path="lib/apache-mime4j-0.6.jar"/>\r
-       <classpathentry kind="lib" path="lib/commons-codec-1.3.jar"/>\r
+       <classpathentry kind="lib" path="lib/commons-codec-1.5.jar"/>\r
        <classpathentry kind="lib" path="lib/commons-logging-1.1.1.jar"/>\r
-       <classpathentry kind="lib" path="lib/httpclient-4.0.3.jar"/>\r
-       <classpathentry kind="lib" path="lib/httpcore-4.0.1.jar"/>\r
-       <classpathentry kind="lib" path="lib/httpmime-4.0.3.jar"/>\r
-       <classpathentry kind="lib" path="lib/pdfbox-app-1.3.1.jar"/>\r
+       <classpathentry kind="lib" path="lib/httpclient-4.1.1.jar"/>\r
+       <classpathentry kind="lib" path="lib/httpcore-4.1.jar"/>\r
+       <classpathentry kind="lib" path="lib/httpmime-4.1.1.jar"/>\r
+       <classpathentry kind="lib" path="lib/pdfbox-app-1.6.0.jar"/>\r
        <classpathentry kind="output" path="bin"/>\r
 </classpath>\r

diff --git a/lib/PDFRenderer.jar b/lib/PDFRenderer.jar
deleted file mode 100644 (file)
index 524b6a6..0000000
Binary files a/lib/PDFRenderer.jar and /dev/null differ

diff --git a/lib/commons-codec-1.3.jar b/lib/commons-codec-1.3.jar
deleted file mode 100644 (file)
index 957b675..0000000
Binary files a/lib/commons-codec-1.3.jar and /dev/null differ

diff --git a/lib/commons-codec-1.5.jar b/lib/commons-codec-1.5.jar
new file mode 100644 (file)
index 0000000..e9013fe
Binary files /dev/null and b/lib/commons-codec-1.5.jar differ

diff --git a/lib/commons-compress-1.1.jar b/lib/commons-compress-1.1.jar
deleted file mode 100644 (file)
index 51baf91..0000000
Binary files a/lib/commons-compress-1.1.jar and /dev/null differ

diff --git a/lib/commons-compress-1.2.jar b/lib/commons-compress-1.2.jar
new file mode 100644 (file)
index 0000000..6175390
Binary files /dev/null and b/lib/commons-compress-1.2.jar differ

diff --git a/lib/commons-lang-2.4.jar b/lib/commons-lang-2.4.jar
deleted file mode 100644 (file)
index 880c89b..0000000
Binary files a/lib/commons-lang-2.4.jar and /dev/null differ

diff --git a/lib/commons-lang3-3.0.jar b/lib/commons-lang3-3.0.jar
new file mode 100644 (file)
index 0000000..780db95
Binary files /dev/null and b/lib/commons-lang3-3.0.jar differ

diff --git a/lib/evernote-api-1.19.jar b/lib/evernote-api-1.19.jar
new file mode 100644 (file)
index 0000000..371d80e
Binary files /dev/null and b/lib/evernote-api-1.19.jar differ

diff --git a/lib/evernote.jar b/lib/evernote.jar
deleted file mode 100644 (file)
index 7c1cfae..0000000
Binary files a/lib/evernote.jar and /dev/null differ

diff --git a/lib/httpclient-4.0.3.jar b/lib/httpclient-4.0.3.jar
deleted file mode 100644 (file)
index fd0d377..0000000
Binary files a/lib/httpclient-4.0.3.jar and /dev/null differ

diff --git a/lib/httpclient-4.1.1.jar b/lib/httpclient-4.1.1.jar
new file mode 100644 (file)
index 0000000..c845ef9
Binary files /dev/null and b/lib/httpclient-4.1.1.jar differ

diff --git a/lib/httpcore-4.0.1.jar b/lib/httpcore-4.0.1.jar
deleted file mode 100644 (file)
index 4aef35e..0000000
Binary files a/lib/httpcore-4.0.1.jar and /dev/null differ

diff --git a/lib/httpcore-4.1.jar b/lib/httpcore-4.1.jar
new file mode 100644 (file)
index 0000000..a357c07
Binary files /dev/null and b/lib/httpcore-4.1.jar differ

diff --git a/lib/httpmime-4.0.3.jar b/lib/httpmime-4.0.3.jar
deleted file mode 100644 (file)
index 0dfd331..0000000
Binary files a/lib/httpmime-4.0.3.jar and /dev/null differ

diff --git a/lib/httpmime-4.1.1.jar b/lib/httpmime-4.1.1.jar
new file mode 100644 (file)
index 0000000..01af40b
Binary files /dev/null and b/lib/httpmime-4.1.1.jar differ

diff --git a/lib/pdfbox-app-1.3.1.jar b/lib/pdfbox-app-1.6.0.jar
similarity index 89%
rename from lib/pdfbox-app-1.3.1.jar
rename to lib/pdfbox-app-1.6.0.jar
index 19dc7ef..52b5cf9 100644 (file)
Binary files a/lib/pdfbox-app-1.3.1.jar and b/lib/pdfbox-app-1.6.0.jar differ

diff --git a/nixnote-osx b/nixnote-osx
index 64fcd80..579a2b5 100644 (file)
--- a/nixnote-osx
+++ b/nixnote-osx
@@ -88,21 +88,21 @@ NN_CLASSPATH=$NIXNOTE/nixnote.jar
 
 NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/PDFRenderer.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/apache-mime4j-0.6.jar
-NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/commons-codec-1.3.jar
-NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/commons-compress-1.1.jar
-NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/commons-lang-2.4.jar
+NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/commons-codec-1.5.jar
+NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/commons-compress-1.2.jar
+NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/commons-lang3-3.0.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/commons-logging-1.1.1.jar
-NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/evernote.jar
+NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/evernote-api-1.19.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/h2-1.3.158.jar
-NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/httpclient-4.0.3.jar
-NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/httpcore-4.0.1.jar
-NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/httpmime-4.0.3.jar
+NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/httpclient-4.1.1.jar
+NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/httpcore-4.1.jar
+NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/httpmime-4.1.1.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/jaxen-1.1.3.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/jazzy.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/jtidy-r938.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/libthrift.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/log4j-1.2.14.jar
-NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/pdfbox-app-1.3.1.jar
+NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/pdfbox-app-1.6.0.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/poi-3.7-20101029.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/poi-ooxml-3.7.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/poi-ooxml-schemas-3.7-20101029.jar

diff --git a/nixnote.bat b/nixnote.bat
index 064f1a5..aa7ec0c 100644 (file)
--- a/nixnote.bat
+++ b/nixnote.bat
@@ -78,23 +78,22 @@ rem # Setup environment #
 rem #####################\r
 set NN_CLASSPATH=%NIXNOTE%nixnote.jar\r
 \r
-set NN_CLASSPATH=%NN_CLASSPATH%;%NIXNOTE%lib\PDFRenderer.jar\r
 set NN_CLASSPATH=%NN_CLASSPATH%;%NIXNOTE%lib\apache-mime4j-0.6.jar\r
-set NN_CLASSPATH=%NN_CLASSPATH%;%NIXNOTE%lib\commons-codec-1.3.jar\r
-set NN_CLASSPATH=%NN_CLASSPATH%;%NIXNOTE%lib\commons-compress-1.1.jar\r
-set NN_CLASSPATH=%NN_CLASSPATH%;%NIXNOTE%lib\commons-lang-2.4.jar\r
+set NN_CLASSPATH=%NN_CLASSPATH%;%NIXNOTE%lib\commons-codec-1.5.jar\r
+set NN_CLASSPATH=%NN_CLASSPATH%;%NIXNOTE%lib\commons-compress-1.2.jar\r
+set NN_CLASSPATH=%NN_CLASSPATH%;%NIXNOTE%lib\commons-lang3-3.0.jar\r
 set NN_CLASSPATH=%NN_CLASSPATH%;%NIXNOTE%lib\commons-logging-1.1.1.jar\r
-set NN_CLASSPATH=%NN_CLASSPATH%;%NIXNOTE%lib\evernote.jar\r
+set NN_CLASSPATH=%NN_CLASSPATH%;%NIXNOTE%lib\evernote-api-1.19.jar\r
 set NN_CLASSPATH=%NN_CLASSPATH%;%NIXNOTE%lib\h2-1.3.158.jar\r
-set NN_CLASSPATH=%NN_CLASSPATH%;%NIXNOTE%lib\httpclient-4.0.3.jar\r
-set NN_CLASSPATH=%NN_CLASSPATH%;%NIXNOTE%lib\httpcore-4.0.1.jar\r
-set NN_CLASSPATH=%NN_CLASSPATH%;%NIXNOTE%lib\httpmime-4.0.3.jar\r
+set NN_CLASSPATH=%NN_CLASSPATH%;%NIXNOTE%lib\httpclient-4.1.1.jar\r
+set NN_CLASSPATH=%NN_CLASSPATH%;%NIXNOTE%lib\httpcore-4.1.jar\r
+set NN_CLASSPATH=%NN_CLASSPATH%;%NIXNOTE%lib\httpmime-4.1.1.jar\r
 set NN_CLASSPATH=%NN_CLASSPATH%;%NIXNOTE%lib\jaxen-1.1.3.jar\r
 set NN_CLASSPATH=%NN_CLASSPATH%;%NIXNOTE%lib\jazzy.jar\r
 set NN_CLASSPATH=%NN_CLASSPATH%;%NIXNOTE%lib\jtidy-r938.jar\r
 set NN_CLASSPATH=%NN_CLASSPATH%;%NIXNOTE%lib\libthrift.jar\r
 set NN_CLASSPATH=%NN_CLASSPATH%;%NIXNOTE%lib\log4j-1.2.14.jar\r
-set NN_CLASSPATH=%NN_CLASSPATH%;%NIXNOTE%lib\pdfbox-app-1.3.1.jar\r
+set NN_CLASSPATH=%NN_CLASSPATH%;%NIXNOTE%lib\pdfbox-app-1.6.0.jar\r
 set NN_CLASSPATH=%NN_CLASSPATH%;%NIXNOTE%lib\poi-3.7-20101029.jar\r
 set NN_CLASSPATH=%NN_CLASSPATH%;%NIXNOTE%lib\poi-ooxml-3.7.jar\r
 set NN_CLASSPATH=%NN_CLASSPATH%;%NIXNOTE%lib\poi-ooxml-schemas-3.7-20101029.jar\r

diff --git a/nixnote.sh b/nixnote.sh
index 3e85fc0..3466cfd 100755 (executable)
--- a/nixnote.sh
+++ b/nixnote.sh
@@ -81,23 +81,22 @@ done
 #####################
 NN_CLASSPATH=$NIXNOTE/nixnote.jar
 
-NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/PDFRenderer.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/apache-mime4j-0.6.jar
-NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/commons-codec-1.3.jar
-NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/commons-compress-1.1.jar
-NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/commons-lang-2.4.jar
+NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/commons-codec-1.5.jar
+NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/commons-compress-1.2.jar
+NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/commons-lang3-3.0.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/commons-logging-1.1.1.jar
-NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/evernote.jar
+NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/evernote-api-1.19.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/h2-1.3.158.jar
-NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/httpclient-4.0.3.jar
-NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/httpcore-4.0.1.jar
-NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/httpmime-4.0.3.jar
+NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/httpclient-4.1.1.jar
+NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/httpcore-4.1.jar
+NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/httpmime-4.1.1.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/jaxen-1.1.3.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/jazzy.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/jtidy-r938.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/libthrift.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/log4j-1.2.14.jar
-NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/pdfbox-app-1.3.1.jar
+NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/pdfbox-app-1.6.0.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/poi-3.7-20101029.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/poi-ooxml-3.7.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NIXNOTE/lib/poi-ooxml-schemas-3.7-20101029.jar

diff --git a/src/cx/fbn/nevernote/Global.java b/src/cx/fbn/nevernote/Global.java
index 6ab88f9..01c731d 100644 (file)
--- a/src/cx/fbn/nevernote/Global.java
+++ b/src/cx/fbn/nevernote/Global.java
@@ -31,7 +31,7 @@ import java.util.Calendar;
 import java.util.HashMap;\r
 import java.util.List;\r
 \r
-import org.apache.commons.lang.StringEscapeUtils;\r
+import org.apache.commons.lang3.StringEscapeUtils;\r
 \r
 import com.evernote.edam.type.Accounting;\r
 import com.evernote.edam.type.PrivilegeLevel;\r
@@ -1604,7 +1604,7 @@ public class Global {
        int zoom = 1;\r
                if (content.indexOf("application/pdf") == -1) {\r
                        if (content.indexOf("image/") == -1) {\r
-                               String text =  StringEscapeUtils.unescapeHtml(content.replaceAll("\\<.*?\\>", ""));\r
+                               String text =  StringEscapeUtils.unescapeHtml4(content.replaceAll("\\<.*?\\>", ""));\r
                                zoom = 2;\r
                                if (text.length() < 500) \r
                                        zoom = 2;\r

diff --git a/src/cx/fbn/nevernote/filters/NoteSortFilterProxyModel.java b/src/cx/fbn/nevernote/filters/NoteSortFilterProxyModel.java
index bb2c4da..810b503 100644 (file)
--- a/src/cx/fbn/nevernote/filters/NoteSortFilterProxyModel.java
+++ b/src/cx/fbn/nevernote/filters/NoteSortFilterProxyModel.java
@@ -38,7 +38,6 @@ public class NoteSortFilterProxyModel extends QSortFilterProxyModel {
        \r
        public NoteSortFilterProxyModel(QObject parent) {\r
                super(parent);\r
-               boolean blocked = false;\r
                guids = new TreeSet<String>();\r
                setDynamicSortFilter(true);\r
                sortChanged = new Signal2<Integer,Integer>();\r

diff --git a/src/cx/fbn/nevernote/gui/BrowserWindow.java b/src/cx/fbn/nevernote/gui/BrowserWindow.java
index 2c2157c..64422fd 100644 (file)
--- a/src/cx/fbn/nevernote/gui/BrowserWindow.java
+++ b/src/cx/fbn/nevernote/gui/BrowserWindow.java
@@ -38,8 +38,8 @@ import java.util.List;
 import java.util.Locale;\r
 import java.util.StringTokenizer;\r
 \r
-import org.apache.commons.lang.StringEscapeUtils;\r
-import org.apache.commons.lang.StringUtils;\r
+import org.apache.commons.lang3.StringEscapeUtils;\r
+import org.apache.commons.lang3.StringUtils;\r
 \r
 import com.evernote.edam.limits.Constants;\r
 import com.evernote.edam.type.Data;\r
@@ -3388,7 +3388,7 @@ public class BrowserWindow extends QWidget {
                QTextCodec codec = QTextCodec.codecForLocale();\r
                codec = QTextCodec.codecForName("UTF-8");\r
         String content =  codec.fromUnicode(sourceEdit.toHtml()).toString();\r
-               content = StringEscapeUtils.unescapeHtml(removeTags(content));\r
+               content = StringEscapeUtils.unescapeHtml4(removeTags(content));\r
                QByteArray data = new QByteArray(sourceEditHeader+content+"</body></html>");\r
                getBrowser().setContent(data);\r
                checkNoteTitle();\r

diff --git a/src/cx/fbn/nevernote/sql/NoteTable.java b/src/cx/fbn/nevernote/sql/NoteTable.java
index bd27b1d..477a794 100644 (file)
--- a/src/cx/fbn/nevernote/sql/NoteTable.java
+++ b/src/cx/fbn/nevernote/sql/NoteTable.java
@@ -27,7 +27,7 @@ import java.util.ArrayList;
 import java.util.HashMap;\r
 import java.util.List;\r
 \r
-import org.apache.commons.lang.StringEscapeUtils;\r
+import org.apache.commons.lang3.StringEscapeUtils;\r
 \r
 import com.evernote.edam.type.Note;\r
 import com.evernote.edam.type.NoteAttributes;\r
@@ -328,7 +328,7 @@ public class NoteTable {
                                        String tempEntity = entity.substring(2, len);\r
                                        try {\r
                                                Integer.parseInt(tempEntity);\r
-                                               entity = codec.fromUnicode(StringEscapeUtils.unescapeHtml(entity)).toString();\r
+                                               entity = codec.fromUnicode(StringEscapeUtils.unescapeHtml4(entity)).toString();\r
                                                buffer.delete(i, j);\r
                                                buffer.insert(i, entity);\r
                                        } catch (Exception e){ }\r

diff --git a/src/cx/fbn/nevernote/sql/REnSearch.java b/src/cx/fbn/nevernote/sql/REnSearch.java
index 70eae3e..abb6c85 100644 (file)
--- a/src/cx/fbn/nevernote/sql/REnSearch.java
+++ b/src/cx/fbn/nevernote/sql/REnSearch.java
@@ -27,7 +27,7 @@ import java.util.GregorianCalendar;
 import java.util.List;\r
 import java.util.regex.Pattern;\r
 \r
-import org.apache.commons.lang.StringEscapeUtils;\r
+import org.apache.commons.lang3.StringEscapeUtils;\r
 \r
 import com.evernote.edam.type.Note;\r
 import com.evernote.edam.type.Notebook;\r
@@ -249,7 +249,7 @@ public class REnSearch {
                n = conn.getNoteTable().getNote(n.getGuid(), true, true, false, false, false);\r
 \r
                // Check for search phrases\r
-               String text = StringEscapeUtils.unescapeHtml(n.getContent().replaceAll("\\<.*?\\>", "")).toLowerCase();\r
+               String text = StringEscapeUtils.unescapeHtml4(n.getContent().replaceAll("\\<.*?\\>", "")).toLowerCase();\r
                boolean negative = false;\r
                for (int i=0; i<searchPhrases.size(); i++) {\r
                        String phrase = searchPhrases.get(i);\r
@@ -512,7 +512,7 @@ public class REnSearch {
                n = conn.getNoteTable().getNote(n.getGuid(), true, true, false, false, false);\r
                \r
                // Check for search phrases\r
-               String text = StringEscapeUtils.unescapeHtml(n.getContent().replaceAll("\\<.*?\\>", "")).toLowerCase();\r
+               String text = StringEscapeUtils.unescapeHtml4(n.getContent().replaceAll("\\<.*?\\>", "")).toLowerCase();\r
                boolean negative = false;\r
                for (int i=0; i<searchPhrases.size(); i++) {\r
                        String phrase = searchPhrases.get(i);\r

diff --git a/src/cx/fbn/nevernote/threads/IndexRunner.java b/src/cx/fbn/nevernote/threads/IndexRunner.java
index 938aac7..f0afc15 100644 (file)
--- a/src/cx/fbn/nevernote/threads/IndexRunner.java
+++ b/src/cx/fbn/nevernote/threads/IndexRunner.java
@@ -29,7 +29,7 @@ import java.util.TreeSet;
 import java.util.concurrent.LinkedBlockingQueue;\r
 import java.util.concurrent.locks.LockSupport;\r
 \r
-import org.apache.commons.lang.StringEscapeUtils;\r
+import org.apache.commons.lang3.StringEscapeUtils;\r
 import org.apache.tika.exception.TikaException;\r
 import org.apache.tika.metadata.Metadata;\r
 import org.apache.tika.parser.ParseContext;\r
@@ -180,9 +180,9 @@ public class IndexRunner extends QObject implements Runnable {
                        data = "";\r
                String text;\r
                if (indexNoteTitle)\r
-                       text =  removeTags(StringEscapeUtils.unescapeHtml(data) +" "+ n.getTitle());\r
+                       text =  removeTags(StringEscapeUtils.unescapeHtml4(data) +" "+ n.getTitle());\r
                else\r
-                       text = removeTags(StringEscapeUtils.unescapeHtml(data));\r
+                       text = removeTags(StringEscapeUtils.unescapeHtml4(data));\r
                                \r
                logger.log(logger.EXTREME, "Splitting words");\r
                String[] result = text.toString().split(regex);\r

diff --git a/src/cx/fbn/nevernote/threads/SyncRunner.java b/src/cx/fbn/nevernote/threads/SyncRunner.java
index d2d4f59..16286e6 100644 (file)
--- a/src/cx/fbn/nevernote/threads/SyncRunner.java
+++ b/src/cx/fbn/nevernote/threads/SyncRunner.java
@@ -609,17 +609,20 @@ public class SyncRunner extends QObject implements Runnable {
                        \r
                if (enNote.isActive()) {\r
                        try {\r
-                               logger.log(logger.EXTREME, "Active dirty note found - non new");\r
                                if (enNote.getUpdateSequenceNum() > 0) {\r
+                                       logger.log(logger.EXTREME, "Active dirty note found - non new" +enNote.getGuid());\r
+                                       logger.log(logger.EXTREME, "Fetching note content");\r
                                        enNote = getNoteContent(enNote);\r
                                        logger.log(logger.MEDIUM, "Updating note : "+ enNote.getGuid() +" <title>" +enNote.getTitle()+"</title>");\r
                                        enNote = noteStore.updateNote(token, enNote);\r
                                } else { \r
-                                       logger.log(logger.EXTREME, "Active dirty found - new note");\r
-                                       logger.log(logger.MEDIUM, "Creating note : "+ enNote.getGuid() +" <title>" +enNote.getTitle()+"</title>");\r
+                                       logger.log(logger.EXTREME, "Active dirty found - new note " +enNote.getGuid());\r
                                        String oldGuid = enNote.getGuid();\r
+                                       logger.log(logger.MEDIUM, "Fetching note content");\r
                                        enNote = getNoteContent(enNote);\r
+                                       logger.log(logger.MEDIUM, "Creating note : "+ enNote.getGuid() +" <title>" +enNote.getTitle()+"</title>");\r
                                        enNote = noteStore.createNote(token, enNote);\r
+                                       logger.log(logger.MEDIUM, "New note Guid : "+ enNote.getGuid() +" <title>" +enNote.getTitle()+"</title>");\r
                                        noteSignal.guidChanged.emit(oldGuid, enNote.getGuid());\r
                                        conn.getNoteTable().updateNoteGuid(oldGuid, enNote.getGuid());\r
                                }\r