cut/copy: make utf8 copying work

mimecuvalo · Nov 14, 2014 · 4a36918 · 4a36918
1 parent e0c971c
commit 4a36918
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/components/nsIFireFTPUtils.js b/src/components/nsIFireFTPUtils.js
@@ -166,6 +166,8 @@ FireFTPUtils.prototype = {
           newFile.remove(true);
         }
 
+        newName = decodeURI(newName);                                                           // XXX Firefox doesn't send UTF8 across component boundary correctly.
+
         if (isCut) {
           file.moveTo(newDir, newName);                                                         // cut
         } else {

diff --git a/src/content/js/local/localTree.js b/src/content/js/local/localTree.js
@@ -1174,7 +1174,9 @@ var localTree = {
           }
         }
 
-        var innerEx = gFireFTPUtils.cutCopy(this.isCut, zeFiles[x], newFile, newDir, newFile.leafName);
+        // XXX Firefox doesn't send UTF8 across component boundary correctly.
+        // So we encodeURI on the leafName to fix that. Woo.
+        var innerEx = gFireFTPUtils.cutCopy(this.isCut, zeFiles[x], newFile, newDir, encodeURI(newFile.leafName));
 
         if (innerEx) {
           throw innerEx;