Correct problem with # in the file name of an attachment.

[neighbornote/NeighborNote.git] / src / cx / fbn / nevernote / gui / BrowserWindow.java

diff --git a/src/cx/fbn/nevernote/gui/BrowserWindow.java b/src/cx/fbn/nevernote/gui/BrowserWindow.java
index 052bad6..6c44862 100644 (file)
--- a/src/cx/fbn/nevernote/gui/BrowserWindow.java
+++ b/src/cx/fbn/nevernote/gui/BrowserWindow.java
@@ -1099,8 +1099,6 @@ public class BrowserWindow extends QWidget {
                }\r
                QClipboard clipboard = QApplication.clipboard();\r
                QMimeData mime = clipboard.mimeData();\r
-               \r
-//              String x = mime.html();\r
 \r
                if (mime.hasImage()) {\r
                        logger.log(logger.EXTREME, "Image paste found");\r
@@ -1112,7 +1110,7 @@ public class BrowserWindow extends QWidget {
 \r
                if (mime.hasUrls()) {\r
                        logger.log(logger.EXTREME, "URL paste found");\r
-                       if (!mime.text().startsWith("evernote:")) {\r
+                       if (mime.text().startsWith("evernote:")) {\r
                                handleNoteLink(mime);\r
                        } else {\r
                                handleUrls(mime);\r
@@ -2406,15 +2404,15 @@ public class BrowserWindow extends QWidget {
                                imageURL = file.fileName() + ".png";\r
                                }\r
                        }\r
-                                               \r
+                       \r
                        logger.log(logger.EXTREME, "Generating link tags");\r
                        buffer.delete(0, buffer.length());\r
                        buffer.append("<a en-tag=\"en-media\" guid=\"" +newRes.getGuid()+"\" ");\r
                        buffer.append(" onContextMenu=\"window.jambi.imageContextMenu(&apos;")\r
                      .append(Global.getFileManager().getResDirPath(fileName))\r
                      .append("&apos;);\" ");                   buffer.append("type=\"" + mimeType + "\" href=\"nnres://" + fileName +"\" hash=\""+Global.byteArrayToHexString(newRes.getData().getBodyHash()) +"\" >");\r
-                       buffer.append("<img src=\"" + imageURL + "\" title=\"" +newRes.getAttributes().getFileName());\r
-                       buffer.append("\"></img>");\r
+                       buffer.append("<img src='\"" + imageURL + "\" title=\"" +new QUrl(newRes.getAttributes().getFileName()).toEncoded().toString());\r
+                       buffer.append("\"'></img>");\r
                        buffer.append("</a>");\r
                        browser.page().mainFrame().evaluateJavaScript(\r
                                        script_start + buffer.toString() + script_end);\r
@@ -2424,13 +2422,18 @@ public class BrowserWindow extends QWidget {
 \r
        private Resource createResource(String url, int sequence, String mime, boolean attachment) {\r
                logger.log(logger.EXTREME, "Inside create resource");\r
-               QFile resourceFile;\r
+               QFile resourceFile; \r
+               //These two lines are added to handle odd characters in the name like #.  Without it\r
+               // toLocalFile() chokes and returns the wrong name.\r
+               url = url.replace("file:///", "");\r
+               url = url.replace("file://", "");\r
                String urlTest = new QUrl(url).toLocalFile();\r
+               urlTest = url;\r
                if (!urlTest.equals(""))\r
                        url = urlTest;\r
-               url = url.replace("/", File.separator);\r
+//             url = url.replace("/", File.separator);\r
                logger.log(logger.EXTREME, "Reading from file to create resource");\r
-       resourceFile = new QFile(url); \r
+               resourceFile = new QFile(url); \r
        resourceFile.open(new QIODevice.OpenMode(QIODevice.OpenModeFlag.ReadOnly));\r
 //     logger.log(logger.EXTREME, "Error opening file "+url.toString()  +": "+resourceFile.errorString());\r
        byte[] fileData = resourceFile.readAll().toByteArray();\r